Updating submodules and pace refactor

constraints.txt

@@ -62,7 +62,6 @@ charset-normalizer==2.0.4
 click==8.0.1
     # via
     #   black
-    #   flask
     #   gt4py
 cloudpickle==2.0.0
     # via dask
@@ -74,6 +73,8 @@ coverage==5.5
     # via pytest-cov
 cytoolz==0.12.1
     # via gt4py
+dace
+    # via ndsl
 dacite==1.6.0
     # via
     #   fv3config
@@ -111,16 +112,19 @@ f90nml==1.3.1
     # via
     #   -r requirements_dev.txt
     #   fv3config
+    #   ndsl
     #   pyfv3
     #   pyshield
+factory-boy==3.3.0
+    # via gt4py
+faker==24.3.0
+    # via factory-boy
 fasteners==0.16.3
     # via zarr
 fastjsonschema==2.16.2
     # via nbformat
 filelock==3.0.12
     # via virtualenv
-flask==2.1.2
-    # via dace
 fparser==0.1.4
     # via dace
 frozendict==2.3.4
@@ -143,8 +147,10 @@ google-auth-oauthlib==0.4.5
     # via gcsfs
 gprof2dot==2021.2.21
     # via pytest-profiling
-gridtools-cpp
+gridtools-cpp==2.3.2
     # via gt4py
+gt4py
+    # via ndsl
 h5netcdf==1.1.0
     # via ndsl
 h5py==3.10.0
@@ -157,8 +163,6 @@ idna==3.2
     #   yarl
 imagesize==1.2.0
     # via sphinx
-importlib-metadata==4.11.3
-    # via flask
 importlib-resources==5.10.0
     # via
     #   gt4py
@@ -169,13 +173,11 @@ ipykernel==6.16.2
     # via nbmake
 ipython==8.5.0
     # via ipykernel
-itsdangerous==2.1.2
-    # via flask
 jedi==0.18.1
     # via ipython
 jinja2==3.0.1
     # via
-    #   flask
+    #   dace
     #   gt4py
     #   sphinx
 jsonschema==4.16.0
@@ -243,7 +245,7 @@ nodeenv==1.6.0
     # via pre-commit
 numcodecs==0.7.2
     # via zarr
-numpy==1.21.2
+numpy==1.23.3
     # via
     #   -r requirements_dev.txt
     #   cftime
@@ -312,7 +314,7 @@ pyasn1==0.4.8
     #   rsa
 pyasn1-modules==0.2.8
     # via google-auth
-pybind11==2.8.1
+pybind11==2.11.1
     # via gt4py
 pydantic==1.7.4
     # via nbmake
@@ -346,6 +348,7 @@ pytest-subtests==0.5.0
     # via -r requirements_dev.txt
 python-dateutil==2.8.2
     # via
+    #   faker
     #   jupyter-client
     #   pandas
 pytz==2021.1
@@ -368,7 +371,6 @@ recommonmark==0.7.1
     # via -r requirements_docs.txt
 requests==2.26.0
     # via
-    #   dace
     #   gcsfs
     #   requests-oauthlib
     #   sphinx
@@ -454,6 +456,7 @@ typing-extensions==4.3.0
     # via
     #   aiohttp
     #   black
+    #   faker
     #   gt4py
     #   setuptools-scm
 urllib3==1.26.6
@@ -464,8 +467,6 @@ wcwidth==0.2.5
     # via prompt-toolkit
 websockets==10.3
     # via dace
-werkzeug==2.1.2
-    # via flask
 wheel==0.37.0
     # via astunparse
 xarray==0.19.0
@@ -484,9 +485,7 @@ zarr==2.9.2
     #   -r requirements_dev.txt
     #   pace-driver
 zipp==3.8.0
-    # via
-    #   importlib-metadata
-    #   importlib-resources
+    # via importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

driver/examples/notebooks/serial_debugging.ipynb

@@ -27,9 +27,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import pace.util\n",
+    "from ndsl.constants import X_DIM, Y_DIM, Z_DIM\n",
     "import pace.driver\n",
-    "import pace.fv3core.stencils.d2a2c_vect\n",
+    "from pyFV3.stencils import DGrid2AGrid2CGridVectors\n",
     "import yaml\n",
     "import dacite\n",
     "import copy\n",
@@ -344,7 +344,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "d2a2c = fv3core.stencils.d2a2c_vect.DGrid2AGrid2CGridVectors(\n",
+    "d2a2c = DGrid2AGrid2CGridVectors(\n",
     "    stencil_factory=driver.stencil_factory,\n",
     "    grid_data=driver.state.grid_data,\n",
     "    nested=False,\n",
