fixed nesting with both disjoint and nested nests

Author: bjorkqvi

dnora/executer/decorators.py

@@ -5,11 +5,8 @@ def add_write_method(file_type: DnoraFileType):
     def wrapper(c):
         def write(self, **kwargs) -> None:
             self._write(file_type=file_type, **kwargs)
-            nest = self._nest
-
-            while nest is not None:
-                nest._write(file_type=file_type, **kwargs)
-                nest = nest._nest
+            for __, single_nest in self._nest.items():
+                exec(f"single_nest.write_{file_type.name.lower()}_file(**kwargs)")
 
         exec(f"c.write_{file_type.name.lower()}_file = write")
         return c
@@ -21,11 +18,8 @@ def add_run_method(file_type: DnoraFileType):
     def wrapper(c):
         def run(self, **kwargs) -> None:
             self._run(file_type=file_type, **kwargs)
-            nest = self._nest
-
-            while nest is not None:
-                nest._run(file_type=file_type, **kwargs)
-                nest = nest._nest
+            for __, single_nest in self._nest.items():
+                exec(f"single_nest.run_{file_type.name.lower()}(**kwargs)")
 
         exec(f"c.run_{file_type.name.lower()} = run")
         return c

dnora/executer/executer.py

@@ -13,6 +13,7 @@
 from typing import Union, Optional
 
 
+@add_run_method(DnoraFileType.INPUT)
 @add_run_method(DnoraFileType.SPECTRA)
 @add_run_method(DnoraFileType.ICE)
 @add_run_method(DnoraFileType.WATERLEVEL)
@@ -38,10 +39,14 @@ def _get_default_format(self) -> str:
 
     def __init__(self, model, include_nest: bool = True):
         self.model = model
-        if include_nest and model.nest() is not None:
-            self._nest = self.__class__(model.nest())
-        else:
-            self._nest = None
+        self._nest = {}
+        if not self.model.parent():
+            msg.header(self, "Initializing model executer...")
+            msg.plain(f"Will execute '{model.grid().name}'")
+        if include_nest and model.nest():
+            for name, nest in self.model.nest(get_dict=True).items():
+                msg.plain(f"Will execute '{name}' inside '{model.grid().name}'")
+                self._nest[name] = self.__class__(nest)
 
     def dry_run(self) -> bool:
         return self._dry_run or self.model.dry_run()
@@ -118,28 +123,16 @@ def run_model(
         **kwargs,
     ):
         """Run the main model. Set post_process=False to disable any post-processing that might be defined."""
-        self._run(
-            file_type=DnoraFileType.INPUT,
+
+        # Use the method generated by the decorateor, since that will automatically go through all nested grids if present
+        self.run_input(
             model_runner=model_runner,
             model_folder=model_folder,
             post_process=post_process,
             dry_run=dry_run,
             **kwargs,
         )
 
-        nest = self._nest
-
-        while nest is not None:
-            nest._run(
-                file_type=DnoraFileType.INPUT,
-                model_runner=model_runner,
-                model_folder=model_folder,
-                post_process=post_process,
-                dry_run=dry_run,
-                **kwargs,
-            )
-            nest = nest._nest
-
     def _run(
         self,
         file_type: Union[DnoraFileType, str],

dnora/executer/inputfile/inputfile_writers.py

@@ -377,12 +377,13 @@ def __call__(
 
             swan_spectral_output_points(file_out, model.grid(), STR_START, homog)
 
-            if model.nest() is not None:
-                if not homog:
-                    nest_start_time = model.nest().start_time()
-                else:
-                    nest_start_time = None
-                swan_output_for_nest(file_out, model.nest().grid(), nest_start_time)
+            if model.nest():
+                for __, nest in model.nest(get_dict=True).items():
+                    if not homog:
+                        nest_start_time = nest.start_time()
+                    else:
+                        nest_start_time = None
+                    swan_output_for_nest(file_out, nest.grid(), nest_start_time)
 
             file_out.write("COMPUTE")
             if not homog:

dnora/export/decorators.py

@@ -6,11 +6,8 @@ def wrapper(c):
         def export(self, *args, **kwargs) -> None:
             self.export(obj_type, *args, **kwargs)
 
-            nest = self._nest
-
-            while nest is not None:
-                nest.export(obj_type, *args, **kwargs)
-                nest = nest._nest
+            for __, single_nest in self._nest.items():
+                exec(f"single_nest.export_{obj_type.name.lower()}(*args, **kwargs)")
 
         exec(f"c.export_{obj_type.name.lower()} = export")
         return c

dnora/export/exporter.py

@@ -52,13 +52,11 @@ def _get_writer(
 
     def __init__(self, model, include_nest: bool = True):
         self.model = model
-        if include_nest and model.nest() is not None:
-            msg.process(
-                f"Including nested grid {model.nest().grid().name} inside {model.grid().name}"
-            )
-            self._nest = self.__class__(model.nest())
-        else:
-            self._nest = None
+        self._nest = {}
+        if include_nest and model.nest():
+            for name, nest in self.model.nest(get_dict=True).items():
+                msg.process(f"Including nested grid {name} inside {model.grid().name}")
+                self._nest[name] = self.__class__(nest)
 
     def export(
         self,
@@ -78,18 +76,22 @@ def export(
 
         if not self.dry_run():
             if not self._silent:
-                if self.model.get(obj_type) is not None:
-                    data_name = f" from {self.model[obj_type].name}"
-                else:
-                    data_name = ""
+                if self.model.get(obj_type) is None:
+                    return
+                    # if self.model.parent() is None or (
+                    #     self.model.parent() is not None
+                    #     and self.model.parent().get(obj_type) is not None
+                    #     and self.model.parent().get(obj_type).name
+                    #     == self.model[obj_type].name
+                    # ):
                 msg.header(
                     writer_function,
-                    f"Writing {obj_type.name} data" + data_name,
+                    f"Writing {obj_type.name} data from {self.model[obj_type].name}",
                 )
 
-            if self.model.get(obj_type) is None:
-                msg.info(f"No {obj_type.name} data exists. Won't export anything.")
-                return
+            # if self.model.get(obj_type) is None:
+            #     msg.info(f"No {obj_type.name} data exists. Won't export anything.")
+            #     return
 
             if spectral_convention is None:
                 try:  # GeneralWritingFunction might not have this method defined