ladim 2.0.4__tar.gz → 2.0.5__tar.gz

{ladim-2.0.4 → ladim-2.0.5}/PKG-INFO

@@ -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 → ladim-2.0.5}/ladim/__init__.py

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

{ladim-2.0.4 → ladim-2.0.5}/ladim/__main__.py

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

{ladim-2.0.4 → ladim-2.0.5}/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-2.0.4 → ladim-2.0.5}/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-2.0.4 → ladim-2.0.5}/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-2.0.4 → ladim-2.0.5}/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 → ladim-2.0.5}/ladim.egg-info/PKG-INFO

@@ -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 → ladim-2.0.5}/tests/test_config.py

@@ -37,6 +37,8 @@ class Test_convert_1_to_2:
             'forcing': {
                 'dt': 60,
                 'file': '../forcing*.nc',
+                'first_file': '',
+                'last_file': '',
                 'ibm_forcing': [],
                 'legacy_module': 'ladim.gridforce.ROMS.Forcing',
                 'start_time': np.datetime64('2015-09-07T01:00:00'),
@@ -44,7 +46,9 @@ class Test_convert_1_to_2:
             'grid': {
                 'file': '../forcing*.nc',
                 'legacy_module': 'ladim.gridforce.ROMS.Grid',
-                'start_time': np.datetime64('2015-09-07T01:00:00')},
+                'start_time': np.datetime64('2015-09-07T01:00:00'),
+                'subgrid': None,
+            },
             'ibm': {},
             'output': {
                 'file': 'out.nc',