Removing ndsl.Namelist from Pace (NOAA-GFDL#158)

* Removing ndsl.Namelist

* Cleanup from pySHiELD PR 68

Author: jjuyeonkim

pace/driver.py

@@ -241,21 +241,8 @@ def from_dict(cls, kwargs: Dict[str, Any]) -> "DriverConfig":
             )
 
         if isinstance(kwargs["physics_config"], dict):
-            # TODO - After pySHiELD PR #68, replace physics dacite cmd with:
-            # kwargs["physics_config"] = PhysicsConfig.from_dict(
-            #     kwargs.get("physics_config", {})
-            # )
-            phys_dacite_config = dacite.Config(
-                strict=True,
-                type_hooks={
-                    Tuple[int, int]: lambda x: tuple(x),
-                    Tuple[str, ...]: lambda x: tuple(x) if x is not None else None,
-                },
-            )
-            kwargs["physics_config"] = dacite.from_dict(
-                data_class=PhysicsConfig,
-                data=kwargs.get("physics_config", {}),
-                config=phys_dacite_config,
+            kwargs["physics_config"] = PhysicsConfig.from_dict(
+                kwargs.get("physics_config", {})
             )
 
         kwargs["layout"] = tuple(kwargs["layout"])

pace/grid.py

@@ -6,7 +6,7 @@
 import f90nml
 import xarray as xr
 
-from ndsl import Namelist, QuantityFactory, ndsl_log
+from ndsl import QuantityFactory, ndsl_log
 from ndsl.comm.partitioner import get_tile_index
 from ndsl.constants import X_DIM, X_INTERFACE_DIM, Y_DIM, Y_INTERFACE_DIM
 from ndsl.grid import (
@@ -22,6 +22,7 @@
 from ndsl.grid.stretch_transformation import direct_transform
 from ndsl.stencils.testing import TranslateGrid, grid
 from ndsl.typing import Communicator
+from ndsl.utils import grid_params_from_f90nml
 from pace.registry import Registry
 
 
@@ -151,8 +152,8 @@ def _f90_namelist(self) -> f90nml.Namelist:
         return f90nml.read(self.path + "/input.nml")
 
     @property
-    def _namelist(self) -> Namelist:
-        return Namelist.from_f90nml(self._f90_namelist)
+    def _grid_params(self) -> dict:
+        return grid_params_from_f90nml(self._f90_namelist)
 
     def _serializer(self, communicator: Communicator):
         import serialbox
@@ -171,7 +172,7 @@ def _get_serialized_grid(
     ) -> grid.Grid:  # type: ignore
         ser = self._serializer(communicator)
         grid = TranslateGrid.new_from_serialized_data(
-            ser, communicator.rank, self._namelist.layout, backend
+            ser, communicator.rank, self._grid_params["layout"], backend
         ).python_grid()
         return grid
 

pace/initialization.py

@@ -11,7 +11,6 @@
 from ndsl import (
     CompilationConfig,
     DaceConfig,
-    Namelist,
     QuantityFactory,
     StencilConfig,
     StencilFactory,
@@ -20,6 +19,7 @@
 from ndsl.grid import DampingCoefficients, DriverGridData, GridData
 from ndsl.stencils.testing import TranslateGrid, grid
 from ndsl.typing import Communicator
+from ndsl.utils import grid_params_from_f90nml
 from pace.registry import Registry
 from pace.state import DriverState, TendencyState, _restart_driver_state
 from pyfv3 import DycoreState, DynamicalCoreConfig
@@ -253,8 +253,8 @@ def _f90_namelist(self) -> f90nml.Namelist:
         return f90nml.read(self.path + "/input.nml")
 
     @property
-    def _namelist(self) -> Namelist:
-        return Namelist.from_f90nml(self._f90_namelist)
+    def _grid_params(self) -> dict:
+        return grid_params_from_f90nml(self._f90_namelist)
 
     def _get_serialized_grid(
         self,
@@ -263,7 +263,7 @@ def _get_serialized_grid(
     ) -> grid.Grid:  # type: ignore
         ser = self._serializer(communicator)
         grid = TranslateGrid.new_from_serialized_data(
-            ser, communicator.rank, self._namelist.layout, backend
+            ser, communicator.rank, self._grid_params["layout"], backend
         ).python_grid()
         return grid
 
@@ -318,8 +318,8 @@ def _initialize_dycore_state(
         dace_config = DaceConfig(
             communicator,
             backend,
-            tile_nx=self._namelist.npx,
-            tile_nz=self._namelist.npz,
+            tile_nx=self._grid_params["npx"],
+            tile_nz=self._grid_params["npz"],
         )
         stencil_config = StencilConfig(
             compilation_config=CompilationConfig(
@@ -330,7 +330,9 @@ def _initialize_dycore_state(
         stencil_factory = StencilFactory(
             config=stencil_config, grid_indexing=grid.grid_indexing
         )
-        translate_object = TranslateFVDynamics(grid, self._namelist, stencil_factory)
+        translate_object = TranslateFVDynamics(
+            grid, self._f90_namelist, stencil_factory
+        )
         input_data = translate_object.collect_input_data(ser, savepoint_in)
         dycore_state = translate_object.state_from_inputs(input_data)
         return dycore_state