updates

* updated to use appropriote branch of opendrift
* changed hatch_time_hours to hatch_time_days

Author: kthyng

ci/environment-py3.11.yml

@@ -33,6 +33,6 @@ dependencies:
   - pytest
   - pip:
     # - adios_db
-    - git+https://github.com/kthyng/opendrift.git@start_habs
+    - git+https://github.com/kthyng/opendrift.git@larvalfish_with_phytoplankton
     # - git+https://github.com/fsspec/kerchunk
     # - xroms  # can't be found on conda-forge for CI, but don't need since in runslow tests?

ci/environment-py3.12.yml

@@ -32,7 +32,7 @@ dependencies:
   - pip
   - pytest
   - pip:
-    - git+https://github.com/kthyng/opendrift.git@start_habs
+    - git+https://github.com/kthyng/opendrift.git@larvalfish_with_phytoplankton
     # - adios_db
     # - git+https://github.com/OpenDrift/opendrift
     # - git+https://github.com/fsspec/kerchunk

ci/environment-py3.13.yml

@@ -32,7 +32,7 @@ dependencies:
   - pip
   - pytest
   - pip:
-    - git+https://github.com/kthyng/opendrift.git@start_habs
+    - git+https://github.com/kthyng/opendrift.git@larvalfish_with_phytoplankton
     # - adios_db
     # - git+https://github.com/OpenDrift/opendrift
     # - git+https://github.com/fsspec/kerchunk

docs/environment.yml

@@ -29,7 +29,7 @@ dependencies:
    - recommonmark
    - pip
    - pip:
-     - git+https://github.com/kthyng/opendrift.git@start_habs
+     - git+https://github.com/kthyng/opendrift.git@larvalfish_with_phytoplankton
      - particle-tracking-manager
      - docstring-inheritance
      - docrep<=0.2.7

docs/whats_new.md

@@ -1,6 +1,6 @@
 # What's New
 
-## Unreleased
+## v2.4.0 (March 5, 2026)
 
 * Changed default value of `use_static_masks` to False from True, so that wet/dry masks from ocean models are used by default.
 * Added `time_step_output_integer` to the schema which is a multiplier on `time_step` to calculate `time_step_output`. `time_step_output` is calculated in a field and input to the `OpenDrift` model.
@@ -18,7 +18,7 @@
   * Added new depth-targeting parameters: `z_pref`, `z_day`, `z_night`, `w_active`
   * Added band expansion parameters: `dz_min`, `dz_rel`, `dz_max`
   * Added `hatching_method` parameter: `temperature` (default, legacy) or `fixed_time`
-  * Added `hatch_time_hours` parameter for fixed-time hatching method
+  * Added `hatch_time_days` parameter for fixed-time hatching method
 * Updated test suite to use `Phytoplankton` instead of `HarmfulAlgalBloom` and added comprehensive tests for new `LarvalFish` features
 
 ## v2.3.0 (January 15, 2026)

particle_tracking_manager/models/opendrift/config_opendrift.py

@@ -832,15 +832,15 @@ class LarvalFishModelConfig(OceanDriftModelConfig):
         },
     )
 
-    hatch_time_hours: float = Field(
-        default=48.0,
+    hatch_time_days: float = Field(
+        default=2.0,
         description="Fixed time to hatching when hatching_method is fixed_time.",
         title="Hatch Time",
-        ge=0.1,
-        le=10000,
+        ge=0.004,
+        le=416,
         json_schema_extra={
-            "units": "hours",
-            "od_mapping": "egg:hatch_time_hours",
+            "units": "days",
+            "od_mapping": "egg:hatch_time_days",
             "ptm_level": 2,
         },
     )

setup.cfg

@@ -64,7 +64,7 @@ install_requires =
     matplotlib
     netcdf4
     numpy
-    opendrift
+    opendrift @ git+https://github.com/kthyng/opendrift.git@larvalfish_with_phytoplankton
     pandas
     pip
     pydantic

tests/test_config_opendrift.py

@@ -366,10 +366,10 @@ def test_LarvalFish_fixed_time_hatching():
         drift_model="LarvalFish",
         steps=1,
         hatching_method=HatchingMethodEnum.fixed_time,
-        hatch_time_hours=72.0,
+        hatch_time_days=3.0,
     )
     assert m.hatching_method == HatchingMethodEnum.fixed_time
-    assert m.hatch_time_hours == 72.0
+    assert m.hatch_time_days == 3.0
 
 
 def test_LarvalFish_dvm_mode():

tests/test_opendrift.py

@@ -355,7 +355,7 @@ def test_LarvalFish_hatching_seeding():
     m = OpenDriftModel(
         drift_model="LarvalFish",
         hatching_method="fixed_time",
-        hatch_time_hours=72.0,
+        hatch_time_days=3.0,
         lon=-151,
         lat=60,
         do3D=True,
@@ -365,7 +365,7 @@ def test_LarvalFish_hatching_seeding():
     )
     m.setup_for_simulation()  # creates m.o
     assert m.o._config["egg:hatching_method"]["value"] == "fixed_time"
-    assert m.o._config["egg:hatch_time_hours"]["value"] == 72.0
+    assert m.o._config["egg:hatch_time_days"]["value"] == 3.0
 
 
 def test_wind_drift():

tests/test_realistic.py

@@ -367,7 +367,7 @@ def test_run_LarvalFish_hatching_fixed_time():
         ocean_model_local=False,
         drift_model="LarvalFish",
         hatching_method="fixed_time",
-        hatch_time_hours=0.99,  # Set to 1 hour for quick test but isn't exact
+        hatch_time_days=0.04,  # Set to ~1 hour for quick test
         hatched=0,  # Start as egg
         do3D=True,
     )