ladim 2.0.4__py3-none-any.whl → 2.0.5__py3-none-any.whl

ladim/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '2.0.4'
+__version__ = '2.0.5'
 
 from .main import main, run

ladim/__main__.py

@@ -1,2 +1,2 @@
 from . import run
-run()
+run()

ladim/config.py

@@ -73,7 +73,7 @@ def convert_1_to_2(c):
     if 'numerics' in c:
         if 'dt' in c['numerics']:
             dt_value, dt_unit = c['numerics']['dt']
-            dt_sec = np.timedelta64(dt_value, dt_unit).astype('timedelta64[s]').astype('int64')
+            dt_sec = int(np.timedelta64(dt_value, dt_unit).astype('timedelta64[s]').astype(int))
 
     out['version'] = 2
 
@@ -86,13 +86,17 @@ def convert_1_to_2(c):
 
     out['grid'] = {}
     out['grid']['file'] = dict_get(c, [
+        'gridforce.first_file',
         'files.grid_file', 'gridforce.grid_file',
         'files.input_file', 'gridforce.input_file'])
     out['grid']['legacy_module'] = dict_get(c, 'gridforce.module', '') + '.Grid'
     out['grid']['start_time'] = np.datetime64(dict_get(c, 'time_control.start_time', '1970'), 's')
+    out['grid']['subgrid'] = dict_get(c, 'gridforce.subgrid', None)
 
     out['forcing'] = {}
     out['forcing']['file'] = dict_get(c, ['gridforce.input_file', 'files.input_file'])
+    out['forcing']['first_file'] = dict_get(c, 'gridforce.first_file', "")
+    out['forcing']['last_file'] = dict_get(c, 'gridforce.last_file', "")
     out['forcing']['legacy_module'] = dict_get(c, 'gridforce.module', '') + '.Forcing'
     out['forcing']['start_time'] = np.datetime64(dict_get(c, 'time_control.start_time', '1970'), 's')
     out['forcing']['stop_time'] = np.datetime64(dict_get(c, 'time_control.stop_time', '1970'), 's')

ladim/forcing.py