@@ -371,8 +371,8 @@
    "outputs": [],
    "source": [
     "# need temporaries for c-grid contravariant wind multiplied by timestep\n",
-    "utc = driver.quantity_factory.zeros(dims=[pace.util.X_DIM, pace.util.Y_DIM, pace.util.Z_DIM], units=\"m/s\")\n",
-    "vtc = driver.quantity_factory.zeros(dims=[pace.util.X_DIM, pace.util.Y_DIM, pace.util.Z_DIM], units=\"m/s\")\n",
+    "utc = driver.quantity_factory.zeros(dims=[X_DIM, Y_DIM, Z_DIM], units=\"m/s\")\n",
+    "vtc = driver.quantity_factory.zeros(dims=[X_DIM, Y_DIM, Z_DIM], units=\"m/s\")\n",
     "d2a2c(\n",
     "    uc=remap_state.uc,\n",
     "    vc=remap_state.vc,\n",

driver/examples/stencil_signatures.py

@@ -4,15 +4,14 @@
 
 import yaml
 
-import ndsl.dsl
-import ndsl.util
 import pace.driver
+from ndsl import FrozenStencil
 
 
 def has_stencils(object):
     for name in dir(object):
         try:
-            stencil_found = isinstance(getattr(object, name), ndsl.dsl.FrozenStencil)
+            stencil_found = isinstance(getattr(object, name), FrozenStencil)
         except (AttributeError, RuntimeError):
             stencil_found = False
         if stencil_found:
@@ -26,7 +25,7 @@ def report_stencils(obj, file: Optional[TextIO]):
     print(f"module {module.__name__}, class {obj.__class__.__name__}:", file=file)
     all_access_names = collections.defaultdict(list)
     for name, value in obj.__dict__.items():
-        if isinstance(value, ndsl.dsl.FrozenStencil):
+        if isinstance(value, FrozenStencil):
             print(f"    stencil {name}:", file=file)
             for arg_name, field_info in value.stencil_object.field_info.items():
                 if field_info is None:

driver/pace/driver/__init__.py

@@ -8,11 +8,30 @@
     ReaderCommConfig,
     WriterCommConfig,
 )
-from .diagnostics import Diagnostics, DiagnosticsConfig
+from .diagnostics import (
+    Diagnostics,
+    DiagnosticsConfig,
+    MonitorDiagnostics,
+    NullDiagnostics,
+    ZSelect,
+)
 from .driver import Driver, DriverConfig, RestartConfig
-from .grid import GeneratedGridConfig, SerialboxGridConfig
-from .initialization import AnalyticInit, PredefinedStateInit, RestartInit
-from .registry import Registry
+from .grid import (
+    ExternalNetcdfGridConfig,
+    GeneratedGridConfig,
+    GridInitializerSelector,
+    SerialboxGridConfig,
+)
+from .initialization import (
+    AnalyticInit,
+    FortranRestartInit,
+    InitializerSelector,
+    PredefinedStateInit,
+    RestartInit,
+    SerialboxInit,
+)
+from .registry import ConfigSpecification, Registry
+from .safety_checks import SafetyChecker, VariableBounds
 from .state import DriverState, TendencyState
 
 

driver/pace/driver/comm.py

@@ -3,12 +3,9 @@
 import os
 from typing import Any, ClassVar, List
 
-from ndsl.comm.caching_comm import CachingCommReader, CachingCommWriter
-from ndsl.comm.comm_abc import Comm
-from ndsl.comm.mpi import MPIComm
-from ndsl.comm.null_comm import NullComm
-
-from .registry import Registry
+from ndsl import MPIComm, NullComm
+from ndsl.comm import CachingCommReader, CachingCommWriter, Comm
+from pace.driver.registry import Registry
 
 
 class CreatesComm(abc.ABC):

driver/pace/driver/configs/comm.py

@@ -5,9 +5,8 @@
 
 import dacite
 
-from ndsl.comm.caching_comm import CachingCommReader, CachingCommWriter
-from ndsl.comm.mpi import MPIComm
-from ndsl.comm.null_comm import NullComm
+from ndsl import MPIComm, NullComm
+from ndsl.comm import CachingCommReader, CachingCommWriter
 
 
 class CreatesComm(abc.ABC):

driver/pace/driver/diagnostics.py

@@ -4,16 +4,16 @@
 from datetime import datetime, timedelta
 from typing import List, Optional, Union
 
-from ndsl.comm.communicator import Communicator
+from ndsl import Quantity
 from ndsl.constants import RGRAV, Z_DIM, Z_INTERFACE_DIM
 from ndsl.dsl.dace.orchestration import dace_inhibitor
 from ndsl.filesystem import get_fs
 from ndsl.grid import GridData
