Merge pull request #19 from axiom-data-science/updates

Updates
axiom-data-science · Feb 21, 2024 · 3ae1faf · 3ae1faf
2 parents 9414427 + 494ee81
commit 3ae1faf
Show file tree

Hide file tree

Showing 15 changed files with 730 additions and 420 deletions.
diff --git a/ci/environment-py3.10.yml b/ci/environment-py3.10.yml
@@ -5,6 +5,7 @@ dependencies:
   - python=3.10
   ############## These will have to be adjusted to your specific project
   # - adios_db
+  - appdirs
   - aiohttp
   - numpy
   # opendrift reqs

diff --git a/ci/environment-py3.11.yml b/ci/environment-py3.11.yml
@@ -5,6 +5,7 @@ dependencies:
   - python=3.11
   ############## These will have to be adjusted to your specific project
   # - adios_db
+  - appdirs
   - aiohttp
   - numpy
   # opendrift reqs

diff --git a/ci/environment-py3.9.yml b/ci/environment-py3.9.yml
@@ -5,6 +5,7 @@ dependencies:
   - python=3.9
   ############## These will have to be adjusted to your specific project
   # - adios_db
+  - appdirs
   - aiohttp
   - numpy
   # opendrift reqs

diff --git a/docs/api.rst b/docs/api.rst
@@ -9,4 +9,4 @@ API
    :recursive:
 
    the_manager
-   models.opendrift.model_opendrift
+   models.opendrift.opendrift
diff --git a/docs/whats_new.md b/docs/whats_new.md
@@ -1,5 +1,15 @@
 # What's New
 
+## v0.7.0 (February 21, 2024)
+
+* Now initialize all class attributes with None and removed usage of `hasattr` which simplifies and clarifies some code.
+* Improved handling of `start_time`, `end_time`, `duration`, and `steps` in `manager.py` which fixed a bug in which users couldn't input `start_time` and have the simulation run successfully.
+* simplified handling of `horizontal_diffusivity` in `opendrift` model.
+* user can change `end_time`, `duration`, and `steps` and have the others update accordingly. Tests added to check this.
+* changed known model "CIOFS_now" to "CIOFSOP" to avoid upper/lower issues and include "OP" for "operational".
+* many more tests and improved behavior for attribute checks and updates
+
+
 ## v0.6.0 (February 15, 2024)
 
 * is set up to tell `opendrift` ROMS reader to save the interpolator to a cache that is set up the first time it is run. This only works with the newest dev version of `opendrift` at the moment, and the files saved are hundreds of MB, but it speeds up the simulations pretty well (12 to 30 seconds).

diff --git a/particle_tracking_manager/__init__.py b/particle_tracking_manager/__init__.py
@@ -1,4 +1,4 @@
 """Particle Tracking Manager."""
 
-from .models.opendrift.model_opendrift import OpenDriftModel
+from .models.opendrift.opendrift import OpenDriftModel
 from .the_manager import ParticleTrackingManager
diff --git a/...er/models/opendrift/opendrift_config.json → ...king_manager/models/opendrift/config.json b/...er/models/opendrift/opendrift_config.json → ...king_manager/models/opendrift/config.json
diff --git a/...nager/models/opendrift/model_opendrift.py → ...ing_manager/models/opendrift/opendrift.py b/...nager/models/opendrift/model_opendrift.py → ...ing_manager/models/opendrift/opendrift.py