Skip to content

Commit

Permalink
Merge branch 'Oscillations_like_Fortran' of github.com:astro-turing/I…
Browse files Browse the repository at this point in the history
…ntegrating-diagenetic-equations-using-Python into Oscillations_like_Fortran
  • Loading branch information
HannoSpreeuw committed Jul 25, 2024
2 parents 743838d + 1a0a4a3 commit c57a6e3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,10 @@ or
poetry run python -m pytest
```

## Copyright

Copyright 2023 Netherlands eScience Center and Utrecht University

## Funding information
Funded by the European Union (ERC, MindTheGap, StG project no 101041077). Views and opinions expressed are however those of the author(s) only and do not necessarily reflect those of the European Union or the European Research Council. Neither the European Union nor the granting authority can be held responsible for them.
![European Union and European Research Council logos](https://erc.europa.eu/sites/default/files/2023-06/LOGO_ERC-FLAG_FP.png)
8 changes: 1 addition & 7 deletions marlpde/parameters.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# ~\~ language=Python filename=marlpde/marlpde.py
# ~\~ begin <<lit/python-interface.md|marlpde/marlpde.py>>[init]
# import numpy
import configparser
from pathlib import Path
from dataclasses import (dataclass, asdict, make_dataclass, fields)
Expand Down Expand Up @@ -153,9 +150,6 @@ class Solver:
So parameters like time interval, time step and tolerance.
'''
dt: float = 1.e-6
eps: float = 1.e-2
# T* is more suitable as a default value
# than the original value (100_000 years).
tmax: int = 250_000
N: int = 200
solver: str = "scipy"
Expand All @@ -170,7 +164,7 @@ class Tracker:
Initialises all the tracking parameters, such as tracker interval.
Also indicates the quantities to be tracked, as boolean values.
'''
progress_tracker_interval: float = 2.5e2 / Map_Scenario().Tstar
progress_tracker_interval: float = Solver().tmax/ 100 / Map_Scenario().Tstar
live_plotting: bool = False
plotting_interval: str = '0:05'
data_tracker_interval: float = 0.01
Expand Down

0 comments on commit c57a6e3

Please sign in to comment.