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

ladim/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '2.0.4'
+__version__ = '2.0.6'
 
 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

@@ -2,19 +2,15 @@ from .model import Model, Module
 
 
 class Forcing(Module):
-    def __init__(self, model: Model):
-        super().__init__(model)
-
     def velocity(self, X, Y, Z, tstep=0.0):
         raise NotImplementedError
 
 
 class RomsForcing(Forcing):
-    def __init__(self, model: Model, file, variables=None, **conf):
+    def __init__(self, file, variables=None, **conf):
         """
         Forcing module which uses output data from the ROMS ocean model
 
-        :param model: Parent model
         :param file: Glob pattern for the input files
         :param variables: A mapping of variable names to interpolation
         specifications. Each interpolaction specification consists of 0-4
@@ -34,17 +30,17 @@ class RomsForcing(Forcing):
 
         :param conf: Legacy config dict
         """
-        super().__init__(model)
-
         # Apply default interpolation configs
         variables = variables or dict()
         default_vars = dict(u="xt", v="yt", w="zt", temp="xyzt", salt="xyzt")
         self.variables = {**default_vars, **variables}
 
-        grid_ref = GridReference(model)
+        grid_ref = GridReference()
         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),
@@ -65,17 +61,19 @@ class RomsForcing(Forcing):
         # self.U = self.forcing.U
         # self.V = self.forcing.V
 
-    def update(self):
-        elapsed = self.model.solver.time - self.model.solver.start
-        t = elapsed // self.model.solver.step
+    def update(self, model: Model):
+        elapsed = model.solver.time - model.solver.start
+        t = elapsed // model.solver.step
 
+        # noinspection PyProtectedMember
+        self.forcing._grid.modules = model
         self.forcing.update(t)
 
         # Update state variables by sampling the field
-        x, y, z = self.model.state['X'], self.model.state['Y'], self.model.state['Z']
+        x, y, z = model.state['X'], model.state['Y'], model.state['Z']
         for v in self.variables:
-            if v in self.model.state:
-                self.model.state[v] = self.field(x, y, z, v)
+            if v in model.state:
+                model.state[v] = self.field(x, y, z, v)
 
     def velocity(self, X, Y, Z, tstep=0.0):
         return self.forcing.velocity(X, Y, Z, tstep=tstep)
@@ -88,8 +86,8 @@ class RomsForcing(Forcing):
 
 
 class GridReference:
-    def __init__(self, modules: Model):
-        self.modules = modules
+    def __init__(self):
+        self.modules = None
 
     def __getattr__(self, item):
         return getattr(self.modules.grid.grid, item)