@@ -45,6 +45,8 @@ class RomsForcing(Forcing):
         legacy_conf = dict(
             gridforce=dict(
                 input_file=file,
+                first_file=conf.get('first_file', ""),
+                last_file=conf.get('last_file', ""),
             ),
             ibm_forcing=conf.get('ibm_forcing', []),
             start_time=conf.get('start_time', None),

ladim/grid.py

@@ -22,18 +22,28 @@ class Grid(Module):
 
 
 class RomsGrid(Grid):
-    def __init__(self, model: Model, **conf):
+    def __init__(
+            self,
+            model: Model,
+            file: str,
+            start_time=None,
+            subgrid=None,
+            legacy_module='ladim.gridforce.ROMS.Grid',
+            **_,
+    ):
         super().__init__(model)
 
         legacy_conf = dict(
             gridforce=dict(
-                input_file=conf['file'],
+                input_file=file,
             ),
-            start_time=conf.get('start_time', None),
+            start_time=start_time,
         )
+        if subgrid is not None:
+            legacy_conf['gridforce']['subgrid'] = subgrid
 
         from .model import load_class
-        LegacyGrid = load_class(conf.get('legacy_module', 'ladim.gridforce.ROMS.Grid'))
+        LegacyGrid = load_class(legacy_module)
 
         # Allow gridforce module in current directory
         import sys

ladim/output.py

@@ -242,5 +242,4 @@ def create_netcdf_file(fname: str, formats: dict[str, OutputFormat], diskless=Fa
         dset.variables[varname].set_auto_mask(False)
         dset.variables[varname].setncatts(item.attributes)
 
-
     return dset

{ladim-2.0.4.dist-info → ladim-2.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: ladim
-Version: 2.0.4
+Version: 2.0.5
 Summary: Lagrangian Advection and Diffusion Model
 Home-page: https://github.com/pnsaevik/ladim
 Author: Bjørn Ådlandsvik

{ladim-2.0.4.dist-info → ladim-2.0.5.dist-info}/RECORD

@@ -1,11 +1,11 @@
-ladim/__init__.py,sha256=1pOaNTt2-oJQ33nsnZyDsOulYErImxLErxjlfOb8Oyg,51
-ladim/__main__.py,sha256=8f07EMfxQllDZSgpak5ECyYHnfQFy8LaHl2xdC-aO9c,23
-ladim/config.py,sha256=tnTyKDeaDG1M9T5fiUGXG8Ezc_n7Xwm8l6--UpBJhaE,5449
-ladim/forcing.py,sha256=f4PpSwyilSScXeNyorTWLMgVTiat9htSLkCwAkRlJVM,3048
-ladim/grid.py,sha256=m6bQrGJ3cux7rqC8pbRXD86cOI-VQKF-XjP9m1jCIcY,2221
+ladim/__init__.py,sha256=UGP8_kdUONjjK3VRkweldaz-FdiCQ5T8Jxip8Yuff20,51
+ladim/__main__.py,sha256=I1AOHBQDwQNe3fVmDMyC84JcriqidOEURoeoJSOCTzg,24
+ladim/config.py,sha256=p6swxS4yF0wHPNxE8psNtRxr4YGyhqnsrBs5kdYkUc0,5698
+ladim/forcing.py,sha256=0KjV7R0S0Zx8RCDV2KohA6aWB7zpYekLiBpxRQeZfsw,3156
+ladim/grid.py,sha256=42R6kIaLzDjFy026Ja0iJkwfbsidCYfcJ2vHghTyzEg,2417
 ladim/main.py,sha256=6_blu3PYnDXaYdPxfZoukWsjN0o9vh7O8_-W2-aguAI,2894
 ladim/model.py,sha256=iXClvieChhipCSZ-dDrmnjqwS4cuM53VpJv7oaJyQ88,3794
-ladim/output.py,sha256=Rz7iujvS7Z3LoABiJduQqyb3zPswNqhhFsywr3MLsBY,8373
+ladim/output.py,sha256=uhdPdlIRicggXcARXXj72js811BeVymTH-NAq6qvmTI,8372
 ladim/release.py,sha256=1j__9Gj0BD0CqVCM2KLZhio1Ia-hz1gbUIhTsa0J3Rg,8451
 ladim/sample.py,sha256=n8wRGd_VsW_qyQe1ZoTpmfZcdcwB929vsM8PoKG6JTs,8292
 ladim/solver.py,sha256=sZvYgOxzJ-EItI-IB2y8_z8Tf-SJAQSrmydlhDRa7ZQ,755
@@ -24,9 +24,9 @@ postladim/cellcount.py,sha256=nCFu9iJmprubn4YmPB4W0VO02GfEb90Iif7D49w1Kss,2054
 postladim/kde_plot.py,sha256=GvMWzT6VxIeXKh1cnqaGzR-4jGG_WIHGMLPpRMXIpo4,1628
 postladim/particlefile.py,sha256=0aif9wYUJ-VrpQKeCef8wB5VCiBB-gWY6sxNCUYviTA,4889
 postladim/variable.py,sha256=-2aihoppYMMmpSpCqaF31XvpinTMaH3Y01-USDIkbBc,6587
-ladim-2.0.4.dist-info/LICENSE,sha256=BgtXyjNr6Ly9nQ7ZLXKpV3r5kWRLnh5MiN0dxp0Bvfc,1085
-ladim-2.0.4.dist-info/METADATA,sha256=9zVlHY1N0c5JKYGu9_ayPTmBVcPnzHaj9i8kJgLRgOU,1841
-ladim-2.0.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-ladim-2.0.4.dist-info/entry_points.txt,sha256=JDlNJo87GJaOkH0-BpAzTPLCrZcuPSdSlHNQ4XmnoRg,41
-ladim-2.0.4.dist-info/top_level.txt,sha256=TK8Gl7d6MsrAQvqKG4b6YJCbB4UL46Se3SzsI-sJAuc,16
-ladim-2.0.4.dist-info/RECORD,,
+ladim-2.0.5.dist-info/LICENSE,sha256=BgtXyjNr6Ly9nQ7ZLXKpV3r5kWRLnh5MiN0dxp0Bvfc,1085
+ladim-2.0.5.dist-info/METADATA,sha256=XLp5OWtYkodte-kXvLCRp5HPZQZuIq9c98kzBtlhs-E,1841
+ladim-2.0.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ladim-2.0.5.dist-info/entry_points.txt,sha256=JDlNJo87GJaOkH0-BpAzTPLCrZcuPSdSlHNQ4XmnoRg,41
+ladim-2.0.5.dist-info/top_level.txt,sha256=TK8Gl7d6MsrAQvqKG4b6YJCbB4UL46Se3SzsI-sJAuc,16
+ladim-2.0.5.dist-info/RECORD,,

{ladim-2.0.4.dist-info → ladim-2.0.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any