-from ndsl.monitor import Monitor, NetCDFMonitor, ZarrMonitor
-from ndsl.quantity import Quantity
-from pyFV3.dycore_state import DycoreState
-
-from .state import DriverState
+from ndsl.monitor import Monitor, ZarrMonitor
+from ndsl.monitor.netcdf_monitor import NetCDFMonitor
+from ndsl.typing import Communicator
+from pace.driver.state import DriverState
+from pyFV3 import DycoreState
 
 
 try:

driver/pace/driver/driver.py

@@ -9,29 +9,31 @@
 import dacite
 import yaml
 
-import pyFV3
-import pySHiELD
-from ndsl.comm.comm_abc import Comm
-from ndsl.comm.communicator import (
-    Communicator,
+from ndsl import (
+    CompilationConfig,
     CubedSphereCommunicator,
+    DaceConfig,
+    GridIndexing,
+    PerformanceCollector,
+    QuantityFactory,
+    RunMode,
+    StencilConfig,
+    StencilFactory,
+    SubtileGridSizer,
     TileCommunicator,
+    TilePartitioner,
+    ndsl_log,
 )
-from ndsl.comm.partitioner import TilePartitioner
+from ndsl.comm import Comm
 from ndsl.constants import N_HALO_DEFAULT
-from ndsl.dsl.dace.dace_config import DaceConfig
 from ndsl.dsl.dace.orchestration import dace_inhibitor, orchestrate
-from ndsl.dsl.stencil import GridIndexing, StencilFactory
-from ndsl.dsl.stencil_config import CompilationConfig, RunMode, StencilConfig
 from ndsl.dsl.typing import Float
 from ndsl.grid import DampingCoefficients, DriverGridData, GridData
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.initialization.sizer import SubtileGridSizer
-from ndsl.logging import ndsl_log
-from ndsl.performance import PerformanceConfig
-from ndsl.performance.collector import PerformanceCollector
-from ndsl.performance.timer import Timer
+from ndsl.performance import PerformanceConfig, Timer
+from ndsl.typing import Communicator
 from pace.driver.safety_checks import SafetyChecker
+from pyFV3 import DynamicalCore, DynamicalCoreConfig
+from pySHiELD import Physics, PhysicsConfig
 
 # TODO: move update_atmos_state into pace.driver
 from pySHiELD.update import update_atmos_state
@@ -112,12 +114,10 @@ class DriverConfig:
     comm_config: CreatesCommSelector = dataclasses.field(
         default_factory=CreatesCommSelector
     )
-    dycore_config: pyFV3.DynamicalCoreConfig = dataclasses.field(
-        default_factory=pyFV3.DynamicalCoreConfig
-    )
-    physics_config: pySHiELD.PhysicsConfig = dataclasses.field(
-        default_factory=pySHiELD.PhysicsConfig
+    dycore_config: DynamicalCoreConfig = dataclasses.field(
+        default_factory=DynamicalCoreConfig
     )
+    physics_config: PhysicsConfig = dataclasses.field(default_factory=PhysicsConfig)
 
     days: int = 0
     hours: int = 0
@@ -242,14 +242,14 @@ def from_dict(cls, kwargs: Dict[str, Any]) -> "DriverConfig":
                     )
 
             kwargs["dycore_config"] = dacite.from_dict(
-                data_class=pyFV3.DynamicalCoreConfig,
+                data_class=DynamicalCoreConfig,
                 data=kwargs.get("dycore_config", {}),
                 config=dacite.Config(strict=True),
             )
 
         if isinstance(kwargs["physics_config"], dict):
             kwargs["physics_config"] = dacite.from_dict(
-                data_class=pySHiELD.PhysicsConfig,
+                data_class=PhysicsConfig,
                 data=kwargs.get("physics_config", {}),
                 config=dacite.Config(strict=True),
             )
@@ -491,7 +491,7 @@ def exit_instead_of_build(self):
 
             self._start_time = self.config.initialization.start_time
             ndsl_log.info("setting up dycore object started")
-            self.dycore = pyFV3.DynamicalCore(
+            self.dycore = DynamicalCore(
                 comm=communicator,
                 grid_data=self.state.grid_data,
                 stencil_factory=self.stencil_factory,
@@ -506,7 +506,7 @@ def exit_instead_of_build(self):
 
             ndsl_log.info("setting up physics object started")
             if not config.dycore_only and not config.disable_step_physics:
-                self.physics = pySHiELD.Physics(
+                self.physics = Physics(
                     stencil_factory=self.stencil_factory,
                     quantity_factory=self.quantity_factory,
                     grid_data=self.state.grid_data,