From 0bac0cdc50181c01ec0ba75ab903b5077dec2e7a Mon Sep 17 00:00:00 2001
From: Florian Deconinck <deconinck.florian@gmail.com>
Date: Fri, 2 Feb 2024 11:23:55 -0500
Subject: [PATCH 1/6] Move `pace.fv3core` to `pyFV3`

---
 driver/pace/driver/diagnostics.py             |  11 +-
 driver/pace/driver/driver.py                  |  24 +-
 driver/pace/driver/initialization.py          |  18 +-
 driver/pace/driver/safety_checks.py           |   2 +-
 driver/pace/driver/state.py                   |  10 +-
 driver/setup.py                               |   3 +-
 examples/notebooks/functions.py               |   6 +-
 fv3core/.jenkins/actions/get_test_data.sh     |   5 -
 .../actions/run_parallel_regression_tests.sh  |  26 --
 .../.jenkins/actions/run_regression_tests.sh  |  21 --
 fv3core/.jenkins/actions/run_standalone.sh    | 154 -----------
 fv3core/.jenkins/actions/test_action.sh       |   5 -
 fv3core/.jenkins/jenkins.sh                   | 243 ------------------
 physics/pace/physics/update/fv_update_phys.py |   8 +-
 .../pace/physics/update/update_atmos_state.py |  10 +-
 {fv3core => pyFV3}/.gitignore                 |   0
 {fv3core => pyFV3}/FORTRAN_CHANGELOG.md       |   0
 {fv3core => pyFV3}/LICENSE.txt                |   0
 {fv3core => pyFV3}/Makefile                   |   0
 {fv3core => pyFV3}/README.md                  |   0
 {fv3core => pyFV3}/convert_xppm_yppm.sh       |   0
 .../examples/standalone/benchmarks/README.md  |   0
 .../benchmarks/collect_memory_usage_data.py   |   0
 .../standalone/benchmarks/run_on_daint.sh     |   0
 .../examples/standalone/runfile/__init__.py   |   0
 .../examples/standalone/runfile/acoustics.py  |   8 +-
 .../examples/standalone/runfile/compile.py    |   2 +-
 .../examples/standalone/runfile/dynamics.py   |   8 +-
 .../examples/standalone/runfile/timing.py     |   0
 .../pace/fv3core => pyFV3/pyFV3}/__init__.py  |   0
 .../pace/fv3core => pyFV3/pyFV3}/_config.py   |   0
 .../fv3core => pyFV3/pyFV3}/dycore_state.py   |   0
 .../pyFV3}/initialization/__init__.py         |   0
 .../pyFV3}/initialization/analytic_init.py    |   6 +-
 .../pyFV3}/initialization/init_utils.py       |   4 +-
 .../test_cases/initialize_baroclinic.py       |   4 +-
 .../test_cases/initialize_tc.py               |   6 +-
 .../pyFV3}/stencils/__init__.py               |   0
 .../pyFV3}/stencils/a2b_ord4.py               |   2 +-
 .../pyFV3}/stencils/basic_operations.py       |   0
 .../fv3core => pyFV3/pyFV3}/stencils/c_sw.py  |   2 +-
 .../pyFV3}/stencils/d2a2c_vect.py             |   2 +-
 .../fv3core => pyFV3/pyFV3}/stencils/d_sw.py  |  18 +-
 .../pyFV3}/stencils/del2cubed.py              |   4 +-
 .../pyFV3}/stencils/delnflux.py               |   0
 .../pyFV3}/stencils/divergence_damping.py     |  10 +-
 .../pyFV3}/stencils/dyn_core.py               |  30 +--
 .../fv3core => pyFV3/pyFV3}/stencils/fillz.py |   0
 .../pyFV3}/stencils/fv_dynamics.py            |  18 +-
 .../pyFV3}/stencils/fv_subgridz.py            |   6 +-
 .../pyFV3}/stencils/fvtp2d.py                 |   6 +-
 .../fv3core => pyFV3/pyFV3}/stencils/fxadv.py |   2 +-
 .../pyFV3}/stencils/map_single.py             |   4 +-
 .../pyFV3}/stencils/mapn_tracer.py            |   4 +-
 .../pyFV3}/stencils/moist_cv.py               |   0
 .../pyFV3}/stencils/neg_adj3.py               |   0
 .../pyFV3}/stencils/nh_p_grad.py              |   4 +-
 .../pyFV3}/stencils/pe_halo.py                |   0
 .../pyFV3}/stencils/pk3_halo.py               |   4 +-
 .../fv3core => pyFV3/pyFV3}/stencils/ppm.py   |   0
 .../pyFV3}/stencils/ray_fast.py               |   0
 .../pyFV3}/stencils/remap_profile.py          |   0
 .../pyFV3}/stencils/remapping.py              |  14 +-
 .../pyFV3}/stencils/riem_solver3.py           |   4 +-
 .../pyFV3}/stencils/riem_solver_c.py          |   2 +-
 .../pyFV3}/stencils/saturation_adjustment.py  |  15 +-
 .../pyFV3}/stencils/sim1_solver.py            |   0
 .../pyFV3}/stencils/temperature_adjust.py     |   2 +-
 .../pyFV3}/stencils/tracer_2d_1l.py           |   2 +-
 .../pyFV3}/stencils/updatedzc.py              |   0
 .../pyFV3}/stencils/updatedzd.py              |   4 +-
 .../fv3core => pyFV3/pyFV3}/stencils/xppm.py  |   4 +-
 .../fv3core => pyFV3/pyFV3}/stencils/xtp_u.py |   2 +-
 .../fv3core => pyFV3/pyFV3}/stencils/yppm.py  |   4 +-
 .../fv3core => pyFV3/pyFV3}/stencils/ytp_v.py |   2 +-
 .../pyFV3}/testing/__init__.py                |   0
 .../pyFV3}/testing/map_single.py              |   2 +-
 .../pyFV3}/testing/translate_dyncore.py       |   4 +-
 .../pyFV3}/testing/translate_fvdynamics.py    |   6 +-
 .../pyFV3}/testing/validation.py              |  12 +-
 .../fv3core => pyFV3/pyFV3}/utils/__init__.py |   0
 .../pyFV3}/utils/functional_validation.py     |   0
 .../pyFV3}/wrappers/geos_wrapper.py           |  10 +-
 {fv3core => pyFV3}/setup.py                   |   9 +-
 {fv3core => pyFV3}/tests/conftest.py          |   0
 .../tests/mpi/test_doubly_periodic.py         |  12 +-
 {fv3core => pyFV3}/tests/pytest.ini           |   0
 .../tests/savepoint/__init__.py               |   0
 .../tests/savepoint/conftest.py               |   6 +-
 .../tests/savepoint/output/.gitkeep           |   0
 .../tests/savepoint/test_translate.py         |   0
 .../tests/savepoint/translate/__init__.py     |   2 +-
 .../savepoint/translate/overrides/README.md   |   0
 .../translate/overrides/baroclinic.yaml       |   0
 .../translate/overrides/standard.yaml         |   0
 .../savepoint/translate/translate_a2b_ord4.py |   4 +-
 .../savepoint/translate/translate_c_sw.py     |   4 +-
 .../savepoint/translate/translate_corners.py  |   2 +-
 .../translate/translate_cubedtolatlon.py      |   0
 .../translate/translate_d2a2c_vect.py         |   4 +-
 .../savepoint/translate/translate_d_sw.py     |   8 +-
 .../translate/translate_del2cubed.py          |   4 +-
 .../translate/translate_del6vtflux.py         |   4 +-
 .../savepoint/translate/translate_delnflux.py |   4 +-
 .../translate/translate_divergencedamping.py  |   4 +-
 .../savepoint/translate/translate_fillz.py    |   4 +-
 .../translate/translate_fvsubgridz.py         |   2 +-
 .../savepoint/translate/translate_fvtp2d.py   |   4 +-
 .../savepoint/translate/translate_fxadv.py    |   6 +-
 .../savepoint/translate/translate_grid.py     |   0
 .../translate/translate_haloupdate.py         |   0
 .../translate/translate_init_case.py          |   8 +-
 .../translate/translate_last_step.py          |   4 +-
 .../translate/translate_moistcvpluspkz_2d.py  |   4 +-
 .../translate/translate_moistcvpluspt_2d.py   |   2 +-
 .../savepoint/translate/translate_neg_adj3.py |   4 +-
 .../translate/translate_nh_p_grad.py          |   4 +-
 .../savepoint/translate/translate_pe_halo.py  |   4 +-
 .../savepoint/translate/translate_pk3_halo.py |   4 +-
 ...ssureadjustedtemperature_nonhydrostatic.py |  10 +-
 .../savepoint/translate/translate_qsinit.py   |   4 +-
 .../savepoint/translate/translate_ray_fast.py |   4 +-
 .../translate/translate_remapping.py          |   6 +-
 .../translate/translate_riem_solver3.py       |   6 +-
 .../translate/translate_riem_solver_c.py      |   4 +-
 .../translate/translate_satadjust3d.py        |  10 +-
 .../translate/translate_tracer2d1l.py         |  16 +-
 .../translate/translate_updatedzc.py          |   6 +-
 .../translate/translate_updatedzd.py          |  14 +-
 .../savepoint/translate/translate_xppm.py     |   4 +-
 .../savepoint/translate/translate_xtp_u.py    |   2 +-
 .../savepoint/translate/translate_yppm.py     |   4 +-
 .../savepoint/translate/translate_ytp_v.py    |   8 +-
 requirements_dev.txt                          |   2 +-
 setup.cfg                                     |  12 +-
 tests/main/driver/test_diagnostics_config.py  |   2 +-
 tests/main/fv3core/test_config.py             |  12 +-
 tests/main/fv3core/test_dycore_call.py        |  12 +-
 tests/main/fv3core/test_init_from_geos.py     |   8 +-
 .../main/fv3core/test_selective_validation.py |   2 +-
 tests/mpi_54rank/test_grid_init.py            |   6 +-
 tests/savepoint/test_checkpoints.py           |  14 +-
 tests/savepoint/translate/translate_driver.py |   8 +-
 143 files changed, 308 insertions(+), 774 deletions(-)
 delete mode 100755 fv3core/.jenkins/actions/get_test_data.sh
 delete mode 100755 fv3core/.jenkins/actions/run_parallel_regression_tests.sh
 delete mode 100755 fv3core/.jenkins/actions/run_regression_tests.sh
 delete mode 100755 fv3core/.jenkins/actions/run_standalone.sh
 delete mode 100755 fv3core/.jenkins/actions/test_action.sh
 delete mode 100755 fv3core/.jenkins/jenkins.sh
 rename {fv3core => pyFV3}/.gitignore (100%)
 rename {fv3core => pyFV3}/FORTRAN_CHANGELOG.md (100%)
 rename {fv3core => pyFV3}/LICENSE.txt (100%)
 rename {fv3core => pyFV3}/Makefile (100%)
 rename {fv3core => pyFV3}/README.md (100%)
 rename {fv3core => pyFV3}/convert_xppm_yppm.sh (100%)
 rename {fv3core => pyFV3}/examples/standalone/benchmarks/README.md (100%)
 rename {fv3core => pyFV3}/examples/standalone/benchmarks/collect_memory_usage_data.py (100%)
 rename {fv3core => pyFV3}/examples/standalone/benchmarks/run_on_daint.sh (100%)
 rename {fv3core => pyFV3}/examples/standalone/runfile/__init__.py (100%)
 rename {fv3core => pyFV3}/examples/standalone/runfile/acoustics.py (97%)
 rename {fv3core => pyFV3}/examples/standalone/runfile/compile.py (98%)
 rename {fv3core => pyFV3}/examples/standalone/runfile/dynamics.py (97%)
 rename {fv3core => pyFV3}/examples/standalone/runfile/timing.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/__init__.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/_config.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/dycore_state.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/initialization/__init__.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/initialization/analytic_init.py (90%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/initialization/init_utils.py (99%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/initialization/test_cases/initialize_baroclinic.py (98%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/initialization/test_cases/initialize_tc.py (99%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/__init__.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/a2b_ord4.py (99%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/basic_operations.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/c_sw.py (99%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/d2a2c_vect.py (99%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/d_sw.py (98%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/del2cubed.py (98%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/delnflux.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/divergence_damping.py (98%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/dyn_core.py (97%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/fillz.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/fv_dynamics.py (97%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/fv_subgridz.py (99%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/fvtp2d.py (98%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/fxadv.py (99%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/map_single.py (97%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/mapn_tracer.py (95%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/moist_cv.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/neg_adj3.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/nh_p_grad.py (98%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/pe_halo.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/pk3_halo.py (96%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/ppm.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/ray_fast.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/remap_profile.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/remapping.py (98%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/riem_solver3.py (98%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/riem_solver_c.py (99%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/saturation_adjustment.py (98%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/sim1_solver.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/temperature_adjust.py (96%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/tracer_2d_1l.py (99%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/updatedzc.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/updatedzd.py (99%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/xppm.py (99%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/xtp_u.py (98%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/yppm.py (99%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/stencils/ytp_v.py (98%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/testing/__init__.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/testing/map_single.py (94%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/testing/translate_dyncore.py (98%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/testing/translate_fvdynamics.py (98%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/testing/validation.py (95%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/utils/__init__.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/utils/functional_validation.py (100%)
 rename {fv3core/pace/fv3core => pyFV3/pyFV3}/wrappers/geos_wrapper.py (98%)
 rename {fv3core => pyFV3}/setup.py (82%)
 rename {fv3core => pyFV3}/tests/conftest.py (100%)
 rename {fv3core => pyFV3}/tests/mpi/test_doubly_periodic.py (93%)
 rename {fv3core => pyFV3}/tests/pytest.ini (100%)
 rename {fv3core => pyFV3}/tests/savepoint/__init__.py (100%)
 rename {fv3core => pyFV3}/tests/savepoint/conftest.py (73%)
 rename {fv3core => pyFV3}/tests/savepoint/output/.gitkeep (100%)
 rename {fv3core => pyFV3}/tests/savepoint/test_translate.py (100%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/__init__.py (97%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/overrides/README.md (100%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/overrides/baroclinic.yaml (100%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/overrides/standard.yaml (100%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_a2b_ord4.py (95%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_c_sw.py (98%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_corners.py (98%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_cubedtolatlon.py (100%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_d2a2c_vect.py (91%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_d_sw.py (97%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_del2cubed.py (87%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_del6vtflux.py (93%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_delnflux.py (94%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_divergencedamping.py (94%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_fillz.py (96%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_fvsubgridz.py (99%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_fvtp2d.py (96%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_fxadv.py (92%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_grid.py (100%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_haloupdate.py (100%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_init_case.py (98%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_last_step.py (92%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_moistcvpluspkz_2d.py (97%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_moistcvpluspt_2d.py (98%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_neg_adj3.py (93%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_nh_p_grad.py (92%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_pe_halo.py (93%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_pk3_halo.py (85%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_pressureadjustedtemperature_nonhydrostatic.py (83%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_qsinit.py (92%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_ray_fast.py (88%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_remapping.py (95%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_riem_solver3.py (93%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_riem_solver_c.py (87%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_satadjust3d.py (88%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_tracer2d1l.py (90%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_updatedzc.py (92%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_updatedzd.py (88%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_xppm.py (96%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_xtp_u.py (98%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_yppm.py (96%)
 rename {fv3core => pyFV3}/tests/savepoint/translate/translate_ytp_v.py (93%)

diff --git a/driver/pace/driver/diagnostics.py b/driver/pace/driver/diagnostics.py
index 6843a6e7..1ee49822 100644
--- a/driver/pace/driver/diagnostics.py
+++ b/driver/pace/driver/diagnostics.py
@@ -12,7 +12,7 @@
 from ndsl.monitor import Monitor, NetCDFMonitor, ZarrMonitor
 from ndsl.quantity import Quantity
 
-from pace.fv3core.dycore_state import DycoreState
+from pyFV3.dycore_state import DycoreState
 
 from .state import DriverState
 
@@ -25,16 +25,13 @@
 
 class Diagnostics(abc.ABC):
     @abc.abstractmethod
-    def store(self, time: Union[datetime, timedelta], state: DriverState):
-        ...
+    def store(self, time: Union[datetime, timedelta], state: DriverState): ...
 
     @abc.abstractmethod
-    def store_grid(self, grid_data: GridData):
-        ...
+    def store_grid(self, grid_data: GridData): ...
 
     @abc.abstractmethod
-    def cleanup(self):
-        ...
+    def cleanup(self): ...
 
 
 @dataclasses.dataclass
diff --git a/driver/pace/driver/driver.py b/driver/pace/driver/driver.py
index bd350a4d..9771598e 100644
--- a/driver/pace/driver/driver.py
+++ b/driver/pace/driver/driver.py
@@ -31,7 +31,7 @@
 
 import pace.driver
 import pace.physics
-from pace import fv3core
+import pyFV3
 from pace.driver.safety_checks import SafetyChecker
 
 # TODO: move update_atmos_state into pace.driver
@@ -113,8 +113,8 @@ class DriverConfig:
     comm_config: CreatesCommSelector = dataclasses.field(
         default_factory=CreatesCommSelector
     )
-    dycore_config: fv3core.DynamicalCoreConfig = dataclasses.field(
-        default_factory=fv3core.DynamicalCoreConfig
+    dycore_config: pyFV3.DynamicalCoreConfig = dataclasses.field(
+        default_factory=pyFV3.DynamicalCoreConfig
     )
     physics_config: pace.physics.PhysicsConfig = dataclasses.field(
         default_factory=pace.physics.PhysicsConfig
@@ -243,7 +243,7 @@ def from_dict(cls, kwargs: Dict[str, Any]) -> "DriverConfig":
                     )
 
             kwargs["dycore_config"] = dacite.from_dict(
-                data_class=fv3core.DynamicalCoreConfig,
+                data_class=pyFV3.DynamicalCoreConfig,
                 data=kwargs.get("dycore_config", {}),
                 config=dacite.Config(strict=True),
             )
@@ -293,10 +293,10 @@ def from_dict(cls, kwargs: Dict[str, Any]) -> "DriverConfig":
             isinstance(kwargs["stencil_config"], dict)
             and "compilation_config" in kwargs["stencil_config"].keys()
         ):
-            kwargs["stencil_config"][
-                "compilation_config"
-            ] = CompilationConfig.from_dict(
-                data=kwargs["stencil_config"]["compilation_config"]
+            kwargs["stencil_config"]["compilation_config"] = (
+                CompilationConfig.from_dict(
+                    data=kwargs["stencil_config"]["compilation_config"]
+                )
             )
 
         return dacite.from_dict(
@@ -473,7 +473,11 @@ def exit_instead_of_build(self):
                 stencil_compare_comm=stencil_compare_comm,
             )
             ndsl_log.info("setting up grid started")
-            (damping_coefficients, driver_grid_data, grid_data,) = self.config.get_grid(
+            (
+                damping_coefficients,
+                driver_grid_data,
+                grid_data,
+            ) = self.config.get_grid(
                 quantity_factory=self.quantity_factory,
                 communicator=communicator,
             )
@@ -490,7 +494,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 = fv3core.DynamicalCore(
+            self.dycore = pyFV3.DynamicalCore(
                 comm=communicator,
                 grid_data=self.state.grid_data,
                 stencil_factory=self.stencil_factory,
diff --git a/driver/pace/driver/initialization.py b/driver/pace/driver/initialization.py
index 1e6e9b87..91064bb8 100644
--- a/driver/pace/driver/initialization.py
+++ b/driver/pace/driver/initialization.py
@@ -17,10 +17,10 @@
 from ndsl.stencils.testing import TranslateGrid, grid
 
 import pace.driver
-import pace.fv3core.initialization.analytic_init as analytic_init
+import pyFV3.initialization.analytic_init as analytic_init
 import pace.physics
-from pace import fv3core
-from pace.fv3core.testing import TranslateFVDynamics
+import pyFV3
+from pyFV3.testing import TranslateFVDynamics
 
 from .registry import Registry
 from .state import DriverState, TendencyState, _restart_driver_state
@@ -29,8 +29,7 @@
 class Initializer(abc.ABC):
     @property
     @abc.abstractmethod
-    def start_time(self) -> datetime:
-        ...
+    def start_time(self) -> datetime: ...
 
     @abc.abstractmethod
     def get_driver_state(
@@ -41,8 +40,7 @@ def get_driver_state(
         driver_grid_data: DriverGridData,
         grid_data: GridData,
         schemes: List[pace.physics.PHYSICS_PACKAGES],
-    ) -> DriverState:
-        ...
+    ) -> DriverState: ...
 
 
 IT = TypeVar("IT", bound=Type[Initializer])
@@ -306,7 +304,7 @@ def _initialize_dycore_state(
         self,
         communicator: Communicator,
         backend: str,
-    ) -> fv3core.DycoreState:
+    ) -> pyFV3.DycoreState:
         grid = self._get_serialized_grid(communicator=communicator, backend=backend)
 
         ser = self._serializer(communicator)
@@ -343,7 +341,7 @@ class PredefinedStateInit(Initializer):
     used to construct the class.
     """
 
-    dycore_state: fv3core.DycoreState
+    dycore_state: pyFV3.DycoreState
     physics_state: pace.physics.PhysicsState
     tendency_state: TendencyState
     grid_data: GridData
@@ -370,7 +368,7 @@ def get_driver_state(
         )
 
 
-# TODO: refactor fv3core so that pe and peln are internal temporaries
+# TODO: refactor pyFV3 so that pe and peln are internal temporaries
 # of the dynamical core, computed automatically, so that this helper
 # can be eliminated from initialization
 def _update_fortran_restart_pe_peln(state: DriverState) -> None:
diff --git a/driver/pace/driver/safety_checks.py b/driver/pace/driver/safety_checks.py
index 6c2911ec..86ae5dc7 100644
--- a/driver/pace/driver/safety_checks.py
+++ b/driver/pace/driver/safety_checks.py
@@ -3,7 +3,7 @@
 import numpy as np
 from ndsl.quantity import Quantity
 
-from pace.fv3core.dycore_state import DycoreState
+from pyFV3.dycore_state import DycoreState
 
 
 class VariableBounds:
diff --git a/driver/pace/driver/state.py b/driver/pace/driver/state.py
index 136f1f98..32f65349 100644
--- a/driver/pace/driver/state.py
+++ b/driver/pace/driver/state.py
@@ -14,7 +14,7 @@
 from ndsl.quantity import Quantity
 
 import pace.physics
-from pace import fv3core
+import pyFV3
 
 
 @dataclasses.dataclass()
@@ -63,7 +63,7 @@ def init_zeros(cls, quantity_factory: QuantityFactory) -> "TendencyState":
 
 @dataclasses.dataclass
 class DriverState:
-    dycore_state: fv3core.DycoreState
+    dycore_state: pyFV3.DycoreState
     physics_state: pace.physics.PhysicsState
     tendency_state: TendencyState
     grid_data: GridData
@@ -155,7 +155,7 @@ def save_state(self, comm, restart_path: str = "RESTART"):
 def _overwrite_state_from_restart(
     path: str,
     rank: int,
-    state: fv3core.DycoreState,
+    state: pyFV3.DycoreState,
     restart_file_prefix: str,
 ):
     """
@@ -192,11 +192,11 @@ def _restart_driver_state(
     )
 
     if is_fortran_restart:
-        dycore_state = fv3core.DycoreState.from_fortran_restart(
+        dycore_state = pyFV3.DycoreState.from_fortran_restart(
             quantity_factory=quantity_factory, communicator=communicator, path=path
         )
     else:
-        dycore_state = fv3core.DycoreState.init_zeros(quantity_factory=quantity_factory)
+        dycore_state = pyFV3.DycoreState.init_zeros(quantity_factory=quantity_factory)
         _overwrite_state_from_restart(
             path,
             rank,
diff --git a/driver/setup.py b/driver/setup.py
index 6f217e23..aca6aa7e 100644
--- a/driver/setup.py
+++ b/driver/setup.py
@@ -6,7 +6,8 @@
 setup_requirements: List[str] = []
 
 requirements = [
-    "pace-fv3core",
+    "ndsl",
+    "pyFV3",
     "pace-physics",
     "dacite",
     "pyyaml",
diff --git a/examples/notebooks/functions.py b/examples/notebooks/functions.py
index 2a797a66..ae68e1ee 100644
--- a/examples/notebooks/functions.py
+++ b/examples/notebooks/functions.py
@@ -29,9 +29,9 @@
 from ndsl.quantity import Quantity
 from units_config import units
 
-from pace.fv3core.stencils.fvtp2d import FiniteVolumeTransport
-from pace.fv3core.stencils.fxadv import FiniteVolumeFluxPrep
-from pace.fv3core.stencils.tracer_2d_1l import TracerAdvection
+from pyFV3.stencils.fvtp2d import FiniteVolumeTransport
+from pyFV3.stencils.fxadv import FiniteVolumeFluxPrep
+from pyFV3.stencils.tracer_2d_1l import TracerAdvection
 
 
 class GridType(enum.Enum):
diff --git a/fv3core/.jenkins/actions/get_test_data.sh b/fv3core/.jenkins/actions/get_test_data.sh
deleted file mode 100755
index 07f31067..00000000
--- a/fv3core/.jenkins/actions/get_test_data.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e -x
-for dataset in c12_6ranks_standard c12_54ranks_standard c128_6ranks_baroclinic ; do
-    EXPERIMENT=${dataset} make get_test_data
-done
diff --git a/fv3core/.jenkins/actions/run_parallel_regression_tests.sh b/fv3core/.jenkins/actions/run_parallel_regression_tests.sh
deleted file mode 100755
index ea8b7168..00000000
--- a/fv3core/.jenkins/actions/run_parallel_regression_tests.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-set -e -x
-BACKEND=$1
-EXPNAME=$2
-export TEST_ARGS="${EXTRA_TEST_ARGS} -v -s -rsx --backend=${BACKEND} "
-
-# sync the test data
-make get_test_data
-
-export CPPFLAGS="${CPPFLAGS} -Wno-unused-but-set-variable"
-
-if [ ${python_env} == "virtualenv" ]; then
-    CONTAINER_CMD="" MPIRUN_ARGS="" DEV=n make savepoint_tests_mpi
-    TARGET=init CONTAINER_CMD="" MPIRUN_ARGS="" DEV=n make savepoint_tests_mpi
-else
-    DEV=n make savepoint_tests_mpi
-    TARGET=init DEV=n make savepoint_tests_mpi
-fi
-export TEST_ARGS="${TEST_ARGS} --compute_grid"
-if [ ${python_env} == "virtualenv" ]; then
-    CONTAINER_CMD="" MPIRUN_ARGS="" DEV=n make savepoint_tests_mpi
-    TARGET=init CONTAINER_CMD="" MPIRUN_ARGS="" DEV=n make savepoint_tests_mpi
-else
-    DEV=n make savepoint_tests_mpi
-    TARGET=init DEV=n make savepoint_tests_mpi
-fi
diff --git a/fv3core/.jenkins/actions/run_regression_tests.sh b/fv3core/.jenkins/actions/run_regression_tests.sh
deleted file mode 100755
index 861ac09d..00000000
--- a/fv3core/.jenkins/actions/run_regression_tests.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-set -e -x
-BACKEND=$1
-EXPNAME=$2
-XML_REPORT="sequential_test_results.xml"
-export TEST_ARGS="-v -s -rsx --backend=${BACKEND} "
-
-JENKINS_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/../"
-
-# sync the test data
-make get_test_data
-
-if [ ${python_env} == "virtualenv" ]; then
-    export TEST_ARGS="${TEST_ARGS} --junitxml=${JENKINS_DIR}/${XML_REPORT}"
-    export CONTAINER_CMD="srun"
-else
-    export TEST_ARGS="${TEST_ARGS} --junitxml=/.jenkins/${XML_REPORT}"
-    export VOLUMES="-v ${SCRIPT_DIR}/../:/.jenkins"
-fi
-
-DEV=n make savepoint_tests
diff --git a/fv3core/.jenkins/actions/run_standalone.sh b/fv3core/.jenkins/actions/run_standalone.sh
deleted file mode 100755
index 8546645d..00000000
--- a/fv3core/.jenkins/actions/run_standalone.sh
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/bash
-
-# Jenkins action to run a benchmark of dynamics.py on Piz Daint
-# 3/11/2021, Tobias Wicky, Vulcan Inc
-
-# Syntax:
-# .jenkins/action/run_standlone.sh <option>
-
-## Arguments:
-# $1: <option> which can be either empty, "profile" or "build_cache"
-
-# stop on all errors and echo commands
-set -e
-
-# utility function for error handling
-exitError()
-{
-    echo "ERROR $1: $3" 1>&2
-    echo "ERROR     LOCATION=$0" 1>&2
-    echo "ERROR     LINE=$2" 1>&2
-    exit $1
-}
-
-# check arguments
-DO_PROFILE="false"
-DO_NSYS_RUN="false"
-SAVE_CACHE="false"
-SAVE_TIMINGS="false"
-SAVE_ARTIFACTS="true"
-
-if [ "$1" == "profile" ] ; then
-    DO_PROFILE="true"
-fi
-# Extra run in 'cuda' with nsys
-if [ "${DO_PROFILE}" == "true" ] && [ "${backend}" == "cuda" ] ; then
-    DO_NSYS_RUN="true"
-fi
-if [ "$1" == "build_cache" ] ; then
-    SAVE_CACHE="true"
-fi
-# only save timings if this is neither a cache build nor a profiling run
-if [ "${SAVE_CACHE}" != "true" -a "${DO_PROFILE}" != "true" ] ; then
-    SAVE_TIMINGS="true"
-fi
-# check if we store the results of this run
-if [[ "$GIT_BRANCH" != "origin/main" ]]; then
-    SAVE_ARTIFACTS="false"
-fi
-
-# configuration
-SCRIPT=`realpath $0`
-SCRIPTPATH=`dirname $SCRIPT`
-ROOT_DIR="$(dirname "$(dirname "$SCRIPTPATH")")"
-DATA_VERSION=`grep 'FORTRAN_SERIALIZED_DATA_VERSION *=' ${ROOT_DIR}/../Makefile.data_download | cut -d '=' -f 2`
-if [ "$2" != "" ]; then
-    TIMESTEPS=$2
-elif [ "${SAVE_CACHE}" == "true" ]; then
-    TIMESTEPS=2
-else
-    TIMESTEPS=60
-fi
-
-# Could parse from namelist, ranks = 6 * layout[0] * layout[1]
-RANKS=`echo ${experiment} | grep -o -E '[0-9]+ranks' | grep -o -E '[0-9]+'`
-BENCHMARK_DIR=${ROOT_DIR}/examples/standalone/benchmarks
-DATA_DIR="/project/s1053/fv3core_serialized_test_data/${DATA_VERSION}/${experiment}/driver"
-ARTIFACT_ROOT="/project/s1053/performance/"
-TIMING_DIR="${ARTIFACT_ROOT}/fv3core_performance/${backend}"
-PROFILE_DIR="${ARTIFACT_ROOT}/fv3core_profile/${backend}"
-
-
-# check sanity of environment
-test -n "${experiment}" || exitError 1001 ${LINENO} "experiment is not defined"
-test -n "${backend}" || exitError 1002 ${LINENO} "backend is not defined"
-if [ ! -d "${DATA_DIR}" ] ; then
-    exitError 1003 ${LINENO} "test data directory ${DATA_DIR} does not exist"
-fi
-if [ ! -d "${ARTIFACT_ROOT}" ] ; then
-    exitError 1004 ${LINENO} "Artifact directory ${ARTIFACT_ROOT} does not exist"
-fi
-if [ ! -d "${BENCHMARK_DIR}" ] ; then
-    exitError 1005 ${LINENO} "Benchmark directory ${BENCHMARK_DIR} does not exist"
-fi
-
-if [[ $backend = gt_* ]] ; then
-    # sed explained: replace _ with :
-    backend=`echo $backend | sed 's/_/:/'`
-fi
-
-# echo config
-echo "=== $0 configuration ==========================="
-echo "Script:                       ${SCRIPT}"
-echo "Do profiling:                 ${DO_PROFILE}"
-echo "Save GT4Py caches:            ${SAVE_CACHE}"
-echo "Save timings:                 ${SAVE_TIMINGS}"
-echo "Save Aritfacts:               ${SAVE_ARTIFACTS}"
-echo "Root directory:               ${ROOT_DIR}"
-echo "Experiment:                   ${experiment}"
-echo "Backend:                      ${backend}"
-echo "Data version:                 ${DATA_VERSION}"
-echo "Timesteps:                    ${TIMESTEPS}"
-echo "Ranks:                        ${RANKS}"
-echo "Benchmark directory:          ${BENCHMARK_DIR}"
-echo "Data directory:               ${DATA_DIR}"
-echo "Perf. artifact directory:     ${TIMING_DIR}"
-echo "Profile artifact directory:   ${PROFILE_DIR}"
-
-
-# NOTE: All backends are GTC backends, so fetch caches
-. ${ROOT_DIR}/../.jenkins/fetch_caches.sh $backend $experiment dycore
-
-# run standalone
-echo "=== Running standalone ========================="
-if [ "${DO_PROFILE}" == "true" ] ; then
-    profile="--profile"
-fi
-cmd="${BENCHMARK_DIR}/run_on_daint.sh ${TIMESTEPS} ${RANKS} ${backend} ${DATA_DIR}"
-echo "Run command: ${cmd} \"\" \"${profile}\""
-${cmd} "" "${profile}" "${DO_NSYS_RUN}"
-echo "=== Post-processing ============================"
-
-# store timing artifacts
-if [ "${SAVE_TIMINGS}" == "true" ] && [ "${SAVE_ARTIFACTS}" == "true" ] ; then
-        echo "Copying timing information to ${TIMING_DIR}"
-        cp $ROOT_DIR/*.json ${TIMING_DIR}/
-fi
-
-# copying the cache is in a separate action (generate_caches.sh),
-# otherwise delete it
-if [ "${SAVE_CACHE}" != "true" ] ; then
-    rm -rf .gt_cache*
-fi
-
-# store profiling artifacts
-if [ "${DO_PROFILE}" == "true" ] ; then
-    echo "Analyzing profiling results"
-    if [ "${SAVE_ARTIFACTS}" == "true" ] ; then
-        echo "Copying profiling information to ${PROFILE_DIR}/prof/"
-        rm -f ${PROFILE_DIR}/prof/*.prof || true
-        cp $ROOT_DIR/*.prof ${PROFILE_DIR}/prof/
-    fi
-fi
-
-# copy nsys results - cleaning the old ones first
-if [ "${DO_NSYS_RUN}" == "true" ] ; then
-    echo "Copying new nsys results to ${PROFILE_DIR}/nsys/"
-    rm -f ${PROFILE_DIR}/nsys/*.qdrep || true
-    cp $ROOT_DIR/*.qdrep ${PROFILE_DIR}/nsys/
-fi
-
-# remove venv (too many files!)
-rm -rf $ROOT_DIR/venv
-
-echo "=== Done ======================================="
diff --git a/fv3core/.jenkins/actions/test_action.sh b/fv3core/.jenkins/actions/test_action.sh
deleted file mode 100755
index 496909a0..00000000
--- a/fv3core/.jenkins/actions/test_action.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e -x
-echo "${JOB_NAME}-${BUILD_NUMBER}"
-echo `pip list`
-echo `which python`
diff --git a/fv3core/.jenkins/jenkins.sh b/fv3core/.jenkins/jenkins.sh
deleted file mode 100755
index 91a399d6..00000000
--- a/fv3core/.jenkins/jenkins.sh
+++ /dev/null
@@ -1,243 +0,0 @@
-#!/bin/bash
-# This is the master script used to trigger Jenkins actions.
-# The idea of this script is to keep the amount of code in the "Execute shell" field small
-#
-# Example syntax:
-# .jenkins/jenkins.sh run_regression_tests
-#
-# Other actions such as test/build/deploy can be defined.
-
-### Some environment variables available from Jenkins
-### Note: for a complete list see https://jenkins.ginko.ch/env-vars.html
-# slave              The name of the build host (daint, kesch, ...).
-# BUILD_NUMBER       The current build number, such as "153".
-# BUILD_ID           The current build id, such as "2005-08-22_23-59-59" (YYYY-MM-DD_hh-mm-ss).
-# BUILD_DISPLAY_NAME The display name of the current build, something like "#153" by default.
-# NODE_NAME          Name of the host.
-# NODE_LABELS        Whitespace-separated list of labels that the node is assigned.
-# JENKINS_HOME       The absolute path of the data storage directory assigned on the master node.
-# JENKINS_URL        Full URL of Jenkins, like http://server:port/jenkins/
-# BUILD_URL          Full URL of this build, like http://server:port/jenkins/job/foo/15/
-# JOB_URL            Full URL of this job, like http://server:port/jenkins/job/foo/
-
-exitError()
-{
-    echo "ERROR $1: $3" 1>&2
-    echo "ERROR     LOCATION=$0" 1>&2
-    echo "ERROR     LINE=$2" 1>&2
-    exit $1
-}
-
-set -x
-
-# echo basic setup
-echo "####### executing: $0 $* (PID=$$ HOST=$HOSTNAME TIME=`date '+%D %H:%M:%S'`)"
-
-# start timer
-T="$(date +%s)"
-
-# check sanity of environment
-test -n "$1" || exitError 1001 ${LINENO} "must pass an argument"
-test -n "${slave}" || exitError 1005 ${LINENO} "slave is not defined"
-
-JENKINS_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-PACE_DIR=$JENKINS_DIR/../../
-BUILDENV_DIR=$PACE_DIR/buildenv
-TOP_LEVEL_JENKINS_DIR=$PACE_DIR/.jenkins
-
-# Read arguments
-action=$1
-backend=$2
-experiment=$3
-
-if [[ $backend == gt_* || $backend == dace_* ]]; then
-    backend=${backend/_/:}
-fi
-
-# NOTE: Timeout is set by run_command in schedulerTools.sh
-if [ -v LONG_EXECUTION ]; then
-    default_timeout=210
-else
-    default_timeout=45
-fi
-minutes=${4:-$default_timeout}
-
-# check presence of env directory
-pushd `dirname $0` > /dev/null
-popd > /dev/null
-shopt -s expand_aliases
-
-# setup module environment and default queue
-test -f ${BUILDENV_DIR}/machineEnvironment.sh || exitError 1201 ${LINENO} "cannot find machineEnvironment.sh script"
-. ${BUILDENV_DIR}/machineEnvironment.sh
-export python_env=${python_env}
-echo "PYTHON env ${python_env}"
-
-# NOTE: All backends are GTC backends, so fetch the caches
-echo "Fetching existing gt_caches"
-${TOP_LEVEL_JENKINS_DIR}/fetch_caches.sh $backend $experiment dycore
-
-# load machine dependent environment
-if [ ! -f ${BUILDENV_DIR}/env.${host}.sh ] ; then
-    exitError 1202 ${LINENO} "could not find ${BUILDENV_DIR}/env.${host}.sh"
-fi
-. ${BUILDENV_DIR}/env.${host}.sh
-
-# check if action script exists
-script="${JENKINS_DIR}/actions/${action}.sh"
-test -f "${script}" || exitError 1301 ${LINENO} "cannot find script ${script}"
-
-# load scheduler tools
-. ${BUILDENV_DIR}/schedulerTools.sh
-scheduler_script="${BUILDENV_DIR}/submit.${host}.${scheduler}"
-
-# if there is a scheduler script, make a copy for this job
-if [ -f ${scheduler_script} ] ; then
-    if [ "${action}" == "setup" ]; then
-        scheduler="none"
-    else
-        cp  ${scheduler_script} job_${action}.sh
-        scheduler_script=job_${action}.sh
-    fi
-fi
-
-# if this is a parallel job and the number of ranks is specified in the experiment argument, set NUM_RANKS
-# and update the scheduler script if there is one
-if grep -q "parallel" <<< "${script}"; then
-    if grep -q "ranks" <<< "${experiment}"; then
-        export NUM_RANKS=`echo ${experiment} | grep -o -E '[0-9]+ranks' | grep -o -E '[0-9]+'`
-        echo "Setting NUM_RANKS=${NUM_RANKS}"
-        if grep -q "cuda\|gpu" <<< "${backend}" ; then
-            export MPICH_RDMA_ENABLED_CUDA=1
-            # Has to be deactivated to be able to use VRAM pooling
-            export CRAY_CUDA_MPS=0
-        else
-            export MPICH_RDMA_ENABLED_CUDA=0
-            export CRAY_CUDA_MPS=0
-        fi
-        if [ -f ${scheduler_script} ] ; then
-            sed -i 's|<NTASKS>|<NTASKS>\n#SBATCH \-\-hint=multithread|g' ${scheduler_script}
-            # if [ "$NUM_RANKS" -gt "6" ] && [ ! -v LONG_EXECUTION ]; then
-            #  sed -i 's|cscsci|debug|g' ${scheduler_script}
-            if [[ $NUM_RANKS -gt 6 || $backend == *gpu* || $backend == *cuda* ]]; then
-                sed -i 's|cscsci|normal|g' ${scheduler_script}
-            fi
-            sed -i "s|<NTASKS>|$NUM_RANKS|g" ${scheduler_script}
-            if [[ $backend == *gpu* || $backend == *cuda* ]]; then
-                ntaskspernode=1
-            else
-                ntaskspernode=6
-            fi
-            sed -i "s|<NTASKSPERNODE>|$ntaskspernode|g" ${scheduler_script}
-        fi
-    fi
-fi
-
-if grep -q "fv_dynamics" <<< "${script}"; then
-        if grep -q "cuda\|gpu" <<< "${backend}" ; then
-            export MPICH_RDMA_ENABLED_CUDA=1
-            # This enables single node compilation
-            # but will NOT work for c128
-            export CRAY_CUDA_MPS=1
-        else
-            export MPICH_RDMA_ENABLED_CUDA=0
-        export CRAY_CUDA_MPS=0
-        fi
-    sed -i 's|<NTASKS>|6\n#SBATCH \-\-hint=nomultithread|g' ${scheduler_script}
-    minutes=210
-    if [[ $backend == *gpu* || $backend == *cuda* ]]; then
-        ntaskspernode=1
-    else
-        ntaskspernode=24
-    fi
-    sed -i "s|<NTASKSPERNODE>|$ntaskspernode|g" ${scheduler_script}
-    sed -i 's|<CPUSPERTASK>|1|g' ${scheduler_script}
-    export MPIRUN_CALL="srun"
-fi
-
-
-# Set the SCRATCH directory to the working directory if not set (e.g. for running on gce)
-if [ -z ${SCRATCH} ] ; then
-    export SCRATCH=`pwd`
-fi
-
-# Set the host data head directory location
-export TEST_DATA_ROOT="${SCRATCH}/jenkins/scratch/fv3core_fortran_data/"
-export FV3_STENCIL_REBUILD_FLAG=False
-# Set the host data location
-export EXPERIMENT=${experiment}
-if [ -z ${JENKINS_TAG} ]; then
-    export JENKINS_TAG=${JOB_NAME}${BUILD_NUMBER}
-    if [ -z ${JENKINS_TAG} ]; then
-        export JENKINS_TAG=test
-    fi
-fi
-export JENKINS_TAG=${JENKINS_TAG//[,=\/]/-}
-if [ ${#JENKINS_TAG} -gt 85 ]; then
-        NAME=`echo ${JENKINS_TAG} | md5sum | cut -f1 -d" "`
-        export JENKINS_TAG=${NAME//[,=\/]/-}-${BUILD_NUMBER}
-fi
-echo "JENKINS TAG ${JENKINS_TAG}"
-
-if [ -z ${VIRTUALENV} ]; then
-    echo "setting VIRTUALENV"
-    export VIRTUALENV=${JENKINS_DIR}/../venv_${JENKINS_TAG}
-fi
-
-if [ ${python_env} == "virtualenv" ]; then
-    if [ -d ${VIRTUALENV} ]; then
-        echo "Using existing virtualenv ${VIRTUALENV}"
-    else
-        echo "virtualenv ${VIRTUALENV} is not setup yet, installing now"
-        export FV3CORE_INSTALL_FLAGS="-e"
-        ${TOP_LEVEL_JENKINS_DIR}/install_virtualenv.sh ${VIRTUALENV}
-    fi
-    source ${VIRTUALENV}/bin/activate
-    if grep -q "parallel" <<< "${script}"; then
-        export MPIRUN_CALL="srun"
-    fi
-    export FV3_PATH="${JENKINS_DIR}/../"
-fi
-
-run_command "${script} ${backend} ${experiment} " Job${action} ${scheduler_script} $minutes
-
-if [ $? -ne 0 ] ; then
-  exitError 1510 ${LINENO} "problem while executing script ${script}"
-fi
-echo "### ACTION ${action} SUCCESSFUL"
-
-# second run, this time with timing
-if grep -q "fv_dynamics" <<< "${script}"; then
-    cp  ${run_timing_script} job_${action}_2.sh
-    run_timing_script=job_${action}_2.sh
-    export CRAY_CUDA_MPS=0
-        if grep -q "cuda\|gpu" <<< "${backend}" ; then
-            export MPICH_RDMA_ENABLED_CUDA=1
-        export CRAY_CUDA_MPS=1
-        else
-            export MPICH_RDMA_ENABLED_CUDA=0
-        export CRAY_CUDA_MPS=0
-        fi
-    sed -i 's|<NTASKS>|6\n#SBATCH \-\-hint=nomultithread|g' ${run_timing_script}
-    minutes=15
-    sed -i 's|<NTASKSPERNODE>|1|g' ${run_timing_script}
-    sed -i 's/<CPUSPERTASK>/1/g' ${run_timing_script}
-    sed -i 's|cscsci|debug|g' ${run_timing_script}
-    run_command "${script} ${backend} ${experiment} " Job2${action} ${run_timing_script} $minutes
-    if [ $? -ne 0 ] ; then
-        exitError 1511 ${LINENO} "problem while executing script ${script}"
-    fi
-fi
-
-
-echo "### ACTION ${action} SUCCESSFUL"
-
-# end timer and report time taken
-T="$(($(date +%s)-T))"
-printf "####### time taken: %02d:%02d:%02d:%02d\n" "$((T/86400))" "$((T/3600%24))" "$((T/60%60))" "$((T%60))"
-
-# no errors encountered
-echo "####### finished: $0 $* (PID=$$ HOST=$HOSTNAME TIME=`date '+%D %H:%M:%S'`)"
-exit 0
-
-# so long, Earthling!
diff --git a/physics/pace/physics/update/fv_update_phys.py b/physics/pace/physics/update/fv_update_phys.py
index bc1c1e8b..eaf59966 100644
--- a/physics/pace/physics/update/fv_update_phys.py
+++ b/physics/pace/physics/update/fv_update_phys.py
@@ -12,11 +12,11 @@
 from ndsl.quantity import Quantity
 from ndsl.stencils.c2l_ord import CubedToLatLon
 
-from pace import fv3core
+import pyFV3
 from pace.physics.update.update_dwind_phys import AGrid2DGridPhysics
 
 
-# TODO: This is the same as moist_cv.py in fv3core, should move to integration dir
+# TODO: This is the same as moist_cv.py in pyFV3, should move to integration dir
 @gtscript.function
 def moist_cvm(qvapor, gz, ql, qs):
     cvm = (
@@ -28,7 +28,7 @@ def moist_cvm(qvapor, gz, ql, qs):
     return cvm
 
 
-# This is based off of moist_cv_nwat6_fn gt4py function in moist_cv.py in fv3core
+# This is based off of moist_cv_nwat6_fn gt4py function in moist_cv.py in pyFV3
 def moist_cv(
     qvapor: FloatField,
     qliquid: FloatField,
@@ -90,7 +90,7 @@ def __init__(
         namelist,
         comm: Communicator,
         grid_info: DriverGridData,
-        state: fv3core.DycoreState,
+        state: pyFV3.DycoreState,
         u_dt: Quantity,
         v_dt: Quantity,
     ):
diff --git a/physics/pace/physics/update/update_atmos_state.py b/physics/pace/physics/update/update_atmos_state.py
index 472eb31d..e80c8042 100644
--- a/physics/pace/physics/update/update_atmos_state.py
+++ b/physics/pace/physics/update/update_atmos_state.py
@@ -9,12 +9,12 @@
 from ndsl.grid import DriverGridData, GridData
 from ndsl.initialization.allocator import QuantityFactory
 
-import pace.fv3core.stencils.fv_subgridz as fv_subgridz
-from pace import fv3core
+import pyFV3.stencils.fv_subgridz as fv_subgridz
+import pyFV3
 from pace.physics.update.fv_update_phys import ApplyPhysicsToDycore
 
 
-# TODO: when this file is not importable from physics or fv3core, import
+# TODO: when this file is not importable from physics or pyFV3, import
 #       PhysicsState and DycoreState and use them to type hint below
 
 
@@ -150,7 +150,7 @@ def __init__(
         self,
         stencil_factory: StencilFactory,
         quantity_factory: QuantityFactory,
-        dycore_config: fv3core.DynamicalCoreConfig,
+        dycore_config: pyFV3.DynamicalCoreConfig,
         do_dry_convective_adjust: bool,
         dycore_only: bool,
     ):
@@ -244,7 +244,7 @@ def __init__(
         namelist,
         comm: Communicator,
         grid_info: DriverGridData,
-        state: fv3core.DycoreState,
+        state: pyFV3.DycoreState,
         quantity_factory: QuantityFactory,
         dycore_only: bool,
         apply_tendencies: bool,
diff --git a/fv3core/.gitignore b/pyFV3/.gitignore
similarity index 100%
rename from fv3core/.gitignore
rename to pyFV3/.gitignore
diff --git a/fv3core/FORTRAN_CHANGELOG.md b/pyFV3/FORTRAN_CHANGELOG.md
similarity index 100%
rename from fv3core/FORTRAN_CHANGELOG.md
rename to pyFV3/FORTRAN_CHANGELOG.md
diff --git a/fv3core/LICENSE.txt b/pyFV3/LICENSE.txt
similarity index 100%
rename from fv3core/LICENSE.txt
rename to pyFV3/LICENSE.txt
diff --git a/fv3core/Makefile b/pyFV3/Makefile
similarity index 100%
rename from fv3core/Makefile
rename to pyFV3/Makefile
diff --git a/fv3core/README.md b/pyFV3/README.md
similarity index 100%
rename from fv3core/README.md
rename to pyFV3/README.md
diff --git a/fv3core/convert_xppm_yppm.sh b/pyFV3/convert_xppm_yppm.sh
similarity index 100%
rename from fv3core/convert_xppm_yppm.sh
rename to pyFV3/convert_xppm_yppm.sh
diff --git a/fv3core/examples/standalone/benchmarks/README.md b/pyFV3/examples/standalone/benchmarks/README.md
similarity index 100%
rename from fv3core/examples/standalone/benchmarks/README.md
rename to pyFV3/examples/standalone/benchmarks/README.md
diff --git a/fv3core/examples/standalone/benchmarks/collect_memory_usage_data.py b/pyFV3/examples/standalone/benchmarks/collect_memory_usage_data.py
similarity index 100%
rename from fv3core/examples/standalone/benchmarks/collect_memory_usage_data.py
rename to pyFV3/examples/standalone/benchmarks/collect_memory_usage_data.py
diff --git a/fv3core/examples/standalone/benchmarks/run_on_daint.sh b/pyFV3/examples/standalone/benchmarks/run_on_daint.sh
similarity index 100%
rename from fv3core/examples/standalone/benchmarks/run_on_daint.sh
rename to pyFV3/examples/standalone/benchmarks/run_on_daint.sh
diff --git a/fv3core/examples/standalone/runfile/__init__.py b/pyFV3/examples/standalone/runfile/__init__.py
similarity index 100%
rename from fv3core/examples/standalone/runfile/__init__.py
rename to pyFV3/examples/standalone/runfile/__init__.py
diff --git a/fv3core/examples/standalone/runfile/acoustics.py b/pyFV3/examples/standalone/runfile/acoustics.py
similarity index 97%
rename from fv3core/examples/standalone/runfile/acoustics.py
rename to pyFV3/examples/standalone/runfile/acoustics.py
index 7c673e5b..5e4c8b78 100755
--- a/fv3core/examples/standalone/runfile/acoustics.py
+++ b/pyFV3/examples/standalone/runfile/acoustics.py
@@ -15,9 +15,9 @@
 from ndsl.stencils.testing.grid import Grid
 from timing import collect_data_and_write_to_file
 
-from pace.fv3core._config import DynamicalCoreConfig
-from pace.fv3core.stencils.dyn_core import AcousticDynamics
-from pace.fv3core.testing import TranslateDynCore
+from pyFV3._config import DynamicalCoreConfig
+from pyFV3.stencils.dyn_core import AcousticDynamics
+from pyFV3.testing import TranslateDynCore
 
 
 try:
@@ -29,7 +29,7 @@
 def dycore_config_from_namelist(data_directory: str) -> DynamicalCoreConfig:
     """
     Reads the namelist at the given directory and sets
-    the global fv3core config to it
+    the global pyFV3 config to it
     """
     namelist = f90nml.read(data_directory + "/input.nml")
     dycore_config = DynamicalCoreConfig.from_f90nml(namelist)
diff --git a/fv3core/examples/standalone/runfile/compile.py b/pyFV3/examples/standalone/runfile/compile.py
similarity index 98%
rename from fv3core/examples/standalone/runfile/compile.py
rename to pyFV3/examples/standalone/runfile/compile.py
index ce72a88c..a9ee594f 100755
--- a/fv3core/examples/standalone/runfile/compile.py
+++ b/pyFV3/examples/standalone/runfile/compile.py
@@ -10,7 +10,7 @@
 import ndsl.dsl.stencil  # noqa: F401
 from ndsl.comm.null_comm import NullComm
 
-from pace.fv3core._config import DynamicalCoreConfig
+from pyFV3._config import DynamicalCoreConfig
 
 
 try:
diff --git a/fv3core/examples/standalone/runfile/dynamics.py b/pyFV3/examples/standalone/runfile/dynamics.py
similarity index 97%
rename from fv3core/examples/standalone/runfile/dynamics.py
rename to pyFV3/examples/standalone/runfile/dynamics.py
index b23a3fc4..1cee3d35 100755
--- a/fv3core/examples/standalone/runfile/dynamics.py
+++ b/pyFV3/examples/standalone/runfile/dynamics.py
@@ -26,10 +26,10 @@
 from ndsl.stencils.testing import dataset_to_dict
 from ndsl.stencils.testing.grid import Grid
 
-from pace.fv3core import DynamicalCore, DynamicalCoreConfig
-from pace.fv3core.dycore_state import DycoreState
-from pace.fv3core.initialization.baroclinic import init_baroclinic_state
-from pace.fv3core.testing import TranslateFVDynamics
+from pyFV3 import DynamicalCore, DynamicalCoreConfig
+from pyFV3.dycore_state import DycoreState
+from pyFV3.initialization.baroclinic import init_baroclinic_state
+from pyFV3.testing import TranslateFVDynamics
 
 
 def parse_args() -> Namespace:
diff --git a/fv3core/examples/standalone/runfile/timing.py b/pyFV3/examples/standalone/runfile/timing.py
similarity index 100%
rename from fv3core/examples/standalone/runfile/timing.py
rename to pyFV3/examples/standalone/runfile/timing.py
diff --git a/fv3core/pace/fv3core/__init__.py b/pyFV3/pyFV3/__init__.py
similarity index 100%
rename from fv3core/pace/fv3core/__init__.py
rename to pyFV3/pyFV3/__init__.py
diff --git a/fv3core/pace/fv3core/_config.py b/pyFV3/pyFV3/_config.py
similarity index 100%
rename from fv3core/pace/fv3core/_config.py
rename to pyFV3/pyFV3/_config.py
diff --git a/fv3core/pace/fv3core/dycore_state.py b/pyFV3/pyFV3/dycore_state.py
similarity index 100%
rename from fv3core/pace/fv3core/dycore_state.py
rename to pyFV3/pyFV3/dycore_state.py
diff --git a/fv3core/pace/fv3core/initialization/__init__.py b/pyFV3/pyFV3/initialization/__init__.py
similarity index 100%
rename from fv3core/pace/fv3core/initialization/__init__.py
rename to pyFV3/pyFV3/initialization/__init__.py
diff --git a/fv3core/pace/fv3core/initialization/analytic_init.py b/pyFV3/pyFV3/initialization/analytic_init.py
similarity index 90%
rename from fv3core/pace/fv3core/initialization/analytic_init.py
rename to pyFV3/pyFV3/initialization/analytic_init.py
index f2c2bb98..c8d22893 100644
--- a/fv3core/pace/fv3core/initialization/analytic_init.py
+++ b/pyFV3/pyFV3/initialization/analytic_init.py
@@ -5,7 +5,7 @@
 from ndsl.initialization.allocator import QuantityFactory
 from ndsl.utils import MetaEnumStr
 
-from pace.fv3core.dycore_state import DycoreState
+from pyFV3.dycore_state import DycoreState
 
 
 class Cases(Enum, metaclass=MetaEnumStr):
@@ -38,7 +38,7 @@ def init_analytic_state(
     """
     if analytic_init_case in Cases:  # type: ignore
         if analytic_init_case == Cases.baroclinic.value:  # type: ignore
-            import pace.fv3core.initialization.test_cases.initialize_baroclinic as bc
+            import pyFV3.initialization.test_cases.initialize_baroclinic as bc
 
             assert isinstance(comm, CubedSphereCommunicator)
 
@@ -52,7 +52,7 @@ def init_analytic_state(
             )
 
         elif analytic_init_case == Cases.tropicalcyclone.value:  # type: ignore
-            import pace.fv3core.initialization.test_cases.initialize_tc as tc
+            import pyFV3.initialization.test_cases.initialize_tc as tc
 
             assert isinstance(comm, CubedSphereCommunicator)
 
diff --git a/fv3core/pace/fv3core/initialization/init_utils.py b/pyFV3/pyFV3/initialization/init_utils.py
similarity index 99%
rename from fv3core/pace/fv3core/initialization/init_utils.py
rename to pyFV3/pyFV3/initialization/init_utils.py
index 1032fa7b..b95a5624 100644
--- a/fv3core/pace/fv3core/initialization/init_utils.py
+++ b/pyFV3/pyFV3/initialization/init_utils.py
@@ -8,7 +8,7 @@
 from ndsl.grid import lon_lat_midpoint
 from ndsl.grid.gnomonic import get_lonlat_vect, get_unit_vector_direction
 
-from pace.fv3core.dycore_state import DycoreState
+from pyFV3.dycore_state import DycoreState
 
 
 # maximum windspeed amplitude - close to windspeed of zonal-mean time-mean
@@ -216,7 +216,7 @@ def initialize_kappa_pressures(pe, peln, ptop):
     """
     pk = np.zeros(pe.shape)
     pkz = np.zeros(pe.shape)
-    pk[:, :, 0] = ptop ** constants.KAPPA
+    pk[:, :, 0] = ptop**constants.KAPPA
     pk[:, :, 1:] = np.exp(constants.KAPPA * np.log(pe[:, :, 1:]))
     pkz[:, :, :-1] = (pk[:, :, 1:] - pk[:, :, :-1]) / (
         constants.KAPPA * (peln[:, :, 1:] - peln[:, :, :-1])
diff --git a/fv3core/pace/fv3core/initialization/test_cases/initialize_baroclinic.py b/pyFV3/pyFV3/initialization/test_cases/initialize_baroclinic.py
similarity index 98%
rename from fv3core/pace/fv3core/initialization/test_cases/initialize_baroclinic.py
rename to pyFV3/pyFV3/initialization/test_cases/initialize_baroclinic.py
index ab98c23b..c559679b 100644
--- a/fv3core/pace/fv3core/initialization/test_cases/initialize_baroclinic.py
+++ b/pyFV3/pyFV3/initialization/test_cases/initialize_baroclinic.py
@@ -7,8 +7,8 @@
 from ndsl.grid import GridData, great_circle_distance_lon_lat, lon_lat_midpoint
 from ndsl.initialization.allocator import QuantityFactory
 
-import pace.fv3core.initialization.init_utils as init_utils
-from pace.fv3core.dycore_state import DycoreState
+import pyFV3.initialization.init_utils as init_utils
+from pyFV3.dycore_state import DycoreState
 
 
 # maximum windspeed amplitude - close to windspeed of zonal-mean time-mean
diff --git a/fv3core/pace/fv3core/initialization/test_cases/initialize_tc.py b/pyFV3/pyFV3/initialization/test_cases/initialize_tc.py
similarity index 99%
rename from fv3core/pace/fv3core/initialization/test_cases/initialize_tc.py
rename to pyFV3/pyFV3/initialization/test_cases/initialize_tc.py
index 3ffa2abe..0b625638 100644
--- a/fv3core/pace/fv3core/initialization/test_cases/initialize_tc.py
+++ b/pyFV3/pyFV3/initialization/test_cases/initialize_tc.py
@@ -4,8 +4,8 @@
 from ndsl.grid import GridData, great_circle_distance_lon_lat
 from ndsl.initialization.allocator import QuantityFactory
 
-import pace.fv3core.initialization.init_utils as init_utils
-from pace.fv3core.dycore_state import DycoreState
+import pyFV3.initialization.init_utils as init_utils
+from pyFV3.dycore_state import DycoreState
 
 
 def _calculate_distance_from_tc_center(pe_v, ps_v, muv, calc, tc_properties):
@@ -15,7 +15,7 @@ def _calculate_distance_from_tc_center(pe_v, ps_v, muv, calc, tc_properties):
         muv["midpoint"][:, :, 0] - calc["p0"][0]
     )
     d2 = np.cos(calc["p0"][1]) * np.sin(muv["midpoint"][:, :, 0] - calc["p0"][0])
-    d = np.sqrt(d1 ** 2 + d2 ** 2)
+    d = np.sqrt(d1**2 + d2**2)
     d[d < 1e-15] = 1e-15
 
     r = great_circle_distance_lon_lat(
diff --git a/fv3core/pace/fv3core/stencils/__init__.py b/pyFV3/pyFV3/stencils/__init__.py
similarity index 100%
rename from fv3core/pace/fv3core/stencils/__init__.py
rename to pyFV3/pyFV3/stencils/__init__.py
diff --git a/fv3core/pace/fv3core/stencils/a2b_ord4.py b/pyFV3/pyFV3/stencils/a2b_ord4.py
similarity index 99%
rename from fv3core/pace/fv3core/stencils/a2b_ord4.py
rename to pyFV3/pyFV3/stencils/a2b_ord4.py
index 82f8896c..a8521b69 100644
--- a/fv3core/pace/fv3core/stencils/a2b_ord4.py
+++ b/pyFV3/pyFV3/stencils/a2b_ord4.py
@@ -17,7 +17,7 @@
 from ndsl.grid import GridData
 from ndsl.initialization.allocator import QuantityFactory
 
-from pace.fv3core.stencils.basic_operations import copy_defn
+from pyFV3.stencils.basic_operations import copy_defn
 
 
 # comact 4-pt cubic interpolation
diff --git a/fv3core/pace/fv3core/stencils/basic_operations.py b/pyFV3/pyFV3/stencils/basic_operations.py
similarity index 100%
rename from fv3core/pace/fv3core/stencils/basic_operations.py
rename to pyFV3/pyFV3/stencils/basic_operations.py
diff --git a/fv3core/pace/fv3core/stencils/c_sw.py b/pyFV3/pyFV3/stencils/c_sw.py
similarity index 99%
rename from fv3core/pace/fv3core/stencils/c_sw.py
rename to pyFV3/pyFV3/stencils/c_sw.py
index 3c1a3cb1..80b504e4 100644
--- a/fv3core/pace/fv3core/stencils/c_sw.py
+++ b/pyFV3/pyFV3/stencils/c_sw.py
@@ -15,7 +15,7 @@
 from ndsl.quantity import Quantity
 from ndsl.stencils import corners
 
-from pace.fv3core.stencils.d2a2c_vect import DGrid2AGrid2CGridVectors
+from pyFV3.stencils.d2a2c_vect import DGrid2AGrid2CGridVectors
 
 
 def zero_delpc_ptc(delpc: FloatField, ptc: FloatField):
diff --git a/fv3core/pace/fv3core/stencils/d2a2c_vect.py b/pyFV3/pyFV3/stencils/d2a2c_vect.py
similarity index 99%
rename from fv3core/pace/fv3core/stencils/d2a2c_vect.py
rename to pyFV3/pyFV3/stencils/d2a2c_vect.py
index 5754919f..c31d7854 100644
--- a/fv3core/pace/fv3core/stencils/d2a2c_vect.py
+++ b/pyFV3/pyFV3/stencils/d2a2c_vect.py
@@ -8,7 +8,7 @@
 from ndsl.initialization.allocator import QuantityFactory
 from ndsl.stencils import corners
 
-from pace.fv3core.stencils.a2b_ord4 import a1, a2, lagrange_x_func, lagrange_y_func
+from pyFV3.stencils.a2b_ord4 import a1, a2, lagrange_x_func, lagrange_y_func
 
 
 c1 = -2.0 / 14.0
diff --git a/fv3core/pace/fv3core/stencils/d_sw.py b/pyFV3/pyFV3/stencils/d_sw.py
similarity index 98%
rename from fv3core/pace/fv3core/stencils/d_sw.py
rename to pyFV3/pyFV3/stencils/d_sw.py
index a1542f24..6f531a6a 100644
--- a/fv3core/pace/fv3core/stencils/d_sw.py
+++ b/pyFV3/pyFV3/stencils/d_sw.py
@@ -17,15 +17,15 @@
 from ndsl.initialization.allocator import QuantityFactory
 from ndsl.quantity import Quantity
 
-import pace.fv3core.stencils.delnflux as delnflux
-from pace.fv3core._config import DGridShallowWaterLagrangianDynamicsConfig
-from pace.fv3core.stencils.d2a2c_vect import contravariant
-from pace.fv3core.stencils.delnflux import DelnFluxNoSG
-from pace.fv3core.stencils.divergence_damping import DivergenceDamping
-from pace.fv3core.stencils.fvtp2d import FiniteVolumeTransport
-from pace.fv3core.stencils.fxadv import FiniteVolumeFluxPrep
-from pace.fv3core.stencils.xtp_u import advect_u_along_x
-from pace.fv3core.stencils.ytp_v import advect_v_along_y
+import pyFV3.stencils.delnflux as delnflux
+from pyFV3._config import DGridShallowWaterLagrangianDynamicsConfig
+from pyFV3.stencils.d2a2c_vect import contravariant
+from pyFV3.stencils.delnflux import DelnFluxNoSG
+from pyFV3.stencils.divergence_damping import DivergenceDamping
+from pyFV3.stencils.fvtp2d import FiniteVolumeTransport
+from pyFV3.stencils.fxadv import FiniteVolumeFluxPrep
+from pyFV3.stencils.xtp_u import advect_u_along_x
+from pyFV3.stencils.ytp_v import advect_v_along_y
 
 
 dcon_threshold = 1e-5
diff --git a/fv3core/pace/fv3core/stencils/del2cubed.py b/pyFV3/pyFV3/stencils/del2cubed.py
similarity index 98%
rename from fv3core/pace/fv3core/stencils/del2cubed.py
rename to pyFV3/pyFV3/stencils/del2cubed.py
index 55fde9b9..ba097b47 100644
--- a/fv3core/pace/fv3core/stencils/del2cubed.py
+++ b/pyFV3/pyFV3/stencils/del2cubed.py
@@ -7,7 +7,7 @@
 from ndsl.grid import DampingCoefficients
 from ndsl.initialization.allocator import QuantityFactory
 
-from pace.fv3core.stencils.basic_operations import copy_defn
+from pyFV3.stencils.basic_operations import copy_defn
 
 
 #
@@ -90,7 +90,7 @@ def __init__(
     ):
         """
         Args:
-            grid: fv3core grid object
+            grid: pyFV3 grid object
         """
         orchestrate(obj=self, config=stencil_factory.config.dace_config)
         grid_indexing = stencil_factory.grid_indexing
diff --git a/fv3core/pace/fv3core/stencils/delnflux.py b/pyFV3/pyFV3/stencils/delnflux.py
similarity index 100%
rename from fv3core/pace/fv3core/stencils/delnflux.py
rename to pyFV3/pyFV3/stencils/delnflux.py
diff --git a/fv3core/pace/fv3core/stencils/divergence_damping.py b/pyFV3/pyFV3/stencils/divergence_damping.py
similarity index 98%
rename from fv3core/pace/fv3core/stencils/divergence_damping.py
rename to pyFV3/pyFV3/stencils/divergence_damping.py
index fb28a046..4d5f7f37 100644
--- a/fv3core/pace/fv3core/stencils/divergence_damping.py
+++ b/pyFV3/pyFV3/stencils/divergence_damping.py
@@ -17,12 +17,12 @@
 from ndsl.initialization.allocator import QuantityFactory
 from ndsl.quantity import Quantity
 
-import pace.fv3core.stencils.basic_operations as basic
-from pace.fv3core.stencils.a2b_ord4 import (
+import pyFV3.stencils.basic_operations as basic
+from pyFV3.stencils.a2b_ord4 import (
     AGrid2BGridFourthOrder,
     doubly_periodic_a2b_ord4,
 )
-from pace.fv3core.stencils.d2a2c_vect import contravariant
+from pyFV3.stencils.d2a2c_vect import contravariant
 
 
 @gtscript.function
@@ -253,7 +253,7 @@ def smagorinsky_diffusion_approx(delpc: FloatField, vort: FloatField, absdt: Flo
         absdt (in): abs(dt)
     """
     with computation(PARALLEL), interval(...):
-        vort = absdt * (delpc ** 2.0 + vort ** 2.0) ** 0.5
+        vort = absdt * (delpc**2.0 + vort**2.0) ** 0.5
 
 
 def smag_corner(
@@ -297,7 +297,7 @@ def smag_corner(
         wk = rarea * (vt2 - vt2[0, 1, 0] + ut2 - ut2[1, 0, 0])
 
         shear = doubly_periodic_a2b_ord4(wk)
-        smag_c = dt * sqrt(shear ** 2 + smag_c_t ** 2)
+        smag_c = dt * sqrt(shear**2 + smag_c_t**2)
 
 
 class DivergenceDamping:
diff --git a/fv3core/pace/fv3core/stencils/dyn_core.py b/pyFV3/pyFV3/stencils/dyn_core.py
similarity index 97%
rename from fv3core/pace/fv3core/stencils/dyn_core.py
rename to pyFV3/pyFV3/stencils/dyn_core.py
index f3de801d..4927258c 100644
--- a/fv3core/pace/fv3core/stencils/dyn_core.py
+++ b/pyFV3/pyFV3/stencils/dyn_core.py
@@ -30,21 +30,21 @@
 from ndsl.initialization.allocator import QuantityFactory
 from ndsl.quantity import Quantity
 
-import pace.fv3core.stencils.basic_operations as basic
-import pace.fv3core.stencils.d_sw as d_sw
-import pace.fv3core.stencils.nh_p_grad as nh_p_grad
-import pace.fv3core.stencils.pe_halo as pe_halo
-import pace.fv3core.stencils.ray_fast as ray_fast
-import pace.fv3core.stencils.temperature_adjust as temperature_adjust
-import pace.fv3core.stencils.updatedzc as updatedzc
-import pace.fv3core.stencils.updatedzd as updatedzd
-from pace.fv3core._config import AcousticDynamicsConfig
-from pace.fv3core.dycore_state import DycoreState
-from pace.fv3core.stencils.c_sw import CGridShallowWaterDynamics
-from pace.fv3core.stencils.del2cubed import HyperdiffusionDamping
-from pace.fv3core.stencils.pk3_halo import PK3Halo
-from pace.fv3core.stencils.riem_solver3 import NonhydrostaticVerticalSolver
-from pace.fv3core.stencils.riem_solver_c import NonhydrostaticVerticalSolverCGrid
+import pyFV3.stencils.basic_operations as basic
+import pyFV3.stencils.d_sw as d_sw
+import pyFV3.stencils.nh_p_grad as nh_p_grad
+import pyFV3.stencils.pe_halo as pe_halo
+import pyFV3.stencils.ray_fast as ray_fast
+import pyFV3.stencils.temperature_adjust as temperature_adjust
+import pyFV3.stencils.updatedzc as updatedzc
+import pyFV3.stencils.updatedzd as updatedzd
+from pyFV3._config import AcousticDynamicsConfig
+from pyFV3.dycore_state import DycoreState
+from pyFV3.stencils.c_sw import CGridShallowWaterDynamics
+from pyFV3.stencils.del2cubed import HyperdiffusionDamping
+from pyFV3.stencils.pk3_halo import PK3Halo
+from pyFV3.stencils.riem_solver3 import NonhydrostaticVerticalSolver
+from pyFV3.stencils.riem_solver_c import NonhydrostaticVerticalSolverCGrid
 
 
 HUGE_R = 1.0e40
diff --git a/fv3core/pace/fv3core/stencils/fillz.py b/pyFV3/pyFV3/stencils/fillz.py
similarity index 100%
rename from fv3core/pace/fv3core/stencils/fillz.py
rename to pyFV3/pyFV3/stencils/fillz.py
diff --git a/fv3core/pace/fv3core/stencils/fv_dynamics.py b/pyFV3/pyFV3/stencils/fv_dynamics.py
similarity index 97%
rename from fv3core/pace/fv3core/stencils/fv_dynamics.py
rename to pyFV3/pyFV3/stencils/fv_dynamics.py
index 26e83d67..034c0c94 100644
--- a/fv3core/pace/fv3core/stencils/fv_dynamics.py
+++ b/pyFV3/pyFV3/stencils/fv_dynamics.py
@@ -19,15 +19,15 @@
 from ndsl.quantity import Quantity
 from ndsl.stencils.c2l_ord import CubedToLatLon
 
-import pace.fv3core.stencils.moist_cv as moist_cv
-from pace.fv3core._config import DynamicalCoreConfig
-from pace.fv3core.dycore_state import DycoreState
-from pace.fv3core.stencils import fvtp2d, tracer_2d_1l
-from pace.fv3core.stencils.basic_operations import copy_defn
-from pace.fv3core.stencils.del2cubed import HyperdiffusionDamping
-from pace.fv3core.stencils.dyn_core import AcousticDynamics
-from pace.fv3core.stencils.neg_adj3 import AdjustNegativeTracerMixingRatio
-from pace.fv3core.stencils.remapping import LagrangianToEulerian
+import pyFV3.stencils.moist_cv as moist_cv
+from pyFV3._config import DynamicalCoreConfig
+from pyFV3.dycore_state import DycoreState
+from pyFV3.stencils import fvtp2d, tracer_2d_1l
+from pyFV3.stencils.basic_operations import copy_defn
+from pyFV3.stencils.del2cubed import HyperdiffusionDamping
+from pyFV3.stencils.dyn_core import AcousticDynamics
+from pyFV3.stencils.neg_adj3 import AdjustNegativeTracerMixingRatio
+from pyFV3.stencils.remapping import LagrangianToEulerian
 
 
 def pt_to_potential_density_pt(
diff --git a/fv3core/pace/fv3core/stencils/fv_subgridz.py b/pyFV3/pyFV3/stencils/fv_subgridz.py
similarity index 99%
rename from fv3core/pace/fv3core/stencils/fv_subgridz.py
rename to pyFV3/pyFV3/stencils/fv_subgridz.py
index aa7a3080..ef2245f3 100644
--- a/fv3core/pace/fv3core/stencils/fv_subgridz.py
+++ b/pyFV3/pyFV3/stencils/fv_subgridz.py
@@ -29,8 +29,8 @@
 from ndsl.initialization.allocator import QuantityFactory
 from ndsl.quantity import Quantity
 
-from pace.fv3core.dycore_state import DycoreState
-from pace.fv3core.stencils.basic_operations import dim
+from pyFV3.dycore_state import DycoreState
+from pyFV3.stencils.basic_operations import dim
 
 
 RK = CP_AIR / RDGAS + 1.0
@@ -65,7 +65,7 @@ def standard_cm(cpm, cvm, q0_vapor, q0_liquid, q0_rain, q0_ice, q0_snow, q0_grau
 
 @gtscript.function
 def tvol(gz, u0, v0, w0):
-    return gz + 0.5 * (u0 ** 2 + v0 ** 2 + w0 ** 2)
+    return gz + 0.5 * (u0**2 + v0**2 + w0**2)
 
 
 def init(
diff --git a/fv3core/pace/fv3core/stencils/fvtp2d.py b/pyFV3/pyFV3/stencils/fvtp2d.py
similarity index 98%
rename from fv3core/pace/fv3core/stencils/fvtp2d.py
rename to pyFV3/pyFV3/stencils/fvtp2d.py
index f038c05d..d69f9fdc 100644
--- a/fv3core/pace/fv3core/stencils/fvtp2d.py
+++ b/pyFV3/pyFV3/stencils/fvtp2d.py
@@ -10,9 +10,9 @@
 from ndsl.grid import DampingCoefficients, GridData
 from ndsl.initialization.allocator import QuantityFactory
 
-from pace.fv3core.stencils.delnflux import DelnFlux
-from pace.fv3core.stencils.xppm import XPiecewiseParabolic
-from pace.fv3core.stencils.yppm import YPiecewiseParabolic
+from pyFV3.stencils.delnflux import DelnFlux
+from pyFV3.stencils.xppm import XPiecewiseParabolic
+from pyFV3.stencils.yppm import YPiecewiseParabolic
 
 
 @gtscript.function
diff --git a/fv3core/pace/fv3core/stencils/fxadv.py b/pyFV3/pyFV3/stencils/fxadv.py
similarity index 99%
rename from fv3core/pace/fv3core/stencils/fxadv.py
rename to pyFV3/pyFV3/stencils/fxadv.py
index 83e7ab6b..f71d9c5c 100644
--- a/fv3core/pace/fv3core/stencils/fxadv.py
+++ b/pyFV3/pyFV3/stencils/fxadv.py
@@ -11,7 +11,7 @@
 from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
 from ndsl.grid import GridData
 
-from pace.fv3core.stencils.d2a2c_vect import contravariant
+from pyFV3.stencils.d2a2c_vect import contravariant
 
 
 def main_uc_vc_contra(
diff --git a/fv3core/pace/fv3core/stencils/map_single.py b/pyFV3/pyFV3/stencils/map_single.py
similarity index 97%
rename from fv3core/pace/fv3core/stencils/map_single.py
rename to pyFV3/pyFV3/stencils/map_single.py
index a6dd875e..c576585b 100644
--- a/fv3core/pace/fv3core/stencils/map_single.py
+++ b/pyFV3/pyFV3/stencils/map_single.py
@@ -7,8 +7,8 @@
 from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ, IntFieldIJ  # noqa: F401
 from ndsl.initialization.allocator import QuantityFactory
 
-from pace.fv3core.stencils.basic_operations import copy_defn
-from pace.fv3core.stencils.remap_profile import RemapProfile
+from pyFV3.stencils.basic_operations import copy_defn
+from pyFV3.stencils.remap_profile import RemapProfile
 
 
 def set_dp(dp1: FloatField, pe1: FloatField, lev: IntFieldIJ):
diff --git a/fv3core/pace/fv3core/stencils/mapn_tracer.py b/pyFV3/pyFV3/stencils/mapn_tracer.py
similarity index 95%
rename from fv3core/pace/fv3core/stencils/mapn_tracer.py
rename to pyFV3/pyFV3/stencils/mapn_tracer.py
index a55f875e..64933336 100644
--- a/fv3core/pace/fv3core/stencils/mapn_tracer.py
+++ b/pyFV3/pyFV3/stencils/mapn_tracer.py
@@ -8,8 +8,8 @@
 from ndsl.initialization.allocator import QuantityFactory
 from ndsl.quantity import Quantity
 
-from pace.fv3core.stencils.fillz import FillNegativeTracerValues
-from pace.fv3core.stencils.map_single import MapSingle
+from pyFV3.stencils.fillz import FillNegativeTracerValues
+from pyFV3.stencils.map_single import MapSingle
 
 
 class MapNTracer:
diff --git a/fv3core/pace/fv3core/stencils/moist_cv.py b/pyFV3/pyFV3/stencils/moist_cv.py
similarity index 100%
rename from fv3core/pace/fv3core/stencils/moist_cv.py
rename to pyFV3/pyFV3/stencils/moist_cv.py
diff --git a/fv3core/pace/fv3core/stencils/neg_adj3.py b/pyFV3/pyFV3/stencils/neg_adj3.py
similarity index 100%
rename from fv3core/pace/fv3core/stencils/neg_adj3.py
rename to pyFV3/pyFV3/stencils/neg_adj3.py
diff --git a/fv3core/pace/fv3core/stencils/nh_p_grad.py b/pyFV3/pyFV3/stencils/nh_p_grad.py
similarity index 98%
rename from fv3core/pace/fv3core/stencils/nh_p_grad.py
rename to pyFV3/pyFV3/stencils/nh_p_grad.py
index 145d986e..80b891f6 100644
--- a/fv3core/pace/fv3core/stencils/nh_p_grad.py
+++ b/pyFV3/pyFV3/stencils/nh_p_grad.py
@@ -6,7 +6,7 @@
 from ndsl.grid import GridData
 from ndsl.initialization.allocator import QuantityFactory
 
-from pace.fv3core.stencils.a2b_ord4 import AGrid2BGridFourthOrder
+from pyFV3.stencils.a2b_ord4 import AGrid2BGridFourthOrder
 
 
 def set_k0_and_calc_wk(
@@ -228,7 +228,7 @@ def __call__(
         # Fortran names:
         # u=u v=v pp=pkc gz=gz pk3=pk3 delp=delp dt=dt
 
-        ptk = ptop ** akap
+        ptk = ptop**akap
         top_value = ptk  # = peln1 if spec.namelist.use_logp else ptk
 
         # TODO: make it clearer that each of these a2b outputs is updated
diff --git a/fv3core/pace/fv3core/stencils/pe_halo.py b/pyFV3/pyFV3/stencils/pe_halo.py
similarity index 100%
rename from fv3core/pace/fv3core/stencils/pe_halo.py
rename to pyFV3/pyFV3/stencils/pe_halo.py
diff --git a/fv3core/pace/fv3core/stencils/pk3_halo.py b/pyFV3/pyFV3/stencils/pk3_halo.py
similarity index 96%
rename from fv3core/pace/fv3core/stencils/pk3_halo.py
rename to pyFV3/pyFV3/stencils/pk3_halo.py
index 16e1ddd7..28d7fbc3 100644
--- a/fv3core/pace/fv3core/stencils/pk3_halo.py
+++ b/pyFV3/pyFV3/stencils/pk3_halo.py
@@ -6,7 +6,7 @@
 
 
 # TODO merge with pe_halo? reuse partials?
-# NOTE: This is different from pace.fv3core.stencils.pe_halo.edge_pe
+# NOTE: This is different from pyFV3.stencils.pe_halo.edge_pe
 def edge_pe_update(
     pe: FloatFieldIJ, delp: FloatField, pk3: FloatField, ptop: Float, akap: Float
 ):
@@ -29,7 +29,7 @@ def edge_pe_update(
                 region[local_is - 2 : local_ie + 3, local_je + 1 : local_je + 3],
             ):
                 pe = pe + delp[0, 0, -1]
-                pk3 = pe ** akap
+                pk3 = pe**akap
 
 
 class PK3Halo:
diff --git a/fv3core/pace/fv3core/stencils/ppm.py b/pyFV3/pyFV3/stencils/ppm.py
similarity index 100%
rename from fv3core/pace/fv3core/stencils/ppm.py
rename to pyFV3/pyFV3/stencils/ppm.py
diff --git a/fv3core/pace/fv3core/stencils/ray_fast.py b/pyFV3/pyFV3/stencils/ray_fast.py
similarity index 100%
rename from fv3core/pace/fv3core/stencils/ray_fast.py
rename to pyFV3/pyFV3/stencils/ray_fast.py
diff --git a/fv3core/pace/fv3core/stencils/remap_profile.py b/pyFV3/pyFV3/stencils/remap_profile.py
similarity index 100%
rename from fv3core/pace/fv3core/stencils/remap_profile.py
rename to pyFV3/pyFV3/stencils/remap_profile.py
diff --git a/fv3core/pace/fv3core/stencils/remapping.py b/pyFV3/pyFV3/stencils/remapping.py
similarity index 98%
rename from fv3core/pace/fv3core/stencils/remapping.py
rename to pyFV3/pyFV3/stencils/remapping.py
index 51fa41d1..cccd5b65 100644
--- a/fv3core/pace/fv3core/stencils/remapping.py
+++ b/pyFV3/pyFV3/stencils/remapping.py
@@ -27,13 +27,13 @@
 from ndsl.initialization.allocator import QuantityFactory
 from ndsl.quantity import Quantity
 
-import pace.fv3core.stencils.moist_cv as moist_cv
-from pace.fv3core._config import RemappingConfig
-from pace.fv3core.stencils.basic_operations import adjust_divide_stencil
-from pace.fv3core.stencils.map_single import MapSingle
-from pace.fv3core.stencils.mapn_tracer import MapNTracer
-from pace.fv3core.stencils.moist_cv import moist_pt_func, moist_pt_last_step
-from pace.fv3core.stencils.saturation_adjustment import SatAdjust3d
+import pyFV3.stencils.moist_cv as moist_cv
+from pyFV3._config import RemappingConfig
+from pyFV3.stencils.basic_operations import adjust_divide_stencil
+from pyFV3.stencils.map_single import MapSingle
+from pyFV3.stencils.mapn_tracer import MapNTracer
+from pyFV3.stencils.moist_cv import moist_pt_func, moist_pt_last_step
+from pyFV3.stencils.saturation_adjustment import SatAdjust3d
 
 
 # TODO: Should this be set here or in global_constants?
diff --git a/fv3core/pace/fv3core/stencils/riem_solver3.py b/pyFV3/pyFV3/stencils/riem_solver3.py
similarity index 98%
rename from fv3core/pace/fv3core/stencils/riem_solver3.py
rename to pyFV3/pyFV3/stencils/riem_solver3.py
index faf0ff0e..f5fc3798 100644
--- a/fv3core/pace/fv3core/stencils/riem_solver3.py
+++ b/pyFV3/pyFV3/stencils/riem_solver3.py
@@ -18,8 +18,8 @@
 from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
 from ndsl.initialization.allocator import QuantityFactory
 
-from pace.fv3core._config import RiemannConfig
-from pace.fv3core.stencils.sim1_solver import Sim1Solver
+from pyFV3._config import RiemannConfig
+from pyFV3.stencils.sim1_solver import Sim1Solver
 
 
 @typing.no_type_check
diff --git a/fv3core/pace/fv3core/stencils/riem_solver_c.py b/pyFV3/pyFV3/stencils/riem_solver_c.py
similarity index 99%
rename from fv3core/pace/fv3core/stencils/riem_solver_c.py
rename to pyFV3/pyFV3/stencils/riem_solver_c.py
index 2873255e..94e12787 100644
--- a/fv3core/pace/fv3core/stencils/riem_solver_c.py
+++ b/pyFV3/pyFV3/stencils/riem_solver_c.py
@@ -14,7 +14,7 @@
 from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
 from ndsl.initialization.allocator import QuantityFactory
 
-from pace.fv3core.stencils.sim1_solver import Sim1Solver
+from pyFV3.stencils.sim1_solver import Sim1Solver
 
 
 @typing.no_type_check
diff --git a/fv3core/pace/fv3core/stencils/saturation_adjustment.py b/pyFV3/pyFV3/stencils/saturation_adjustment.py
similarity index 98%
rename from fv3core/pace/fv3core/stencils/saturation_adjustment.py
rename to pyFV3/pyFV3/stencils/saturation_adjustment.py
index 98239f3b..2118f76d 100644
--- a/fv3core/pace/fv3core/stencils/saturation_adjustment.py
+++ b/pyFV3/pyFV3/stencils/saturation_adjustment.py
@@ -14,9 +14,9 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
 
-from pace.fv3core._config import SatAdjustConfig
-from pace.fv3core.stencils.basic_operations import dim
-from pace.fv3core.stencils.moist_cv import compute_pkz_func
+from pyFV3._config import SatAdjustConfig
+from pyFV3.stencils.basic_operations import dim
+from pyFV3.stencils.moist_cv import compute_pkz_func
 
 
 # TODO: This code could be reduced greatly with abstraction, but first gt4py
@@ -262,7 +262,7 @@ def heterogeneous_freezing(
 ):
     tc = constants.TICE0 - pt1
     if ql > 0.0 and tc > 0.0:
-        sink = 3.3333e-10 * dt_bigg * (exptc - 1.0) * den * ql ** 2
+        sink = 3.3333e-10 * dt_bigg * (exptc - 1.0) * den * ql**2
         sink = min(ql, sink)
         sink = min(sink, tc / icp2)
         ql = ql - sink
@@ -360,10 +360,7 @@ def sublimation(
                 * 349138.78
                 * expsubl
                 / (
-                    iqs2
-                    * den
-                    * constants.LAT2
-                    / (0.0243 * constants.RVGAS * pt1 ** 2.0)
+                    iqs2 * den * constants.LAT2 / (0.0243 * constants.RVGAS * pt1**2.0)
                     + 4.42478e4
                 )
             )
@@ -898,7 +895,7 @@ def satadjust(
             mindw = min(1.0, abs(hs) / (10.0 * constants.GRAV))
             dw = dw_ocean + (dw_land - dw_ocean) * mindw
             # "scale - aware" subgrid variability: 100 - km as the base
-            dbl_sqrt_area = dw * (area ** 0.5 / 100.0e3) ** 0.5
+            dbl_sqrt_area = dw * (area**0.5 / 100.0e3) ** 0.5
             maxtmp = max(0.01, dbl_sqrt_area)
             hvar = min(0.2, maxtmp)
             # partial cloudiness by pdf:
diff --git a/fv3core/pace/fv3core/stencils/sim1_solver.py b/pyFV3/pyFV3/stencils/sim1_solver.py
similarity index 100%
rename from fv3core/pace/fv3core/stencils/sim1_solver.py
rename to pyFV3/pyFV3/stencils/sim1_solver.py
diff --git a/fv3core/pace/fv3core/stencils/temperature_adjust.py b/pyFV3/pyFV3/stencils/temperature_adjust.py
similarity index 96%
rename from fv3core/pace/fv3core/stencils/temperature_adjust.py
rename to pyFV3/pyFV3/stencils/temperature_adjust.py
index 9e8c7819..bf6e9f2c 100644
--- a/fv3core/pace/fv3core/stencils/temperature_adjust.py
+++ b/pyFV3/pyFV3/stencils/temperature_adjust.py
@@ -2,7 +2,7 @@
 from gt4py.cartesian.gtscript import PARALLEL, computation, exp, interval, log
 from ndsl.dsl.typing import Float, FloatField
 
-from pace.fv3core.stencils.basic_operations import sign
+from pyFV3.stencils.basic_operations import sign
 
 
 def apply_diffusive_heating(
diff --git a/fv3core/pace/fv3core/stencils/tracer_2d_1l.py b/pyFV3/pyFV3/stencils/tracer_2d_1l.py
similarity index 99%
rename from fv3core/pace/fv3core/stencils/tracer_2d_1l.py
rename to pyFV3/pyFV3/stencils/tracer_2d_1l.py
index b287fd86..f9d13d07 100644
--- a/fv3core/pace/fv3core/stencils/tracer_2d_1l.py
+++ b/pyFV3/pyFV3/stencils/tracer_2d_1l.py
@@ -19,7 +19,7 @@
 from ndsl.initialization.allocator import QuantityFactory
 from ndsl.quantity import Quantity
 
-from pace.fv3core.stencils.fvtp2d import FiniteVolumeTransport
+from pyFV3.stencils.fvtp2d import FiniteVolumeTransport
 
 
 @gtscript.function
diff --git a/fv3core/pace/fv3core/stencils/updatedzc.py b/pyFV3/pyFV3/stencils/updatedzc.py
similarity index 100%
rename from fv3core/pace/fv3core/stencils/updatedzc.py
rename to pyFV3/pyFV3/stencils/updatedzc.py
diff --git a/fv3core/pace/fv3core/stencils/updatedzd.py b/pyFV3/pyFV3/stencils/updatedzd.py
similarity index 99%
rename from fv3core/pace/fv3core/stencils/updatedzd.py
rename to pyFV3/pyFV3/stencils/updatedzd.py
index c84cf5e5..acbb29a2 100644
--- a/fv3core/pace/fv3core/stencils/updatedzd.py
+++ b/pyFV3/pyFV3/stencils/updatedzd.py
@@ -18,8 +18,8 @@
 from ndsl.initialization.allocator import QuantityFactory
 from ndsl.quantity import Quantity
 
-from pace.fv3core.stencils.delnflux import DelnFluxNoSG
-from pace.fv3core.stencils.fvtp2d import FiniteVolumeTransport
+from pyFV3.stencils.delnflux import DelnFluxNoSG
+from pyFV3.stencils.fvtp2d import FiniteVolumeTransport
 
 
 DZ_MIN = constants.DZ_MIN
diff --git a/fv3core/pace/fv3core/stencils/xppm.py b/pyFV3/pyFV3/stencils/xppm.py
similarity index 99%
rename from fv3core/pace/fv3core/stencils/xppm.py
rename to pyFV3/pyFV3/stencils/xppm.py
index 4fba0dc4..3ae0317e 100644
--- a/fv3core/pace/fv3core/stencils/xppm.py
+++ b/pyFV3/pyFV3/stencils/xppm.py
@@ -11,8 +11,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.dsl.typing import FloatField, FloatFieldIJ, Index3D
 
-from pace.fv3core.stencils import ppm
-from pace.fv3core.stencils.basic_operations import sign
+from pyFV3.stencils import ppm
+from pyFV3.stencils.basic_operations import sign
 
 
 @gtscript.function
diff --git a/fv3core/pace/fv3core/stencils/xtp_u.py b/pyFV3/pyFV3/stencils/xtp_u.py
similarity index 98%
rename from fv3core/pace/fv3core/stencils/xtp_u.py
rename to pyFV3/pyFV3/stencils/xtp_u.py
index 0d5e43f9..a6c4185f 100644
--- a/fv3core/pace/fv3core/stencils/xtp_u.py
+++ b/pyFV3/pyFV3/stencils/xtp_u.py
@@ -2,7 +2,7 @@
 from gt4py.cartesian.gtscript import __INLINED, compile_assert, horizontal, region
 from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
 
-from pace.fv3core.stencils import ppm, xppm
+from pyFV3.stencils import ppm, xppm
 
 
 @gtscript.function
diff --git a/fv3core/pace/fv3core/stencils/yppm.py b/pyFV3/pyFV3/stencils/yppm.py
similarity index 99%
rename from fv3core/pace/fv3core/stencils/yppm.py
rename to pyFV3/pyFV3/stencils/yppm.py
index 59f1dd39..6caeee0b 100644
--- a/fv3core/pace/fv3core/stencils/yppm.py
+++ b/pyFV3/pyFV3/stencils/yppm.py
@@ -12,8 +12,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.dsl.typing import FloatField, FloatFieldIJ, Index3D
 
-from pace.fv3core.stencils import ppm
-from pace.fv3core.stencils.basic_operations import sign
+from pyFV3.stencils import ppm
+from pyFV3.stencils.basic_operations import sign
 
 
 @gtscript.function
diff --git a/fv3core/pace/fv3core/stencils/ytp_v.py b/pyFV3/pyFV3/stencils/ytp_v.py
similarity index 98%
rename from fv3core/pace/fv3core/stencils/ytp_v.py
rename to pyFV3/pyFV3/stencils/ytp_v.py
index 8e729f02..305ef8c9 100644
--- a/fv3core/pace/fv3core/stencils/ytp_v.py
+++ b/pyFV3/pyFV3/stencils/ytp_v.py
@@ -2,7 +2,7 @@
 from gt4py.cartesian.gtscript import __INLINED, compile_assert, horizontal, region
 from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
 
-from pace.fv3core.stencils import ppm, yppm
+from pyFV3.stencils import ppm, yppm
 
 
 @gtscript.function
diff --git a/fv3core/pace/fv3core/testing/__init__.py b/pyFV3/pyFV3/testing/__init__.py
similarity index 100%
rename from fv3core/pace/fv3core/testing/__init__.py
rename to pyFV3/pyFV3/testing/__init__.py
diff --git a/fv3core/pace/fv3core/testing/map_single.py b/pyFV3/pyFV3/testing/map_single.py
similarity index 94%
rename from fv3core/pace/fv3core/testing/map_single.py
rename to pyFV3/pyFV3/testing/map_single.py
index 8cf1fd8a..4ae609a7 100644
--- a/fv3core/pace/fv3core/testing/map_single.py
+++ b/pyFV3/pyFV3/testing/map_single.py
@@ -4,7 +4,7 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.initialization.allocator import QuantityFactory
 
-from pace.fv3core.stencils.map_single import MapSingle
+from pyFV3.stencils.map_single import MapSingle
 
 
 class MapSingleFactory:
diff --git a/fv3core/pace/fv3core/testing/translate_dyncore.py b/pyFV3/pyFV3/testing/translate_dyncore.py
similarity index 98%
rename from fv3core/pace/fv3core/testing/translate_dyncore.py
rename to pyFV3/pyFV3/testing/translate_dyncore.py
index e0530814..a06f1c6f 100644
--- a/fv3core/pace/fv3core/testing/translate_dyncore.py
+++ b/pyFV3/pyFV3/testing/translate_dyncore.py
@@ -5,8 +5,8 @@
 from ndsl.quantity import Quantity
 from ndsl.stencils.testing import ParallelTranslate2PyState
 
-import pace.fv3core.stencils.dyn_core as dyn_core
-from pace.fv3core import DycoreState, DynamicalCoreConfig
+import pyFV3.stencils.dyn_core as dyn_core
+from pyFV3 import DycoreState, DynamicalCoreConfig
 
 
 class TranslateDynCore(ParallelTranslate2PyState):
diff --git a/fv3core/pace/fv3core/testing/translate_fvdynamics.py b/pyFV3/pyFV3/testing/translate_fvdynamics.py
similarity index 98%
rename from fv3core/pace/fv3core/testing/translate_fvdynamics.py
rename to pyFV3/pyFV3/testing/translate_fvdynamics.py
index afd26d5e..1d71e8b3 100644
--- a/fv3core/pace/fv3core/testing/translate_fvdynamics.py
+++ b/pyFV3/pyFV3/testing/translate_fvdynamics.py
@@ -20,9 +20,9 @@
 from ndsl.stencils.testing import ParallelTranslateBaseSlicing
 from ndsl.stencils.testing.translate import TranslateFortranData2Py
 
-import pace.fv3core.stencils.fv_dynamics as fv_dynamics
-from pace.fv3core._config import DynamicalCoreConfig
-from pace.fv3core.dycore_state import DycoreState
+import pyFV3.stencils.fv_dynamics as fv_dynamics
+from pyFV3._config import DynamicalCoreConfig
+from pyFV3.dycore_state import DycoreState
 
 
 class TranslateDycoreFortranData2Py(TranslateFortranData2Py):
diff --git a/fv3core/pace/fv3core/testing/validation.py b/pyFV3/pyFV3/testing/validation.py
similarity index 95%
rename from fv3core/pace/fv3core/testing/validation.py
rename to pyFV3/pyFV3/testing/validation.py
index d8e8d6be..eeed0d94 100644
--- a/fv3core/pace/fv3core/testing/validation.py
+++ b/pyFV3/pyFV3/testing/validation.py
@@ -5,8 +5,8 @@
 from ndsl.constants import X_DIM, X_INTERFACE_DIM, Y_DIM, Y_INTERFACE_DIM, Z_DIM
 from ndsl.quantity import Quantity
 
-import pace.fv3core.stencils.divergence_damping
-import pace.fv3core.stencils.updatedzd
+import pyFV3.stencils.divergence_damping
+import pyFV3.stencils.updatedzd
 
 
 def get_selective_class(
@@ -172,16 +172,16 @@ def enable_selective_validation():
     # this should require only a new function for (origin, domain)
     # note we have not implemented disabling selective validation once enabled
 
-    pace.fv3core.stencils.divergence_damping.DivergenceDamping = get_selective_class(
-        pace.fv3core.stencils.divergence_damping.DivergenceDamping,
+    pyFV3.stencils.divergence_damping.DivergenceDamping = get_selective_class(
+        pyFV3.stencils.divergence_damping.DivergenceDamping,
         {
             "v_contra_dxc": get_domain_func([X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM]),
             "vort": get_domain_func([X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM]),
         },  # must include both function argument and savepoint names
     )
     cell_center_func = get_domain_func([X_DIM, Y_DIM, Z_DIM])
-    pace.fv3core.stencils.fv_dynamics.DynamicalCore = get_selective_class(
-        pace.fv3core.stencils.fv_dynamics.DynamicalCore,
+    pyFV3.stencils.fv_dynamics.DynamicalCore = get_selective_class(
+        pyFV3.stencils.fv_dynamics.DynamicalCore,
         {
             "qsnow": cell_center_func,
             "va": cell_center_func,
diff --git a/fv3core/pace/fv3core/utils/__init__.py b/pyFV3/pyFV3/utils/__init__.py
similarity index 100%
rename from fv3core/pace/fv3core/utils/__init__.py
rename to pyFV3/pyFV3/utils/__init__.py
diff --git a/fv3core/pace/fv3core/utils/functional_validation.py b/pyFV3/pyFV3/utils/functional_validation.py
similarity index 100%
rename from fv3core/pace/fv3core/utils/functional_validation.py
rename to pyFV3/pyFV3/utils/functional_validation.py
diff --git a/fv3core/pace/fv3core/wrappers/geos_wrapper.py b/pyFV3/pyFV3/wrappers/geos_wrapper.py
similarity index 98%
rename from fv3core/pace/fv3core/wrappers/geos_wrapper.py
rename to pyFV3/pyFV3/wrappers/geos_wrapper.py
index 1a5fbe9c..f8429974 100644
--- a/fv3core/pace/fv3core/wrappers/geos_wrapper.py
+++ b/pyFV3/pyFV3/wrappers/geos_wrapper.py
@@ -29,7 +29,7 @@
 from ndsl.performance.collector import PerformanceCollector
 from ndsl.utils import safe_assign_array
 
-from pace import fv3core
+import pyFV3
 
 
 class StencilBackendCompilerOverride:
@@ -112,7 +112,7 @@ def __init__(
 
         self.backend = backend
         self.namelist = namelist
-        self.dycore_config = fv3core.DynamicalCoreConfig.from_f90nml(self.namelist)
+        self.dycore_config = pyFV3.DynamicalCoreConfig.from_f90nml(self.namelist)
         self.dycore_config.dt_atmos = bdt
         assert self.dycore_config.dt_atmos != 0
 
@@ -168,7 +168,7 @@ def __init__(
             config=stencil_config, grid_indexing=self._grid_indexing
         )
 
-        self.dycore_state = fv3core.DycoreState.init_zeros(
+        self.dycore_state = pyFV3.DycoreState.init_zeros(
             quantity_factory=quantity_factory
         )
         self.dycore_state.bdt = self.dycore_config.dt_atmos
@@ -176,7 +176,7 @@ def __init__(
         damping_coefficients = DampingCoefficients.new_from_metric_terms(metric_terms)
 
         with StencilBackendCompilerOverride(MPI.COMM_WORLD, stencil_config.dace_config):
-            self.dynamical_core = fv3core.DynamicalCore(
+            self.dynamical_core = pyFV3.DynamicalCore(
                 comm=self.communicator,
                 grid_data=grid_data,
                 stencil_factory=stencil_factory,
@@ -328,7 +328,7 @@ def _put_fortran_data_in_dycore(
         cxd: np.ndarray,
         cyd: np.ndarray,
         diss_estd: np.ndarray,
-    ) -> fv3core.DycoreState:
+    ) -> pyFV3.DycoreState:
         isc = self._grid_indexing.isc
         jsc = self._grid_indexing.jsc
         iec = self._grid_indexing.iec + 1
diff --git a/fv3core/setup.py b/pyFV3/setup.py
similarity index 82%
rename from fv3core/setup.py
rename to pyFV3/setup.py
index 23b6345a..17326970 100644
--- a/fv3core/setup.py
+++ b/pyFV3/setup.py
@@ -31,19 +31,18 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
     ],
-    description="fv3core is a gt4py-based FV3 dynamical core for atmospheric models",
+    description="pyFV3 is a NDSL-based FV3 dynamical core for atmospheric models",
     install_requires=requirements,
     extras_require={},
     license="BSD license",
     long_description=readme,
     include_package_data=True,
-    keywords="fv3core",
-    name="pace-fv3core",
-    packages=find_namespace_packages(include=["pace.*"]),
+    name="pyFV3",
+    packages=find_namespace_packages(include=["pyFV3.*"]),
     setup_requires=[],
     test_suite="tests",
     tests_require=test_requirements,
-    url="https://github.com/ai2cm/fv3core",
+    url="https://github.com/NOAA-GFDL/pyFV3",
     version="0.2.0",
     zip_safe=False,
 )
diff --git a/fv3core/tests/conftest.py b/pyFV3/tests/conftest.py
similarity index 100%
rename from fv3core/tests/conftest.py
rename to pyFV3/tests/conftest.py
diff --git a/fv3core/tests/mpi/test_doubly_periodic.py b/pyFV3/tests/mpi/test_doubly_periodic.py
similarity index 93%
rename from fv3core/tests/mpi/test_doubly_periodic.py
rename to pyFV3/tests/mpi/test_doubly_periodic.py
index 9b9cdff6..9c454cef 100644
--- a/fv3core/tests/mpi/test_doubly_periodic.py
+++ b/pyFV3/tests/mpi/test_doubly_periodic.py
@@ -11,15 +11,15 @@
 from ndsl.initialization.allocator import QuantityFactory
 from ndsl.initialization.sizer import SubtileGridSizer
 
-import pace.fv3core
-import pace.fv3core._config
-import pace.fv3core.initialization.baroclinic as baroclinic_init
+import pyFV3
+import pyFV3._config
+import pyFV3.initialization.baroclinic as baroclinic_init
 
 
-def setup_dycore() -> Tuple[pace.fv3core.DynamicalCore, List[Any]]:
+def setup_dycore() -> Tuple[pyFV3.DynamicalCore, List[Any]]:
     backend = "numpy"
     layout = (3, 3)
-    config = pace.fv3core.DynamicalCoreConfig(
+    config = pyFV3.DynamicalCoreConfig(
         layout=layout,
         npx=13,
         npy=13,
@@ -117,7 +117,7 @@ def setup_dycore() -> Tuple[pace.fv3core.DynamicalCore, List[Any]]:
         grid_indexing=grid_indexing,
     )
 
-    dycore = pace.fv3core.DynamicalCore(
+    dycore = pyFV3.DynamicalCore(
         comm=communicator,
         grid_data=grid_data,
         stencil_factory=stencil_factory,
diff --git a/fv3core/tests/pytest.ini b/pyFV3/tests/pytest.ini
similarity index 100%
rename from fv3core/tests/pytest.ini
rename to pyFV3/tests/pytest.ini
diff --git a/fv3core/tests/savepoint/__init__.py b/pyFV3/tests/savepoint/__init__.py
similarity index 100%
rename from fv3core/tests/savepoint/__init__.py
rename to pyFV3/tests/savepoint/__init__.py
diff --git a/fv3core/tests/savepoint/conftest.py b/pyFV3/tests/savepoint/conftest.py
similarity index 73%
rename from fv3core/tests/savepoint/conftest.py
rename to pyFV3/tests/savepoint/conftest.py
index ae6d75ad..f8367c9d 100644
--- a/fv3core/tests/savepoint/conftest.py
+++ b/pyFV3/tests/savepoint/conftest.py
@@ -4,11 +4,11 @@
 # between the dycore and physics tests. We can avoid this if we refactor the tests
 # to all run from one directory
 
-import pace.fv3core.testing
+import pyFV3.testing
 
 
-# this must happen before any classes from fv3core are instantiated
-pace.fv3core.testing.enable_selective_validation()
+# this must happen before any classes from pyFV3 are instantiated
+pyFV3.testing.enable_selective_validation()
 
 import ndsl.stencils.testing.conftest
 from ndsl.stencils.testing.conftest import *  # noqa: F403,F401
diff --git a/fv3core/tests/savepoint/output/.gitkeep b/pyFV3/tests/savepoint/output/.gitkeep
similarity index 100%
rename from fv3core/tests/savepoint/output/.gitkeep
rename to pyFV3/tests/savepoint/output/.gitkeep
diff --git a/fv3core/tests/savepoint/test_translate.py b/pyFV3/tests/savepoint/test_translate.py
similarity index 100%
rename from fv3core/tests/savepoint/test_translate.py
rename to pyFV3/tests/savepoint/test_translate.py
diff --git a/fv3core/tests/savepoint/translate/__init__.py b/pyFV3/tests/savepoint/translate/__init__.py
similarity index 97%
rename from fv3core/tests/savepoint/translate/__init__.py
rename to pyFV3/tests/savepoint/translate/__init__.py
index 753132af..651b2551 100644
--- a/fv3core/tests/savepoint/translate/__init__.py
+++ b/pyFV3/tests/savepoint/translate/__init__.py
@@ -1,5 +1,5 @@
 # flake8: noqa: F401
-from pace.fv3core.testing import TranslateDynCore, TranslateFVDynamics
+from pyFV3.testing import TranslateDynCore, TranslateFVDynamics
 
 from .translate_a2b_ord4 import TranslateA2B_Ord4
 from .translate_c_sw import (
diff --git a/fv3core/tests/savepoint/translate/overrides/README.md b/pyFV3/tests/savepoint/translate/overrides/README.md
similarity index 100%
rename from fv3core/tests/savepoint/translate/overrides/README.md
rename to pyFV3/tests/savepoint/translate/overrides/README.md
diff --git a/fv3core/tests/savepoint/translate/overrides/baroclinic.yaml b/pyFV3/tests/savepoint/translate/overrides/baroclinic.yaml
similarity index 100%
rename from fv3core/tests/savepoint/translate/overrides/baroclinic.yaml
rename to pyFV3/tests/savepoint/translate/overrides/baroclinic.yaml
diff --git a/fv3core/tests/savepoint/translate/overrides/standard.yaml b/pyFV3/tests/savepoint/translate/overrides/standard.yaml
similarity index 100%
rename from fv3core/tests/savepoint/translate/overrides/standard.yaml
rename to pyFV3/tests/savepoint/translate/overrides/standard.yaml
diff --git a/fv3core/tests/savepoint/translate/translate_a2b_ord4.py b/pyFV3/tests/savepoint/translate/translate_a2b_ord4.py
similarity index 95%
rename from fv3core/tests/savepoint/translate/translate_a2b_ord4.py
rename to pyFV3/tests/savepoint/translate/translate_a2b_ord4.py
index 8c6d5074..08891bdf 100644
--- a/fv3core/tests/savepoint/translate/translate_a2b_ord4.py
+++ b/pyFV3/tests/savepoint/translate/translate_a2b_ord4.py
@@ -5,8 +5,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-from pace.fv3core.stencils.divergence_damping import DivergenceDamping
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3.stencils.divergence_damping import DivergenceDamping
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class A2B_Ord4Compute:
diff --git a/fv3core/tests/savepoint/translate/translate_c_sw.py b/pyFV3/tests/savepoint/translate/translate_c_sw.py
similarity index 98%
rename from fv3core/tests/savepoint/translate/translate_c_sw.py
rename to pyFV3/tests/savepoint/translate/translate_c_sw.py
index a6aa731c..7baf0269 100644
--- a/fv3core/tests/savepoint/translate/translate_c_sw.py
+++ b/pyFV3/tests/savepoint/translate/translate_c_sw.py
@@ -2,8 +2,8 @@
 from ndsl.initialization.allocator import QuantityFactory
 from ndsl.namelist import Namelist
 
-from pace.fv3core.stencils.c_sw import CGridShallowWaterDynamics
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3.stencils.c_sw import CGridShallowWaterDynamics
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 def get_c_sw_instance(
diff --git a/fv3core/tests/savepoint/translate/translate_corners.py b/pyFV3/tests/savepoint/translate/translate_corners.py
similarity index 98%
rename from fv3core/tests/savepoint/translate/translate_corners.py
rename to pyFV3/tests/savepoint/translate/translate_corners.py
index a426b2e3..fca15720 100644
--- a/fv3core/tests/savepoint/translate/translate_corners.py
+++ b/pyFV3/tests/savepoint/translate/translate_corners.py
@@ -5,7 +5,7 @@
 from ndsl.namelist import Namelist
 from ndsl.stencils import corners
 
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateFill4Corners(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_cubedtolatlon.py b/pyFV3/tests/savepoint/translate/translate_cubedtolatlon.py
similarity index 100%
rename from fv3core/tests/savepoint/translate/translate_cubedtolatlon.py
rename to pyFV3/tests/savepoint/translate/translate_cubedtolatlon.py
diff --git a/fv3core/tests/savepoint/translate/translate_d2a2c_vect.py b/pyFV3/tests/savepoint/translate/translate_d2a2c_vect.py
similarity index 91%
rename from fv3core/tests/savepoint/translate/translate_d2a2c_vect.py
rename to pyFV3/tests/savepoint/translate/translate_d2a2c_vect.py
index c35721c3..8b8d5ea9 100644
--- a/fv3core/tests/savepoint/translate/translate_d2a2c_vect.py
+++ b/pyFV3/tests/savepoint/translate/translate_d2a2c_vect.py
@@ -1,8 +1,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-from pace.fv3core.stencils.d2a2c_vect import DGrid2AGrid2CGridVectors
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3.stencils.d2a2c_vect import DGrid2AGrid2CGridVectors
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateD2A2C_Vect(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_d_sw.py b/pyFV3/tests/savepoint/translate/translate_d_sw.py
similarity index 97%
rename from fv3core/tests/savepoint/translate/translate_d_sw.py
rename to pyFV3/tests/savepoint/translate/translate_d_sw.py
index 3e19e61f..179ecbe9 100644
--- a/fv3core/tests/savepoint/translate/translate_d_sw.py
+++ b/pyFV3/tests/savepoint/translate/translate_d_sw.py
@@ -3,9 +3,9 @@
 from ndsl.dsl.typing import FloatField, FloatFieldIJ
 from ndsl.namelist import Namelist
 
-import pace.fv3core.stencils.d_sw as d_sw
-from pace import fv3core
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+import pyFV3.stencils.d_sw as d_sw
+import pyFV3
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateD_SW(TranslateDycoreFortranData2Py):
@@ -18,7 +18,7 @@ def __init__(
         super().__init__(grid, namelist, stencil_factory)
         self.max_error = 3.2e-10
         self.stencil_factory = stencil_factory
-        dycore_config = fv3core.DynamicalCoreConfig.from_namelist(namelist)
+        dycore_config = pyFV3.DynamicalCoreConfig.from_namelist(namelist)
         column_namelist = d_sw.get_column_namelist(
             config=dycore_config.acoustic_dynamics.d_grid_shallow_water,
             quantity_factory=self.grid.quantity_factory,
diff --git a/fv3core/tests/savepoint/translate/translate_del2cubed.py b/pyFV3/tests/savepoint/translate/translate_del2cubed.py
similarity index 87%
rename from fv3core/tests/savepoint/translate/translate_del2cubed.py
rename to pyFV3/tests/savepoint/translate/translate_del2cubed.py
index b50c677f..2da31253 100644
--- a/fv3core/tests/savepoint/translate/translate_del2cubed.py
+++ b/pyFV3/tests/savepoint/translate/translate_del2cubed.py
@@ -3,8 +3,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-from pace.fv3core.stencils.del2cubed import HyperdiffusionDamping
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3.stencils.del2cubed import HyperdiffusionDamping
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateDel2Cubed(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_del6vtflux.py b/pyFV3/tests/savepoint/translate/translate_del6vtflux.py
similarity index 93%
rename from fv3core/tests/savepoint/translate/translate_del6vtflux.py
rename to pyFV3/tests/savepoint/translate/translate_del6vtflux.py
index 31fc42a1..96f2da38 100644
--- a/fv3core/tests/savepoint/translate/translate_del6vtflux.py
+++ b/pyFV3/tests/savepoint/translate/translate_del6vtflux.py
@@ -2,8 +2,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-import pace.fv3core.stencils.delnflux as delnflux
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+import pyFV3.stencils.delnflux as delnflux
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateDel6VtFlux(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_delnflux.py b/pyFV3/tests/savepoint/translate/translate_delnflux.py
similarity index 94%
rename from fv3core/tests/savepoint/translate/translate_delnflux.py
rename to pyFV3/tests/savepoint/translate/translate_delnflux.py
index 3442e5af..231dbf33 100644
--- a/fv3core/tests/savepoint/translate/translate_delnflux.py
+++ b/pyFV3/tests/savepoint/translate/translate_delnflux.py
@@ -2,8 +2,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-import pace.fv3core.stencils.delnflux as delnflux
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+import pyFV3.stencils.delnflux as delnflux
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateDelnFlux(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_divergencedamping.py b/pyFV3/tests/savepoint/translate/translate_divergencedamping.py
similarity index 94%
rename from fv3core/tests/savepoint/translate/translate_divergencedamping.py
rename to pyFV3/tests/savepoint/translate/translate_divergencedamping.py
index 0d4cb80f..c71beff4 100644
--- a/fv3core/tests/savepoint/translate/translate_divergencedamping.py
+++ b/pyFV3/tests/savepoint/translate/translate_divergencedamping.py
@@ -4,8 +4,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-from pace.fv3core.stencils.divergence_damping import DivergenceDamping
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3.stencils.divergence_damping import DivergenceDamping
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateDivergenceDamping(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_fillz.py b/pyFV3/tests/savepoint/translate/translate_fillz.py
similarity index 96%
rename from fv3core/tests/savepoint/translate/translate_fillz.py
rename to pyFV3/tests/savepoint/translate/translate_fillz.py
index 489e388f..6a7a9db4 100644
--- a/fv3core/tests/savepoint/translate/translate_fillz.py
+++ b/pyFV3/tests/savepoint/translate/translate_fillz.py
@@ -5,8 +5,8 @@
 from ndsl.stencils.testing import pad_field_in_j
 from ndsl.utils import safe_assign_array
 
-import pace.fv3core.stencils.fillz as fillz
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+import pyFV3.stencils.fillz as fillz
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateFillz(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_fvsubgridz.py b/pyFV3/tests/savepoint/translate/translate_fvsubgridz.py
similarity index 99%
rename from fv3core/tests/savepoint/translate/translate_fvsubgridz.py
rename to pyFV3/tests/savepoint/translate/translate_fvsubgridz.py
index e7f297a6..15da852a 100644
--- a/fv3core/tests/savepoint/translate/translate_fvsubgridz.py
+++ b/pyFV3/tests/savepoint/translate/translate_fvsubgridz.py
@@ -6,7 +6,7 @@
 from ndsl.namelist import Namelist
 from ndsl.stencils.testing import ParallelTranslateBaseSlicing
 
-import pace.fv3core.stencils.fv_subgridz as fv_subgridz
+import pyFV3.stencils.fv_subgridz as fv_subgridz
 
 
 # NOTE, does no halo updates, does not need to be a Parallel test,
diff --git a/fv3core/tests/savepoint/translate/translate_fvtp2d.py b/pyFV3/tests/savepoint/translate/translate_fvtp2d.py
similarity index 96%
rename from fv3core/tests/savepoint/translate/translate_fvtp2d.py
rename to pyFV3/tests/savepoint/translate/translate_fvtp2d.py
index 1dab6e64..6552d8f6 100644
--- a/fv3core/tests/savepoint/translate/translate_fvtp2d.py
+++ b/pyFV3/tests/savepoint/translate/translate_fvtp2d.py
@@ -4,8 +4,8 @@
 from ndsl.dsl.typing import Float
 from ndsl.namelist import Namelist
 
-from pace.fv3core.stencils.fvtp2d import FiniteVolumeTransport
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3.stencils.fvtp2d import FiniteVolumeTransport
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateFvTp2d(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_fxadv.py b/pyFV3/tests/savepoint/translate/translate_fxadv.py
similarity index 92%
rename from fv3core/tests/savepoint/translate/translate_fxadv.py
rename to pyFV3/tests/savepoint/translate/translate_fxadv.py
index d28a01cc..b55243cd 100644
--- a/fv3core/tests/savepoint/translate/translate_fxadv.py
+++ b/pyFV3/tests/savepoint/translate/translate_fxadv.py
@@ -3,9 +3,9 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-from pace.fv3core.stencils.fxadv import FiniteVolumeFluxPrep
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
-from pace.fv3core.utils.functional_validation import get_subset_func
+from pyFV3.stencils.fxadv import FiniteVolumeFluxPrep
+from pyFV3.testing import TranslateDycoreFortranData2Py
+from pyFV3.utils.functional_validation import get_subset_func
 
 
 class TranslateFxAdv(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_grid.py b/pyFV3/tests/savepoint/translate/translate_grid.py
similarity index 100%
rename from fv3core/tests/savepoint/translate/translate_grid.py
rename to pyFV3/tests/savepoint/translate/translate_grid.py
diff --git a/fv3core/tests/savepoint/translate/translate_haloupdate.py b/pyFV3/tests/savepoint/translate/translate_haloupdate.py
similarity index 100%
rename from fv3core/tests/savepoint/translate/translate_haloupdate.py
rename to pyFV3/tests/savepoint/translate/translate_haloupdate.py
diff --git a/fv3core/tests/savepoint/translate/translate_init_case.py b/pyFV3/tests/savepoint/translate/translate_init_case.py
similarity index 98%
rename from fv3core/tests/savepoint/translate/translate_init_case.py
rename to pyFV3/tests/savepoint/translate/translate_init_case.py
index db0aa398..d5a40113 100644
--- a/fv3core/tests/savepoint/translate/translate_init_case.py
+++ b/pyFV3/tests/savepoint/translate/translate_init_case.py
@@ -22,10 +22,10 @@
 from ndsl.stencils.testing import ParallelTranslateBaseSlicing
 from ndsl.stencils.testing.grid import TRACER_DIM  # type: ignore
 
-import pace.fv3core.initialization.analytic_init as analytic_init
-import pace.fv3core.initialization.init_utils as init_utils
-import pace.fv3core.initialization.test_cases.initialize_baroclinic as baroclinic_init
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+import pyFV3.initialization.analytic_init as analytic_init
+import pyFV3.initialization.init_utils as init_utils
+import pyFV3.initialization.test_cases.initialize_baroclinic as baroclinic_init
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateInitCase(ParallelTranslateBaseSlicing):
diff --git a/fv3core/tests/savepoint/translate/translate_last_step.py b/pyFV3/tests/savepoint/translate/translate_last_step.py
similarity index 92%
rename from fv3core/tests/savepoint/translate/translate_last_step.py
rename to pyFV3/tests/savepoint/translate/translate_last_step.py
index 934dbb19..505cf30d 100644
--- a/fv3core/tests/savepoint/translate/translate_last_step.py
+++ b/pyFV3/tests/savepoint/translate/translate_last_step.py
@@ -1,8 +1,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-import pace.fv3core.stencils.moist_cv as moist_cv
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+import pyFV3.stencils.moist_cv as moist_cv
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateLastStep(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_moistcvpluspkz_2d.py b/pyFV3/tests/savepoint/translate/translate_moistcvpluspkz_2d.py
similarity index 97%
rename from fv3core/tests/savepoint/translate/translate_moistcvpluspkz_2d.py
rename to pyFV3/tests/savepoint/translate/translate_moistcvpluspkz_2d.py
index cc60fc0c..7a53bda3 100644
--- a/fv3core/tests/savepoint/translate/translate_moistcvpluspkz_2d.py
+++ b/pyFV3/tests/savepoint/translate/translate_moistcvpluspkz_2d.py
@@ -3,8 +3,8 @@
 from ndsl.namelist import Namelist
 from ndsl.stencils.testing import pad_field_in_j
 
-import pace.fv3core.stencils.moist_cv as moist_cv
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+import pyFV3.stencils.moist_cv as moist_cv
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class MoistPKZ:
diff --git a/fv3core/tests/savepoint/translate/translate_moistcvpluspt_2d.py b/pyFV3/tests/savepoint/translate/translate_moistcvpluspt_2d.py
similarity index 98%
rename from fv3core/tests/savepoint/translate/translate_moistcvpluspt_2d.py
rename to pyFV3/tests/savepoint/translate/translate_moistcvpluspt_2d.py
index 2edb43ee..d76fef76 100644
--- a/fv3core/tests/savepoint/translate/translate_moistcvpluspt_2d.py
+++ b/pyFV3/tests/savepoint/translate/translate_moistcvpluspt_2d.py
@@ -3,7 +3,7 @@
 from ndsl.dsl.typing import FloatField
 from ndsl.stencils.testing import TranslateFortranData2Py, pad_field_in_j
 
-import pace.fv3core.stencils.moist_cv as moist_cv
+import pyFV3.stencils.moist_cv as moist_cv
 
 
 def moist_pt(
diff --git a/fv3core/tests/savepoint/translate/translate_neg_adj3.py b/pyFV3/tests/savepoint/translate/translate_neg_adj3.py
similarity index 93%
rename from fv3core/tests/savepoint/translate/translate_neg_adj3.py
rename to pyFV3/tests/savepoint/translate/translate_neg_adj3.py
index 775ad529..55a7d6a8 100644
--- a/fv3core/tests/savepoint/translate/translate_neg_adj3.py
+++ b/pyFV3/tests/savepoint/translate/translate_neg_adj3.py
@@ -4,8 +4,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-from pace.fv3core.stencils.neg_adj3 import AdjustNegativeTracerMixingRatio
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3.stencils.neg_adj3 import AdjustNegativeTracerMixingRatio
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateNeg_Adj3(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_nh_p_grad.py b/pyFV3/tests/savepoint/translate/translate_nh_p_grad.py
similarity index 92%
rename from fv3core/tests/savepoint/translate/translate_nh_p_grad.py
rename to pyFV3/tests/savepoint/translate/translate_nh_p_grad.py
index e07b36b3..6ac41636 100644
--- a/fv3core/tests/savepoint/translate/translate_nh_p_grad.py
+++ b/pyFV3/tests/savepoint/translate/translate_nh_p_grad.py
@@ -1,8 +1,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-import pace.fv3core.stencils.nh_p_grad as NH_P_Grad
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+import pyFV3.stencils.nh_p_grad as NH_P_Grad
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateNH_P_Grad(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_pe_halo.py b/pyFV3/tests/savepoint/translate/translate_pe_halo.py
similarity index 93%
rename from fv3core/tests/savepoint/translate/translate_pe_halo.py
rename to pyFV3/tests/savepoint/translate/translate_pe_halo.py
index 49ebd1eb..297c44e9 100644
--- a/fv3core/tests/savepoint/translate/translate_pe_halo.py
+++ b/pyFV3/tests/savepoint/translate/translate_pe_halo.py
@@ -1,8 +1,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-from pace.fv3core.stencils import pe_halo
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3.stencils import pe_halo
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class PE_Halo_Wrapper:
diff --git a/fv3core/tests/savepoint/translate/translate_pk3_halo.py b/pyFV3/tests/savepoint/translate/translate_pk3_halo.py
similarity index 85%
rename from fv3core/tests/savepoint/translate/translate_pk3_halo.py
rename to pyFV3/tests/savepoint/translate/translate_pk3_halo.py
index 0c78bea3..c7f8ce2a 100644
--- a/fv3core/tests/savepoint/translate/translate_pk3_halo.py
+++ b/pyFV3/tests/savepoint/translate/translate_pk3_halo.py
@@ -1,8 +1,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-from pace.fv3core.stencils.pk3_halo import PK3Halo
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3.stencils.pk3_halo import PK3Halo
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslatePK3_Halo(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_pressureadjustedtemperature_nonhydrostatic.py b/pyFV3/tests/savepoint/translate/translate_pressureadjustedtemperature_nonhydrostatic.py
similarity index 83%
rename from fv3core/tests/savepoint/translate/translate_pressureadjustedtemperature_nonhydrostatic.py
rename to pyFV3/tests/savepoint/translate/translate_pressureadjustedtemperature_nonhydrostatic.py
index d402ce0d..00ece2c1 100644
--- a/fv3core/tests/savepoint/translate/translate_pressureadjustedtemperature_nonhydrostatic.py
+++ b/pyFV3/tests/savepoint/translate/translate_pressureadjustedtemperature_nonhydrostatic.py
@@ -3,10 +3,10 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-import pace.fv3core
-from pace.fv3core.stencils import temperature_adjust
-from pace.fv3core.stencils.dyn_core import get_nk_heat_dissipation
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+import pyFV3
+from pyFV3.stencils import temperature_adjust
+from pyFV3.stencils.dyn_core import get_nk_heat_dissipation
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslatePressureAdjustedTemperature_NonHydrostatic(
@@ -19,7 +19,7 @@ def __init__(
         stencil_factory: StencilFactory,
     ):
         super().__init__(grid, namelist, stencil_factory)
-        dycore_config = pace.fv3core.DynamicalCoreConfig.from_namelist(namelist)
+        dycore_config = pyFV3.DynamicalCoreConfig.from_namelist(namelist)
         self.namelist = dycore_config
         n_adj = get_nk_heat_dissipation(
             config=dycore_config.d_grid_shallow_water,
diff --git a/fv3core/tests/savepoint/translate/translate_qsinit.py b/pyFV3/tests/savepoint/translate/translate_qsinit.py
similarity index 92%
rename from fv3core/tests/savepoint/translate/translate_qsinit.py
rename to pyFV3/tests/savepoint/translate/translate_qsinit.py
index 3095f715..bb54622d 100644
--- a/fv3core/tests/savepoint/translate/translate_qsinit.py
+++ b/pyFV3/tests/savepoint/translate/translate_qsinit.py
@@ -3,8 +3,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-import pace.fv3core.stencils.saturation_adjustment as satadjust
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+import pyFV3.stencils.saturation_adjustment as satadjust
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateQSInit(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_ray_fast.py b/pyFV3/tests/savepoint/translate/translate_ray_fast.py
similarity index 88%
rename from fv3core/tests/savepoint/translate/translate_ray_fast.py
rename to pyFV3/tests/savepoint/translate/translate_ray_fast.py
index 56a40494..0140085f 100644
--- a/fv3core/tests/savepoint/translate/translate_ray_fast.py
+++ b/pyFV3/tests/savepoint/translate/translate_ray_fast.py
@@ -1,8 +1,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-from pace.fv3core.stencils.ray_fast import RayleighDamping
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3.stencils.ray_fast import RayleighDamping
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateRay_Fast(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_remapping.py b/pyFV3/tests/savepoint/translate/translate_remapping.py
similarity index 95%
rename from fv3core/tests/savepoint/translate/translate_remapping.py
rename to pyFV3/tests/savepoint/translate/translate_remapping.py
index 5845d880..5cbdabc2 100644
--- a/fv3core/tests/savepoint/translate/translate_remapping.py
+++ b/pyFV3/tests/savepoint/translate/translate_remapping.py
@@ -3,9 +3,9 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-from pace.fv3core import DynamicalCoreConfig
-from pace.fv3core.stencils.remapping import LagrangianToEulerian
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3 import DynamicalCoreConfig
+from pyFV3.stencils.remapping import LagrangianToEulerian
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateRemapping(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_riem_solver3.py b/pyFV3/tests/savepoint/translate/translate_riem_solver3.py
similarity index 93%
rename from fv3core/tests/savepoint/translate/translate_riem_solver3.py
rename to pyFV3/tests/savepoint/translate/translate_riem_solver3.py
index 3328a5f2..ca936d42 100644
--- a/fv3core/tests/savepoint/translate/translate_riem_solver3.py
+++ b/pyFV3/tests/savepoint/translate/translate_riem_solver3.py
@@ -1,9 +1,9 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-from pace.fv3core import _config as spec
-from pace.fv3core.stencils.riem_solver3 import NonhydrostaticVerticalSolver
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3 import _config as spec
+from pyFV3.stencils.riem_solver3 import NonhydrostaticVerticalSolver
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateRiem_Solver3(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_riem_solver_c.py b/pyFV3/tests/savepoint/translate/translate_riem_solver_c.py
similarity index 87%
rename from fv3core/tests/savepoint/translate/translate_riem_solver_c.py
rename to pyFV3/tests/savepoint/translate/translate_riem_solver_c.py
index 30351b91..33184d19 100644
--- a/fv3core/tests/savepoint/translate/translate_riem_solver_c.py
+++ b/pyFV3/tests/savepoint/translate/translate_riem_solver_c.py
@@ -1,8 +1,8 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-from pace.fv3core.stencils.riem_solver_c import NonhydrostaticVerticalSolverCGrid
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3.stencils.riem_solver_c import NonhydrostaticVerticalSolverCGrid
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateRiem_Solver_C(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_satadjust3d.py b/pyFV3/tests/savepoint/translate/translate_satadjust3d.py
similarity index 88%
rename from fv3core/tests/savepoint/translate/translate_satadjust3d.py
rename to pyFV3/tests/savepoint/translate/translate_satadjust3d.py
index b358d74b..57884f92 100644
--- a/fv3core/tests/savepoint/translate/translate_satadjust3d.py
+++ b/pyFV3/tests/savepoint/translate/translate_satadjust3d.py
@@ -1,10 +1,10 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-import pace.fv3core
-from pace.fv3core import DynamicalCoreConfig
-from pace.fv3core.stencils.saturation_adjustment import SatAdjust3d
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+import pyFV3
+from pyFV3 import DynamicalCoreConfig
+from pyFV3.stencils.saturation_adjustment import SatAdjust3d
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateSatAdjust3d(TranslateDycoreFortranData2Py):
@@ -62,7 +62,7 @@ def __init__(
             },
             "cappa": {},
         }
-        self.namelist = pace.fv3core.DynamicalCoreConfig.from_namelist(namelist)
+        self.namelist = pyFV3.DynamicalCoreConfig.from_namelist(namelist)
         self.stencil_factory = stencil_factory
 
     def compute_from_storage(self, inputs):
diff --git a/fv3core/tests/savepoint/translate/translate_tracer2d1l.py b/pyFV3/tests/savepoint/translate/translate_tracer2d1l.py
similarity index 90%
rename from fv3core/tests/savepoint/translate/translate_tracer2d1l.py
rename to pyFV3/tests/savepoint/translate/translate_tracer2d1l.py
index 0313c14c..b4d0a6d2 100644
--- a/fv3core/tests/savepoint/translate/translate_tracer2d1l.py
+++ b/pyFV3/tests/savepoint/translate/translate_tracer2d1l.py
@@ -5,9 +5,9 @@
 from ndsl.namelist import Namelist
 from ndsl.stencils.testing import ParallelTranslate
 
-import pace.fv3core.stencils.fvtp2d
-import pace.fv3core.stencils.tracer_2d_1l
-from pace.fv3core.utils.functional_validation import get_subset_func
+import pyFV3.stencils.fvtp2d
+import pyFV3.stencils.tracer_2d_1l
+from pyFV3.utils.functional_validation import get_subset_func
 
 
 class TranslateTracer2D1L(ParallelTranslate):
@@ -53,7 +53,7 @@ def compute_parallel(self, inputs, communicator):
         inputs["tracers"] = self.get_advected_tracer_dict(
             inputs["tracers"], int(inputs.pop("nq"))
         )
-        transport = pace.fv3core.stencils.fvtp2d.FiniteVolumeTransport(
+        transport = pyFV3.stencils.fvtp2d.FiniteVolumeTransport(
             stencil_factory=self.stencil_factory,
             quantity_factory=self.grid.quantity_factory,
             grid_data=self.grid.grid_data,
@@ -62,7 +62,7 @@ def compute_parallel(self, inputs, communicator):
             hord=self.namelist.hord_tr,
         )
 
-        self.tracer_advection = pace.fv3core.stencils.tracer_2d_1l.TracerAdvection(
+        self.tracer_advection = pyFV3.stencils.tracer_2d_1l.TracerAdvection(
             self.stencil_factory,
             self.grid.quantity_factory,
             transport,
@@ -79,9 +79,9 @@ def compute_parallel(self, inputs, communicator):
         inputs["mfyd"] = inputs.pop("y_mass_flux")
         inputs["cxd"] = inputs.pop("x_courant")
         inputs["cyd"] = inputs.pop("y_courant")
-        inputs[
-            "tracers"
-        ] = all_tracers  # some aren't advected, still need to be validated
+        inputs["tracers"] = (
+            all_tracers  # some aren't advected, still need to be validated
+        )
         # need to convert tracers dict to [x, y, z, n_tracer] array before subsetting
         outputs = self._base.slice_output(inputs)
         outputs["tracers"] = self.subset_output("tracers", outputs["tracers"])
diff --git a/fv3core/tests/savepoint/translate/translate_updatedzc.py b/pyFV3/tests/savepoint/translate/translate_updatedzc.py
similarity index 92%
rename from fv3core/tests/savepoint/translate/translate_updatedzc.py
rename to pyFV3/tests/savepoint/translate/translate_updatedzc.py
index 7d0fee1e..bdcac7aa 100644
--- a/fv3core/tests/savepoint/translate/translate_updatedzc.py
+++ b/pyFV3/tests/savepoint/translate/translate_updatedzc.py
@@ -3,9 +3,9 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-import pace.fv3core.stencils.updatedzc as updatedzc
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
-from pace.fv3core.utils.functional_validation import get_subset_func
+import pyFV3.stencils.updatedzc as updatedzc
+from pyFV3.testing import TranslateDycoreFortranData2Py
+from pyFV3.utils.functional_validation import get_subset_func
 
 
 class TranslateUpdateDzC(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_updatedzd.py b/pyFV3/tests/savepoint/translate/translate_updatedzd.py
similarity index 88%
rename from fv3core/tests/savepoint/translate/translate_updatedzd.py
rename to pyFV3/tests/savepoint/translate/translate_updatedzd.py
index e65b7c5e..68f32cea 100644
--- a/fv3core/tests/savepoint/translate/translate_updatedzd.py
+++ b/pyFV3/tests/savepoint/translate/translate_updatedzd.py
@@ -3,11 +3,11 @@
 from ndsl.dsl.stencil import StencilFactory
 from ndsl.namelist import Namelist
 
-import pace.fv3core
-import pace.fv3core.stencils.updatedzd
-from pace.fv3core.stencils import d_sw
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
-from pace.fv3core.utils.functional_validation import get_subset_func
+import pyFV3
+import pyFV3.stencils.updatedzd
+from pyFV3.stencils import d_sw
+from pyFV3.testing import TranslateDycoreFortranData2Py
+from pyFV3.utils.functional_validation import get_subset_func
 
 
 class TranslateUpdateDzD(TranslateDycoreFortranData2Py):
@@ -50,7 +50,7 @@ def __init__(
         self.out_vars["ws"]["kstart"] = grid.npz
         self.out_vars["ws"]["kend"] = None
         self.stencil_factory = stencil_factory
-        self.namelist = pace.fv3core.DynamicalCoreConfig.from_namelist(namelist)
+        self.namelist = pyFV3.DynamicalCoreConfig.from_namelist(namelist)
         self._subset = get_subset_func(
             self.grid.grid_indexing,
             dims=[X_DIM, Y_DIM, Z_DIM],
@@ -61,7 +61,7 @@ def __init__(
 
     def compute(self, inputs):
         self.make_storage_data_input_vars(inputs)
-        self.updatedzd = pace.fv3core.stencils.updatedzd.UpdateHeightOnDGrid(
+        self.updatedzd = pyFV3.stencils.updatedzd.UpdateHeightOnDGrid(
             self.stencil_factory,
             self.grid.quantity_factory,
             self.grid.damping_coefficients,
diff --git a/fv3core/tests/savepoint/translate/translate_xppm.py b/pyFV3/tests/savepoint/translate/translate_xppm.py
similarity index 96%
rename from fv3core/tests/savepoint/translate/translate_xppm.py
rename to pyFV3/tests/savepoint/translate/translate_xppm.py
index 94ccc090..5362380c 100644
--- a/fv3core/tests/savepoint/translate/translate_xppm.py
+++ b/pyFV3/tests/savepoint/translate/translate_xppm.py
@@ -3,8 +3,8 @@
 from ndsl.namelist import Namelist
 from ndsl.stencils.testing import TranslateGrid
 
-from pace.fv3core.stencils import xppm
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3.stencils import xppm
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateXPPM(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_xtp_u.py b/pyFV3/tests/savepoint/translate/translate_xtp_u.py
similarity index 98%
rename from fv3core/tests/savepoint/translate/translate_xtp_u.py
rename to pyFV3/tests/savepoint/translate/translate_xtp_u.py
index 66b17640..3b5645a6 100644
--- a/fv3core/tests/savepoint/translate/translate_xtp_u.py
+++ b/pyFV3/tests/savepoint/translate/translate_xtp_u.py
@@ -4,7 +4,7 @@
 from ndsl.grid import GridData
 from ndsl.namelist import Namelist
 
-import pace.fv3core.stencils.xtp_u as xtp_u
+import pyFV3.stencils.xtp_u as xtp_u
 
 from .translate_ytp_v import TranslateYTP_V
 
diff --git a/fv3core/tests/savepoint/translate/translate_yppm.py b/pyFV3/tests/savepoint/translate/translate_yppm.py
similarity index 96%
rename from fv3core/tests/savepoint/translate/translate_yppm.py
rename to pyFV3/tests/savepoint/translate/translate_yppm.py
index a80e8510..8ab7cfaf 100644
--- a/fv3core/tests/savepoint/translate/translate_yppm.py
+++ b/pyFV3/tests/savepoint/translate/translate_yppm.py
@@ -4,8 +4,8 @@
 from ndsl.namelist import Namelist
 from ndsl.stencils.testing import TranslateGrid
 
-from pace.fv3core.stencils import yppm
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+from pyFV3.stencils import yppm
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 class TranslateYPPM(TranslateDycoreFortranData2Py):
diff --git a/fv3core/tests/savepoint/translate/translate_ytp_v.py b/pyFV3/tests/savepoint/translate/translate_ytp_v.py
similarity index 93%
rename from fv3core/tests/savepoint/translate/translate_ytp_v.py
rename to pyFV3/tests/savepoint/translate/translate_ytp_v.py
index 733af946..3465dc69 100644
--- a/fv3core/tests/savepoint/translate/translate_ytp_v.py
+++ b/pyFV3/tests/savepoint/translate/translate_ytp_v.py
@@ -4,9 +4,9 @@
 from ndsl.grid import GridData
 from ndsl.namelist import Namelist
 
-import pace.fv3core
-import pace.fv3core.stencils.ytp_v as ytp_v
-from pace.fv3core.testing import TranslateDycoreFortranData2Py
+import pyFV3
+import pyFV3.stencils.ytp_v as ytp_v
+from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
 def ytp_v_stencil_defn(
@@ -85,7 +85,7 @@ def __init__(
         self.in_vars["parameters"] = []
         self.out_vars = {"flux": flux_info}
         self.stencil_factory = stencil_factory
-        self.namelist = pace.fv3core.DynamicalCoreConfig.from_namelist(namelist)
+        self.namelist = pyFV3.DynamicalCoreConfig.from_namelist(namelist)
 
     def compute_from_storage(self, inputs):
         ytp_obj = YTP_V(
diff --git a/requirements_dev.txt b/requirements_dev.txt
index 0dfbc317..11f2a06b 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -16,5 +16,5 @@ f90nml>=1.1.0
 numpy>=1.15
 -e NDSL
 -e physics
--e fv3core
+-e pyFV3
 -e driver
diff --git a/setup.cfg b/setup.cfg
index 894956b6..1aa5d540 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,7 +21,7 @@ use_parentheses = true
 lines_after_imports = 2
 default_section = THIRDPARTY
 sections = FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
-known_first_party = fv3core,fv3gfs,pace
+known_first_party = pyFV3,fv3gfs,pace
 known_third_party = f90nml,pytest,xarray,numpy,mpi4py,gt4py
 
 [mypy]
@@ -29,7 +29,7 @@ ignore_missing_imports = True
 follow_imports = normal
 namespace_packages = True
 strict_optional = False
-mypy_path = driver:ndsl:fv3core:physics
+mypy_path = driver:ndsl:pyFV3:physics
 warn_unreachable = True
 explicit_package_bases = True
 
@@ -49,14 +49,6 @@ replace = __version__ = "{new_version}"
 search = version="{current_version}"
 replace = version="{new_version}"
 
-[bumpversion:file:fv3core/pace/fv3core/__init__.py]
-search = __version__ = "{current_version}"
-replace = __version__ = "{new_version}"
-
-[bumpversion:file:fv3core/setup.py]
-search = version="{current_version}"
-replace = version="{new_version}"
-
 [bumpversion:file:physics/pace/physics/__init__.py]
 search = __version__ = "{current_version}"
 replace = __version__ = "{new_version}"
diff --git a/tests/main/driver/test_diagnostics_config.py b/tests/main/driver/test_diagnostics_config.py
index 0355c30e..a817ce09 100644
--- a/tests/main/driver/test_diagnostics_config.py
+++ b/tests/main/driver/test_diagnostics_config.py
@@ -6,7 +6,7 @@
 
 import pace.driver
 import pace.driver.diagnostics
-from pace.fv3core.dycore_state import DycoreState
+from pyFV3.dycore_state import DycoreState
 
 
 def test_returns_null_diagnostics_if_no_path_given():
diff --git a/tests/main/fv3core/test_config.py b/tests/main/fv3core/test_config.py
index 5ed8e578..b4c6aa82 100644
--- a/tests/main/fv3core/test_config.py
+++ b/tests/main/fv3core/test_config.py
@@ -4,15 +4,15 @@
 
 import pytest
 
-import pace.fv3core._config
+import pyFV3._config
 
 
 CONFIG_CLASSES = [
-    pace.fv3core._config.SatAdjustConfig,
-    pace.fv3core._config.AcousticDynamicsConfig,
-    pace.fv3core._config.RiemannConfig,
-    pace.fv3core._config.DGridShallowWaterLagrangianDynamicsConfig,
-    pace.fv3core._config.DynamicalCoreConfig,
+    pyFV3._config.SatAdjustConfig,
+    pyFV3._config.AcousticDynamicsConfig,
+    pyFV3._config.RiemannConfig,
+    pyFV3._config.DGridShallowWaterLagrangianDynamicsConfig,
+    pyFV3._config.DynamicalCoreConfig,
 ]
 
 
diff --git a/tests/main/fv3core/test_dycore_call.py b/tests/main/fv3core/test_dycore_call.py
index baf67b48..99279bf5 100644
--- a/tests/main/fv3core/test_dycore_call.py
+++ b/tests/main/fv3core/test_dycore_call.py
@@ -18,17 +18,17 @@
 from ndsl.quantity import Quantity
 from ndsl.stencils.testing import assert_same_temporaries, copy_temporaries
 
-import pace.fv3core.initialization.analytic_init as ai
-from pace import fv3core
-from pace.fv3core.dycore_state import DycoreState
+import pyFV3.initialization.analytic_init as ai
+import pyFV3
+from pyFV3.dycore_state import DycoreState
 
 
 DIR = os.path.abspath(os.path.dirname(__file__))
 
 
-def setup_dycore() -> Tuple[fv3core.DynamicalCore, fv3core.DycoreState, Timer]:
+def setup_dycore() -> Tuple[pyFV3.DynamicalCore, pyFV3.DycoreState, Timer]:
     backend = "numpy"
-    config = fv3core.DynamicalCoreConfig(
+    config = pyFV3.DynamicalCoreConfig(
         layout=(1, 1),
         npx=13,
         npy=13,
@@ -122,7 +122,7 @@ def setup_dycore() -> Tuple[fv3core.DynamicalCore, fv3core.DycoreState, Timer]:
         grid_indexing=grid_indexing,
     )
 
-    dycore = fv3core.DynamicalCore(
+    dycore = pyFV3.DynamicalCore(
         comm=communicator,
         grid_data=grid_data,
         stencil_factory=stencil_factory,
diff --git a/tests/main/fv3core/test_init_from_geos.py b/tests/main/fv3core/test_init_from_geos.py
index 67d340b8..824999cf 100644
--- a/tests/main/fv3core/test_init_from_geos.py
+++ b/tests/main/fv3core/test_init_from_geos.py
@@ -3,7 +3,7 @@
 import pytest  # noqa
 from ndsl.comm.null_comm import NullComm
 
-from pace import fv3core
+import pyFV3
 
 
 def test_geos_wrapper():
@@ -84,7 +84,7 @@ def test_geos_wrapper():
     comm = NullComm(rank=0, total_ranks=6, fill_value=0.0)
     backend = "numpy"
 
-    wrapper = fv3core.GeosDycoreWrapper(
+    wrapper = pyFV3.GeosDycoreWrapper(
         namelist=namelist,
         comm=comm,
         backend=backend,
@@ -122,8 +122,8 @@ def test_geos_wrapper():
         7,
     )
 
-    assert isinstance(wrapper, fv3core.GeosDycoreWrapper)
-    assert isinstance(wrapper.dynamical_core, fv3core.DynamicalCore)
+    assert isinstance(wrapper, pyFV3.GeosDycoreWrapper)
+    assert isinstance(wrapper.dynamical_core, pyFV3.DynamicalCore)
 
     u = np.ones(shape_y_interface)
     v = np.ones(shape_x_interface)
diff --git a/tests/main/fv3core/test_selective_validation.py b/tests/main/fv3core/test_selective_validation.py
index bd77cab7..133ff345 100644
--- a/tests/main/fv3core/test_selective_validation.py
+++ b/tests/main/fv3core/test_selective_validation.py
@@ -3,7 +3,7 @@
 import numpy as np
 import pytest
 
-from pace.fv3core.testing.validation import get_selective_class
+from pyFV3.testing.validation import get_selective_class
 
 
 class DummyClass:
diff --git a/tests/mpi_54rank/test_grid_init.py b/tests/mpi_54rank/test_grid_init.py
index 237b146f..ad281ca1 100644
--- a/tests/mpi_54rank/test_grid_init.py
+++ b/tests/mpi_54rank/test_grid_init.py
@@ -10,8 +10,8 @@
 from ndsl.initialization.sizer import SubtileGridSizer
 from ndsl.quantity import Quantity
 
-import pace.fv3core
-from pace.fv3core.initialization.test_cases.initialize_baroclinic import (
+import pyFV3
+from pyFV3.initialization.test_cases.initialize_baroclinic import (
     init_baroclinic_state,
 )
 
@@ -123,7 +123,7 @@ def metric_terms_to_quantity_dict(metric_terms: MetricTerms) -> Dict[str, Quanti
 
 
 def dycore_state_to_quantity_dict(
-    dycore_state: pace.fv3core.DycoreState,
+    dycore_state: pyFV3.DycoreState,
 ) -> Dict[str, Quantity]:
     return {
         "u": dycore_state.u,
diff --git a/tests/savepoint/test_checkpoints.py b/tests/savepoint/test_checkpoints.py
index bf52a8a8..aab426ff 100644
--- a/tests/savepoint/test_checkpoints.py
+++ b/tests/savepoint/test_checkpoints.py
@@ -31,9 +31,9 @@
 from ndsl.stencils.testing.grid import Grid
 from ndsl.testing import perturb
 
-from pace import fv3core
-from pace.fv3core.initialization.dycore_state import DycoreState
-from pace.fv3core.testing.translate_fvdynamics import TranslateFVDynamics
+import pyFV3
+from pyFV3.initialization.dycore_state import DycoreState
+from pyFV3.testing.translate_fvdynamics import TranslateFVDynamics
 
 
 def get_grid(data_path: str, rank: int, layout: Tuple[int, int], backend: str) -> Grid:
@@ -110,7 +110,7 @@ def test_fv_dynamics(
     ds = xr.open_dataset(os.path.join(data_path, "FVDynamics-In.nc")).sel(
         savepoint=0, rank=communicator.rank
     )
-    dycore_config = fv3core.DynamicalCoreConfig.from_namelist(namelist)
+    dycore_config = pyFV3.DynamicalCoreConfig.from_namelist(namelist)
     initializer = StateInitializer(
         ds,
         translate,
@@ -142,7 +142,7 @@ def test_fv_dynamics(
         savepoint_data_path=data_path, thresholds=thresholds, rank=communicator.rank
     )
     state, grid_data = initializer.new_state()
-    dycore = fv3core.DynamicalCore(
+    dycore = pyFV3.DynamicalCore(
         comm=communicator,
         grid_data=grid_data,
         stencil_factory=stencil_factory,
@@ -164,7 +164,7 @@ def _calibrate_thresholds(
     stencil_factory: StencilFactory,
     quantity_factory: QuantityFactory,
     damping_coefficients: DampingCoefficients,
-    dycore_config: fv3core.DynamicalCoreConfig,
+    dycore_config: pyFV3.DynamicalCoreConfig,
     n_trials: int,
     factor: float,
 ):
@@ -175,7 +175,7 @@ def _calibrate_thresholds(
         perturb(dycore_state_to_dict(trial_state))
         # we need to initialize new DynamicalCore because halo updates bind
         # to a particular state object, currently
-        dycore = fv3core.DynamicalCore(
+        dycore = pyFV3.DynamicalCore(
             comm=communicator,
             grid_data=grid_data,
             stencil_factory=stencil_factory,
diff --git a/tests/savepoint/translate/translate_driver.py b/tests/savepoint/translate/translate_driver.py
index 7aab8f71..075802a4 100644
--- a/tests/savepoint/translate/translate_driver.py
+++ b/tests/savepoint/translate/translate_driver.py
@@ -5,12 +5,12 @@
 
 from pace.driver.run import Driver, DriverConfig
 from pace.driver.state import TendencyState
-from pace.fv3core._config import DynamicalCoreConfig
+from pyFV3._config import DynamicalCoreConfig
 
-# TODO physics should not depend on fv3core
+# TODO physics should not depend on pyFV3
 # but also, driver tests should not be in physics
-from pace.fv3core.testing.translate_fvdynamics import TranslateFVDynamics
-from pace.fv3core.testing.validation import enable_selective_validation
+from pyFV3.testing.translate_fvdynamics import TranslateFVDynamics
+from pyFV3.testing.validation import enable_selective_validation
 from pace.physics import PHYSICS_PACKAGES, PhysicsConfig, PhysicsState
 
 

From 4c0ce7fbc3c3a1d988f8021bde617082553d7393 Mon Sep 17 00:00:00 2001
From: Florian Deconinck <deconinck.florian@gmail.com>
Date: Fri, 2 Feb 2024 11:25:49 -0500
Subject: [PATCH 2/6] Lint

---
 driver/pace/driver/diagnostics.py                  |  9 ++++++---
 driver/pace/driver/driver.py                       | 14 +++++---------
 driver/pace/driver/initialization.py               |  8 +++++---
 physics/pace/physics/update/update_atmos_state.py  |  2 +-
 pyFV3/pyFV3/initialization/init_utils.py           |  2 +-
 .../initialization/test_cases/initialize_tc.py     |  2 +-
 pyFV3/pyFV3/stencils/divergence_damping.py         |  9 +++------
 pyFV3/pyFV3/stencils/fv_subgridz.py                |  2 +-
 pyFV3/pyFV3/stencils/nh_p_grad.py                  |  2 +-
 pyFV3/pyFV3/stencils/pk3_halo.py                   |  2 +-
 pyFV3/pyFV3/stencils/saturation_adjustment.py      |  9 ++++++---
 pyFV3/tests/savepoint/translate/translate_d_sw.py  |  2 +-
 .../savepoint/translate/translate_tracer2d1l.py    |  6 +++---
 tests/main/fv3core/test_dycore_call.py             |  2 +-
 tests/mpi_54rank/test_grid_init.py                 |  4 +---
 tests/savepoint/translate/translate_driver.py      |  2 +-
 16 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/driver/pace/driver/diagnostics.py b/driver/pace/driver/diagnostics.py
index 1ee49822..d0bfa017 100644
--- a/driver/pace/driver/diagnostics.py
+++ b/driver/pace/driver/diagnostics.py
@@ -25,13 +25,16 @@
 
 class Diagnostics(abc.ABC):
     @abc.abstractmethod
-    def store(self, time: Union[datetime, timedelta], state: DriverState): ...
+    def store(self, time: Union[datetime, timedelta], state: DriverState):
+        ...
 
     @abc.abstractmethod
-    def store_grid(self, grid_data: GridData): ...
+    def store_grid(self, grid_data: GridData):
+        ...
 
     @abc.abstractmethod
-    def cleanup(self): ...
+    def cleanup(self):
+        ...
 
 
 @dataclasses.dataclass
diff --git a/driver/pace/driver/driver.py b/driver/pace/driver/driver.py
index 9771598e..54534726 100644
--- a/driver/pace/driver/driver.py
+++ b/driver/pace/driver/driver.py
@@ -293,10 +293,10 @@ def from_dict(cls, kwargs: Dict[str, Any]) -> "DriverConfig":
             isinstance(kwargs["stencil_config"], dict)
             and "compilation_config" in kwargs["stencil_config"].keys()
         ):
-            kwargs["stencil_config"]["compilation_config"] = (
-                CompilationConfig.from_dict(
-                    data=kwargs["stencil_config"]["compilation_config"]
-                )
+            kwargs["stencil_config"][
+                "compilation_config"
+            ] = CompilationConfig.from_dict(
+                data=kwargs["stencil_config"]["compilation_config"]
             )
 
         return dacite.from_dict(
@@ -473,11 +473,7 @@ def exit_instead_of_build(self):
                 stencil_compare_comm=stencil_compare_comm,
             )
             ndsl_log.info("setting up grid started")
-            (
-                damping_coefficients,
-                driver_grid_data,
-                grid_data,
-            ) = self.config.get_grid(
+            (damping_coefficients, driver_grid_data, grid_data,) = self.config.get_grid(
                 quantity_factory=self.quantity_factory,
                 communicator=communicator,
             )
diff --git a/driver/pace/driver/initialization.py b/driver/pace/driver/initialization.py
index 91064bb8..3d11ff3a 100644
--- a/driver/pace/driver/initialization.py
+++ b/driver/pace/driver/initialization.py
@@ -17,9 +17,9 @@
 from ndsl.stencils.testing import TranslateGrid, grid
 
 import pace.driver
-import pyFV3.initialization.analytic_init as analytic_init
 import pace.physics
 import pyFV3
+import pyFV3.initialization.analytic_init as analytic_init
 from pyFV3.testing import TranslateFVDynamics
 
 from .registry import Registry
@@ -29,7 +29,8 @@
 class Initializer(abc.ABC):
     @property
     @abc.abstractmethod
-    def start_time(self) -> datetime: ...
+    def start_time(self) -> datetime:
+        ...
 
     @abc.abstractmethod
     def get_driver_state(
@@ -40,7 +41,8 @@ def get_driver_state(
         driver_grid_data: DriverGridData,
         grid_data: GridData,
         schemes: List[pace.physics.PHYSICS_PACKAGES],
-    ) -> DriverState: ...
+    ) -> DriverState:
+        ...
 
 
 IT = TypeVar("IT", bound=Type[Initializer])
diff --git a/physics/pace/physics/update/update_atmos_state.py b/physics/pace/physics/update/update_atmos_state.py
index e80c8042..c307e2dd 100644
--- a/physics/pace/physics/update/update_atmos_state.py
+++ b/physics/pace/physics/update/update_atmos_state.py
@@ -9,8 +9,8 @@
 from ndsl.grid import DriverGridData, GridData
 from ndsl.initialization.allocator import QuantityFactory
 
-import pyFV3.stencils.fv_subgridz as fv_subgridz
 import pyFV3
+import pyFV3.stencils.fv_subgridz as fv_subgridz
 from pace.physics.update.fv_update_phys import ApplyPhysicsToDycore
 
 
diff --git a/pyFV3/pyFV3/initialization/init_utils.py b/pyFV3/pyFV3/initialization/init_utils.py
index b95a5624..28e37610 100644
--- a/pyFV3/pyFV3/initialization/init_utils.py
+++ b/pyFV3/pyFV3/initialization/init_utils.py
@@ -216,7 +216,7 @@ def initialize_kappa_pressures(pe, peln, ptop):
     """
     pk = np.zeros(pe.shape)
     pkz = np.zeros(pe.shape)
-    pk[:, :, 0] = ptop**constants.KAPPA
+    pk[:, :, 0] = ptop ** constants.KAPPA
     pk[:, :, 1:] = np.exp(constants.KAPPA * np.log(pe[:, :, 1:]))
     pkz[:, :, :-1] = (pk[:, :, 1:] - pk[:, :, :-1]) / (
         constants.KAPPA * (peln[:, :, 1:] - peln[:, :, :-1])
diff --git a/pyFV3/pyFV3/initialization/test_cases/initialize_tc.py b/pyFV3/pyFV3/initialization/test_cases/initialize_tc.py
index 0b625638..1bb48ddc 100644
--- a/pyFV3/pyFV3/initialization/test_cases/initialize_tc.py
+++ b/pyFV3/pyFV3/initialization/test_cases/initialize_tc.py
@@ -15,7 +15,7 @@ def _calculate_distance_from_tc_center(pe_v, ps_v, muv, calc, tc_properties):
         muv["midpoint"][:, :, 0] - calc["p0"][0]
     )
     d2 = np.cos(calc["p0"][1]) * np.sin(muv["midpoint"][:, :, 0] - calc["p0"][0])
-    d = np.sqrt(d1**2 + d2**2)
+    d = np.sqrt(d1 ** 2 + d2 ** 2)
     d[d < 1e-15] = 1e-15
 
     r = great_circle_distance_lon_lat(
diff --git a/pyFV3/pyFV3/stencils/divergence_damping.py b/pyFV3/pyFV3/stencils/divergence_damping.py
index 4d5f7f37..31fee96f 100644
--- a/pyFV3/pyFV3/stencils/divergence_damping.py
+++ b/pyFV3/pyFV3/stencils/divergence_damping.py
@@ -18,10 +18,7 @@
 from ndsl.quantity import Quantity
 
 import pyFV3.stencils.basic_operations as basic
-from pyFV3.stencils.a2b_ord4 import (
-    AGrid2BGridFourthOrder,
-    doubly_periodic_a2b_ord4,
-)
+from pyFV3.stencils.a2b_ord4 import AGrid2BGridFourthOrder, doubly_periodic_a2b_ord4
 from pyFV3.stencils.d2a2c_vect import contravariant
 
 
@@ -253,7 +250,7 @@ def smagorinsky_diffusion_approx(delpc: FloatField, vort: FloatField, absdt: Flo
         absdt (in): abs(dt)
     """
     with computation(PARALLEL), interval(...):
-        vort = absdt * (delpc**2.0 + vort**2.0) ** 0.5
+        vort = absdt * (delpc ** 2.0 + vort ** 2.0) ** 0.5
 
 
 def smag_corner(
@@ -297,7 +294,7 @@ def smag_corner(
         wk = rarea * (vt2 - vt2[0, 1, 0] + ut2 - ut2[1, 0, 0])
 
         shear = doubly_periodic_a2b_ord4(wk)
-        smag_c = dt * sqrt(shear**2 + smag_c_t**2)
+        smag_c = dt * sqrt(shear ** 2 + smag_c_t ** 2)
 
 
 class DivergenceDamping:
diff --git a/pyFV3/pyFV3/stencils/fv_subgridz.py b/pyFV3/pyFV3/stencils/fv_subgridz.py
index ef2245f3..1bf09148 100644
--- a/pyFV3/pyFV3/stencils/fv_subgridz.py
+++ b/pyFV3/pyFV3/stencils/fv_subgridz.py
@@ -65,7 +65,7 @@ def standard_cm(cpm, cvm, q0_vapor, q0_liquid, q0_rain, q0_ice, q0_snow, q0_grau
 
 @gtscript.function
 def tvol(gz, u0, v0, w0):
-    return gz + 0.5 * (u0**2 + v0**2 + w0**2)
+    return gz + 0.5 * (u0 ** 2 + v0 ** 2 + w0 ** 2)
 
 
 def init(
diff --git a/pyFV3/pyFV3/stencils/nh_p_grad.py b/pyFV3/pyFV3/stencils/nh_p_grad.py
index 80b891f6..c0e063fc 100644
--- a/pyFV3/pyFV3/stencils/nh_p_grad.py
+++ b/pyFV3/pyFV3/stencils/nh_p_grad.py
@@ -228,7 +228,7 @@ def __call__(
         # Fortran names:
         # u=u v=v pp=pkc gz=gz pk3=pk3 delp=delp dt=dt
 
-        ptk = ptop**akap
+        ptk = ptop ** akap
         top_value = ptk  # = peln1 if spec.namelist.use_logp else ptk
 
         # TODO: make it clearer that each of these a2b outputs is updated
diff --git a/pyFV3/pyFV3/stencils/pk3_halo.py b/pyFV3/pyFV3/stencils/pk3_halo.py
index 28d7fbc3..2e0e1432 100644
--- a/pyFV3/pyFV3/stencils/pk3_halo.py
+++ b/pyFV3/pyFV3/stencils/pk3_halo.py
@@ -29,7 +29,7 @@ def edge_pe_update(
                 region[local_is - 2 : local_ie + 3, local_je + 1 : local_je + 3],
             ):
                 pe = pe + delp[0, 0, -1]
-                pk3 = pe**akap
+                pk3 = pe ** akap
 
 
 class PK3Halo:
diff --git a/pyFV3/pyFV3/stencils/saturation_adjustment.py b/pyFV3/pyFV3/stencils/saturation_adjustment.py
index 2118f76d..9e53fd0d 100644
--- a/pyFV3/pyFV3/stencils/saturation_adjustment.py
+++ b/pyFV3/pyFV3/stencils/saturation_adjustment.py
@@ -262,7 +262,7 @@ def heterogeneous_freezing(
 ):
     tc = constants.TICE0 - pt1
     if ql > 0.0 and tc > 0.0:
-        sink = 3.3333e-10 * dt_bigg * (exptc - 1.0) * den * ql**2
+        sink = 3.3333e-10 * dt_bigg * (exptc - 1.0) * den * ql ** 2
         sink = min(ql, sink)
         sink = min(sink, tc / icp2)
         ql = ql - sink
@@ -360,7 +360,10 @@ def sublimation(
                 * 349138.78
                 * expsubl
                 / (
-                    iqs2 * den * constants.LAT2 / (0.0243 * constants.RVGAS * pt1**2.0)
+                    iqs2
+                    * den
+                    * constants.LAT2
+                    / (0.0243 * constants.RVGAS * pt1 ** 2.0)
                     + 4.42478e4
                 )
             )
@@ -895,7 +898,7 @@ def satadjust(
             mindw = min(1.0, abs(hs) / (10.0 * constants.GRAV))
             dw = dw_ocean + (dw_land - dw_ocean) * mindw
             # "scale - aware" subgrid variability: 100 - km as the base
-            dbl_sqrt_area = dw * (area**0.5 / 100.0e3) ** 0.5
+            dbl_sqrt_area = dw * (area ** 0.5 / 100.0e3) ** 0.5
             maxtmp = max(0.01, dbl_sqrt_area)
             hvar = min(0.2, maxtmp)
             # partial cloudiness by pdf:
diff --git a/pyFV3/tests/savepoint/translate/translate_d_sw.py b/pyFV3/tests/savepoint/translate/translate_d_sw.py
index 179ecbe9..55900608 100644
--- a/pyFV3/tests/savepoint/translate/translate_d_sw.py
+++ b/pyFV3/tests/savepoint/translate/translate_d_sw.py
@@ -3,8 +3,8 @@
 from ndsl.dsl.typing import FloatField, FloatFieldIJ
 from ndsl.namelist import Namelist
 
-import pyFV3.stencils.d_sw as d_sw
 import pyFV3
+import pyFV3.stencils.d_sw as d_sw
 from pyFV3.testing import TranslateDycoreFortranData2Py
 
 
diff --git a/pyFV3/tests/savepoint/translate/translate_tracer2d1l.py b/pyFV3/tests/savepoint/translate/translate_tracer2d1l.py
index b4d0a6d2..dad6d987 100644
--- a/pyFV3/tests/savepoint/translate/translate_tracer2d1l.py
+++ b/pyFV3/tests/savepoint/translate/translate_tracer2d1l.py
@@ -79,9 +79,9 @@ def compute_parallel(self, inputs, communicator):
         inputs["mfyd"] = inputs.pop("y_mass_flux")
         inputs["cxd"] = inputs.pop("x_courant")
         inputs["cyd"] = inputs.pop("y_courant")
-        inputs["tracers"] = (
-            all_tracers  # some aren't advected, still need to be validated
-        )
+        inputs[
+            "tracers"
+        ] = all_tracers  # some aren't advected, still need to be validated
         # need to convert tracers dict to [x, y, z, n_tracer] array before subsetting
         outputs = self._base.slice_output(inputs)
         outputs["tracers"] = self.subset_output("tracers", outputs["tracers"])
diff --git a/tests/main/fv3core/test_dycore_call.py b/tests/main/fv3core/test_dycore_call.py
index 99279bf5..5ed97656 100644
--- a/tests/main/fv3core/test_dycore_call.py
+++ b/tests/main/fv3core/test_dycore_call.py
@@ -18,8 +18,8 @@
 from ndsl.quantity import Quantity
 from ndsl.stencils.testing import assert_same_temporaries, copy_temporaries
 
-import pyFV3.initialization.analytic_init as ai
 import pyFV3
+import pyFV3.initialization.analytic_init as ai
 from pyFV3.dycore_state import DycoreState
 
 
diff --git a/tests/mpi_54rank/test_grid_init.py b/tests/mpi_54rank/test_grid_init.py
index ad281ca1..179449d6 100644
--- a/tests/mpi_54rank/test_grid_init.py
+++ b/tests/mpi_54rank/test_grid_init.py
@@ -11,9 +11,7 @@
 from ndsl.quantity import Quantity
 
 import pyFV3
-from pyFV3.initialization.test_cases.initialize_baroclinic import (
-    init_baroclinic_state,
-)
+from pyFV3.initialization.test_cases.initialize_baroclinic import init_baroclinic_state
 
 
 def get_cube_comm(layout, comm: MPIComm):
diff --git a/tests/savepoint/translate/translate_driver.py b/tests/savepoint/translate/translate_driver.py
index 075802a4..a50a75ce 100644
--- a/tests/savepoint/translate/translate_driver.py
+++ b/tests/savepoint/translate/translate_driver.py
@@ -5,13 +5,13 @@
 
 from pace.driver.run import Driver, DriverConfig
 from pace.driver.state import TendencyState
+from pace.physics import PHYSICS_PACKAGES, PhysicsConfig, PhysicsState
 from pyFV3._config import DynamicalCoreConfig
 
 # TODO physics should not depend on pyFV3
 # but also, driver tests should not be in physics
 from pyFV3.testing.translate_fvdynamics import TranslateFVDynamics
 from pyFV3.testing.validation import enable_selective_validation
-from pace.physics import PHYSICS_PACKAGES, PhysicsConfig, PhysicsState
 
 
 enable_selective_validation()

From 455d2debe05ca4a4eb4638752f3a42b40701d753 Mon Sep 17 00:00:00 2001
From: Frank Malatino <frank.malatino@noaa.gov>
Date: Fri, 2 Feb 2024 11:39:51 -0500
Subject: [PATCH 3/6] Deleted local pyFV3

---
 pyFV3/.gitignore                              |  143 -
 pyFV3/FORTRAN_CHANGELOG.md                    |   16 -
 pyFV3/LICENSE.txt                             |  674 -----
 pyFV3/Makefile                                |   96 -
 pyFV3/README.md                               |  459 ----
 pyFV3/convert_xppm_yppm.sh                    |   57 -
 .../examples/standalone/benchmarks/README.md  |   22 -
 .../benchmarks/collect_memory_usage_data.py   |   94 -
 .../standalone/benchmarks/run_on_daint.sh     |  222 --
 pyFV3/examples/standalone/runfile/__init__.py |    0
 .../examples/standalone/runfile/acoustics.py  |  224 --
 pyFV3/examples/standalone/runfile/compile.py  |  115 -
 pyFV3/examples/standalone/runfile/dynamics.py |  349 ---
 pyFV3/examples/standalone/runfile/timing.py   |  137 -
 pyFV3/pyFV3/__init__.py                       |    8 -
 pyFV3/pyFV3/_config.py                        |  478 ----
 pyFV3/pyFV3/dycore_state.py                   |  517 ----
 pyFV3/pyFV3/initialization/__init__.py        |    1 -
 pyFV3/pyFV3/initialization/analytic_init.py   |   68 -
 pyFV3/pyFV3/initialization/init_utils.py      |  393 ---
 .../test_cases/initialize_baroclinic.py       |  350 ---
 .../test_cases/initialize_tc.py               |  576 ----
 pyFV3/pyFV3/stencils/__init__.py              |    0
 pyFV3/pyFV3/stencils/a2b_ord4.py              |  808 ------
 pyFV3/pyFV3/stencils/basic_operations.py      |   45 -
 pyFV3/pyFV3/stencils/c_sw.py                  |  807 ------
 pyFV3/pyFV3/stencils/d2a2c_vect.py            |  699 -----
 pyFV3/pyFV3/stencils/d_sw.py                  | 1303 ---------
 pyFV3/pyFV3/stencils/del2cubed.py             |  202 --
 pyFV3/pyFV3/stencils/delnflux.py              | 1276 ---------
 pyFV3/pyFV3/stencils/divergence_damping.py    |  713 -----
 pyFV3/pyFV3/stencils/dyn_core.py              | 1013 -------
 pyFV3/pyFV3/stencils/fillz.py                 |  171 --
 pyFV3/pyFV3/stencils/fv_dynamics.py           |  655 -----
 pyFV3/pyFV3/stencils/fv_subgridz.py           |  971 -------
 pyFV3/pyFV3/stencils/fvtp2d.py                |  368 ---
 pyFV3/pyFV3/stencils/fxadv.py                 |  691 -----
 pyFV3/pyFV3/stencils/map_single.py            |  208 --
 pyFV3/pyFV3/stencils/mapn_tracer.py           |   88 -
 pyFV3/pyFV3/stencils/moist_cv.py              |  233 --
 pyFV3/pyFV3/stencils/neg_adj3.py              |  430 ---
 pyFV3/pyFV3/stencils/nh_p_grad.py             |  265 --
 pyFV3/pyFV3/stencils/pe_halo.py               |   33 -
 pyFV3/pyFV3/stencils/pk3_halo.py              |   72 -
 pyFV3/pyFV3/stencils/ppm.py                   |   58 -
 pyFV3/pyFV3/stencils/ray_fast.py              |  205 --
 pyFV3/pyFV3/stencils/remap_profile.py         |  696 -----
 pyFV3/pyFV3/stencils/remapping.py             |  731 ------
 pyFV3/pyFV3/stencils/riem_solver3.py          |  339 ---
 pyFV3/pyFV3/stencils/riem_solver_c.py         |  278 --
 pyFV3/pyFV3/stencils/saturation_adjustment.py | 1108 --------
 pyFV3/pyFV3/stencils/sim1_solver.py           |  218 --
 pyFV3/pyFV3/stencils/temperature_adjust.py    |   42 -
 pyFV3/pyFV3/stencils/tracer_2d_1l.py          |  417 ---
 pyFV3/pyFV3/stencils/updatedzc.py             |  225 --
 pyFV3/pyFV3/stencils/updatedzd.py             |  389 ---
 pyFV3/pyFV3/stencils/xppm.py                  |  366 ---
 pyFV3/pyFV3/stencils/xtp_u.py                 |   95 -
 pyFV3/pyFV3/stencils/yppm.py                  |  368 ---
 pyFV3/pyFV3/stencils/ytp_v.py                 |   94 -
 pyFV3/pyFV3/testing/__init__.py               |    5 -
 pyFV3/pyFV3/testing/map_single.py             |   34 -
 pyFV3/pyFV3/testing/translate_dyncore.py      |  190 --
 pyFV3/pyFV3/testing/translate_fvdynamics.py   |  371 ---
 pyFV3/pyFV3/testing/validation.py             |  196 --
 pyFV3/pyFV3/utils/__init__.py                 |    0
 pyFV3/pyFV3/utils/functional_validation.py    |   61 -
 pyFV3/pyFV3/wrappers/geos_wrapper.py          |  602 -----
 pyFV3/setup.py                                |   48 -
 pyFV3/tests/conftest.py                       |   34 -
 pyFV3/tests/mpi/test_doubly_periodic.py       |  145 -
 pyFV3/tests/pytest.ini                        |    3 -
 pyFV3/tests/savepoint/__init__.py             |    0
 pyFV3/tests/savepoint/conftest.py             |   19 -
 pyFV3/tests/savepoint/output/.gitkeep         |    0
 pyFV3/tests/savepoint/test_translate.py       |    1 -
 pyFV3/tests/savepoint/translate/__init__.py   |   87 -
 .../savepoint/translate/overrides/README.md   |   45 -
 .../translate/overrides/baroclinic.yaml       |  100 -
 .../translate/overrides/standard.yaml         |  230 --
 .../savepoint/translate/translate_a2b_ord4.py |   85 -
 .../savepoint/translate/translate_c_sw.py     |  256 --
 .../savepoint/translate/translate_corners.py  |  171 --
 .../translate/translate_cubedtolatlon.py      |   73 -
 .../translate/translate_d2a2c_vect.py         |   48 -
 .../savepoint/translate/translate_d_sw.py     |  260 --
 .../translate/translate_del2cubed.py          |   32 -
 .../translate/translate_del6vtflux.py         |   50 -
 .../savepoint/translate/translate_delnflux.py |   58 -
 .../translate/translate_divergencedamping.py  |   74 -
 .../savepoint/translate/translate_fillz.py    |   88 -
 .../translate/translate_fvsubgridz.py         |  220 --
 .../savepoint/translate/translate_fvtp2d.py   |   91 -
 .../savepoint/translate/translate_fxadv.py    |   74 -
 .../savepoint/translate/translate_grid.py     | 2335 -----------------
 .../translate/translate_haloupdate.py         |  245 --
 .../translate/translate_init_case.py          |  466 ----
 .../translate/translate_last_step.py          |   51 -
 .../translate/translate_moistcvpluspkz_2d.py  |  133 -
 .../translate/translate_moistcvpluspt_2d.py   |  126 -
 .../savepoint/translate/translate_neg_adj3.py |   67 -
 .../translate/translate_nh_p_grad.py          |   47 -
 .../savepoint/translate/translate_pe_halo.py  |   49 -
 .../savepoint/translate/translate_pk3_halo.py |   22 -
 ...ssureadjustedtemperature_nonhydrostatic.py |   50 -
 .../savepoint/translate/translate_qsinit.py   |   49 -
 .../savepoint/translate/translate_ray_fast.py |   35 -
 .../translate/translate_remapping.py          |  124 -
 .../translate/translate_riem_solver3.py       |   85 -
 .../translate/translate_riem_solver_c.py      |   35 -
 .../translate/translate_satadjust3d.py        |   79 -
 .../translate/translate_tracer2d1l.py         |  117 -
 .../translate/translate_updatedzc.py          |   72 -
 .../translate/translate_updatedzd.py          |   88 -
 .../savepoint/translate/translate_xppm.py     |   71 -
 .../savepoint/translate/translate_xtp_u.py    |   99 -
 .../savepoint/translate/translate_yppm.py     |   75 -
 .../savepoint/translate/translate_ytp_v.py    |   98 -
 118 files changed, 30048 deletions(-)
 delete mode 100644 pyFV3/.gitignore
 delete mode 100644 pyFV3/FORTRAN_CHANGELOG.md
 delete mode 100644 pyFV3/LICENSE.txt
 delete mode 100644 pyFV3/Makefile
 delete mode 100644 pyFV3/README.md
 delete mode 100755 pyFV3/convert_xppm_yppm.sh
 delete mode 100644 pyFV3/examples/standalone/benchmarks/README.md
 delete mode 100644 pyFV3/examples/standalone/benchmarks/collect_memory_usage_data.py
 delete mode 100755 pyFV3/examples/standalone/benchmarks/run_on_daint.sh
 delete mode 100644 pyFV3/examples/standalone/runfile/__init__.py
 delete mode 100755 pyFV3/examples/standalone/runfile/acoustics.py
 delete mode 100755 pyFV3/examples/standalone/runfile/compile.py
 delete mode 100755 pyFV3/examples/standalone/runfile/dynamics.py
 delete mode 100644 pyFV3/examples/standalone/runfile/timing.py
 delete mode 100644 pyFV3/pyFV3/__init__.py
 delete mode 100644 pyFV3/pyFV3/_config.py
 delete mode 100644 pyFV3/pyFV3/dycore_state.py
 delete mode 100644 pyFV3/pyFV3/initialization/__init__.py
 delete mode 100644 pyFV3/pyFV3/initialization/analytic_init.py
 delete mode 100644 pyFV3/pyFV3/initialization/init_utils.py
 delete mode 100644 pyFV3/pyFV3/initialization/test_cases/initialize_baroclinic.py
 delete mode 100644 pyFV3/pyFV3/initialization/test_cases/initialize_tc.py
 delete mode 100644 pyFV3/pyFV3/stencils/__init__.py
 delete mode 100644 pyFV3/pyFV3/stencils/a2b_ord4.py
 delete mode 100644 pyFV3/pyFV3/stencils/basic_operations.py
 delete mode 100644 pyFV3/pyFV3/stencils/c_sw.py
 delete mode 100644 pyFV3/pyFV3/stencils/d2a2c_vect.py
 delete mode 100644 pyFV3/pyFV3/stencils/d_sw.py
 delete mode 100644 pyFV3/pyFV3/stencils/del2cubed.py
 delete mode 100644 pyFV3/pyFV3/stencils/delnflux.py
 delete mode 100644 pyFV3/pyFV3/stencils/divergence_damping.py
 delete mode 100644 pyFV3/pyFV3/stencils/dyn_core.py
 delete mode 100644 pyFV3/pyFV3/stencils/fillz.py
 delete mode 100644 pyFV3/pyFV3/stencils/fv_dynamics.py
 delete mode 100644 pyFV3/pyFV3/stencils/fv_subgridz.py
 delete mode 100644 pyFV3/pyFV3/stencils/fvtp2d.py
 delete mode 100644 pyFV3/pyFV3/stencils/fxadv.py
 delete mode 100644 pyFV3/pyFV3/stencils/map_single.py
 delete mode 100644 pyFV3/pyFV3/stencils/mapn_tracer.py
 delete mode 100644 pyFV3/pyFV3/stencils/moist_cv.py
 delete mode 100644 pyFV3/pyFV3/stencils/neg_adj3.py
 delete mode 100644 pyFV3/pyFV3/stencils/nh_p_grad.py
 delete mode 100644 pyFV3/pyFV3/stencils/pe_halo.py
 delete mode 100644 pyFV3/pyFV3/stencils/pk3_halo.py
 delete mode 100644 pyFV3/pyFV3/stencils/ppm.py
 delete mode 100644 pyFV3/pyFV3/stencils/ray_fast.py
 delete mode 100644 pyFV3/pyFV3/stencils/remap_profile.py
 delete mode 100644 pyFV3/pyFV3/stencils/remapping.py
 delete mode 100644 pyFV3/pyFV3/stencils/riem_solver3.py
 delete mode 100644 pyFV3/pyFV3/stencils/riem_solver_c.py
 delete mode 100644 pyFV3/pyFV3/stencils/saturation_adjustment.py
 delete mode 100644 pyFV3/pyFV3/stencils/sim1_solver.py
 delete mode 100644 pyFV3/pyFV3/stencils/temperature_adjust.py
 delete mode 100644 pyFV3/pyFV3/stencils/tracer_2d_1l.py
 delete mode 100644 pyFV3/pyFV3/stencils/updatedzc.py
 delete mode 100644 pyFV3/pyFV3/stencils/updatedzd.py
 delete mode 100644 pyFV3/pyFV3/stencils/xppm.py
 delete mode 100644 pyFV3/pyFV3/stencils/xtp_u.py
 delete mode 100644 pyFV3/pyFV3/stencils/yppm.py
 delete mode 100644 pyFV3/pyFV3/stencils/ytp_v.py
 delete mode 100644 pyFV3/pyFV3/testing/__init__.py
 delete mode 100644 pyFV3/pyFV3/testing/map_single.py
 delete mode 100644 pyFV3/pyFV3/testing/translate_dyncore.py
 delete mode 100644 pyFV3/pyFV3/testing/translate_fvdynamics.py
 delete mode 100644 pyFV3/pyFV3/testing/validation.py
 delete mode 100644 pyFV3/pyFV3/utils/__init__.py
 delete mode 100644 pyFV3/pyFV3/utils/functional_validation.py
 delete mode 100644 pyFV3/pyFV3/wrappers/geos_wrapper.py
 delete mode 100644 pyFV3/setup.py
 delete mode 100644 pyFV3/tests/conftest.py
 delete mode 100644 pyFV3/tests/mpi/test_doubly_periodic.py
 delete mode 100644 pyFV3/tests/pytest.ini
 delete mode 100644 pyFV3/tests/savepoint/__init__.py
 delete mode 100644 pyFV3/tests/savepoint/conftest.py
 delete mode 100644 pyFV3/tests/savepoint/output/.gitkeep
 delete mode 100644 pyFV3/tests/savepoint/test_translate.py
 delete mode 100644 pyFV3/tests/savepoint/translate/__init__.py
 delete mode 100644 pyFV3/tests/savepoint/translate/overrides/README.md
 delete mode 100644 pyFV3/tests/savepoint/translate/overrides/baroclinic.yaml
 delete mode 100644 pyFV3/tests/savepoint/translate/overrides/standard.yaml
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_a2b_ord4.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_c_sw.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_corners.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_cubedtolatlon.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_d2a2c_vect.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_d_sw.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_del2cubed.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_del6vtflux.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_delnflux.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_divergencedamping.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_fillz.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_fvsubgridz.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_fvtp2d.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_fxadv.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_grid.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_haloupdate.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_init_case.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_last_step.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_moistcvpluspkz_2d.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_moistcvpluspt_2d.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_neg_adj3.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_nh_p_grad.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_pe_halo.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_pk3_halo.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_pressureadjustedtemperature_nonhydrostatic.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_qsinit.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_ray_fast.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_remapping.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_riem_solver3.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_riem_solver_c.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_satadjust3d.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_tracer2d1l.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_updatedzc.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_updatedzd.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_xppm.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_xtp_u.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_yppm.py
 delete mode 100644 pyFV3/tests/savepoint/translate/translate_ytp_v.py

diff --git a/pyFV3/.gitignore b/pyFV3/.gitignore
deleted file mode 100644
index dd913edd..00000000
--- a/pyFV3/.gitignore
+++ /dev/null
@@ -1,143 +0,0 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-coverage
-gridtools4py
-test_data
-tests/output
-.DS_Store
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-pip-wheel-metadata/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-tests/savepoint/output/*.nc
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-.python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# Visual Studio Code
-.vscode/
-
-# GT4Py
-**/.gt_cache/
-gt4py/
diff --git a/pyFV3/FORTRAN_CHANGELOG.md b/pyFV3/FORTRAN_CHANGELOG.md
deleted file mode 100644
index 7940c5b5..00000000
--- a/pyFV3/FORTRAN_CHANGELOG.md
+++ /dev/null
@@ -1,16 +0,0 @@
-Fortran Changelog
-=================
-
-This document outlines changes to the source code from the patterns or conventions used in the original Fortran. This information is meant to help map between the updated Python source code and the Fortran equivalent.
-
-d_sw:
-- in flux_adjust, "w" is renamed to "q" since the variable refers to any scalar, not just vertical wind
-- gx/gy for pt fluxes, fx/fy for delp fluxes have been renamed to pt_x_flux, delp_x_flux and similar for y fluxes
-- converted one of the usages of ut to u and dx (ut = u * dx) and similar for vt to v and dy
-- ubke and vbke calculations in Fortran use dt4 which is 0.25 * dt and dt5 which is 0.2 * dt in the new code
-- in ubke/vbke calculations, renamed ub to ub_contra since it is contravariant wind (similarly for vb)
-- in ubke/vbke calculations, renamed ut to uc_contra since it is contravariant wind (similarly for vt)
-- renamed one of the usages of ub/vb to vort_x_delta and vort_y_delta, where they hold x and y finite differences of the vort variable
-- renamed first usage of ptc to u_contra_dyc and first usage of vort to v_contra_dxc
-- in xppm/yppm routines, separated "courant" which was b-wind * dt into dt (timestep) and ub_contra/vb_contra
-- a2b_ord4 uses lon for the Fortran code's `grid(:, :, 1)` and lat for `grid(:, :, 2)`, and similarly lon_agrid/lat_agrid for the components of the Fortran code's agrid variable.
diff --git a/pyFV3/LICENSE.txt b/pyFV3/LICENSE.txt
deleted file mode 100644
index f288702d..00000000
--- a/pyFV3/LICENSE.txt
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/pyFV3/Makefile b/pyFV3/Makefile
deleted file mode 100644
index 91bd8e35..00000000
--- a/pyFV3/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-include ../docker/Makefile.image_names
-
-GCR_URL = us.gcr.io/vcm-ml
-EXPERIMENT ?=c12_6ranks_standard
-SHELL=/bin/bash
-CWD=$(shell pwd)
-DEV ?=y
-NUM_RANKS ?=6
-VOLUMES ?=
-CONTAINER_ENGINE ?=docker
-RUN_FLAGS ?=--rm
-RUN_FLAGS += -e FV3_DACEMODE=$(FV3_DACEMODE)
-TEST_ARGS ?=
-TARGET ?=dycore
-FV3UTIL_DIR=$(CWD)/external/util
-ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-TEST_DATA_ROOT ?=$(ROOT_DIR)/test_data/
-TEST_DATA_FTP ?=in/put/abc/cosmo/fuo/pace/fv3core/
-
-FV3=fv3core
-FV3_PATH ?=/pace/$(FV3)
-
-ifeq ($(DEV),y)
-	VOLUMES += -v $(CWD)/..:/pace
-endif
-CONTAINER_CMD?=$(CONTAINER_ENGINE) run $(RUN_FLAGS) $(VOLUMES) $(PACE_IMAGE)
-
-ifneq (,$(findstring $(PACE_IMAGE),$(CONTAINER_CMD)))
-	TEST_DATA_RUN_LOC =/test_data
-else
-	TEST_DATA_RUN_LOC=$(TEST_DATA_HOST)
-endif
-
-PYTHON_FILES = $(shell git ls-files | grep -e 'py$$' | grep -v -e '__init__.py')
-PYTHON_INIT_FILES = $(shell git ls-files | grep '__init__.py')
-TEST_DATA_TARFILE=dat_files.tar.gz
-TEST_DATA_TARPATH=$(TEST_DATA_HOST)/$(TEST_DATA_TARFILE)
-MPIRUN_ARGS ?=--oversubscribe
-MPIRUN_CALL ?=mpirun -np $(NUM_RANKS) $(MPIRUN_ARGS)
-BASE_INSTALL?=$(FV3)-install-serialbox
-DATA_BUCKET= $(REGRESSION_DATA_STORAGE_BUCKET)/$(FORTRAN_SERIALIZED_DATA_VERSION)/$(EXPERIMENT)/$(TARGET)/
-
-TEST_TYPE=$(word 3, $(subst _, ,$(EXPERIMENT)))
-THRESH_ARGS=--threshold_overrides_file=$(FV3_PATH)/tests/savepoint/translate/overrides/$(TEST_TYPE).yaml
-PYTEST_MAIN=pytest $(TEST_ARGS) $(FV3_PATH)/tests/main
-PYTEST_SEQUENTIAL=pytest --data_path=$(TEST_DATA_RUN_LOC) $(TEST_ARGS) $(THRESH_ARGS) $(FV3_PATH)/tests/savepoint
-# we can't rule out a deadlock if one test fails, so we must set maxfail=1 for parallel tests
-PYTEST_PARALLEL=$(MPIRUN_CALL) python3 -m mpi4py -m pytest --maxfail=1 --data_path=$(TEST_DATA_RUN_LOC) $(TEST_ARGS) $(THRESH_ARGS) -m parallel $(FV3_PATH)/tests/savepoint
-ifeq ($(DEV),y)
-	VOLUMES += -v $(CWD)/$(FV3):/$(FV3)/$(FV3) -v $(CWD)/tests:/$(FV3)/tests -v $(FV3UTIL_DIR):/external/util -v $(CWD)/external/dsl:/external/dsl -v $(CWD)/external/stencils:/external/stencils
-endif
-CONTAINER_CMD?=$(CONTAINER_ENGINE) run $(RUN_FLAGS) $(VOLUMES) $(PACE_IMAGE)
-
-clean:
-
-build:
-	$(MAKE) -C .. build
-
-cleanup_remote:
-	$(MAKE) -C docker cleanup_remote
-
-# end of image build targets which have been moved to docker/Makefile
-
-test:
-	$(MAKE) -C .. test_main
-
-tests:
-	$(MAKE) -C .. test_main
-
-savepoint_tests:
-	TEST_DATA_ROOT=$(TEST_DATA_ROOT) TARGET=$(TARGET) EXPERIMENT=$(EXPERIMENT) $(MAKE) -C .. $@
-
-savepoint_tests_mpi:
-	TEST_DATA_ROOT=$(TEST_DATA_ROOT) TARGET=$(TARGET) EXPERIMENT=$(EXPERIMENT) $(MAKE) -C .. $@
-
-dev:
-	docker run --rm -it \
-		--network host \
-		-v $(TEST_DATA_HOST):$(TEST_DATA_RUN_LOC) \
-		-v $(CWD):/port_dev \
-		$(VOLUMES) \
-		$(PACE_IMAGE) bash
-
-sync_test_data:
-	TEST_DATA_ROOT=$(TEST_DATA_ROOT) TARGET=$(TARGET) EXPERIMENT=$(EXPERIMENT) $(MAKE) -C .. $@
-
-sync_test_data_from_ftp:
-	TEST_DATA_ROOT=$(TEST_DATA_ROOT) TARGET=$(TARGET) EXPERIMENT=$(EXPERIMENT) $(MAKE) -C .. $@
-
-get_test_data:
-	TEST_DATA_ROOT=$(TEST_DATA_ROOT) TARGET=$(TARGET) EXPERIMENT=$(EXPERIMENT) $(MAKE) -C .. $@
-
-lint:
-	pre-commit run --all-files
-
-.PHONY: dev get_test_data tests
diff --git a/pyFV3/README.md b/pyFV3/README.md
deleted file mode 100644
index a6192aac..00000000
--- a/pyFV3/README.md
+++ /dev/null
@@ -1,459 +0,0 @@
-> DISCLAIMER: Work in progress
-
-# FV3core
-
-FV3core is a Python version, using GridTools GT4Py with CPU and GPU backend options, of the FV3 dynamical core (fv3gfs-fortran repo).
-The code here includes regression test data of computation units coming from serialized output from the Fortran model generated using the `GridTools/serialbox` framework.
-
-As of January 10, 2021 this documentation is outdated in that it was written when we had fv3core as its own single repository. Some functionality, such as linting, has been moved to the top level but may still be described in this document as occuring inside the fv3core folder.
-
-**WARNING** This repo is under active development and relies on code and data that is not publicly available at this point.
-
-## QuickStart
-
-1. Ensure you have docker installed and available for building and running and has access to the VCM cloud
-
-Be sure to complete any required post-installation instructions (e.g. [for linux](https://docs.docker.com/engine/install/linux-postinstall/)). Also [authorize Docker to pull from gcr](https://cloud.google.com/container-registry/docs/advanced-authentication). Your user will need to have read access to the `us.gcr.io/vcm-ml` repository.
-
-2.  You can build the image, download the data, and run the tests using:
-
-```shell
-$ make tests savepoint_tests savepoint_tests_mpi
-```
-
-If you want to develop code, you should also install the linting requirements and git hooks locally
-
-```shell
-$ pip install -c constraints.txt -r requirements/requirements_lint.txt
-$ pre-commit install
-
-## Getting started, in more detail
-If you want to build the main fv3core docker image, run
-
-```shell
-$ make build
-```
-
-If you want to download test data run
-
-```shell
-$ make get_test_data
-```
-
-And the c12_6ranks_standard data will download into the `test_data` directory.
-
-If you do not have a GCP account, there is an option to download basic test data from a public FTP server and you can skip the GCP authentication step above. To download test data from the FTP server, use `make USE_FTP=yes get_test_data` instead and this will avoid fetching from a GCP storage bucket. You will need a valid in stallation of the `lftp` command.
-
-MPI parallel tests (that run that way to exercise halo updates in the model) can also be run with:
-
-```shell
-$ make savepoint_tests_mpi
-```
-
-The environment image that the fv3core container uses is prebuilt and lives in the GCR. The above commands will by default pull this image before building the fv3core image and running the tests.
-To build the environment from scratch (including GT4py) before running tests, either run
-
-```
-make build_environment
-```
-
-or
-
-```shell
-$ PULL=False make savepoint_tests
-```
-
-which will execute the target `build_environment` for you before running the tests.
-
-There are `push_environment` and `rebuild_environment` targets, but these should normally not be done manually. Updating the install image should only be done by Jenkins after the tests pass using a new environment.
-
-### Test data options
-
-If you want to run different test data, discover the possible options with
-```shell
-$ make list_test_data_options
-```
-This will list the storage buckets in the cloud. Then to run one of them, set EXPERIMENT to the folder name of the data you'd like to use:
-
-e.g.
-```shell
-$EXPERIMENT=c48_6ranks_standard make tests
-```
-
-If you choose an experiment with a different number of ranks than 6, also set `NUM_RANKS=<num ranks>`
-
-## Testing interactively outside the container
-
-After `make savepoint_tests` has been run at least once (or you have data in test_data and the docker image fv3core exists because `make build` has been run), you can iterate on code changes using
-
-```shell
-$ DEV=y make savepoint_tests
-```
-or for the parallel or non-savepoint tests:
-
-```shell
-$ DEV=y make tests savepoint_tests_mpi
-```
-These will mount your current code into the fv3core container and run it rather than the code that was built when `make build` ran.
-
-## Running tests inside a container
-
-If you to prefer to work interactively inside the fv3core container, get the test data and build the docker image (see above if you do not have a GCP account and want to get test data):
-```shell
-$ make get_test_data
-```
-
-```shell
-$ make build
-```
-Testing can be run with this data from `/port_dev` inside the container:
-
-```shell
-$ make dev
-```
-
-Then in the container:
-
-```shell
-$ pytest -v -s --data_path=/test_data/ /port_dev/tests --which_modules=<stencil name>
-```
-The 'stencil name' can be determined from the associated Translate class. e.g. TranslateXPPM is a test class that translate data serialized from a run of the fortran model, and 'XPPM' is the name you can use with --which_modules.
-
-
-
-
-### Test options
-
-All of the make endpoints involved running tests can be prefixed with the `TEST_ARGS` environment variable to set test options or pytest CLI args (see below) when running inside the container.
-
-* `--which_modules <modules to run tests for>` - comma separated list of which modules to test (defaults to running all of them).
-
-* `--print_failures` - if your test fails, it will only report the first datapoint. If you want all the nonmatching regression data to print out (so you can see if there are patterns, e.g. just incorrect for the first 'i' or whatever'), this will print out for every failing test all the non-matching data.
-
-* `--failure_stride` - when printing failures, print every n failures only.
-
-* `--data_path` - path to where you have the `Generator*.dat` and `*.json` serialization regression data. Defaults to current directory.
-
-* `--backend` - which backend to use for the computation. Options: `[numpy, gt:cpu_ifirst, gt:cpu_first, gt:gpu, cuda]`. Defaults to `numpy`.
-* `--python_regression` - Run the tests that have Python based regression data. Only applies to running parallel tests (savepoint_tests_mpi)
-Pytest provides a lot of options, which you can see by `pytest --help`. Here are some
-common options for our tests, which you can add to `TEST_ARGS`:
-
-* `-r` - is used to report test types other than failure. It can be provided `s` for skipped (e.g. tests which were not run because earlier tests of the same stencil failed), `x` for xfail or "expected to fail" tests (like tests with no translate class), or `p` for pass. For example, to report skipped and xfail tests you would use `-rsx`.
-
-* `--disable-warnings` - will stop all warnings from being printed at the end of the tests, for example warnings that translate classes are not yet implemented.
-
-* `-v` - will increase test verbosity, while `-q` will decrease it.
-
-* `-s` - will let stdout print directly to console instead of capturing the output and printing it when a test fails only. Note that logger lines will always be printed both during (by setting log_cli in our pytest.ini file) and after tests.
-
-* `-m` - will let you run only certain groups of tests. For example, `-m=parallel` will run only parallel stencils, while `-m=sequential` will run only stencils that operate on one rank at a time.
-
-* `--threshold_overrides_file` - will read a yaml file with error thresholds specified for specific backend and platform (docker or metal) configurations, overriding the max_error thresholds defined in the Translate classes. Format of the yaml file is described [here](tests/savepoint/translate/overrides/README.md).
-
-* `--dperiodic` - run tests on a doubly-periodic domain. Will look for only one tile's worth of test data and parallel tests will be run with a TileCommunicator instead of a CubedSphereCommunicator.
-
-**NOTE:** FV3 is current assumed to be by default in a "development mode", where stencils are checked each time they execute for code changes (which can trigger regeneration). This process is somewhat expensive, so there is an option to put FV3 in a performance mode by telling it that stencils should not automatically be rebuilt:
-
-```shell
-$ export FV3_STENCIL_REBUILD_FLAG=False
-```
-
-## Porting a new stencil
-
-1. Find the location in the fv3gfs-fortran repo code where the save-point is to be added, e.g. using
-
-```shell
-$ git grep <stencil_name> <checkout of fv3gfs-fortran>
-```
-
-2. Create a `translate` class from the serialized save-point data to a call to the stencil or function that calls the relevant stencil(s).
-
-These are usually named `tests/savepoint/translate/translate_<lowercase name>`
-
-Import this class in the `tests/savepoint/translate/__init__.py` file
-
-3. Write a Python function wrapper that the translate function (created above) calls.
-
-By convention, we name these `fv3core/stencils/<lower case stencil name>.py`
-
-4. Run the test, either with one name or a comma-separated list
-
-```shell
-$ make dev_tests TEST_ARGS="-–which_modules=<stencil name(s)>"
-```
-
-**Please also review the [Porting conventions](#porting-conventions) section for additional explanation**
-## Installation
-
-### Docker Image
-
-To build the `us.gcr.io/vcm-ml/fv3core` image with required dependencies for running the Python code, run
-
-```shell
-$ make build
-```
-
-Add `PULL=False` to build from scratch without running `docker pull`:
-
-```shell
-PULL=False make build
-```
-
-## Relevant repositories
-
-- https://github.com/GridTools/serialbox -
-  Serialbox generates serialized data when the Fortran model runs and has bindings to manage data from Python
-
-- https://github.com/VulcanClimateModeling/fv3gfs-fortran -
-  This is the existing Fortran model decorated with serialization statements from which the test data is generated
-
-- https://github.com/GridTools/gt4py -
-  Python package for the DSL language
-
-- https://github.com/VulcanClimateModeling/util
-  Python specific model functionality, such as halo updates.
-
-- https://github.com/VulcanClimateModeling/fv3gfs-wrapper
-  A Python based wrapper for running the Fortran version of the FV3GFS model.
-
-Some of these are submodules.
-While tests can work without these, it may be necessary for development to have these as well.
-To add these to the local repository, run
-
-```shell
-$ git submodule update --init
-```
-
-The submodules include:
-
-- `external/util` - git@github.com:VulcanClimateModeling/util.git
-- `external/daint_venv` -  git@github.com:VulcanClimateModeling/daint_venv.git
-
-## Dockerfiles and building
-
-There are two main docker files:
-
-1. `docker/dependencies.Dockerfile` - defines dependency images such as for mpi, serialbox, and GT4py
-
-2. `docker/Dockerfile` - uses the dependencies to define the final fv3core images.
-
-The dependencies are separated out into their own images to expedite rebuilding the docker image without having to rebuild dependencies, especially on CI.
-
-For the commands below using `make -C docker`, you can alternatively run `make` from within the `docker` directory.
-
-These dependencies can be updated, pushed, and pulled with `make -C docker build_deps`, `make -C docker push_deps`, and `make -C docker pull_deps`. The tag of the dependencies is based on the tag of the current build in the Makefile, which we will expand on below.
-
-Building from scratch requires both a deps and build command, such as `make -C docker pull_deps fv3core_image`.
-
-If any example fails for "pulled dependencies", it means the dependencies have never been built. You can
-build them and push them to GCR with:
-
-```shell
-$ make -C docker build_deps push_deps
-```
-
-### Building examples
-
-fv3core image with pulled dependencies:
-
-```shell
-$ make -C docker pull_deps fv3core_image
-```
-
-CUDA-enabled fv3core image with pulled dependencies:
-```
-$ CUDA=y make -C docker pull_deps fv3core_image
-```
-
-fv3core image with locally-built dependencies:
-```shell
-$ make -C docker build_deps fv3core_image
-```
-
-### Updating Serialbox
-
-If you need to install an updated version of Serialbox, you must first install cmake into the development environment. To install an updated version of Serialbox from within the container run
-
-```shell
-$ wget https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3.tar.gz && \
-  tar xzf cmake-3.17.3.tar.gz && \
-  cd cmake-3.17.3 && \
-  ./bootstrap && make -j4 && make install
-$ git clone -b v2.6.1 --depth 1 https://github.com/GridTools/serialbox.git /tmp/serialbox
-$ cd /tmp/serialbox
-$ cmake -B build -S /tmp/serialbox -DSERIALBOX_USE_NETCDF=ON -DSERIALBOX_TESTING=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/serialbox
-$ cmake --build build/ -j $(nproc) --target install
-$ cd -
-$ rm -rf build /tmp/serialbox
-```
-
-## Pinned dependencies
-
-Dependencies are pinned using `constraints.txt`. This is auto-generated by pip-compile from the `pip-tools` package, which reads `requirements.txt` and `requirements/requirements_lint.txt`, determines the latest versions of all dependencies (including recursive dependencies) compatible those files, and writes pinned versions for all dependencies. This can be updated using:
-
-```shell
-$ make constraints.txt
-```
-
-This file is committed to the repository, and gives more reproducible tests if an old commit of the repository is checked out in the future. The constraints are followed when creating the `fv3core` docker images. To ensure consistency this should ideally be run from inside a docker development environment, but you can also run it on your local system with an appropriate Python 3 environment.
-
-## Development
-
-To develop fv3core, you need to install the linting requirements in `requirements/requirements_lint.txt`. To install the pinned versions, use:
-
-```shell
-$ pip install -c constraints.txt -r requirements/requirements_lint.txt
-```
-
-This adds `pre-commit`, which we use to lint and enforce style on the code. The first time you install `pre-commit`, install its git hooks using:
-
-```shell
-$ pre-commit install
-pre-commit installed at .git/hooks/pre-commit
-```
-
-As a convenience, the `lint` target of the top-level makefile executes `pre-commit run --all-files`.
-Linting, which formats files and checks for some style conventions, is required, as the same checks are the first step in the continuous integration testing that happens when creating a pull request.
-Linting locally saves time and literal energy, since CI tests do not have to be launched so many times!
-
- Please see the 'Development Guidelines' below for more information on the structure of the code to align your new code with the current conventions, as well as the CONTRIBUTING.md document for style guidelines.
-
-## GT4Py version
-
-FV3Core does not actually use the [GridTools/gt4py](https://github.com/gridtools/gt4py) main, it instead uses a Vulcan Climate Modeling development branch.
-This is publically available version at [VCM/gt4py](https://github.com/vulcanclimatemodeling/gt4py).
-
-Situation: There is a new stable feature in a gt4py PR, but it is not yet merged into the GridTools/gt4py main branch.
-[branches.cfg](https://github.com/VulcanClimateModeling/gt4py/blob/develop/branches.cfg) lists these features.
-Steps:
-
-1. Add any new branches to `branches.cfg`
-2. Rebuild the develop branch, either:
-  a. `make_develop gt4py-dev path/to/branches.cfg` (you may have to resolve conflicts...)
-  b. Adding new commits on top of the existing develop branch (e.g. merge or cherry-pick)
-3. Force push to the develop branch: `git push -f upstream develop`
-
-The last step will launch Jenkins tests. If these pass:
-
-1. Create a git tag: `git tag v-$(git rev-parse --short HEAD)`
-2. Push the tag: `git push upstream --tags`
-3. Make a PR to [VCM/gt4py](https://github.com/vulcanclimatemodeling/fv3core) that updates the version in `docker/Makefile` to the new tag.
-
-## License
-FV3Core is provided under the terms of the [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html) license.
-
-# Development guidelines
-
-## File structure / conventions
-The main functionality of the FV3 dynamical core, which has been ported from the Fortran version in the fv3gfs-fortran repo, is defined using GT4py stencils and python 'compute' functions in fv3core/stencils. The core is comprised of units of calculations defined for regression testing. These were initially generally separated into distinct files in fv3core/stencils with corresponding files in tests/savepoint/translate/translate_<unit>.py defining the translation of variables from Fortran to Python. Exceptions exist in cases where topical and logical grouping allowed for code reuse. As refactors optimize the model, these units may be merged to occupy the same files and even methods/stencils, but the units should still be tested separately, unless determined to be redundant.
-
-The core has most of its calculations happening in GT4py stencils, but there are still several instances of operations happening in Python directly, which will need to be replaced with GT4py code for optimal performance.
-
-The namelist and grid are global variables defined in fv3core/_config.py The namelist is 'flattened' so that the grouping name of the option is not required to access the data (we may want to change this).
-
-The grid variables are mostly 2d variables and are 'global' to the model thread per mpi rank. The grid object also contains domain and layout information relevant to the current rank being operated on.
-
-Utility functions in `fv3core/utils/` include:
-  - `gt4py_utils.py`:
-    - default gt4py and model settings
-    - methods for generating gt4py storages
-    - methods for using numpy and cupy arrays in python functions that have not been put into GT4py
-    - methods for handling complex patterns that did not immediately map to gt4py, and will mostly be removed with future refactors (e.g. k_split_run)
-    - some general model math computations (e.g. great_circle_dist), that will eventually be put into gt4py with a future refactor
-  - `grid.py`:
-    - A Grid class definition that provides information about the grid layout, current tile informationm access to grid variables used globally, and convenience methods related to tile indexing, origins and domains commonly used
-    - A grid is defined for each MPI rank (minimum 6 ranks, 1 for each tile face of the cubed sphere grid represnting the whole Earth)
-    - Also provides functionality for generating a Quantity object used for halo updates and other utilities
-  - `corners`: port of corner calculations, initially direct Python calculations, being replaced with GT4py gtscript functions as the GT4py regions feature is implemented
-  - `mpi.py`: a wrapper for importing mpi4py when available
-  - `global_constants.py`: constants for use throughout the model
-  - `typing.py`: Clean names for common types we use in the model. This is new and
-    hasn't been adopted throughout the model yet, but will eventually be our
-    standard. A shorthand 'sd' has been used in the intial version.
-
-The `tests/` directory currently includes a framework for translating fields serialized (using
-Serialbox from GridTools) from a Fortran run into gt4py storages that can be inputs to
-fv3core unit computations, and compares the results of the ported code to serialized
-data following a unit computation.
-
-The `docker/` directory provides Dockerfiles for building a repeatable environment in which
-to run the core
-
-The `external/` directory is for submoduled repos that provide essential functionality
-
-The build system uses Makefiles following the convention of other repos within VulcanClimateModeling.
-
-## Model Interface
-
-The top level functions fv_dynamics and fv_sugridz can currenty only be run in parallel using mpi with a minimum of 6 ranks (there are a few other units that also require this, e.g. whenever there is a halo update involved in a unit). These are the interface to the rest of the model and currently have different conventions than the rest of the model.
- - A 'state' object (currently a SimpleNamespace) stores pointers to the allocated data fields
- - Most functions within dyn_core can be run sequentially per rank
- - Currently a list of ArgSpecs must decorate an interface function, where each ArgSpec provides useful information about the argument, e.g.: `@state_inputs( ArgSpec("qvapor", "specific_humidity", "kg/kg", intent="inout")`
-   - The format is (fortran_name, long_name, units, intent)
-   - We currently provide a duplicate of most of the metadata in the specification of the unit test, but that may be removed eventually.
- - Then the function itself, e.g. fv_dynamics, has arguments of 'state', 'comm' (the communicator) and all of the scalar parameters being provided.
-
-### Porting conventions
-
-Generation of regression data occurs in the fv3gfs-fortran repo (https://github.com/VulcanClimateModeling/fv3gfs-fortran) with serialization statements and a build procedure defined in `tests/serialized_test_data_generation`. The version of data this repo currently tests against is defined in `FORTRAN_SERIALIZED_DATA_VERSION` in this repo's `docker/Makefile.image_names`. Fields serialized are defined in Fortran code with serialization comment statements such as:
-
-```
-    !$ser savepoint C_SW-In
-    !$ser data delpcd=delpc delpd=delp ptcd=ptc
-```
-
-where the name being assigned is the name the fv3core uses to identify the variable in the test code. When this name is not equal to the name of the variable, this was usually done to avoid conflicts with other parts of the code where the same name is used to reference a differently sized field.
-
-The majority of the logic for translating from data serialized from Fortran to something that can be used by Python, and the comparison of the results, is encompassed by the main Translate class in the tests/savepoint/translate/translate.py file. Any units not involving a halo update can be run using this framework, while those that need to be run in parallel can look to the ParallelTranslate class as the parent class in tests/savepoint/translate/parallel_translate.py. These parent classes provide generally useful operations for translating serialized data between Fortran and Python specifications, and for applying regression tests.
-
-A new unit test can be defined as a new child class of one of these, with a naming convention of `Translate<Savepoint Name>` where `Savepoint Name` is the name used in the serialization statements in the Fortran code, without the `-In` and `-Out` part of the name. A translate class can usually be minimally specify the input and output fields. Then, in cases where the parent compute function is insuffient to handle the complexity of either the data translation or the compute function, the appropriate methods can be overridden.
-
-For Translate objects
-  - The init function establishes the assumed translation setup for the class, which can be dynamically overridden as needed.
-  - the parent compute function does:
-    - Makes gt4py storages of the max shape (grid.npx+1, grid.npy+1, grid.npz+1) aligning the data based on the start indices specified. (gt4py requires data fields have the same shape, so in this model we have buffer points so all calculations can be done easily without worrying about shape matching).
-    - runs the compute function (defined in self.compute_func) on the input data storages
-    - slices the computed Python fields to be compared to fortran regression data
-  - The unit test then uses a modified relative error metric to determine whether the unit passes
-  - The init method for a Translate class:
-    - The input (self.in_vars["data_vars"]) and output(self.out_vars) variables are specified in dictionaries, where the keys are the name of the variable used in the model and the values are dictionaries specifying metadata for translation of serialized data to gt4py storages. The metadata that can be specied to override defaults are:
-    - Indices to line up data arrays into gt4py storages (which all get created as the max possible size needed by all operations, for simplicity): "istart", "iend", "jstart", "jend", "kstart", "kend". These should be set using the 'grid' object available to the Translate object, using equivalent index names as in the declaration of variables in the Fortran code, e.g. real:: cx(bd%is:bd%ie+1,bd%jsd:bd%jed ) means we should assign. Example:
-
-```python
-      self.in_vars["data_vars"]["cx"] = {"istart": self.is\_, "iend": self.ie + 1,
-                                         "jstart": self.jsd, "jend": self.jed,}
-```
-  - There is only a limited set of Fortran shapes declared, so abstractions defined in the grid can also be used,
-    e.g.: `self.out_vars["cx"] = self.grid.x3d_compute_domain_y_dict()`. Note that the variables, e.g. `grid.is\_` and `grid.ie` specify the 'compute' domain in the x direction of the current tile, equivalent to `bd%is` and `bd%ie` in the Fortran model EXCEPT that the Python variables are local to the current MPI rank (a subset of the tile face), while the Fortran values are global to the tile face. This is because these indices are used to slice into fields, which in Python is 0-based, and in Fortran is based on however the variables are declared. But, for the purposes of aligning data for computations and comparisons, we can match them in this framework. Shapes need to be defined in a dictionary per variable including `"istart"`, `"iend"`, `"jstart"`, `"jend"`, `"kstart"`, `"kend"` that represent the shape of that variable as defined in the Fortran code. The default shape assumed if a variable is specified with an empty dictionary is `isd:ied, jsd:jed, 0:npz - 1` inclusive, and variables that aren't that shape in the Fortran code need to have the 'start' indices specified for the in_vars dictionary , and 'start' and 'end' for the out_vars.
-    - `"serialname"` can be used to specify a name used in the Fortran code declaration if we'd like the model to use a different name
-    - `"kaxis"`: which dimension is the vertical direction. For most variables this is '2' and does not need to be specified. For Fortran variables that assign the vertical dimension to a different axis, this can be set to ensure we end up with 3d storages that have the vertical dimension where it is expected by GT4py.
-    - `"dummy_axes"`: If set this will set of the storage to have singleton dimensions in the axes defined. This is to enable testing stencils where the full 3d data has not been collected and we want to run stencil tests on the data for a particular slice.
-    - `"names_4d"`: If a 4d variable is being serialized, this can be set to specify the names of each 3d field. By default this is the list of tracers.
-    - input variables that are scalars should be added to `self.in_vars["parameters"]`
-    - `self.compute_func` is the name of the model function that should be run by the compute method in the translate class
-    - `self.max_error` overrides the parent classes relative error threshold. This should only be changed when the reasons for non-bit reproducibility are understood.
-    - `self.max_shape` sets the size of the gt4py storage created for testing
-    - `self.ignore_near_zero_errors[<varname>] = True`: This is an option to let some fields pass with higher relative error if the absolute error is very small
-    - `self.skip_test`: This is an option to jump over the test case, to be used in the override file for temporary deactivation of tests.
-
-For `ParallelTranslate` objects:
-  - Inputs and outputs are defined at the class level, and these include metadata such as the "name" (e.g. understandable name for the symbol), dimensions, units and n_halo(numb er of halo lines)
-  - Both `compute_sequential` and `compute_parallel` methods may be defined, where a mock communicator is used in the `compute_sequential` case
-  - The parent assumes a state object for tracking fields and methods exist for translating from inputs to a state object and extracting the output variables from the state. It is assumed that Quantity objects are needed in the model method in order to do halo updates.
-  - `ParallelTranslate2Py` is a slight variation of this used for many of the parallel units that do not yet utilize a state object and relies on the specification of the same index metadata of the Translate classes
-  - `ParallelTranslateBaseSlicing` makes use of the state but relies on the Translate object of self._base, a Translate class object, to align the data before making quantities, computing and comparing.
-
-### Debugging Tests
-
-Pytest can be configured to give you a pdb session when a test fails. To route this properly through docker, you can run:
-
-```bash
-TEST_ARGS="-v -s --pdb" RUN_FLAGS="--rm -it" make tests
-```
-
-This can be done with any pytest target, such as `make savepoint_tests` and `make savepoint_tests_mpi`.
-
-### GEOS API
-
-The `GeosDycoreWrapper` class provides an API to run the dynamical core in a Python component of a GEOS model run. A `GeosDycoreWrapper` object is initialized with a namelist, communicator, and backend, which creates the communicators, partitioners, dycore state, and dycore object required to run the Pace dycore. A wrapper object takes numpy arrays of `u, v, w, delz, pt, delp, q, ps, pe, pk, peln, pkz, phis, q_con, omga, ua, va, uc, vc, mfxd, mfyd, cxd, cyd,` and `diss_estd` and returns a dictionary containing numpy arrays of those same variables. Wrapper objects contain a `timer` attrubite that tracks the amount of time moving input data to the dycore state, running the dynamical core, and retrieving the data from the state.
diff --git a/pyFV3/convert_xppm_yppm.sh b/pyFV3/convert_xppm_yppm.sh
deleted file mode 100755
index 2316263a..00000000
--- a/pyFV3/convert_xppm_yppm.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-#
-# Script to convert xppm.py/xtp_u.py into yppm/ytp_v.py. Can be deleted once we
-# have a way to use the same codebase for x-direction and y-direction advection.
-#
-
-set -e -x
-
-cp pace/fv3core/stencils/xppm.py pace/fv3core/stencils/yppm.py
-cp pace/fv3core/stencils/xtp_u.py pace/fv3core/stencils/ytp_v.py
-
-for fname in pace/fv3core/stencils/yppm.py pace/fv3core/stencils/ytp_v.py
-do
-    gsed -i 's/ub/vb/g' $fname
-    gsed -i 's/dx/dy/g' $fname
-    gsed -i 's/xt/yt/g' $fname
-    gsed -i 's/eyternals/externals/g' $fname
-    gsed -i 's/xflux/yflux/g' $fname
-    gsed -i 's/_x/_y/g' $fname
-    gsed -i 's/_u/_v/g' $fname
-    gsed -i 's/u_/v_/g' $fname
-    gsed -i 's/u,/v,/g' $fname
-    gsed -i 's/u:/v:/g' $fname
-    gsed -i 's/u\[/v\[/g' $fname
-    gsed -i 's/u)/v)/g' $fname
-    gsed -i 's/iord/jord/g' $fname
-    gsed -i 's/\[-1, 0/\[0, -1/g' $fname
-    gsed -i 's/\[-2, 0/\[0, -2/g' $fname
-    gsed -i 's/\[1, 0/\[0, 1/g' $fname
-    gsed -i 's/\[2, 0/\[0, 2/g' $fname
-    gsed -i 's/ u / v /g' $fname
-    gsed -i 's/x-/y-/g' $fname
-    gsed -i 's/i_start/j_start/g' $fname
-    gsed -i 's/i_end/j_end/g' $fname
-    gsed -i 's/\[j_start - 1, :/\[:, j_start - 1/g' $fname
-    gsed -i 's/\[j_start, :/\[:, j_start/g' $fname
-    gsed -i 's/\[j_start + 1, :/\[:, j_start + 1/g' $fname
-    gsed -i 's/\[j_end - 2, :/\[:, j_end - 2/g' $fname
-    gsed -i 's/\[j_end - 1, :/\[:, j_end - 1/g' $fname
-    gsed -i 's/\[j_end, :/\[:, j_end/g' $fname
-    gsed -i 's/\[j_end + 1, :/\[:, j_end + 1/g' $fname
-    gsed -i 's/\[j_end + 2, :/\[:, j_end + 2/g' $fname
-done
-
-gsed -i 's/i_start/j_start/g' pace/fv3core/stencils/yppm.py
-gsed -i 's/i_end/j_end/g' pace/fv3core/stencils/yppm.py
-gsed -i 's/XPiecewise/YPiecewise/g' pace/fv3core/stencils/yppm.py
-gsed -i 's/u\*/v\*/g' pace/fv3core/stencils/yppm.py
-
-gsed -i 's/j_start - 1 : j_start + 1, j_start/i_start, j_start - 1 : j_start + 1/g' pace/fv3core/stencils/ytp_v.py
-gsed -i 's/j_start - 1 : j_start + 1, j_end + 1/i_end + 1, j_start - 1 : j_start + 1/g' pace/fv3core/stencils/ytp_v.py
-gsed -i 's/j_end : j_end + 2, j_start/i_start, j_end : j_end + 2/g' pace/fv3core/stencils/ytp_v.py
-gsed -i 's/j_end : j_end + 2, j_end + 1/i_end + 1, j_end : j_end + 2/g' pace/fv3core/stencils/ytp_v.py
-gsed -i 's/j_end, j_start, jord, j_end, j_start/j_end, j_start, jord, i_end, i_start/g' pace/fv3core/stencils/ytp_v.py
-gsed -i 's/xppm/yppm/g' pace/fv3core/stencils/ytp_v.py
-
-gsed -i 's/region\[j_start - 1 : j_start + 2, :\], region\[j_end - 1 : j_end + 2, :\]/region\[:, j_start - 1 : j_start + 2\], region\[:, j_end - 1 : j_end + 2\]/g' pace/fv3core/stencils/yppm.py
diff --git a/pyFV3/examples/standalone/benchmarks/README.md b/pyFV3/examples/standalone/benchmarks/README.md
deleted file mode 100644
index 61841d30..00000000
--- a/pyFV3/examples/standalone/benchmarks/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# How to get performance numbers
-
-## Daint
-
-### Arguments
-
-- timesteps: Number of timesteps to execute (this includes the first one as a warm up step)
-- ranks: Number of ranks to run with
-- backend: choice of gt4py backend
-- data_path: the test data
-
-### Constraints
-
-The data directory is expected to be serialized data (serialized by serialbox). The archive `dat_files.tar.gz` gets unpacked. The serialized data is also expected to have both the `input.nml` as well as the `*.yml` namelists present.
-
-### Output
-
-A `timing.json` file containing statistics over the ranks for execution time. The first timestep is counted towards `init`, the rest of the timesteps are in `main loop`. Total is inclusive of the other categories
-
-### Example
-
-`examples/standalone/benchmarks/run_on_daint.sh 60 6 gtx86`
diff --git a/pyFV3/examples/standalone/benchmarks/collect_memory_usage_data.py b/pyFV3/examples/standalone/benchmarks/collect_memory_usage_data.py
deleted file mode 100644
index bb7db7f3..00000000
--- a/pyFV3/examples/standalone/benchmarks/collect_memory_usage_data.py
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/env python3
-
-import json
-import os
-import statistics
-from argparse import ArgumentParser
-from datetime import datetime
-
-
-def parse_args():
-    usage = "python %(prog)s <run_dir> <hash> "
-    parser = ArgumentParser(usage=usage)
-    parser.add_argument(
-        "run_dir",
-        type=str,
-        action="store",
-        help="directory containing run.daint.out file(s) from which data is collected",
-    )
-    parser.add_argument(
-        "hash",
-        type=str,
-        action="store",
-        help="git hash to store",
-    )
-    return parser.parse_args()
-
-
-def gather_meta_data_from_line(output_line):
-    """parses the output line that ran the dynamics to extract the
-    dataset and the backend"""
-    experiment_call = output_line.split("/")
-    for index, path in enumerate(experiment_call):
-        if "fv3core_serialized_test_data" in path:
-            data_set = (experiment_call[index + 2]).split()[0]
-            backend = "python/" + (experiment_call[index + 3]).split()[2]
-            return data_set, backend
-
-
-def gather_memory_usage_from_file(filename):
-    """parses the output and collects data on gpu memory usage"""
-    collected_data = {
-        "data": [],
-        "data_set": "",
-        "backend": "",
-    }
-    with open(filename) as datafile:
-        all_lines = datafile.readlines()
-        for index, line in enumerate(all_lines):
-            if "fv3core_serialized_test_data" in line:
-                (
-                    collected_data["data_set"],
-                    collected_data["backend"],
-                ) = gather_meta_data_from_line(line)
-            elif "GPU utilization data" in line:
-                # skip the four header lines
-                data_lines = all_lines[index + 4 :]
-                for line in data_lines:
-                    splits = line.split()
-                    if len(splits) > 1 and splits[1].isnumeric():
-                        collected_data["data"].append(float(splits[1]))
-                    else:
-                        break
-                break
-        return collected_data
-
-
-def write_to_file(collected_data, git_hash):
-    """writes statistics and metadata to a json
-    file that is parsable by the plotting tool"""
-    if len(collected_data["data"]) > 0:
-        now = datetime.now()
-        memory_footprint = {
-            "minimum": min(collected_data["data"]),
-            "maximum": max(collected_data["data"]),
-            "mean": statistics.mean(collected_data["data"]),
-            "setup": {
-                "hash": git_hash,
-                "timestamp": now.strftime("%d/%m/%Y %H:%M:%S"),
-                "version": collected_data["backend"],
-                "dataset": collected_data["data_set"],
-            },
-        }
-        timestamp = now.strftime("%Y-%m-%d-%H-%M-%S")
-        with open(timestamp + "_memory_usage.json", "w") as output:
-            json.dump(memory_footprint, output, sort_keys=True, indent=4)
-
-
-if __name__ == "__main__":
-    args = parse_args()
-    file_path = os.path.join(args.run_dir, "run.daint.out")
-    if not os.path.isfile(file_path):
-        raise ValueError(f"Could not find file {file_path}")
-    collected_data = gather_memory_usage_from_file(file_path)
-    write_to_file(collected_data, args.hash)
diff --git a/pyFV3/examples/standalone/benchmarks/run_on_daint.sh b/pyFV3/examples/standalone/benchmarks/run_on_daint.sh
deleted file mode 100755
index dcb35002..00000000
--- a/pyFV3/examples/standalone/benchmarks/run_on_daint.sh
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/bin/bash
-
-#############################################
-# Example syntax:
-# ./run_on_daint.sh 60 6 gtx86 <path_to_serialized_data>
-
-## Arguments:
-# $1: number of timesteps to run
-# $2: number of ranks to execute with (ensure that this is compatible with fv3core)
-# $3: backend to use in gt4py
-# $4: path to the data directory that should be run
-# $5: (optional) arguments to pass to python invocation
-# $6: (optional) arguments to pass to dynamics.py invocation
-# $7: (optional) true|false wraps an extra 2 timestep run in nsys
-
-# stop on all errors
-set -e
-
-# configuration
-SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-FV3CORE_DIR="$(dirname "$(dirname "$(dirname "$SCRIPT_DIR")")")"
-BUILDENV_DIR="$FV3CORE_DIR/../buildenv"
-PACE_DIR=$SCRIPT_DIR/../../../../
-NTHREADS=12
-
-
-# utility functions
-function exitError()
-{
-    echo "ERROR $1: $3" 1>&2
-    echo "ERROR     LOCATION=$0" 1>&2
-    echo "ERROR     LINE=$2" 1>&2
-    exit $1
-}
-
-function cleanupFailedJob {
-    res=$1
-    jobout=$2
-    jobid=`echo "${res}" | sed  's/^Submitted batch job //g'`
-    test -n "${jobid}" || exitError 7207 ${LINENO} "problem determining job ID of SLURM job"
-    echo "jobid:" ${jobid}
-    status=`sacct --jobs ${jobid} -X -p -n -b -D `
-    while [[ $status == *"COMPLETING"* ]]; do
-        if [ $timeout -lt 120 ]; then
-	    status=`sacct --jobs ${jobid} -p -n -b -D `
-	    sleep 30
-	    timeout=$timeout + 30
-        else
-            exitError 1004 ${LINENO} "problem waiting for job ${jobid} to complete"
-        fi
-    done
-    if [[ ! $status == *"COMPLETED"* ]]; then
-        echo ${status}
-        echo `cat ${jobout}`
-        rm -rf .gt_cache*
-        pip list
-        deactivate
-        rm -rf venv
-        exitError 1003 ${LINENO} "problem in slurm job"
-    fi
-}
-
-# check sanity of environment
-test -n "$1" || exitError 1001 ${LINENO} "must pass a number of timesteps"
-timesteps="$1"
-test -n "$2" || exitError 1002 ${LINENO} "must pass a number of ranks"
-ranks="$2"
-test -n "$3" || exitError 1003 ${LINENO} "must pass a backend"
-backend="$3"
-test -n "$4" || exitError 1004 ${LINENO} "must pass a data path"
-data_path="$4"
-py_args="$5"
-run_args="$6"
-DO_NSYS_RUN="$7"
-
-
-# get dependencies
-cd $FV3CORE_DIR
-git submodule update --init
-
-
-# set up the virtual environment
-echo "creating the venv"
-if [ -d ./venv ] ; then rm -rf venv ; fi
-if [ -d ./gt4py ] ; then rm -rf gt4py ; fi
-cd $FV3CORE_DIR
-$PACE_DIR/.jenkins/install_virtualenv.sh $FV3CORE_DIR/venv
-source ./venv/bin/activate
-pip list
-
-# set the environment
-cp $BUILDENV_DIR/submit.daint.slurm compile.daint.slurm
-cp $BUILDENV_DIR/submit.daint.slurm run.daint.slurm
-if [ "${DO_NSYS_RUN}" == "true" ] ; then
-    cp $BUILDENV_DIR/submit.daint.slurm run.nsys.daint.slurm
-fi
-
-if git rev-parse --git-dir > /dev/null 2>&1 ; then
-  githash=`git rev-parse HEAD`
-else
-  githash="notarepo"
-fi
-
-split_path=(${data_path//\// })
-experiment=${split_path[-1]}
-
-echo "Configuration overview:"
-echo "    Root dir:          $FV3CORE_DIR"
-echo "    Timesteps:         $timesteps"
-echo "    Ranks:             $ranks"
-echo "    Backend:           $backend"
-echo "    Input data dir:    $data_path"
-echo "    Experiment:        $experiment"
-echo "    Threads per rank:  $NTHREADS"
-echo "    GIT hash:          $githash"
-echo "    Python arguments:  $py_args"
-echo "    Run arguments:     $run_args"
-echo "    Extra run in nsys: $DO_NSYS_RUN"
-
-
-$FV3CORE_DIR/../.jenkins/fetch_caches.sh $backend $EXPNAME dycore
-tile_size=$(( ranks / 6 ))
-COMPILING_RANKS=$(( 3 < tile_size ? 3 : tile_size ))
-CPU_PER_TASK=$(( 12 / COMPILING_RANKS ))
-env_vars="export PYTHONOPTIMIZE=TRUE\nexport CRAY_CUDA_MPS=1"
-clear_cache="rm -rf $FV3CORE_DIR/.gt_cache*"
-set_up_cache_dir="export GT_CACHE_DIR_NAME=/tmp"
-execution="srun python examples/standalone/runfile/compile.py $data_path $backend $FV3CORE_DIR"
-run_command="$env_vars\n$clear_cache\n$set_up_cache_dir\n$execution"
-# Adapt batch script to compile the code:
-sed -i "s/<NAME>/compilestandalone/g" compile.daint.slurm
-sed -i "s/<NTASKS>/$COMPILING_RANKS/g" compile.daint.slurm
-sed -i "s/<NTASKSPERNODE>/$COMPILING_RANKS/g" compile.daint.slurm
-sed -i "s/<CPUSPERTASK>/$CPU_PER_TASK/g" compile.daint.slurm
-sed -i "s/<OUTFILE>/compile.daint.out\n#SBATCH --hint=nomultithread/g" compile.daint.slurm
-sed -i "s/<TIMEOUT>/03:00:00/g" compile.daint.slurm
-sed -i "s#<CMD>#$run_command#g" compile.daint.slurm
-
-
-env_vars="export PYTHONOPTIMIZE=TRUE\nexport CRAY_CUDA_MPS=0"
-# Adapt batch script to run the code:
-sed -i "s/<NAME>/standalone/g" run.daint.slurm
-sed -i "s/<NTASKS>/$ranks/g" run.daint.slurm
-sed -i "s/<NTASKSPERNODE>/1/g" run.daint.slurm
-sed -i "s/<CPUSPERTASK>/$NTHREADS/g" run.daint.slurm
-sed -i "s/<OUTFILE>/run.daint.out\n#SBATCH --hint=nomultithread/g" run.daint.slurm
-sed -i "s/<TIMEOUT>/00:45:00/g" run.daint.slurm
-sed -i "s/cscsci/normal/g" run.daint.slurm
-sed -i "s#<CMD>#$env_vars\nsrun python $py_args examples/standalone/runfile/dynamics.py $data_path $timesteps $backend $githash $run_args#g" run.daint.slurm
-
-echo "submitting script to do compilation"
-set +e
-res=$(sbatch -W -C gpu compile.daint.slurm 2>&1)
-status1=$?
-grep -q SUCCESS compile.daint.out
-status2=$?
-set -e
-wait
-echo "DONE WAITING ${status1} ${status2}"
-if [ $status1 -ne 0 -o $status2 -ne 0 ] ; then
-    cleanupFailedJob "${res}" compile.daint.out
-    echo "ERROR: compilation step failed"
-    exit 1
-else
-    echo "compilation step finished"
-fi
-
-echo "Submitting script to do performance run"
-set +e
-res=$(sbatch -W -C gpu run.daint.slurm 2>&1)
-status1=$?
-grep -q SUCCESS run.daint.out
-status2=$?
-set -e
-wait
-echo "DONE WAITING ${status1} ${status2}"
-if [ $status1 -ne 0 -o $status2 -ne 0 ] ; then
-    if [ ! -z "${BUILD_TAG}" ] ; then
-	cleanupFailedJob "${res}" run.daint.out
-    fi
-    echo "ERROR: performance run not sucessful"
-    exit 1
-else
-    echo "performance run sucessful"
-fi
-
-if [ "${DO_NSYS_RUN}" == "true" ] ; then
-    module load nvidia-nsight-systems/2021.1.1.66-6c5c5cb
-    echo "Install performance_visualization package"
-    git clone git@github.com:ai2cm/performance_visualization.git
-    pip install -e performance_visualization.git
-    echo "submitting script to do performance run wrapped by nsys"
-    # Adapt batch script to run the code:
-    sed -i "s/<NAME>/standalone/g" run.nsys.daint.slurm
-    sed -i "s/<NTASKS>/$ranks/g" run.nsys.daint.slurm
-    sed -i "s/<NTASKSPERNODE>/1/g" run.nsys.daint.slurm
-    sed -i "s/<CPUSPERTASK>/$NTHREADS/g" run.nsys.daint.slurm
-    sed -i "s/<OUTFILE>/run.nsys.daint.out\n#SBATCH --hint=nomultithread/g" run.nsys.daint.slurm
-    sed -i "s/<TIMEOUT>/00:40:00/g" run.nsys.daint.slurm
-    sed -i "s/cscsci/normal/g" run.nsys.daint.slurm
-    sed -i "s#<CMD>#srun nsys profile --force-overwrite=true -o %h.%q{SLURM_NODEID}.%q{SLURM_PROCID}.qdstrm --trace=cuda,mpi,nvtx --mpi-impl=mpich python ./performance_visualization/analysis/pywrapper.py --config ./performance_visualization/config_examples/f3core.json --nvtx examples/standalone/runfile/dynamics.py $data_path 3 $backend $githash --disable_json_dump#g" run.nsys.daint.slurm
-    # execute on a gpu node
-    set +e
-    res=$(sbatch -W -C gpu run.nsys.daint.slurm 2>&1)
-    status1=$?
-    grep -q SUCCESS run.nsys.daint.out
-    status2=$?
-    set -e
-    wait
-    echo "DONE WAITING ${status1} ${status2}"
-    if [ $status1 -ne 0 -o $status2 -ne 0 ] ; then
-	if [ ! -z "${BUILD_TAG}" ] ; then
-            cleanupFailedJob "${res}" run.nsys.daint.out
-	fi
-        echo "ERROR: performance run wrapped by nsys not sucessful"
-        exit 1
-    else
-        echo "performance run wrapped by nsys sucessful"
-    fi
-fi
-
-python examples/standalone/benchmarks/collect_memory_usage_data.py . $githash
diff --git a/pyFV3/examples/standalone/runfile/__init__.py b/pyFV3/examples/standalone/runfile/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/pyFV3/examples/standalone/runfile/acoustics.py b/pyFV3/examples/standalone/runfile/acoustics.py
deleted file mode 100755
index 5e4c8b78..00000000
--- a/pyFV3/examples/standalone/runfile/acoustics.py
+++ /dev/null
@@ -1,224 +0,0 @@
-#!/usr/bin/env python3
-# type: ignore
-from types import SimpleNamespace
-from typing import Any, Dict, List, Optional, Tuple
-
-import click
-import f90nml
-import ndsl.dsl
-import ndsl.util as util
-import serialbox
-import yaml
-from ndsl.comm.null_comm import NullComm
-from ndsl.dsl.dace.orchestration import DaceConfig
-from ndsl.dsl.stencil import CompilationConfig
-from ndsl.stencils.testing.grid import Grid
-from timing import collect_data_and_write_to_file
-
-from pyFV3._config import DynamicalCoreConfig
-from pyFV3.stencils.dyn_core import AcousticDynamics
-from pyFV3.testing import TranslateDynCore
-
-
-try:
-    from mpi4py import MPI
-except ImportError:
-    MPI = None
-
-
-def dycore_config_from_namelist(data_directory: str) -> DynamicalCoreConfig:
-    """
-    Reads the namelist at the given directory and sets
-    the global pyFV3 config to it
-    """
-    namelist = f90nml.read(data_directory + "/input.nml")
-    dycore_config = DynamicalCoreConfig.from_f90nml(namelist)
-    return dycore_config
-
-
-def initialize_serializer(data_directory: str, rank: int = 0) -> serialbox.Serializer:
-    """Creates a Serializer based on the data-directory and the rank"""
-    return serialbox.Serializer(
-        serialbox.OpenModeKind.Read,
-        data_directory,
-        "Generator_rank" + str(rank),
-    )
-
-
-def read_input_data(
-    grid: Grid,
-    namelist: DynamicalCoreConfig,
-    stencil_factory: ndsl.dsl.stencil.StencilFactory,
-    serializer: serialbox.Serializer,
-) -> Dict[str, Any]:
-    """Uses the serializer to read the input data from disk"""
-    driver_object = TranslateDynCore([grid], namelist, stencil_factory)
-    savepoint_in = serializer.get_savepoint("DynCore-In")[0]
-    return driver_object.collect_input_data(serializer, savepoint_in)
-
-
-def get_state_from_input(
-    grid: Grid, namelist, stencil_config, input_data: Dict[str, Any]
-) -> Dict[str, SimpleNamespace]:
-    """
-    Transforms the input data from the dictionary of strings
-    to arrays into a state we can pass in.
-
-    This will also take care of reshaping the arrays into same sized
-    fields as required by the acoustics.
-    """
-    driver_object = TranslateDynCore([grid], namelist, stencil_config)
-    driver_object._base.make_storage_data_input_vars(input_data)
-
-    inputs = driver_object.inputs
-    for name, properties in inputs.items():
-        grid.quantity_dict_update(
-            input_data, name, dims=properties["dims"], units=properties["units"]
-        )
-
-    statevars = SimpleNamespace(**input_data)
-    return {"state": statevars}
-
-
-def set_up_communicator(
-    disable_halo_exchange: bool,
-    layout: Tuple[int, int],
-) -> Tuple[Optional[MPI.Comm], Optional[util.CubedSphereCommunicator]]:
-    partitioner = util.CubedSpherePartitioner(util.TilePartitioner(layout))
-    if MPI is not None:
-        comm = MPI.COMM_WORLD
-    else:
-        comm = None
-    if not disable_halo_exchange:
-        assert comm is not None
-        cube_comm = util.CubedSphereCommunicator(comm, partitioner)
-    else:
-        cube_comm = util.CubedSphereCommunicator(NullComm(0, 0), partitioner)
-    return comm, cube_comm
-
-
-def get_experiment_name(
-    data_directory: str,
-) -> str:
-    return yaml.safe_load(
-        open(
-            data_directory + "/input.yml",
-            "r",
-        )
-    )["experiment_name"]
-
-
-def initialize_timers() -> Tuple[util.Timer, util.Timer, List, List]:
-    total_timer = util.Timer()
-    total_timer.start("total")
-    timestep_timer = util.Timer()
-    return total_timer, timestep_timer, [], []
-
-
-def read_and_reset_timer(timestep_timer, times_per_step, hits_per_step):
-    times_per_step.append(timestep_timer.times)
-    hits_per_step.append(timestep_timer.hits)
-    timestep_timer.reset()
-    return times_per_step, hits_per_step
-
-
-@click.command()
-@click.argument("data_directory", required=True, nargs=1)
-@click.argument("time_steps", required=False, default="1")
-@click.argument("backend", required=False, default="gt:cpu_ifirst")
-@click.option("--disable_halo_exchange/--no-disable_halo_exchange", default=False)
-@click.option("--print_timings/--no-print_timings", default=True)
-def driver(
-    data_directory: str,
-    time_steps: str,
-    backend: str,
-    disable_halo_exchange: bool,
-    print_timings: bool,
-):
-    total_timer, timestep_timer, times_per_step, hits_per_step = initialize_timers()
-    with total_timer.clock("initialization"):
-        dycore_config = dycore_config_from_namelist(data_directory)
-        serializer = initialize_serializer(data_directory)
-        layout = dycore_config.layout
-        mpi_comm, communicator = set_up_communicator(
-            disable_halo_exchange, layout=layout
-        )
-        grid = Grid.with_data_from_namelist(dycore_config, communicator, backend)
-        dace_config = DaceConfig(
-            communicator,
-            backend,
-            tile_nx=dycore_config.npx,
-            tile_nz=dycore_config.npz,
-        )
-        stencil_config = ndsl.dsl.stencil.StencilConfig(
-            compilation_config=CompilationConfig(
-                backend=backend, rebuild=False, validate_args=True
-            ),
-            dace_config=dace_config,
-        )
-        stencil_factory = ndsl.dsl.stencil.StencilFactory(
-            config=stencil_config,
-            grid_indexing=grid.grid_indexing,
-        )
-        input_data = read_input_data(grid, dycore_config, stencil_factory, serializer)
-        experiment_name = get_experiment_name(data_directory)
-        nested = False
-        stretched_grid = False
-
-        state = get_state_from_input(grid, dycore_config, stencil_config, input_data)
-
-        acoustics_object = AcousticDynamics(
-            communicator,
-            stencil_factory,
-            grid.grid_data,
-            grid.damping_coefficients,
-            dycore_config.grid_type,
-            nested,
-            stretched_grid,
-            dycore_config.acoustic_dynamics,
-            input_data["phis"],
-            input_data["wsd"],
-            state,
-        )
-
-        # warm-up timestep.
-        # We're intentionally not passing the timer here to exclude
-        # warmup/compilation from the internal timers
-        acoustics_object(
-            state,
-            n_map=state["n_map"],
-        )
-
-    # we set up a specific timer for each timestep
-    # that is cleared after so we get individual statistics
-    for _ in range(int(time_steps) - 1):
-        # this loop is not required
-        # but make performance numbers comparable with FVDynamics
-        for _ in range(dycore_config.k_split):
-            with timestep_timer.clock("DynCore"):
-                acoustics_object(state, n_map=state["n_map"])
-        times_per_step, hits_per_step = read_and_reset_timer(
-            timestep_timer, times_per_step, hits_per_step
-        )
-    total_timer.stop("total")
-    times_per_step, hits_per_step = read_and_reset_timer(
-        total_timer, times_per_step, hits_per_step
-    )
-
-    experiment_info = {
-        "name": "acoustics",
-        "dataset": experiment_name,
-        "timesteps": time_steps,
-        "backend": backend,
-        "halo_update": not disable_halo_exchange,
-        "hash": "",
-    }
-    if print_timings:
-        # Collect times and output statistics in json
-        collect_data_and_write_to_file(
-            mpi_comm, hits_per_step, times_per_step, experiment_info
-        )
-
-
-if __name__ == "__main__":
-    driver()
diff --git a/pyFV3/examples/standalone/runfile/compile.py b/pyFV3/examples/standalone/runfile/compile.py
deleted file mode 100755
index a9ee594f..00000000
--- a/pyFV3/examples/standalone/runfile/compile.py
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/env python3
-import math
-import os
-import shutil
-import sys
-from argparse import ArgumentParser, Namespace
-
-import f90nml
-import gt4py.cartesian.config
-import ndsl.dsl.stencil  # noqa: F401
-from ndsl.comm.null_comm import NullComm
-
-from pyFV3._config import DynamicalCoreConfig
-
-
-try:
-    from mpi4py import MPI
-except ImportError:
-    MPI = None
-
-local = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-sys.path.insert(0, local)
-from runfile.dynamics import get_experiment_info, setup_dycore  # noqa: E402
-
-
-def parse_args() -> Namespace:
-    parser = ArgumentParser()
-
-    parser.add_argument(
-        "data_dir",
-        type=str,
-        action="store",
-        help="directory containing data to run with",
-    )
-    parser.add_argument(
-        "backend",
-        type=str,
-        action="store",
-        help="gt4py backend to use",
-    )
-    parser.add_argument(
-        "target_dir",
-        type=str,
-        action="store",
-        help="directory to copy the caches to",
-    )
-
-    return parser.parse_args()
-
-
-if __name__ == "__main__":
-    args = parse_args()
-    namelist = f90nml.read(args.data_dir + "/input.nml")
-    experiment_name, is_baroclinic_test_case = get_experiment_info(args.data_dir)
-    dycore_config = DynamicalCoreConfig.from_f90nml(namelist)
-    if MPI is not None:
-        comm = MPI.COMM_WORLD
-        global_rank = comm.Get_rank()
-        size = comm.Get_size()
-    else:
-        comm = None
-        global_rank = 0
-        size = 1
-    sub_tiles = dycore_config.layout[0] * dycore_config.layout[1]
-    iterations = math.ceil(sub_tiles / size)
-    gt4py.cartesian.config.cache_settings["root_path"] = os.environ.get(
-        "GT_CACHE_DIR_NAME", "."
-    )
-    for iteration in range(iterations):
-        top_tile_rank = global_rank + size * iteration
-        if top_tile_rank < sub_tiles:
-            mpi_comm = NullComm(
-                rank=top_tile_rank,
-                total_ranks=6 * sub_tiles,
-                fill_value=0.0,
-            )
-            gt4py.cartesian.config.cache_settings["dir_name"] = os.environ.get(
-                "GT_CACHE_ROOT", f".gt_cache_{mpi_comm.Get_rank():06}"
-            )
-            dycore, dycore_args, stencil_factory = setup_dycore(
-                dycore_config,
-                mpi_comm,
-                args.backend,
-                is_baroclinic_test_case,
-                args.data_dir,
-            )
-            if stencil_factory.config.dace_config.is_dace_orchestrated():
-                raise RuntimeError(
-                    "cannot use a setup of the dycore to initialize "
-                    "orchestrated code, the code needs to be run!"
-                )
-            print(f"rank {global_rank} compiled target rank {top_tile_rank}")
-    # NOTE (jdahm): Temporary until driver initialization-based cache is merged
-    if comm is not None:
-        comm.Barrier()
-    root_path = gt4py.cartesian.config.cache_settings["root_path"]
-    for iter in range(iterations):
-        top_tile_rank = global_rank + size * iter
-        if top_tile_rank < sub_tiles:
-            for tile in range(6):
-                shutil.copytree(
-                    f"{root_path}/.gt_cache_{top_tile_rank:06}",
-                    f"{args.target_dir}/.gt_cache"
-                    f"_{(top_tile_rank + tile*sub_tiles):06}",
-                    dirs_exist_ok=True,
-                )
-                print(
-                    f"rank {global_rank} copied for "
-                    f"target rank {(top_tile_rank + tile*sub_tiles)}"
-                )
-    if comm is not None:
-        comm.Barrier()
-    print(f"rank {global_rank} is past the barrier, exiting")
-    if global_rank == 0:
-        print("SUCCESS")
diff --git a/pyFV3/examples/standalone/runfile/dynamics.py b/pyFV3/examples/standalone/runfile/dynamics.py
deleted file mode 100755
index 1cee3d35..00000000
--- a/pyFV3/examples/standalone/runfile/dynamics.py
+++ /dev/null
@@ -1,349 +0,0 @@
-#!/usr/bin/env python3
-# type: ignore
-
-import copy
-import json
-import os
-from argparse import ArgumentParser, Namespace
-from datetime import datetime, timedelta
-from typing import Any, Dict, List, Tuple
-
-import f90nml
-
-# NOTE: we need to import dsl.stencil prior to
-# ndsl.util, otherwise xarray precedes gt4py, causing
-# very strange errors on some systems (e.g. daint)
-import ndsl.dsl.stencil
-import ndsl.util as util
-import numpy as np
-import xarray as xr
-import yaml
-from mpi4py import MPI
-from ndsl.comm.null_comm import NullComm
-from ndsl.dsl import StencilFactory
-from ndsl.dsl.dace.orchestration import DaceConfig
-from ndsl.grid import DampingCoefficients, GridData, MetricTerms
-from ndsl.stencils.testing import dataset_to_dict
-from ndsl.stencils.testing.grid import Grid
-
-from pyFV3 import DynamicalCore, DynamicalCoreConfig
-from pyFV3.dycore_state import DycoreState
-from pyFV3.initialization.baroclinic import init_baroclinic_state
-from pyFV3.testing import TranslateFVDynamics
-
-
-def parse_args() -> Namespace:
-    parser = ArgumentParser()
-
-    parser.add_argument(
-        "data_dir",
-        type=str,
-        action="store",
-        help="directory containing data to run with",
-    )
-    parser.add_argument(
-        "time_step",
-        type=int,
-        action="store",
-        help="number of timesteps to execute",
-    )
-    parser.add_argument(
-        "backend",
-        type=str,
-        action="store",
-        help="gt4py backend to use",
-    )
-    parser.add_argument(
-        "hash",
-        type=str,
-        action="store",
-        help="git hash to store",
-    )
-    parser.add_argument(
-        "--disable_halo_exchange",
-        action="store_true",
-        help="enable or disable the halo exchange",
-    )
-    parser.add_argument(
-        "--disable_json_dump",
-        action="store_true",
-        help="enable or disable json dump",
-    )
-    parser.add_argument(
-        "--profile",
-        action="store_true",
-        help="enable performance profiling using cProfile",
-    )
-
-    return parser.parse_args()
-
-
-def set_experiment_info(
-    experiment_name: str, time_step: int, backend: str, git_hash: str
-) -> Dict[str, Any]:
-    experiment: Dict[str, Any] = {}
-    now = datetime.now()
-    dt_string = now.strftime("%d/%m/%Y %H:%M:%S")
-    experiment["setup"] = {}
-    experiment["setup"]["timestamp"] = dt_string
-    experiment["setup"]["dataset"] = experiment_name
-    experiment["setup"]["timesteps"] = time_step
-    experiment["setup"]["hash"] = git_hash
-    experiment["setup"]["version"] = "python/" + backend
-    experiment["setup"]["format_version"] = 2
-    experiment["times"] = {}
-    return experiment
-
-
-def collect_keys_from_data(times_per_step: List[Dict[str, float]]) -> List[str]:
-    """Collects all the keys in the list of dics and returns a sorted version"""
-    keys = set()
-    for data_point in times_per_step:
-        for k, _ in data_point.items():
-            keys.add(k)
-    sorted_keys = list(keys)
-    sorted_keys.sort()
-    return sorted_keys
-
-
-def gather_timing_data(
-    times_per_step: List[Dict[str, float]],
-    results: Dict[str, Any],
-    comm: MPI.Comm,
-    root: int = 0,
-) -> Dict[str, Any]:
-    """returns an updated version of  the results dictionary owned
-    by the root node to hold data on the substeps as well as the main loop timers"""
-    is_root = comm.Get_rank() == root
-    keys = collect_keys_from_data(times_per_step)
-    data: List[float] = []
-    for timer_name in keys:
-        data.clear()
-        for data_point in times_per_step:
-            if timer_name in data_point:
-                data.append(data_point[timer_name])
-
-        sendbuf = np.array(data)
-        recvbuf = None
-        if is_root:
-            recvbuf = np.array([data] * comm.Get_size())
-        comm.Gather(sendbuf, recvbuf, root=0)
-        if is_root:
-            results["times"][timer_name]["times"] = copy.deepcopy(recvbuf.tolist())
-    return results
-
-
-def write_global_timings(experiment: Dict[str, Any]) -> None:
-    now = datetime.now()
-    filename = now.strftime("%Y-%m-%d-%H-%M-%S")
-    with open(filename + ".json", "w") as outfile:
-        json.dump(experiment, outfile, sort_keys=True, indent=4)
-
-
-def gather_hit_counts(
-    hits_per_step: List[Dict[str, int]], results: Dict[str, Any]
-) -> Dict[str, Any]:
-    """collects the hit count across all timers called in a program execution"""
-    for data_point in hits_per_step:
-        for name, value in data_point.items():
-            if name not in results["times"]:
-                print(name)
-                results["times"][name] = {"hits": value, "times": []}
-            else:
-                results["times"][name]["hits"] += value
-    return results
-
-
-def get_experiment_info(data_directory: str) -> Tuple[str, bool]:
-    config_yml = yaml.safe_load(
-        open(
-            data_directory + "/input.yml",
-            "r",
-        )
-    )
-    is_baroclinic_test_case = False
-    if (
-        "test_case_nml" in config_yml["namelist"].keys()
-        and config_yml["namelist"]["test_case_nml"]["test_case"] == 13
-    ):
-        is_baroclinic_test_case = True
-    print(
-        "Running "
-        + config_yml["experiment_name"]
-        + ", and using the baroclinic test case?: "
-        + str(is_baroclinic_test_case)
-    )
-    return config_yml["experiment_name"], is_baroclinic_test_case
-
-
-def read_serialized_initial_state(rank, grid, namelist, stencil_factory, data_dir):
-    ds = xr.open_dataset(os.path.join(data_dir, "Driver-In.nc")).sel(
-        savepoint=0, rank=rank
-    )
-    input_data = dataset_to_dict(ds)
-    driver_object = TranslateFVDynamics(grid, namelist, stencil_factory)
-    state = driver_object.state_from_inputs(input_data)
-    return state
-
-
-def collect_data_and_write_to_file(
-    args: Namespace, comm: MPI.Comm, hits_per_step, times_per_step, experiment_name
-) -> None:
-    """
-    collect the gathered data from all the ranks onto rank 0 and write the timing file
-    """
-    is_root = comm.Get_rank() == 0
-    results = None
-    if is_root:
-        print("Gathering Times")
-        results = set_experiment_info(
-            experiment_name, args.time_step, args.backend, args.hash
-        )
-        results = gather_hit_counts(hits_per_step, results)
-
-    results = gather_timing_data(times_per_step, results, comm)
-
-    if is_root:
-        write_global_timings(results)
-
-
-def setup_dycore(
-    dycore_config, mpi_comm, backend, is_baroclinic_test_case, data_dir
-) -> Tuple[DynamicalCore, DycoreState, StencilFactory]:
-    # set up grid-dependent helper structures
-    partitioner = util.CubedSpherePartitioner(
-        util.TilePartitioner(dycore_config.layout)
-    )
-    communicator = util.CubedSphereCommunicator(mpi_comm, partitioner)
-    grid = Grid.from_namelist(dycore_config, mpi_comm.rank, backend)
-
-    dace_config = DaceConfig(
-        communicator,
-        backend,
-        tile_nx=dycore_config.npx,
-        tile_nz=dycore_config.npz,
-    )
-    stencil_config = ndsl.dsl.stencil.StencilConfig(
-        compilation_config=ndsl.dsl.stencil.CompilationConfig(
-            backend=backend, rebuild=False, validate_args=False
-        ),
-        dace_config=dace_config,
-    )
-    stencil_factory = StencilFactory(
-        config=stencil_config,
-        grid_indexing=grid.grid_indexing,
-    )
-    metric_terms = MetricTerms.from_tile_sizing(
-        npx=dycore_config.npx,
-        npy=dycore_config.npy,
-        npz=dycore_config.npz,
-        communicator=communicator,
-        backend=backend,
-    )
-    if is_baroclinic_test_case:
-        # create an initial state from the Jablonowski & Williamson Baroclinic
-        # test case perturbation. JRMS2006
-        state = init_baroclinic_state(
-            metric_terms,
-            adiabatic=dycore_config.adiabatic,
-            hydrostatic=dycore_config.hydrostatic,
-            moist_phys=dycore_config.moist_phys,
-            comm=communicator,
-        )
-    else:
-        state = read_serialized_initial_state(
-            mpi_comm.rank, grid, dycore_config, stencil_factory, data_dir
-        )
-    dycore = DynamicalCore(
-        comm=communicator,
-        grid_data=GridData.new_from_metric_terms(metric_terms),
-        stencil_factory=stencil_factory,
-        damping_coefficients=DampingCoefficients.new_from_metric_terms(metric_terms),
-        config=dycore_config,
-        phis=state.phis,
-        state=state,
-        timestep=timedelta(seconds=dycore_config.dt_atmos),
-    )
-    return dycore, state, stencil_factory
-
-
-if __name__ == "__main__":
-    timer = util.Timer()
-    timer.start("total")
-    with timer.clock("initialization"):
-        args = parse_args()
-        comm = MPI.COMM_WORLD
-        rank = comm.Get_rank()
-
-        profiler = None
-        if args.profile:
-            import cProfile
-
-            profiler = cProfile.Profile()
-            profiler.disable()
-
-        namelist = f90nml.read(args.data_dir + "/input.nml")
-        dycore_config = DynamicalCoreConfig.from_f90nml(namelist)
-        experiment_name, is_baroclinic_test_case = get_experiment_info(args.data_dir)
-        if args.disable_halo_exchange:
-            mpi_comm = NullComm(MPI.COMM_WORLD.Get_rank(), MPI.COMM_WORLD.Get_size())
-        else:
-            mpi_comm = MPI.COMM_WORLD
-        dycore, state, stencil_factory = setup_dycore(
-            dycore_config,
-            mpi_comm,
-            args.backend,
-            is_baroclinic_test_case,
-            args.data_dir,
-        )
-
-        # warm-up timestep.
-        # We're intentionally not passing the timer here to exclude
-        # warmup/compilation from the internal timers
-        if rank == 0:
-            print("timestep 1")
-        dycore.step_dynamics(state, timer)
-
-    if profiler is not None:
-        profiler.enable()
-
-    times_per_step = []
-    hits_per_step = []
-    # we set up a specific timer for each timestep
-    # that is cleared after so we get individual statistics
-    timestep_timer = util.Timer()
-    for i in range(args.time_step - 1):
-        with timestep_timer.clock("mainloop"):
-            if rank == 0:
-                print(f"timestep {i+2}")
-            dycore.step_dynamics(state, timer=timestep_timer)
-        times_per_step.append(timestep_timer.times)
-        hits_per_step.append(timestep_timer.hits)
-        timestep_timer.reset()
-
-    if profiler is not None:
-        profiler.disable()
-
-    timer.stop("total")
-    times_per_step.append(timer.times)
-    hits_per_step.append(timer.hits)
-
-    # output profiling data
-    if profiler is not None:
-        profiler.dump_stats(f"fv3core_{experiment_name}_{args.backend}_{rank}.prof")
-
-    # Timings
-    if not args.disable_json_dump:
-        # Collect times and output statistics in json
-        MPI.COMM_WORLD.Barrier()
-        collect_data_and_write_to_file(
-            args, MPI.COMM_WORLD, hits_per_step, times_per_step, experiment_name
-        )
-    else:
-        # Print a brief summary of timings
-        # Dev Note: we especially do _not_ gather timings here to have a
-        # no-MPI-communication codepath
-        print(f"Rank {rank} done. Total time: {timer.times['total']}.")
-
-    if rank == 0:
-        print("SUCCESS")
diff --git a/pyFV3/examples/standalone/runfile/timing.py b/pyFV3/examples/standalone/runfile/timing.py
deleted file mode 100644
index 411d3a8f..00000000
--- a/pyFV3/examples/standalone/runfile/timing.py
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/env python3
-
-import copy
-import json
-from datetime import datetime
-from typing import Any, Dict, List, Optional
-
-import numpy as np
-from mpi4py import MPI
-
-
-def set_experiment_info(experiment_setup: Dict[str, Any]) -> Dict[str, Any]:
-    experiment: Dict[str, Any] = {}
-    now = datetime.now()
-    dt_string = now.strftime("%d/%m/%Y %H:%M:%S")
-    experiment["setup"] = {}
-    experiment["setup"]["timestamp"] = dt_string
-    experiment["setup"]["dataset"] = experiment_setup["dataset"]
-    experiment["setup"]["timesteps"] = experiment_setup["timesteps"]
-    experiment["setup"]["hash"] = experiment_setup["hash"]
-    experiment["setup"]["version"] = "python/" + experiment_setup["backend"]
-    experiment["setup"]["format_version"] = 2
-    experiment["times"] = {}
-    return experiment
-
-
-def collect_keys_from_data(times_per_step: List[Dict[str, float]]) -> List[str]:
-    """Collects all the keys in the list of dics and returns a sorted version"""
-    keys = set()
-    for data_point in times_per_step:
-        for k, _ in data_point.items():
-            keys.add(k)
-    sorted_keys = list(keys)
-    sorted_keys.sort()
-    return sorted_keys
-
-
-def put_data_into_dict(
-    times_per_step: List[Dict[str, float]], results: Dict[str, Any]
-) -> Dict[str, Any]:
-    keys = collect_keys_from_data(times_per_step)
-    data: List[float] = []
-    for timer_name in keys:
-        data.clear()
-        for data_point in times_per_step:
-            if timer_name in data_point:
-                data.append(data_point[timer_name])
-            results["times"][timer_name]["times"] = copy.deepcopy(data)
-    return results
-
-
-def gather_timing_data(
-    times_per_step: List[Dict[str, float]],
-    results: Dict[str, Any],
-    comm: MPI.Comm,
-    root: int = 0,
-) -> Dict[str, Any]:
-    """
-    returns an updated version of  the results dictionary owned
-    by the root node to hold data on the substeps as well as the main loop timers
-    """
-    is_root = comm.Get_rank() == root
-    keys = collect_keys_from_data(times_per_step)
-    data: List[float] = []
-    for timer_name in keys:
-        data.clear()
-        for data_point in times_per_step:
-            if timer_name in data_point:
-                data.append(data_point[timer_name])
-
-        sendbuf = np.array(data)
-        recvbuf = None
-        if is_root:
-            recvbuf = np.array([data] * comm.Get_size())
-        comm.Gather(sendbuf, recvbuf, root=0)
-        if is_root:
-            results["times"][timer_name]["times"] = copy.deepcopy(recvbuf.tolist())
-    return results
-
-
-def write_global_timings(
-    experiment: Dict[str, Any], experiment_info: Dict[str, Any]
-) -> None:
-    now = datetime.now()
-    halo_str = "haloupade" if experiment_info["halo_update"] else "nohalo"
-    time_string = now.strftime("%Y-%m-%d-%H-%M-%S")
-    full_filename = (
-        "_".join(
-            [time_string, experiment_info["name"], experiment_info["backend"], halo_str]
-        )
-        + ".json"
-    )
-    full_filename = full_filename.replace(":", "")
-    with open(full_filename, "w") as outfile:
-        json.dump(experiment, outfile, sort_keys=True, indent=4)
-
-
-def gather_hit_counts(
-    hits_per_step: List[Dict[str, int]], results: Dict[str, Any]
-) -> Dict[str, Any]:
-    """collects the hit count across all timers called in a program execution"""
-    for data_point in hits_per_step:
-        for name, value in data_point.items():
-            if name not in results["times"]:
-                results["times"][name] = {"hits": value, "times": []}
-            else:
-                results["times"][name]["hits"] += value
-    return results
-
-
-def collect_data_and_write_to_file(
-    comm: Optional[MPI.Comm],
-    hits_per_step,
-    times_per_step,
-    experiment_setup: Dict[str, Any],
-) -> None:
-    """
-    collect the gathered data from all the ranks onto rank 0 and write the timing file
-    """
-    if comm:
-        comm.Barrier()
-        is_root = comm.Get_rank() == 0
-    else:
-        is_root = True
-
-    results = None
-    if is_root:
-        results = set_experiment_info(experiment_setup)
-        results = gather_hit_counts(hits_per_step, results)
-
-    if comm:
-        results = gather_timing_data(times_per_step, results, comm)
-    else:
-        results = put_data_into_dict(times_per_step, results)
-
-    if is_root:
-        write_global_timings(results, experiment_setup)
diff --git a/pyFV3/pyFV3/__init__.py b/pyFV3/pyFV3/__init__.py
deleted file mode 100644
index b0dad3a0..00000000
--- a/pyFV3/pyFV3/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from ._config import DynamicalCoreConfig
-from .dycore_state import DycoreState
-from .stencils.fv_dynamics import DynamicalCore
-from .stencils.fv_subgridz import DryConvectiveAdjustment
-from .wrappers.geos_wrapper import GeosDycoreWrapper
-
-
-__version__ = "0.2.0"
diff --git a/pyFV3/pyFV3/_config.py b/pyFV3/pyFV3/_config.py
deleted file mode 100644
index 127ce3d8..00000000
--- a/pyFV3/pyFV3/_config.py
+++ /dev/null
@@ -1,478 +0,0 @@
-import dataclasses
-from typing import Optional, Tuple
-
-import f90nml
-from ndsl.namelist import Namelist, NamelistDefaults
-
-
-DEFAULT_INT = 0
-DEFAULT_STR = ""
-DEFAULT_FLOAT = 0.0
-DEFAULT_BOOL = False
-
-
-@dataclasses.dataclass(frozen=True)
-class SatAdjustConfig:
-    hydrostatic: bool
-    rad_snow: bool
-    rad_rain: bool
-    rad_graupel: bool
-    tintqs: bool
-    sat_adj0: float
-    ql_gen: float
-    qs_mlt: float
-    ql0_max: float
-    t_sub: float
-    qi_gen: float
-    qi_lim: float
-    qi0_max: float
-    dw_ocean: float
-    dw_land: float
-    icloud_f: int
-    cld_min: float
-    tau_i2s: float
-    tau_v2l: float
-    tau_r2g: float
-    tau_l2r: float
-    tau_l2v: float
-    tau_imlt: float
-    tau_smlt: float
-
-
-@dataclasses.dataclass(frozen=True)
-class RemappingConfig:
-    fill: bool
-    kord_tm: int
-    kord_tr: int
-    kord_wz: int
-    kord_mt: int
-    do_sat_adj: bool
-    sat_adjust: SatAdjustConfig
-
-    @property
-    def hydrostatic(self) -> bool:
-        return self.sat_adjust.hydrostatic
-
-
-@dataclasses.dataclass(frozen=True)
-class RiemannConfig:
-    p_fac: float
-    a_imp: float
-    use_logp: bool
-    beta: float
-
-
-@dataclasses.dataclass(frozen=True)
-class DGridShallowWaterLagrangianDynamicsConfig:
-    dddmp: float
-    d2_bg: float
-    d2_bg_k1: float
-    d2_bg_k2: float
-    d4_bg: float
-    ke_bg: float
-    nord: int
-    n_sponge: int
-    grid_type: int
-    d_ext: float
-    hord_dp: int
-    hord_tm: int
-    hord_mt: int
-    hord_vt: int
-    do_f3d: bool
-    do_skeb: bool
-    d_con: float
-    vtdm4: float
-    inline_q: bool
-    convert_ke: bool
-    do_vort_damp: bool
-    hydrostatic: bool
-
-
-@dataclasses.dataclass(frozen=True)
-class AcousticDynamicsConfig:
-    tau: float
-    k_split: int
-    n_split: int
-    m_split: int
-    delt_max: float
-    rf_cutoff: float
-    rf_fast: bool
-    breed_vortex_inline: bool
-    """
-    setting for nudging where we can insert tropical cyclone tracks
-    and add fake tropical cyclones at a certain point in the code
-    not used so much right now because we can run at high enough
-    resolution to directly nudge to tropical cyclone data
-    """
-    use_old_omega: bool
-    """
-    mainly for backwards compatibility, not really used anymore
-    """
-    riemann: RiemannConfig
-    d_grid_shallow_water: DGridShallowWaterLagrangianDynamicsConfig
-
-    @property
-    def nord(self) -> int:
-        return self.d_grid_shallow_water.nord
-
-    @property
-    def grid_type(self) -> int:
-        return self.d_grid_shallow_water.grid_type
-
-    @property
-    def hydrostatic(self) -> bool:
-        return self.d_grid_shallow_water.hydrostatic
-
-    @property
-    def hord_tm(self) -> int:
-        return self.d_grid_shallow_water.hord_tm
-
-    @property
-    def p_fac(self) -> float:
-        return self.riemann.p_fac
-
-    @property
-    def d_ext(self) -> float:
-        return self.d_grid_shallow_water.d_ext
-
-    @property
-    def d_con(self) -> float:
-        return self.d_grid_shallow_water.d_con
-
-    @property
-    def beta(self) -> float:
-        return self.riemann.beta
-
-    @property
-    def use_logp(self) -> bool:
-        return self.riemann.use_logp
-
-
-@dataclasses.dataclass
-class DynamicalCoreConfig:
-    dt_atmos: int = DEFAULT_INT
-    a_imp: float = DEFAULT_FLOAT
-    beta: float = DEFAULT_FLOAT
-    consv_te: float = DEFAULT_FLOAT
-    d2_bg: float = DEFAULT_FLOAT
-    d2_bg_k1: float = DEFAULT_FLOAT
-    d2_bg_k2: float = DEFAULT_FLOAT
-    d4_bg: float = DEFAULT_FLOAT
-    d_con: float = DEFAULT_FLOAT
-    d_ext: float = DEFAULT_FLOAT
-    dddmp: float = DEFAULT_FLOAT
-    delt_max: float = DEFAULT_FLOAT
-    do_sat_adj: bool = DEFAULT_BOOL
-    do_vort_damp: bool = DEFAULT_BOOL
-    fill: bool = DEFAULT_BOOL
-    hord_dp: int = DEFAULT_INT
-    hord_mt: int = DEFAULT_INT
-    hord_tm: int = DEFAULT_INT
-    hord_tr: int = DEFAULT_INT
-    hord_vt: int = DEFAULT_INT
-    hydrostatic: bool = DEFAULT_BOOL
-    k_split: int = DEFAULT_INT
-    ke_bg: float = DEFAULT_FLOAT
-    kord_mt: int = DEFAULT_INT
-    kord_tm: int = DEFAULT_INT
-    kord_tr: int = DEFAULT_INT
-    kord_wz: int = DEFAULT_INT
-    n_split: int = DEFAULT_INT
-    nord: int = DEFAULT_INT
-    npx: int = DEFAULT_INT
-    npy: int = DEFAULT_INT
-    npz: int = DEFAULT_INT
-    ntiles: int = DEFAULT_INT
-    nwat: int = DEFAULT_INT
-    p_fac: float = DEFAULT_FLOAT
-    rf_cutoff: float = DEFAULT_FLOAT
-    tau: float = DEFAULT_FLOAT
-    vtdm4: float = DEFAULT_FLOAT
-    z_tracer: bool = DEFAULT_BOOL
-    do_qa: bool = DEFAULT_BOOL
-    layout: Tuple[int, int] = NamelistDefaults.layout
-    grid_type: int = NamelistDefaults.grid_type
-    u_max: float = NamelistDefaults.u_max  # max windspeed for dp config
-    do_f3d: bool = NamelistDefaults.do_f3d
-    inline_q: bool = NamelistDefaults.inline_q
-    do_skeb: bool = NamelistDefaults.do_skeb  # save dissipation estimate
-    use_logp: bool = NamelistDefaults.use_logp
-    moist_phys: bool = NamelistDefaults.moist_phys
-    check_negative: bool = NamelistDefaults.check_negative
-    # gfdl_cloud_microphys.F90
-    tau_r2g: float = NamelistDefaults.tau_r2g  # rain freezing during fast_sat
-    tau_smlt: float = NamelistDefaults.tau_smlt  # snow melting
-    tau_g2r: float = NamelistDefaults.tau_g2r  # graupel melting to rain
-    tau_imlt: float = NamelistDefaults.tau_imlt  # cloud ice melting
-    tau_i2s: float = NamelistDefaults.tau_i2s  # cloud ice to snow auto - conversion
-    tau_l2r: float = NamelistDefaults.tau_l2r  # cloud water to rain auto - conversion
-    tau_g2v: float = NamelistDefaults.tau_g2v  # graupel sublimation
-    tau_v2g: float = (
-        NamelistDefaults.tau_v2g
-    )  # graupel deposition -- make it a slow process
-    sat_adj0: float = (
-        NamelistDefaults.sat_adj0
-    )  # adjustment factor (0: no 1: full) during fast_sat_adj
-    ql_gen: float = (
-        1.0e-3  # max new cloud water during remapping step if fast_sat_adj = .t.
-    )
-    ql_mlt: float = (
-        NamelistDefaults.ql_mlt
-    )  # max value of cloud water allowed from melted cloud ice
-    qs_mlt: float = NamelistDefaults.qs_mlt  # max cloud water due to snow melt
-    ql0_max: float = (
-        NamelistDefaults.ql0_max
-    )  # max cloud water value (auto converted to rain)
-    t_sub: float = NamelistDefaults.t_sub  # min temp for sublimation of cloud ice
-    qi_gen: float = (
-        NamelistDefaults.qi_gen
-    )  # max cloud ice generation during remapping step
-    qi_lim: float = (
-        NamelistDefaults.qi_lim
-    )  # cloud ice limiter to prevent large ice build up
-    qi0_max: float = NamelistDefaults.qi0_max  # max cloud ice value (by other sources)
-    rad_snow: bool = (
-        NamelistDefaults.rad_snow
-    )  # consider snow in cloud fraction calculation
-    rad_rain: bool = (
-        NamelistDefaults.rad_rain
-    )  # consider rain in cloud fraction calculation
-    rad_graupel: bool = (
-        NamelistDefaults.rad_graupel
-    )  # consider graupel in cloud fraction calculation
-    tintqs: bool = (
-        NamelistDefaults.tintqs
-    )  # use temperature in the saturation mixing in PDF
-    dw_ocean: float = NamelistDefaults.dw_ocean  # base value for ocean
-    dw_land: float = (
-        NamelistDefaults.dw_land
-    )  # base value for subgrid deviation / variability over land
-    # cloud scheme 0 - ?
-    # 1: old fvgfs gfdl) mp implementation
-    # 2: binary cloud scheme (0 / 1)
-    icloud_f: int = NamelistDefaults.icloud_f
-    cld_min: float = NamelistDefaults.cld_min  # !< minimum cloud fraction
-    tau_l2v: float = (
-        NamelistDefaults.tau_l2v
-    )  # cloud water to water vapor (evaporation)
-    tau_v2l: float = (
-        NamelistDefaults.tau_v2l
-    )  # water vapor to cloud water (condensation)
-    c2l_ord: int = NamelistDefaults.c2l_ord
-    regional: bool = NamelistDefaults.regional
-    m_split: int = NamelistDefaults.m_split
-    convert_ke: bool = NamelistDefaults.convert_ke
-    breed_vortex_inline: bool = NamelistDefaults.breed_vortex_inline
-    use_old_omega: bool = NamelistDefaults.use_old_omega
-    rf_fast: bool = NamelistDefaults.rf_fast
-    adiabatic: bool = NamelistDefaults.adiabatic
-    nf_omega: int = NamelistDefaults.nf_omega
-    fv_sg_adj: int = NamelistDefaults.fv_sg_adj
-    n_sponge: int = NamelistDefaults.n_sponge
-    namelist_override: Optional[str] = None
-
-    def __post_init__(self):
-        if self.namelist_override is not None:
-            try:
-                f90_nml = f90nml.read(self.namelist_override)
-            except FileNotFoundError:
-                print(f"{self.namelist_override} does not exist")
-                raise
-            dycore_config = self.from_f90nml(f90_nml)
-            for var in dycore_config.__dict__.keys():
-                setattr(self, var, dycore_config.__dict__[var])
-        # Single tile cartesian grids
-        if self.grid_type > 3:
-            self.nf_omega = 0
-
-    @classmethod
-    def from_f90nml(self, f90_namelist: f90nml.Namelist) -> "DynamicalCoreConfig":
-        namelist = Namelist.from_f90nml(f90_namelist)
-        return self.from_namelist(namelist)
-
-    @classmethod
-    def from_namelist(cls, namelist: Namelist) -> "DynamicalCoreConfig":
-        return cls(
-            dt_atmos=namelist.dt_atmos,
-            a_imp=namelist.a_imp,
-            beta=namelist.beta,
-            consv_te=namelist.consv_te,
-            d2_bg=namelist.d2_bg,
-            d2_bg_k1=namelist.d2_bg_k1,
-            d2_bg_k2=namelist.d2_bg_k2,
-            d4_bg=namelist.d4_bg,
-            d_con=namelist.d_con,
-            d_ext=namelist.d_ext,
-            dddmp=namelist.dddmp,
-            delt_max=namelist.delt_max,
-            do_sat_adj=namelist.do_sat_adj,
-            do_vort_damp=namelist.do_vort_damp,
-            fill=namelist.fill,
-            hord_dp=namelist.hord_dp,
-            hord_mt=namelist.hord_mt,
-            hord_tm=namelist.hord_tm,
-            hord_tr=namelist.hord_tr,
-            hord_vt=namelist.hord_vt,
-            hydrostatic=namelist.hydrostatic,
-            k_split=namelist.k_split,
-            ke_bg=namelist.ke_bg,
-            kord_mt=namelist.kord_mt,
-            kord_tm=namelist.kord_tm,
-            kord_tr=namelist.kord_tr,
-            kord_wz=namelist.kord_wz,
-            n_split=namelist.n_split,
-            nord=namelist.nord,
-            npx=namelist.npx,
-            npy=namelist.npy,
-            npz=namelist.npz,
-            ntiles=namelist.ntiles,
-            nwat=namelist.nwat,
-            p_fac=namelist.p_fac,
-            rf_cutoff=namelist.rf_cutoff,
-            tau=namelist.tau,
-            vtdm4=namelist.vtdm4,
-            z_tracer=namelist.z_tracer,
-            do_qa=namelist.do_qa,
-            layout=namelist.layout,
-            grid_type=namelist.grid_type,
-            u_max=namelist.u_max,
-            do_f3d=namelist.do_f3d,
-            inline_q=namelist.inline_q,
-            do_skeb=namelist.do_skeb,
-            check_negative=namelist.check_negative,
-            tau_r2g=namelist.tau_r2g,
-            tau_smlt=namelist.tau_smlt,
-            tau_g2r=namelist.tau_g2r,
-            tau_imlt=namelist.tau_imlt,
-            tau_i2s=namelist.tau_i2s,
-            tau_l2r=namelist.tau_l2r,
-            tau_g2v=namelist.tau_g2v,
-            tau_v2g=namelist.tau_v2g,
-            sat_adj0=namelist.sat_adj0,
-            ql_gen=namelist.ql_gen,
-            ql_mlt=namelist.ql_mlt,
-            qs_mlt=namelist.qs_mlt,
-            ql0_max=namelist.ql0_max,
-            t_sub=namelist.t_sub,
-            qi_gen=namelist.qi_gen,
-            qi_lim=namelist.qi_lim,
-            qi0_max=namelist.qi0_max,
-            rad_snow=namelist.rad_snow,
-            rad_rain=namelist.rad_rain,
-            rad_graupel=namelist.rad_graupel,
-            tintqs=namelist.tintqs,
-            dw_ocean=namelist.dw_ocean,
-            dw_land=namelist.dw_land,
-            icloud_f=namelist.icloud_f,
-            cld_min=namelist.cld_min,
-            tau_l2v=namelist.tau_l2v,
-            tau_v2l=namelist.tau_v2l,
-            c2l_ord=namelist.c2l_ord,
-            regional=namelist.regional,
-            m_split=namelist.m_split,
-            convert_ke=namelist.convert_ke,
-            breed_vortex_inline=namelist.breed_vortex_inline,
-            use_old_omega=namelist.use_old_omega,
-            rf_fast=namelist.rf_fast,
-            adiabatic=namelist.adiabatic,
-            nf_omega=namelist.nf_omega,
-            fv_sg_adj=namelist.fv_sg_adj,
-            n_sponge=namelist.n_sponge,
-        )
-
-    @property
-    def do_dry_convective_adjustment(self) -> bool:
-        return self.fv_sg_adj > 0
-
-    @property
-    def riemann(self) -> RiemannConfig:
-        return RiemannConfig(
-            p_fac=self.p_fac,
-            a_imp=self.a_imp,
-            use_logp=self.use_logp,
-            beta=self.beta,
-        )
-
-    @property
-    def d_grid_shallow_water(self) -> DGridShallowWaterLagrangianDynamicsConfig:
-        return DGridShallowWaterLagrangianDynamicsConfig(
-            dddmp=self.dddmp,
-            d2_bg=self.d2_bg,
-            d2_bg_k1=self.d2_bg_k1,
-            d2_bg_k2=self.d2_bg_k2,
-            d4_bg=self.d4_bg,
-            ke_bg=self.ke_bg,
-            nord=self.nord,
-            n_sponge=self.n_sponge,
-            grid_type=self.grid_type,
-            d_ext=self.d_ext,
-            inline_q=self.inline_q,
-            hord_dp=self.hord_dp,
-            hord_tm=self.hord_tm,
-            hord_mt=self.hord_mt,
-            hord_vt=self.hord_vt,
-            do_f3d=self.do_f3d,
-            do_skeb=self.do_skeb,
-            d_con=self.d_con,
-            vtdm4=self.vtdm4,
-            do_vort_damp=self.do_vort_damp,
-            hydrostatic=self.hydrostatic,
-            convert_ke=self.convert_ke,
-        )
-
-    @property
-    def acoustic_dynamics(self) -> AcousticDynamicsConfig:
-        return AcousticDynamicsConfig(
-            tau=self.tau,
-            k_split=self.k_split,
-            n_split=self.n_split,
-            m_split=self.m_split,
-            delt_max=self.delt_max,
-            rf_fast=self.rf_fast,
-            rf_cutoff=self.rf_cutoff,
-            breed_vortex_inline=self.breed_vortex_inline,
-            use_old_omega=self.use_old_omega,
-            riemann=self.riemann,
-            d_grid_shallow_water=self.d_grid_shallow_water,
-        )
-
-    @property
-    def sat_adjust(self) -> SatAdjustConfig:
-        return SatAdjustConfig(
-            hydrostatic=self.hydrostatic,
-            rad_snow=self.rad_snow,
-            rad_rain=self.rad_rain,
-            rad_graupel=self.rad_graupel,
-            tintqs=self.tintqs,
-            sat_adj0=self.sat_adj0,
-            ql_gen=self.ql_gen,
-            qs_mlt=self.qs_mlt,
-            ql0_max=self.ql0_max,
-            t_sub=self.t_sub,
-            qi_gen=self.qi_gen,
-            qi_lim=self.qi_lim,
-            qi0_max=self.qi0_max,
-            dw_ocean=self.dw_ocean,
-            dw_land=self.dw_land,
-            icloud_f=self.icloud_f,
-            cld_min=self.cld_min,
-            tau_i2s=self.tau_i2s,
-            tau_v2l=self.tau_v2l,
-            tau_r2g=self.tau_r2g,
-            tau_l2r=self.tau_l2r,
-            tau_l2v=self.tau_l2v,
-            tau_imlt=self.tau_imlt,
-            tau_smlt=self.tau_smlt,
-        )
-
-    @property
-    def remapping(self) -> RemappingConfig:
-        return RemappingConfig(
-            fill=self.fill,
-            kord_tm=self.kord_tm,
-            kord_tr=self.kord_tr,
-            kord_wz=self.kord_wz,
-            kord_mt=self.kord_mt,
-            do_sat_adj=self.do_sat_adj,
-            sat_adjust=self.sat_adjust,
-        )
diff --git a/pyFV3/pyFV3/dycore_state.py b/pyFV3/pyFV3/dycore_state.py
deleted file mode 100644
index f90a3d88..00000000
--- a/pyFV3/pyFV3/dycore_state.py
+++ /dev/null
@@ -1,517 +0,0 @@
-from dataclasses import asdict, dataclass, field, fields
-from typing import Any, Dict, Mapping, Union
-
-import ndsl.dsl.gt4py_utils as gt_utils
-import xarray as xr
-from ndsl.comm.communicator import Communicator
-from ndsl.constants import (
-    X_DIM,
-    X_INTERFACE_DIM,
-    Y_DIM,
-    Y_INTERFACE_DIM,
-    Z_DIM,
-    Z_INTERFACE_DIM,
-)
-from ndsl.dsl.typing import Float
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.initialization.sizer import GridSizer
-from ndsl.quantity import Quantity
-from ndsl.restart._legacy_restart import open_restart
-
-
-@dataclass()
-class DycoreState:
-    u: Quantity = field(
-        metadata={
-            "name": "x_wind",
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "m/s",
-            "intent": "inout",
-        }
-    )
-    v: Quantity = field(
-        metadata={
-            "name": "y_wind",
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-            "intent": "inout",
-        }
-    )
-    w: Quantity = field(
-        metadata={
-            "name": "vertical_wind",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-            "intent": "inout",
-        }
-    )
-    # TODO: move a-grid winds to temporary internal storage
-    ua: Quantity = field(
-        metadata={
-            "name": "eastward_wind",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-            "intent": "inout",
-        }
-    )
-    va: Quantity = field(
-        metadata={
-            "name": "northward_wind",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        }
-    )
-    uc: Quantity = field(
-        metadata={
-            "name": "x_wind_on_c_grid",
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-            "intent": "inout",
-        }
-    )
-    vc: Quantity = field(
-        metadata={
-            "name": "y_wind_on_c_grid",
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "m/s",
-            "intent": "inout",
-        }
-    )
-    delp: Quantity = field(
-        metadata={
-            "name": "pressure_thickness_of_atmospheric_layer",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "Pa",
-            "intent": "inout",
-        }
-    )
-    delz: Quantity = field(
-        metadata={
-            "name": "vertical_thickness_of_atmospheric_layer",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m",
-            "intent": "inout",
-        }
-    )
-    ps: Quantity = field(
-        metadata={
-            "name": "surface_pressure",
-            "dims": [X_DIM, Y_DIM],
-            "units": "Pa",
-            "intent": "inout",
-        }
-    )
-    pe: Quantity = field(
-        metadata={
-            "name": "interface_pressure",
-            "dims": [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            "units": "Pa",
-            "n_halo": 1,
-            "intent": "inout",
-        }
-    )
-    pt: Quantity = field(
-        metadata={
-            "name": "air_temperature",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "degK",
-            "intent": "inout",
-        }
-    )
-    peln: Quantity = field(
-        metadata={
-            "name": "logarithm_of_interface_pressure",
-            "dims": [
-                X_DIM,
-                Y_DIM,
-                Z_INTERFACE_DIM,
-            ],
-            "units": "ln(Pa)",
-            "n_halo": 0,
-            "intent": "inout",
-        }
-    )
-    pk: Quantity = field(
-        metadata={
-            "name": "interface_pressure_raised_to_power_of_kappa",
-            "dims": [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            "units": "unknown",
-            "n_halo": 0,
-            "intent": "inout",
-        }
-    )
-    pkz: Quantity = field(
-        metadata={
-            "name": "layer_mean_pressure_raised_to_power_of_kappa",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "unknown",
-            "n_halo": 0,
-            "intent": "inout",
-        }
-    )
-    qvapor: Quantity = field(
-        metadata={
-            "name": "specific_humidity",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        }
-    )
-    qliquid: Quantity = field(
-        metadata={
-            "name": "cloud_water_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-            "intent": "inout",
-        }
-    )
-    qice: Quantity = field(
-        metadata={
-            "name": "cloud_ice_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-            "intent": "inout",
-        }
-    )
-    qrain: Quantity = field(
-        metadata={
-            "name": "rain_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-            "intent": "inout",
-        }
-    )
-    qsnow: Quantity = field(
-        metadata={
-            "name": "snow_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-            "intent": "inout",
-        }
-    )
-    qgraupel: Quantity = field(
-        metadata={
-            "name": "graupel_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-            "intent": "inout",
-        }
-    )
-    qo3mr: Quantity = field(
-        metadata={
-            "name": "ozone_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-            "intent": "inout",
-        }
-    )
-    qsgs_tke: Quantity = field(
-        metadata={
-            "name": "turbulent_kinetic_energy",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m**2/s**2",
-            "intent": "inout",
-        }
-    )
-    qcld: Quantity = field(
-        metadata={
-            "name": "cloud_fraction",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "",
-            "intent": "inout",
-        }
-    )
-    q_con: Quantity = field(
-        metadata={
-            "name": "total_condensate_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-            "intent": "inout",
-        }
-    )
-    omga: Quantity = field(
-        metadata={
-            "name": "vertical_pressure_velocity",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "Pa/s",
-            "intent": "inout",
-        }
-    )
-    mfxd: Quantity = field(
-        metadata={
-            "name": "accumulated_x_mass_flux",
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "unknown",
-            "n_halo": 0,
-            "intent": "inout",
-        }
-    )
-    mfyd: Quantity = field(
-        metadata={
-            "name": "accumulated_y_mass_flux",
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "unknown",
-            "n_halo": 0,
-            "intent": "inout",
-        }
-    )
-    cxd: Quantity = field(
-        metadata={
-            "name": "accumulated_x_courant_number",
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "",
-            "n_halo": (0, 3),
-            "intent": "inout",
-        }
-    )
-    cyd: Quantity = field(
-        metadata={
-            "name": "accumulated_y_courant_number",
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "",
-            "n_halo": (3, 0),
-            "intent": "inout",
-        }
-    )
-    diss_estd: Quantity = field(
-        metadata={
-            "name": "dissipation_estimate_from_heat_source",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "unknown",
-            "n_halo": (3, 3),
-            "intent": "inout",
-        }
-    )
-    """
-    how much energy is dissipated, is mainly captured
-    to send to the stochastic physics (in contrast to heat_source)
-    """
-    phis: Quantity = field(
-        metadata={
-            "name": "surface_geopotential",
-            "units": "m^2 s^-2",
-            "dims": [X_DIM, Y_DIM],
-            "intent": "in",
-        }
-    )
-    bdt: float = field(default=0.0)
-    mdt: float = field(default=0.0)
-
-    def __post_init__(self):
-        for _field in fields(self):
-            for check_name in ["units", "dims"]:
-                if check_name in _field.metadata:
-                    required = _field.metadata[check_name]
-                    actual = getattr(getattr(self, _field.name), check_name)
-                    if isinstance(required, list):
-                        actual = list(actual)
-                    if actual != required:
-                        raise TypeError(
-                            f"{_field.name} has metadata {check_name} of {actual}"
-                            f"that does not match the requirement {required}"
-                        )
-
-    @classmethod
-    def init_zeros(cls, quantity_factory: QuantityFactory):
-        initial_storages = {}
-        for _field in fields(cls):
-            if "dims" in _field.metadata.keys():
-                initial_storages[_field.name] = quantity_factory.zeros(
-                    _field.metadata["dims"],
-                    _field.metadata["units"],
-                    dtype=Float,
-                ).data
-        return cls.init_from_storages(
-            storages=initial_storages, sizer=quantity_factory.sizer
-        )
-
-    @classmethod
-    def init_from_numpy_arrays(
-        cls, dict_of_numpy_arrays, sizer: GridSizer, backend: str
-    ):
-        field_names = [_field.name for _field in fields(cls)]
-        for variable_name in dict_of_numpy_arrays.keys():
-            if variable_name not in field_names:
-                raise KeyError(
-                    variable_name + " is provided, but not part of the dycore state"
-                )
-        dict_state = {}
-        for _field in fields(cls):
-            if "dims" in _field.metadata.keys():
-                dims = _field.metadata["dims"]
-                dict_state[_field.name] = Quantity(
-                    dict_of_numpy_arrays[_field.name],
-                    dims,
-                    _field.metadata["units"],
-                    origin=sizer.get_origin(dims),
-                    extent=sizer.get_extent(dims),
-                    gt4py_backend=backend,
-                )
-        state = cls(**dict_state)  # type: ignore
-        return state
-
-    @classmethod
-    def init_from_storages(
-        cls,
-        storages: Mapping[str, Any],
-        sizer: GridSizer,
-        bdt: float = 0.0,
-        mdt: float = 0.0,
-    ):
-        inputs = {}
-        for _field in fields(cls):
-            if "dims" in _field.metadata.keys():
-                dims = _field.metadata["dims"]
-                quantity = Quantity(
-                    storages[_field.name],
-                    dims,
-                    _field.metadata["units"],
-                    origin=sizer.get_origin(dims),
-                    extent=sizer.get_extent(dims),
-                )
-                inputs[_field.name] = quantity
-        return cls(**inputs, bdt=bdt, mdt=mdt)
-
-    @classmethod
-    def from_fortran_restart(
-        cls,
-        *,
-        quantity_factory: QuantityFactory,
-        communicator: Communicator,
-        path: str,
-    ):
-        state_dict: Mapping[str, Quantity] = open_restart(
-            dirname=path,
-            communicator=communicator,
-            tracer_properties=TRACER_PROPERTIES,
-        )
-
-        new = cls.init_zeros(quantity_factory=quantity_factory)
-        new.pt.view[:] = new.pt.np.asarray(
-            state_dict["air_temperature"].transpose(new.pt.dims).view[:]
-        )
-        new.delp.view[:] = new.delp.np.asarray(
-            state_dict["pressure_thickness_of_atmospheric_layer"]
-            .transpose(new.delp.dims)
-            .view[:]
-        )
-        new.phis.view[:] = new.phis.np.asarray(
-            state_dict["surface_geopotential"].transpose(new.phis.dims).view[:]
-        )
-        new.w.view[:] = new.w.np.asarray(
-            state_dict["vertical_wind"].transpose(new.w.dims).view[:]
-        )
-        new.u.view[:] = new.u.np.asarray(
-            state_dict["x_wind"].transpose(new.u.dims).view[:]
-        )
-        new.v.view[:] = new.v.np.asarray(
-            state_dict["y_wind"].transpose(new.v.dims).view[:]
-        )
-        new.qvapor.view[:] = new.qvapor.np.asarray(
-            state_dict["specific_humidity"].transpose(new.qvapor.dims).view[:]
-        )
-        new.qliquid.view[:] = new.qliquid.np.asarray(
-            state_dict["cloud_liquid_water_mixing_ratio"]
-            .transpose(new.qliquid.dims)
-            .view[:]
-        )
-        new.qice.view[:] = new.qice.np.asarray(
-            state_dict["cloud_ice_mixing_ratio"].transpose(new.qice.dims).view[:]
-        )
-        new.qrain.view[:] = new.qrain.np.asarray(
-            state_dict["rain_mixing_ratio"].transpose(new.qrain.dims).view[:]
-        )
-        new.qsnow.view[:] = new.qsnow.np.asarray(
-            state_dict["snow_mixing_ratio"].transpose(new.qsnow.dims).view[:]
-        )
-        new.qgraupel.view[:] = new.qgraupel.np.asarray(
-            state_dict["graupel_mixing_ratio"].transpose(new.qgraupel.dims).view[:]
-        )
-        new.qo3mr.view[:] = new.qo3mr.np.asarray(
-            state_dict["ozone_mixing_ratio"].transpose(new.qo3mr.dims).view[:]
-        )
-        new.qcld.view[:] = new.qcld.np.asarray(
-            state_dict["cloud_fraction"].transpose(new.qcld.dims).view[:]
-        )
-        new.delz.view[:] = new.delz.np.asarray(
-            state_dict["vertical_thickness_of_atmospheric_layer"]
-            .transpose(new.delz.dims)
-            .view[:]
-        )
-
-        return new
-
-    @property
-    def xr_dataset(self):
-        data_vars = {}
-        for name, field_info in self.__dataclass_fields__.items():
-            if issubclass(field_info.type, Quantity):
-                dims = [
-                    f"{dim_name}_{name}" for dim_name in field_info.metadata["dims"]
-                ]
-                data_vars[name] = xr.DataArray(
-                    gt_utils.asarray(getattr(self, name).data),
-                    dims=dims,
-                    attrs={
-                        "long_name": field_info.metadata["name"],
-                        "units": field_info.metadata.get("units", "unknown"),
-                    },
-                )
-        return xr.Dataset(data_vars=data_vars)
-
-    def __getitem__(self, item):
-        return getattr(self, item)
-
-    def as_dict(self, quantity_only=True) -> Dict[str, Union[Quantity, int]]:
-        if quantity_only:
-            return {k: v for k, v in asdict(self).items() if isinstance(v, Quantity)}
-        else:
-            return {k: v for k, v in asdict(self).items()}
-
-
-TRACER_PROPERTIES = {
-    "specific_humidity": {
-        "dims": [Z_DIM, Y_DIM, X_DIM],
-        "restart_name": "sphum",
-        "units": "g/kg",
-    },
-    "cloud_liquid_water_mixing_ratio": {
-        "dims": [Z_DIM, Y_DIM, X_DIM],
-        "restart_name": "liq_wat",
-        "units": "g/kg",
-    },
-    "cloud_ice_mixing_ratio": {
-        "dims": [Z_DIM, Y_DIM, X_DIM],
-        "restart_name": "ice_wat",
-        "units": "g/kg",
-    },
-    "rain_mixing_ratio": {
-        "dims": [Z_DIM, Y_DIM, X_DIM],
-        "restart_name": "rainwat",
-        "units": "g/kg",
-    },
-    "snow_mixing_ratio": {
-        "dims": [Z_DIM, Y_DIM, X_DIM],
-        "restart_name": "snowwat",
-        "units": "g/kg",
-    },
-    "graupel_mixing_ratio": {
-        "dims": [Z_DIM, Y_DIM, X_DIM],
-        "restart_name": "graupel",
-        "units": "g/kg",
-    },
-    "ozone_mixing_ratio": {
-        "dims": [Z_DIM, Y_DIM, X_DIM],
-        "restart_name": "o3mr",
-        "units": "g/kg",
-    },
-    "turbulent_kinetic_energy": {
-        "dims": [Z_DIM, Y_DIM, X_DIM],
-        "restart_name": "sgs_tke",
-        "units": "g/kg",
-    },
-    "cloud_fraction": {
-        "dims": [Z_DIM, Y_DIM, X_DIM],
-        "restart_name": "cld_amt",
-        "units": "g/kg",
-    },
-}
diff --git a/pyFV3/pyFV3/initialization/__init__.py b/pyFV3/pyFV3/initialization/__init__.py
deleted file mode 100644
index 7250e658..00000000
--- a/pyFV3/pyFV3/initialization/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .analytic_init import init_analytic_state
diff --git a/pyFV3/pyFV3/initialization/analytic_init.py b/pyFV3/pyFV3/initialization/analytic_init.py
deleted file mode 100644
index c8d22893..00000000
--- a/pyFV3/pyFV3/initialization/analytic_init.py
+++ /dev/null
@@ -1,68 +0,0 @@
-from enum import Enum
-
-from ndsl.comm.communicator import Communicator, CubedSphereCommunicator
-from ndsl.grid import GridData
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.utils import MetaEnumStr
-
-from pyFV3.dycore_state import DycoreState
-
-
-class Cases(Enum, metaclass=MetaEnumStr):
-    baroclinic = "baroclinic"
-    tropicalcyclone = "tropicalcyclone"
-
-
-def init_analytic_state(
-    analytic_init_case: str,
-    grid_data: GridData,
-    quantity_factory: QuantityFactory,
-    adiabatic: bool,
-    hydrostatic: bool,
-    moist_phys: bool,
-    comm: Communicator,
-) -> DycoreState:
-    """
-    This method initializes the choosen analytic test case type
-    Args:
-        analytic_init_str:      test case specifier
-        grid_data:              current selected grid data values
-        quantity_factory:       inclusion of QuantityFactory class
-        adiabatic:              flag for adiabatic methods
-        hydrostatic:            flag for hydrostatic methods
-        moist_phys:             flag for including moisture physics methods
-        comm:                   inclusion of CubedSphereCommunicator class
-
-    Returns:
-        an instance of DycoreState class
-    """
-    if analytic_init_case in Cases:  # type: ignore
-        if analytic_init_case == Cases.baroclinic.value:  # type: ignore
-            import pyFV3.initialization.test_cases.initialize_baroclinic as bc
-
-            assert isinstance(comm, CubedSphereCommunicator)
-
-            return bc.init_baroclinic_state(
-                grid_data=grid_data,
-                quantity_factory=quantity_factory,
-                adiabatic=adiabatic,
-                hydrostatic=hydrostatic,
-                moist_phys=moist_phys,
-                comm=comm,
-            )
-
-        elif analytic_init_case == Cases.tropicalcyclone.value:  # type: ignore
-            import pyFV3.initialization.test_cases.initialize_tc as tc
-
-            assert isinstance(comm, CubedSphereCommunicator)
-
-            return tc.init_tc_state(
-                grid_data=grid_data,
-                quantity_factory=quantity_factory,
-                hydrostatic=hydrostatic,
-                comm=comm,
-            )
-        else:
-            raise ValueError(f"Case {analytic_init_case} not implemented")
-    else:
-        raise ValueError(f"Case {analytic_init_case} not recognized")
diff --git a/pyFV3/pyFV3/initialization/init_utils.py b/pyFV3/pyFV3/initialization/init_utils.py
deleted file mode 100644
index 28e37610..00000000
--- a/pyFV3/pyFV3/initialization/init_utils.py
+++ /dev/null
@@ -1,393 +0,0 @@
-import math
-from dataclasses import fields
-from types import SimpleNamespace
-
-import ndsl.constants as constants
-import numpy as np
-from ndsl.dsl.typing import Float
-from ndsl.grid import lon_lat_midpoint
-from ndsl.grid.gnomonic import get_lonlat_vect, get_unit_vector_direction
-
-from pyFV3.dycore_state import DycoreState
-
-
-# maximum windspeed amplitude - close to windspeed of zonal-mean time-mean
-# jet stream in troposphere
-U0 = 35.0  # From Table VI of DCMIP2016
-# [lon, lat] of zonal wind perturbation centerpoint at 20E, 40N
-PCEN = [math.pi / 9.0, 2.0 * math.pi / 9.0]  # From Table VI of DCMIP2016
-PTOP_MIN = 1e-8
-U1 = 1.0
-PT0 = 0.0
-ETA_0 = 0.252
-ETA_SURFACE = 1.0
-ETA_TROPOPAUSE = 0.2
-T_0 = 288.0
-DELTA_T = 480000.0
-LAPSE_RATE = 0.005  # From Table VI of DCMIP2016
-SURFACE_PRESSURE = 1.0e5  # units of (Pa), from Table VI of DCMIP2016
-# NOTE RADIUS = 6.3712e6 in FV3 vs Jabowski paper 6.371229e6
-R = constants.RADIUS / 10.0  # Perturbation radiusfor test case 13
-NHALO = constants.N_HALO_DEFAULT
-
-
-def cell_average_nine_components(
-    component_function,
-    component_args,
-    lon,
-    lat,
-    lat_agrid,
-):
-    """
-    Outputs the weighted average of a field that is a function of latitude,
-    averaging over the 9 points on the corners, edges, and center of each
-    gridcell.
-
-    Args:
-        component_function: callable taking in an array of latitude and
-            returning an output array
-        component_args: arguments to pass on to component_function,
-            should not be a function of latitude
-        lon: longitude array, defined on cell corners
-        lat: latitude array, defined on cell corners
-        lat_agrid: latitude array, defined on cell centers
-    """
-    # this weighting is done to reproduce the behavior of the Fortran code
-    # Compute cell lats in the midpoint of each cell edge
-    lat2, lat3, lat4, lat5 = compute_grid_edge_midpoint_latitude_components(lon, lat)
-    pt1 = component_function(*component_args, lat=lat_agrid)
-    pt2 = component_function(*component_args, lat=lat2[:, :-1])
-    pt3 = component_function(*component_args, lat=lat3)
-    pt4 = component_function(*component_args, lat=lat4)
-    pt5 = component_function(*component_args, lat=lat5[:-1, :])
-    pt6 = component_function(*component_args, lat=lat[:-1, :-1])
-    pt7 = component_function(*component_args, lat=lat[1:, :-1])
-    pt8 = component_function(*component_args, lat=lat[1:, 1:])
-    pt9 = component_function(*component_args, lat=lat[:-1, 1:])
-    return cell_average_nine_point(pt1, pt2, pt3, pt4, pt5, pt6, pt7, pt8, pt9)
-
-
-def cell_average_nine_point(pt1, pt2, pt3, pt4, pt5, pt6, pt7, pt8, pt9):
-    """
-    9-point average: should be 2nd order accurate for a rectangular cell
-    9  4  8
-    5  1  3
-    6  2  7
-    """
-    return (
-        0.25 * pt1 + 0.125 * (pt2 + pt3 + pt4 + pt5) + 0.0625 * (pt6 + pt7 + pt8 + pt9)
-    )
-
-
-# TODO: Many duplicate functions do this exact calculation, we should consolidate them
-def compute_eta(ak, bk):
-    """
-    Equation (1) JRMS2006
-    eta is the vertical coordinate and eta_v is an auxiliary vertical coordinate
-    """
-    eta = 0.5 * ((ak[:-1] + ak[1:]) / SURFACE_PRESSURE + bk[:-1] + bk[1:])
-    eta_v = vertical_coordinate(eta)
-    return eta, eta_v
-
-
-def compute_grid_edge_midpoint_latitude_components(lon, lat):
-    _, lat_avg_x_south = lon_lat_midpoint(
-        lon[0:-1, :], lon[1:, :], lat[0:-1, :], lat[1:, :], np
-    )
-    _, lat_avg_y_east = lon_lat_midpoint(
-        lon[1:, 0:-1], lon[1:, 1:], lat[1:, 0:-1], lat[1:, 1:], np
-    )
-    _, lat_avg_x_north = lon_lat_midpoint(
-        lon[0:-1, 1:], lon[1:, 1:], lat[0:-1, 1:], lat[1:, 1:], np
-    )
-    _, lat_avg_y_west = lon_lat_midpoint(
-        lon[:, 0:-1], lon[:, 1:], lat[:, 0:-1], lat[:, 1:], np
-    )
-    return lat_avg_x_south, lat_avg_y_east, lat_avg_x_north, lat_avg_y_west
-
-
-def compute_slices(nx, ny):
-    islice = slice(NHALO, NHALO + nx)
-    jslice = slice(NHALO, NHALO + ny)
-    slice_3d = (islice, jslice, slice(None))
-    slice_2d = (islice, jslice)
-    return islice, jslice, slice_3d, slice_2d
-
-
-def empty_numpy_dycore_state(shape):
-    numpy_dict = {}
-    for _field in fields(DycoreState):
-        if "dims" in _field.metadata.keys():
-            numpy_dict[_field.name] = np.zeros(
-                shape[: len(_field.metadata["dims"])],
-                dtype=Float,
-            )
-    numpy_state = SimpleNamespace(**numpy_dict)
-    return numpy_state
-
-
-def _find_midpoint_unit_vectors(p1, p2):
-    midpoint = np.array(
-        lon_lat_midpoint(p1[:, :, 0], p2[:, :, 0], p1[:, :, 1], p2[:, :, 1], np)
-    ).transpose([1, 2, 0])
-    unit_dir = get_unit_vector_direction(p1, p2, np)
-    exv, eyv = get_lonlat_vect(midpoint, np)
-
-    muv = {"midpoint": midpoint, "unit_dir": unit_dir, "exv": exv, "eyv": eyv}
-
-    return muv
-
-
-def fix_top_log_edge_pressure(peln, ptop):
-    if ptop < PTOP_MIN:
-        ak1 = (constants.KAPPA + 1.0) / constants.KAPPA
-        peln[:, :, 0] = peln[:, :, 1] - ak1
-    else:
-        peln[:, :, 0] = np.log(ptop)
-
-
-def geopotential_perturbation(lat, eta_value):
-    """
-    Equation (7) JRMS2006, just the perturbation component
-    """
-    u_comp = U0 * (np.cos(eta_value) ** (3.0 / 2.0))
-    return u_comp * (
-        (-2.0 * (np.sin(lat) ** 6.0) * (np.cos(lat) ** 2.0 + 1.0 / 3.0) + 10.0 / 63.0)
-        * u_comp
-        + (
-            (8.0 / 5.0) * (np.cos(lat) ** 3.0) * (np.sin(lat) ** 2.0 + 2.0 / 3.0)
-            - math.pi / 4.0
-        )
-        * constants.RADIUS
-        * constants.OMEGA
-    )
-
-
-def horizontally_averaged_temperature(eta):
-    """
-    Equations (4) and (5) JRMS2006 for characteristic temperature profile
-    """
-    # for troposphere:
-    t_mean = T_0 * eta[:] ** (constants.RDGAS * LAPSE_RATE / constants.GRAV)
-    # above troposphere
-    t_mean[ETA_TROPOPAUSE > eta] = (
-        t_mean[ETA_TROPOPAUSE > eta]
-        + DELTA_T * (ETA_TROPOPAUSE - eta[ETA_TROPOPAUSE > eta]) ** 5.0
-    )
-    return t_mean
-
-
-def initialize_delp(ps, ak, bk):
-    return (
-        ak[None, None, 1:]
-        - ak[None, None, :-1]
-        + ps[:, :, None] * (bk[None, None, 1:] - bk[None, None, :-1])
-    )
-
-
-def initialize_delz(pt, peln):
-    return constants.RDG * pt[:, :, :-1] * (peln[:, :, 1:] - peln[:, :, :-1])
-
-
-def initialize_edge_pressure(delp, ptop):
-    pe = np.zeros(delp.shape)
-    pe[:, :, 0] = ptop
-    for k in range(1, pe.shape[2]):
-        pe[:, :, k] = pe[:, :, k - 1] + delp[:, :, k - 1]
-    return pe
-
-
-def _initialize_edge_pressure_cgrid(ak, bk, ps, shape, ptop):
-    """
-    Initialize edge pressure on c-grid for u and v points,
-    depending on which ps is input (ps_uc or ps_vc)
-    """
-    pe_cgrid = np.zeros(shape)
-    pe_cgrid[:, :, 0] = ptop
-
-    pe_cgrid[:, :, :] = ak[None, None, :] + ps[:, :, None] * bk[None, None, :]
-
-    return pe_cgrid
-
-
-def initialize_kappa_pressures(pe, peln, ptop):
-    """
-    Compute the edge_pressure**kappa (pk) and the layer mean of this (pkz)
-    """
-    pk = np.zeros(pe.shape)
-    pkz = np.zeros(pe.shape)
-    pk[:, :, 0] = ptop ** constants.KAPPA
-    pk[:, :, 1:] = np.exp(constants.KAPPA * np.log(pe[:, :, 1:]))
-    pkz[:, :, :-1] = (pk[:, :, 1:] - pk[:, :, :-1]) / (
-        constants.KAPPA * (peln[:, :, 1:] - peln[:, :, :-1])
-    )
-    return pk, pkz
-
-
-def initialize_log_pressure_interfaces(pe, ptop):
-    peln = np.zeros(pe.shape)
-    peln[:, :, 0] = math.log(ptop)
-    peln[:, :, 1:] = np.log(pe[:, :, 1:])
-    return peln
-
-
-def initialize_pkz_dry(delp, pt, delz):
-    return np.exp(
-        constants.KAPPA
-        * np.log(constants.RDG * delp[:, :, :-1] * pt[:, :, :-1] / delz[:, :, :-1])
-    )
-
-
-def initialize_pkz_moist(delp, pt, qvapor, delz):
-    return np.exp(
-        constants.KAPPA
-        * np.log(
-            constants.RDG
-            * delp[:, :, :-1]
-            * pt[:, :, :-1]
-            * (1.0 + constants.ZVIR * qvapor[:, :, :-1])
-            / delz[:, :, :-1]
-        )
-    )
-
-
-def local_compute_size(data_array_shape):
-    nx = data_array_shape[0] - 2 * NHALO - 1
-    ny = data_array_shape[1] - 2 * NHALO - 1
-    nz = data_array_shape[2]
-    return nx, ny, nz
-
-
-def local_coordinate_transformation(u_component, lon, grid_vector_component):
-    """
-    Transform the zonal wind component to the cubed sphere grid using a grid vector
-    """
-    return (
-        u_component
-        * (
-            grid_vector_component[:, :, 1] * np.cos(lon)
-            - grid_vector_component[:, :, 0] * np.sin(lon)
-        )[:, :, None]
-    )
-
-
-def moisture_adjusted_temperature(pt, qvapor):
-    """
-    Update initial temperature to include water vapor contribution
-    """
-    return pt / (1.0 + constants.ZVIR * qvapor)
-
-
-def p_var(
-    delp,
-    delz,
-    pt,
-    ps,
-    qvapor,
-    pe,
-    peln,
-    pkz,
-    ptop,
-    moist_phys,
-    make_nh,
-):
-    """
-    Computes auxiliary pressure variables for a hydrostatic state.
-
-    The Fortran code also recomputes some more pressure variables,
-    pe, pk, but since these are already done in setup_pressure_fields
-    we don't duplicate them here
-    """
-
-    ps[:] = pe[:, :, -1]
-    fix_top_log_edge_pressure(peln, ptop)
-
-    if make_nh:
-        delz[:, :, :-1] = initialize_delz(pt, peln)
-    if moist_phys:
-        pkz[:, :, :-1] = initialize_pkz_moist(delp, pt, qvapor, delz)
-    else:
-        pkz[:, :, :-1] = initialize_pkz_dry(delp, pt, delz)
-
-
-def setup_pressure_fields(
-    eta,
-    eta_v,
-    delp,
-    ps,
-    pe,
-    peln,
-    pk,
-    pkz,
-    ak,
-    bk,
-    ptop,
-):
-    ps[:] = SURFACE_PRESSURE
-    delp[:, :, :-1] = initialize_delp(ps, ak, bk)
-    pe[:] = initialize_edge_pressure(delp, ptop)
-    peln[:] = initialize_log_pressure_interfaces(pe, ptop)
-    pk[:], pkz[:] = initialize_kappa_pressures(pe, peln, ptop)
-    eta[:-1], eta_v[:-1] = compute_eta(ak, bk)
-
-
-def specific_humidity(delp, peln, lat_agrid):
-    """
-    Compute specific humidity using the DCMPI2016 equation 18 and relevant constants
-    """
-    #  Specific humidity vertical pressure width parameter (Pa)
-    pw = 34000.0
-    # Maximum specific humidity amplitude (kg/kg) for Idealized Tropical Cyclone test
-    # TODO: should we be using 0.018, the baroclinic wave test instead?
-    q0 = 0.021
-    # In equation 18 of DCMPI2016, ptmp is pressure - surface pressure
-    # TODO why do we use dp/(d(log(p))) for 'pressure'?
-    ptmp = delp[:, :, :-1] / (peln[:, :, 1:] - peln[:, :, :-1]) - SURFACE_PRESSURE
-    # Similar to equation 18 of DCMIP2016 without a cutoff at tropopause
-    return (
-        q0
-        * np.exp(-((lat_agrid[:, :, None] / PCEN[1]) ** 4.0))
-        * np.exp(-((ptmp / pw) ** 2.0))
-    )
-
-
-def surface_geopotential_perturbation(lat):
-    """
-    From JRMS2006:
-    * 'In hydrostatic models with pressure-based vertical coordinates, it's
-       only necessary to initialize surface geopotential.'
-    * 'balances the non-zero zonal wind at the surface with surface elevation zs'
-    """
-    surface_level = vertical_coordinate(ETA_SURFACE)
-    return geopotential_perturbation(lat, surface_level)
-
-
-def temperature(eta, eta_v, t_mean, lat):
-    """
-    Equation (6)JRMS2006
-    The total temperature distribution from the horizontal-mean temperature
-     and a horizontal variation at each level
-    """
-    lat = lat[:, :, None]
-    return t_mean + 0.75 * (eta[:] * math.pi * U0 / constants.RDGAS) * np.sin(
-        eta_v[:]
-    ) * np.sqrt(np.cos(eta_v[:])) * (
-        (-2.0 * (np.sin(lat) ** 6.0) * (np.cos(lat) ** 2.0 + 1.0 / 3.0) + 10.0 / 63.0)
-        * 2.0
-        * U0
-        * np.cos(eta_v[:]) ** (3.0 / 2.0)
-        + (
-            (8.0 / 5.0) * (np.cos(lat) ** 3.0) * (np.sin(lat) ** 2.0 + 2.0 / 3.0)
-            - math.pi / 4.0
-        )
-        * constants.RADIUS
-        * constants.OMEGA
-    )
-
-
-def vertical_coordinate(eta_value):
-    """
-    Equation (1) JRMS2006
-    computes eta_v, the auxiliary variable vertical coordinate
-    """
-    return (eta_value - ETA_0) * math.pi * 0.5
diff --git a/pyFV3/pyFV3/initialization/test_cases/initialize_baroclinic.py b/pyFV3/pyFV3/initialization/test_cases/initialize_baroclinic.py
deleted file mode 100644
index c559679b..00000000
--- a/pyFV3/pyFV3/initialization/test_cases/initialize_baroclinic.py
+++ /dev/null
@@ -1,350 +0,0 @@
-import math
-
-import ndsl.constants as constants
-import ndsl.dsl.gt4py_utils as utils
-import numpy as np
-from ndsl.comm.communicator import CubedSphereCommunicator
-from ndsl.grid import GridData, great_circle_distance_lon_lat, lon_lat_midpoint
-from ndsl.initialization.allocator import QuantityFactory
-
-import pyFV3.initialization.init_utils as init_utils
-from pyFV3.dycore_state import DycoreState
-
-
-# maximum windspeed amplitude - close to windspeed of zonal-mean time-mean
-# jet stream in troposphere
-U0 = 35.0  # From Table VI of DCMIP2016
-# [lon, lat] of zonal wind perturbation centerpoint at 20E, 40N
-PCEN = [math.pi / 9.0, 2.0 * math.pi / 9.0]  # From Table VI of DCMIP2016
-U1 = 1.0
-SURFACE_PRESSURE = 1.0e5  # units of (Pa), from Table VI of DCMIP2016
-# NOTE RADIUS = 6.3712e6 in FV3 vs Jabowski paper 6.371229e6
-R = constants.RADIUS / 10.0  # Perturbation radiusfor test case 13
-NHALO = constants.N_HALO_DEFAULT
-
-
-def apply_perturbation(u_component, up, lon, lat):
-    """
-    Apply a Gaussian perturbation to intiate a baroclinic wave in JRMS2006
-    up is the maximum amplitude of the perturbation
-    modifies u_component to include the perturbation of radius R
-    """
-    r = np.zeros((u_component.shape[0], u_component.shape[1], 1))
-    # Equation (11), distance from perturbation at 20E, 40N in JRMS2006
-    r = great_circle_distance_lon_lat(PCEN[0], lon, PCEN[1], lat, constants.RADIUS, np)[
-        :, :, None
-    ]
-    r3d = np.repeat(r, u_component.shape[2], axis=2)
-    near_perturbation = (r3d / R) ** 2.0 < 40.0
-    # Equation(10) in JRMS2006 perturbation applied to u_component
-    # Equivalent to Equation (14) in DCMIP 2016, where Zp = 1.0
-    u_component[near_perturbation] = u_component[near_perturbation] + up * np.exp(
-        -((r3d[near_perturbation] / R) ** 2.0)
-    )
-
-
-def baroclinic_perturbed_zonal_wind(eta_v, lon, lat):
-    u = zonal_wind(eta_v, lat)
-    apply_perturbation(u, U1, lon, lat)
-    return u
-
-
-def wind_component_calc(
-    shape,
-    eta_v,
-    lon,
-    lat,
-    grid_vector_component,
-    islice,
-    islice_grid,
-    jslice,
-    jslice_grid,
-):
-    slice_grid = (islice_grid, jslice_grid)
-    slice_3d = (islice, jslice, slice(None))
-    u_component = np.zeros(shape)
-    u_component[slice_3d] = baroclinic_perturbed_zonal_wind(
-        eta_v, lon[slice_grid], lat[slice_grid]
-    )
-    u_component[slice_3d] = init_utils.local_coordinate_transformation(
-        u_component[slice_3d],
-        lon[slice_grid],
-        grid_vector_component[islice_grid, jslice_grid, :],
-    )
-    return u_component
-
-
-def zonal_wind(eta_v, lat):
-    """
-    Equation (2) JRMS2006
-    Returns the zonal wind u
-    """
-    return U0 * np.cos(eta_v[:]) ** (3.0 / 2.0) * np.sin(2.0 * lat[:, :, None]) ** 2.0
-
-
-def initialize_zonal_wind(
-    u,
-    eta,
-    eta_v,
-    lon,
-    lat,
-    east_grid_vector_component,
-    center_grid_vector_component,
-    islice,
-    islice_grid,
-    jslice,
-    jslice_grid,
-    axis,
-):
-    shape = u.shape
-    uu1 = wind_component_calc(
-        shape,
-        eta_v,
-        lon,
-        lat,
-        east_grid_vector_component,
-        islice,
-        islice,
-        jslice,
-        jslice_grid,
-    )
-    uu3 = wind_component_calc(
-        shape,
-        eta_v,
-        lon,
-        lat,
-        east_grid_vector_component,
-        islice,
-        islice_grid,
-        jslice,
-        jslice,
-    )
-    upper = (slice(None),) * axis + (slice(0, -1),)
-    lower = (slice(None),) * axis + (slice(1, None),)
-    pa1, pa2 = lon_lat_midpoint(lon[upper], lon[lower], lat[upper], lat[lower], np)
-    uu2 = wind_component_calc(
-        shape,
-        eta_v,
-        pa1,
-        pa2,
-        center_grid_vector_component,
-        islice,
-        islice,
-        jslice,
-        jslice,
-    )
-    u[islice, jslice, :] = 0.25 * (uu1 + 2.0 * uu2 + uu3)[islice, jslice, :]
-
-
-def baroclinic_initialization(
-    eta,
-    eta_v,
-    peln,
-    qvapor,
-    delp,
-    u,
-    v,
-    pt,
-    phis,
-    delz,
-    w,
-    lon,
-    lat,
-    lon_agrid,
-    lat_agrid,
-    ee1,
-    ee2,
-    es1,
-    ew2,
-    ptop,
-    adiabatic,
-    hydrostatic,
-    nx,
-    ny,
-):
-    """
-    Calls methods that compute initial state via the Jablonowski perturbation test case
-    Transforms results to the cubed sphere grid
-    Creates an initial baroclinic state for u(x-wind), v(y-wind), pt(temperature),
-    phis(surface geopotential)w (vertical windspeed) and delz (vertical coordinate layer
-    width)
-
-    Inputs lon, lat, lon_agrid, lat_agrid, ee1, ee2, es1, ew2, ptop are defined by the
-           grid and can be computed using an instance of the MetricTerms class.
-    Inputs eta and eta_v are vertical coordinate columns derived from the ak and bk
-           variables, also found in the Metric Terms class.
-    """
-
-    # Equation (2) for v
-    # Although meridional wind is 0 in this scheme
-    # on the cubed sphere grid, v is not 0 on every tile
-    initialize_zonal_wind(
-        v,
-        eta,
-        eta_v,
-        lon,
-        lat,
-        east_grid_vector_component=ee2,
-        center_grid_vector_component=ew2,
-        islice=slice(0, nx + 1),
-        islice_grid=slice(0, nx + 1),
-        jslice=slice(0, ny),
-        jslice_grid=slice(1, ny + 1),
-        axis=1,
-    )
-
-    initialize_zonal_wind(
-        u,
-        eta,
-        eta_v,
-        lon,
-        lat,
-        east_grid_vector_component=ee1,
-        center_grid_vector_component=es1,
-        islice=slice(0, nx),
-        islice_grid=slice(1, nx + 1),
-        jslice=slice(0, ny + 1),
-        jslice_grid=slice(0, ny + 1),
-        axis=0,
-    )
-
-    slice_3d = (slice(0, nx), slice(0, ny), slice(None))
-    slice_2d = (slice(0, nx), slice(0, ny))
-    slice_2d_buffer = (slice(0, nx + 1), slice(0, ny + 1))
-    # initialize temperature
-    t_mean = init_utils.horizontally_averaged_temperature(eta)
-    pt[slice_3d] = init_utils.cell_average_nine_components(
-        init_utils.temperature,
-        [eta, eta_v, t_mean],
-        lon[slice_2d_buffer],
-        lat[slice_2d_buffer],
-        lat_agrid[slice_2d],
-    )
-
-    # initialize surface geopotential
-    phis[slice_2d] = init_utils.cell_average_nine_components(
-        init_utils.surface_geopotential_perturbation,
-        [],
-        lon[slice_2d_buffer],
-        lat[slice_2d_buffer],
-        lat_agrid[slice_2d],
-    )
-
-    if not hydrostatic:
-        # vertical velocity is set to 0 for nonhydrostatic setups
-        w[slice_3d] = 0.0
-        delz[:nx, :ny, :-1] = init_utils.initialize_delz(pt[slice_3d], peln[slice_3d])
-
-    if not adiabatic:
-        qvapor[:nx, :ny, :-1] = init_utils.specific_humidity(
-            delp[slice_3d], peln[slice_3d], lat_agrid[slice_2d]
-        )
-        pt[slice_3d] = init_utils.moisture_adjusted_temperature(
-            pt[slice_3d], qvapor[slice_3d]
-        )
-
-
-def init_baroclinic_state(
-    grid_data: GridData,
-    quantity_factory: QuantityFactory,
-    adiabatic: bool,
-    hydrostatic: bool,
-    moist_phys: bool,
-    comm: CubedSphereCommunicator,
-) -> DycoreState:
-    """
-    Create a DycoreState object with quantities initialized to the Jablonowski &
-    Williamson baroclinic test case perturbation applied to the cubed sphere grid.
-    """
-    sample_quantity = grid_data.lat
-    shape = (*sample_quantity.data.shape[0:2], grid_data.ak.data.shape[0])
-    nx, ny, nz = init_utils.local_compute_size(shape)
-    numpy_state = init_utils.empty_numpy_dycore_state(shape)
-    # Initializing to values the Fortran does for easy comparison
-    numpy_state.delp[:] = 1e30
-    numpy_state.delp[:NHALO, :NHALO] = 0.0
-    numpy_state.delp[:NHALO, NHALO + ny :] = 0.0
-    numpy_state.delp[NHALO + nx :, :NHALO] = 0.0
-    numpy_state.delp[NHALO + nx :, NHALO + ny :] = 0.0
-    numpy_state.pe[:] = 0.0
-    numpy_state.pt[:] = 1.0
-    numpy_state.ua[:] = 1e35
-    numpy_state.va[:] = 1e35
-    numpy_state.uc[:] = 1e30
-    numpy_state.vc[:] = 1e30
-    numpy_state.w[:] = 1.0e30
-    numpy_state.delz[:] = 1.0e25
-    numpy_state.phis[:] = 1.0e25
-    numpy_state.ps[:] = SURFACE_PRESSURE
-    eta = np.zeros(nz)
-    eta_v = np.zeros(nz)
-    islice, jslice, slice_3d, slice_2d = init_utils.compute_slices(nx, ny)
-    # Slices with extra buffer points in the horizontal dimension
-    # to accomodate averaging over shifted calculations on the grid
-    _, _, slice_3d_buffer, slice_2d_buffer = init_utils.compute_slices(nx + 1, ny + 1)
-
-    init_utils.setup_pressure_fields(
-        eta=eta,
-        eta_v=eta_v,
-        delp=numpy_state.delp[slice_3d],
-        ps=numpy_state.ps[slice_2d],
-        pe=numpy_state.pe[slice_3d],
-        peln=numpy_state.peln[slice_3d],
-        pk=numpy_state.pk[slice_3d],
-        pkz=numpy_state.pkz[slice_3d],
-        ak=utils.asarray(grid_data.ak.data),
-        bk=utils.asarray(grid_data.bk.data),
-        ptop=grid_data.ptop,
-    )
-
-    baroclinic_initialization(
-        eta=eta,
-        eta_v=eta_v,
-        peln=numpy_state.peln[slice_3d_buffer],
-        qvapor=numpy_state.qvapor[slice_3d_buffer],
-        delp=numpy_state.delp[slice_3d_buffer],
-        u=numpy_state.u[slice_3d_buffer],
-        v=numpy_state.v[slice_3d_buffer],
-        pt=numpy_state.pt[slice_3d_buffer],
-        phis=numpy_state.phis[slice_2d_buffer],
-        delz=numpy_state.delz[slice_3d_buffer],
-        w=numpy_state.w[slice_3d_buffer],
-        lon=utils.asarray(grid_data.lon.data[slice_2d_buffer]),
-        lat=utils.asarray(grid_data.lat.data[slice_2d_buffer]),
-        lon_agrid=utils.asarray(grid_data.lon_agrid.data[slice_2d_buffer]),
-        lat_agrid=utils.asarray(grid_data.lat_agrid.data[slice_2d_buffer]),
-        ee1=utils.asarray(grid_data.ee1.data[slice_3d_buffer]),
-        ee2=utils.asarray(grid_data.ee2.data[slice_3d_buffer]),
-        es1=utils.asarray(grid_data.es1.data[slice_3d_buffer]),
-        ew2=utils.asarray(grid_data.ew2.data[slice_3d_buffer]),
-        ptop=grid_data.ptop,
-        adiabatic=adiabatic,
-        hydrostatic=hydrostatic,
-        nx=nx,
-        ny=ny,
-    )
-
-    init_utils.p_var(
-        delp=numpy_state.delp[slice_3d],
-        delz=numpy_state.delz[slice_3d],
-        pt=numpy_state.pt[slice_3d],
-        ps=numpy_state.ps[slice_2d],
-        qvapor=numpy_state.qvapor[slice_3d],
-        pe=numpy_state.pe[slice_3d],
-        peln=numpy_state.peln[slice_3d],
-        pkz=numpy_state.pkz[slice_3d],
-        ptop=grid_data.ptop,
-        moist_phys=moist_phys,
-        make_nh=(not hydrostatic),
-    )
-    state = DycoreState.init_from_numpy_arrays(
-        numpy_state.__dict__,
-        sizer=quantity_factory.sizer,
-        backend=sample_quantity.metadata.gt4py_backend,
-    )
-
-    comm.halo_update(state.phis, n_points=NHALO)
-
-    comm.vector_halo_update(state.u, state.v, n_points=NHALO)
-
-    return state
diff --git a/pyFV3/pyFV3/initialization/test_cases/initialize_tc.py b/pyFV3/pyFV3/initialization/test_cases/initialize_tc.py
deleted file mode 100644
index 1bb48ddc..00000000
--- a/pyFV3/pyFV3/initialization/test_cases/initialize_tc.py
+++ /dev/null
@@ -1,576 +0,0 @@
-import ndsl.constants as constants
-import numpy as np
-from ndsl.comm.communicator import CubedSphereCommunicator
-from ndsl.grid import GridData, great_circle_distance_lon_lat
-from ndsl.initialization.allocator import QuantityFactory
-
-import pyFV3.initialization.init_utils as init_utils
-from pyFV3.dycore_state import DycoreState
-
-
-def _calculate_distance_from_tc_center(pe_v, ps_v, muv, calc, tc_properties):
-    d1 = np.sin(calc["p0"][1]) * np.cos(muv["midpoint"][:, :, 1]) - np.cos(
-        calc["p0"][1]
-    ) * np.sin(muv["midpoint"][:, :, 1]) * np.cos(
-        muv["midpoint"][:, :, 0] - calc["p0"][0]
-    )
-    d2 = np.cos(calc["p0"][1]) * np.sin(muv["midpoint"][:, :, 0] - calc["p0"][0])
-    d = np.sqrt(d1 ** 2 + d2 ** 2)
-    d[d < 1e-15] = 1e-15
-
-    r = great_circle_distance_lon_lat(
-        calc["p0"][0],
-        muv["midpoint"][:, :, 0],
-        calc["p0"][1],
-        muv["midpoint"][:, :, 1],
-        constants.RADIUS,
-        np,
-    )
-    ptmp = 0.5 * (pe_v[:, :, :-1] + pe_v[:, :, 1:])
-    height = (calc["t00"] / tc_properties["gamma"]) * (
-        1.0 - (ptmp / ps_v[:, :, None]) ** calc["exponent"]
-    )
-
-    distance_dict = {"d": d, "d1": d1, "d2": d2, "height": height, "r": r}
-
-    return distance_dict
-
-
-def _calculate_pt_height(height, qvapor, r, tc_properties, calc):
-    aa = height / tc_properties["zp"]
-    bb = np.exp(aa ** tc_properties["exppz"])
-    cc = r / tc_properties["rp"]
-    dd = np.exp(cc ** tc_properties["exppr"])
-    ee = 1.0 - tc_properties["p_ref"] / tc_properties["dp"] * dd[:, :, None] * bb
-    ff = constants.GRAV * tc_properties["zp"] ** tc_properties["exppz"] * ee
-    gg = calc["t00"] - tc_properties["gamma"] * height
-    hh = 1.0 + tc_properties["exppz"] * constants.RDGAS * gg * height / ff
-    ii = 1.0 + constants.ZVIR * qvapor
-
-    pt = gg / ii / hh
-
-    return pt
-
-
-def _calculate_utmp(height, dist, calc, tc_properties):
-    aa = height / tc_properties["zp"]  # (134, 135, 79)
-    bb = dist["r"] / tc_properties["rp"]  # (134, 135)
-    cc = aa ** tc_properties["exppz"]  # (134, 135, 79)
-    dd = bb ** tc_properties["exppr"]  # (134, 135)
-    ee = 1.0 - tc_properties["p_ref"] / tc_properties["dp"] * np.exp(
-        dd[:, :, None]
-    ) * np.exp(
-        cc
-    )  # (134, 135, 79)
-    ff = constants.GRAV * tc_properties["zp"] ** tc_properties["exppz"]  # number
-    gg = calc["t00"] - tc_properties["gamma"] * height  # (134, 135, 79)
-    hh = (
-        tc_properties["exppz"] * height * constants.RDGAS * gg / ff + ee
-    )  # (134, 135, 79)
-    ii = calc["cor"] * dist["r"] / 2.0  # (134, 135)
-    jj = 2.0  # number
-    kk = (
-        ii[:, :, None] ** jj
-        - tc_properties["exppr"]
-        * bb[:, :, None] ** tc_properties["exppr"]
-        * constants.RDGAS
-        * gg
-        / hh
-    )  # (134, 135, 79)
-    ll = -calc["cor"] * dist["r"][:, :, None] / 2.0 + np.sqrt(kk)  # (134, 135, 79)
-
-    utmp = 1.0 / dist["d"][:, :, None] * ll
-
-    return utmp
-
-
-def _calculate_vortex_surface_pressure_with_radius(p0, p_grid, tc_properties):
-    """
-    p0 is the tc center point
-    p_grid is the grid_data.grid variable corresponding to what is needed
-    for ps on A-grid, p_grid is grid_data.agrid.data
-    """
-
-    r = great_circle_distance_lon_lat(
-        p0[0], p_grid[:, :, 0], p0[1], p_grid[:, :, 1], constants.RADIUS, np
-    )
-    ps = tc_properties["p_ref"] - tc_properties["dp"] * np.exp(
-        -((r / tc_properties["rp"]) ** 1.5)
-    )
-
-    return ps
-
-
-def _define_ak():
-    ak = np.array(
-        [
-            1.0,
-            4.3334675,
-            10.677089,
-            21.541527,
-            35.58495,
-            52.180374,
-            71.43384,
-            93.80036,
-            120.00996,
-            151.22435,
-            188.9106,
-            234.46414,
-            289.17712,
-            354.48535,
-            431.97327,
-            523.37726,
-            630.5866,
-            755.64453,
-            900.745,
-            1068.2289,
-            1260.578,
-            1480.4054,
-            1730.4465,
-            2013.547,
-            2332.6455,
-            2690.7593,
-            3090.968,
-            3536.3882,
-            4030.164,
-            4575.4316,
-            5175.3115,
-            5832.871,
-            6551.1157,
-            7332.957,
-            8181.1987,
-            9098.508,
-            10087.395,
-            11024.773,
-            11800.666,
-            12434.538,
-            12942.799,
-            13339.364,
-            13636.07,
-            13843.023,
-            13968.898,
-            14021.17,
-            14006.316,
-            13929.978,
-            13797.103,
-            13612.045,
-            13378.674,
-            13100.442,
-            12780.452,
-            12421.524,
-            12026.23,
-            11596.926,
-            11135.791,
-            10644.859,
-            10126.039,
-            9581.128,
-            9011.82,
-            8419.746,
-            7806.45,
-            7171.0674,
-            6517.474,
-            5861.0713,
-            5214.543,
-            4583.264,
-            3972.567,
-            3387.6143,
-            2833.4417,
-            2314.8213,
-            1836.298,
-            1402.0687,
-            1016.004,
-            681.5313,
-            401.6795,
-            178.95885,
-            0.0015832484,
-            0.0,
-        ]
-    )
-
-    return ak
-
-
-def _define_bk():
-    bk = np.array(
-        [
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0,
-            0.0012543945,
-            0.004884307,
-            0.01071458,
-            0.018598301,
-            0.028411143,
-            0.040047247,
-            0.05341539,
-            0.068436176,
-            0.08503932,
-            0.10316211,
-            0.12274763,
-            0.14374262,
-            0.16609776,
-            0.18976559,
-            0.21470062,
-            0.24085836,
-            0.2681944,
-            0.2966648,
-            0.32622582,
-            0.35683352,
-            0.38844362,
-            0.421011,
-            0.45448995,
-            0.4888354,
-            0.52400005,
-            0.55993766,
-            0.59673643,
-            0.63420564,
-            0.67150474,
-            0.7079659,
-            0.74333787,
-            0.7773684,
-            0.8098109,
-            0.84042233,
-            0.86897135,
-            0.8952358,
-            0.91901,
-            0.94010323,
-            0.9583462,
-            0.97358865,
-            0.9857061,
-            0.9954344,
-            1.0,
-        ]
-    )
-
-    return bk
-
-
-def _initialize_vortex_ps_phis(grid_data, shape, tc_properties, calc):
-    p0 = [np.deg2rad(tc_properties["lon_tc"]), np.deg2rad(tc_properties["lat_tc"])]
-
-    phis = np.zeros(shape[:2])
-    ps = np.zeros(shape[:2])
-    # breakpoint()
-    grid = np.transpose(
-        np.stack(
-            [
-                grid_data._horizontal_data.lon_agrid.data,
-                grid_data._horizontal_data.lat_agrid.data,
-            ]
-        ),
-        [1, 2, 0],
-    )
-    ps = _calculate_vortex_surface_pressure_with_radius(calc["p0"], grid, tc_properties)
-
-    grid = np.transpose(
-        np.stack(
-            [grid_data._horizontal_data.lon.data, grid_data._horizontal_data.lat.data]
-        ),
-        [1, 2, 0],
-    )
-    ps_vc = np.zeros(shape[:2])
-    p_grid = 0.5 * (grid[:, :-1, :] + grid[:, 1:, :])
-    ps_vc[:, :-1] = _calculate_vortex_surface_pressure_with_radius(
-        p0, p_grid, tc_properties
-    )
-
-    ps_uc = np.zeros(shape[:2])
-    p_grid = 0.5 * (grid[:-1, :, :] + grid[1:, :, :])
-    ps_uc[:-1, :] = _calculate_vortex_surface_pressure_with_radius(
-        p0, p_grid, tc_properties
-    )
-
-    output_dict = {"ps": ps, "ps_uc": ps_uc, "ps_vc": ps_vc, "phis": phis}
-
-    return output_dict
-
-
-def _initialize_qvapor_temperature(grid_data, pe, ps, tc_properties, calc, shape):
-    qvapor = np.zeros(shape)
-    pt = np.zeros(shape)
-    height = np.zeros(shape)
-
-    ptmp = 0.5 * (pe[:, :, :-1] + pe[:, :, 1:])
-    height[:, :, :-1] = (calc["t00"] / tc_properties["gamma"]) * (
-        1.0 - (ptmp / ps[:, :, None]) ** calc["exponent"]
-    )
-    qvapor = (
-        tc_properties["q00"]
-        * np.exp(-height / tc_properties["zq1"])
-        * np.exp(-((height / tc_properties["zq2"]) ** tc_properties["exppz"]))
-    )
-
-    p2 = np.transpose(
-        np.stack(
-            [
-                grid_data._horizontal_data.lon_agrid.data,
-                grid_data._horizontal_data.lat_agrid.data,
-            ]
-        ),
-        [1, 2, 0],
-    )
-    r = great_circle_distance_lon_lat(
-        calc["p0"][0], p2[:, :, 0], calc["p0"][1], p2[:, :, 1], constants.RADIUS, np
-    )
-
-    pt = _calculate_pt_height(height, qvapor, r, tc_properties, calc)
-
-    qvapor[height > tc_properties["ztrop"]] = tc_properties["qtrop"]
-    pt[height > tc_properties["ztrop"]] = calc["ttrop"]
-
-    return qvapor, pt
-
-
-def _initialize_wind_dgrid(
-    grid_data, tc_properties, calc, pe_u, pe_v, ps_u, ps_v, shape
-):
-    # u-wind
-    ud = np.zeros(shape)
-
-    grid = np.transpose(
-        np.stack(
-            [grid_data._horizontal_data.lon.data, grid_data._horizontal_data.lat.data]
-        ),
-        [1, 2, 0],
-    )
-    p1 = grid[:-1, :, :]
-    p2 = grid[1:, :, :]
-    muv = init_utils._find_midpoint_unit_vectors(p1, p2)
-    dist = _calculate_distance_from_tc_center(pe_u, ps_u, muv, calc, tc_properties)
-
-    utmp = _calculate_utmp(dist["height"][:-1, :, :], dist, calc, tc_properties)
-    vtmp = utmp * dist["d2"][:, :, None]
-    print()
-    utmp = utmp * dist["d1"][:, :, None]
-
-    ud[:-1, :, :-1] = (
-        utmp * np.sum(muv["unit_dir"] * muv["exv"], 2)[:, :, None]
-        + vtmp * np.sum(muv["unit_dir"] * muv["eyv"], 2)[:, :, None]
-    )
-    ud[:, :, :-1][dist["height"] > tc_properties["ztrop"]] = 0
-
-    # v-wind
-    vd = np.zeros(shape)
-    p1 = grid[:, :-1, :]
-    p2 = grid[:, 1:, :]
-    muv = init_utils._find_midpoint_unit_vectors(p1, p2)
-    dist = _calculate_distance_from_tc_center(pe_v, ps_v, muv, calc, tc_properties)
-
-    utmp = _calculate_utmp(dist["height"][:, :-1, :], dist, calc, tc_properties)
-    vtmp = utmp * dist["d2"][:, :, None]
-    utmp *= dist["d1"][:, :, None]
-
-    vd[:, :-1, :-1] = (
-        utmp * np.sum(muv["unit_dir"] * muv["exv"], 2)[:, :, None]
-        + vtmp * np.sum(muv["unit_dir"] * muv["eyv"], 2)[:, :, None]
-    )
-    vd[:, :, :-1][dist["height"] > tc_properties["ztrop"]] = 0
-
-    return ud, vd
-
-
-def _interpolate_winds_dgrid_agrid(grid_data, ud, vd, tc_properties, shape):
-    ua = np.zeros(shape)
-    va = np.zeros(shape)
-    if tc_properties["vort"] is True:
-        ua[:, :-1, :] = (
-            0.5
-            * (
-                ud[:, :-1, :] * grid_data._horizontal_data.dx.data[:, :-1, None]
-                + ud[:, 1:, :] * grid_data._horizontal_data.dx.data[:, 1:, None]
-            )
-            / grid_data.dxa.data[:, :-1, None]
-        )
-        va[:-1, :, :] = (
-            0.5
-            * (
-                vd[:-1, :, :] * grid_data._horizontal_data.dy.data[:-1, :, None]
-                + vd[1:, :, :] * grid_data._horizontal_data.dy.data[1:, :, None]
-            )
-            / grid_data._horizontal_data.dya.data[:-1, :, None]
-        )
-    else:
-        pass
-
-    # TODO translate the not vort case#
-    #             do i=isd,ied
-    #             tmp1j(:) = 0.0
-    #             tmp2j(:) = uin(i,:)*dyc(i,:)
-    #             tmp3j(:) = dyc(i,:)
-    #             call interp_left_edge_1d(tmp1j, tmp2j, tmp3j, jsd, jed+1, interpOrder)
-    #             uout(i,jsd:jed) = tmp1j(jsd+1:jed+1)/dya(i,jsd:jed)
-    #          enddo
-    #          do j=jsd,jed
-    #             tmp1i(:) = 0.0
-    #             tmp2i(:) = vin(:,j)*dxc(:,j)
-    #             tmp3i(:) = dxc(:,j)
-    #             call interp_left_edge_1d(tmp1i, tmp2i, tmp3i, isd, ied+1, interpOrder)
-    #             vout(isd:ied,j) = tmp1i(isd+1:ied+1)/dxa(isd:ied,j)
-    #          enddo #2934
-
-    return ua, va
-
-
-def _some_inital_calculations(tc_properties):
-    t00 = tc_properties["Ts0"] * (1.0 + constants.ZVIR * tc_properties["q00"])  # num
-    p0 = [np.deg2rad(tc_properties["lon_tc"]), np.deg2rad(tc_properties["lat_tc"])]
-    exponent = constants.RDGAS * tc_properties["gamma"] / constants.GRAV  # num
-    cor = 2.0 * constants.OMEGA * np.sin(np.deg2rad(tc_properties["lat_tc"]))  # num
-    ttrop = t00 - tc_properties["gamma"] * tc_properties["ztrop"]
-
-    calc = {
-        "cor": cor,
-        "exponent": exponent,
-        "p0": p0,
-        "ttrop": ttrop,
-        "t00": t00,
-    }
-
-    return calc
-
-
-def _initialize_delz_w(pe, ps, pt, qvapor, tc_properties, calc, shape):
-    delz = np.zeros(shape)
-    w = np.zeros(shape)
-    delz[:, :, :-1] = (
-        constants.RDGAS
-        * pt[:, :, :-1]
-        * (1 + constants.ZVIR * qvapor[:, :, :-1])
-        / constants.GRAV
-        * np.log(pe[:, :, :-1] / pe[:, :, 1:])
-    )
-
-    return delz, w
-
-
-def init_tc_state(
-    grid_data: GridData,
-    quantity_factory: QuantityFactory,
-    hydrostatic: bool,
-    comm: CubedSphereCommunicator,
-) -> DycoreState:
-    """
-    --WARNING--WARNING--WARNING--WARNING--WARNING--WARNING--WARNING---
-    --                                                              --
-    --WARNING: THIS IS KNOW TO HAVE BUGS AND REQUIRE NUMERICAL DEBUG--
-    --                                                              --
-    --WARNING--WARNING--WARNING--WARNING--WARNING--WARNING--WARNING---
-    Create a DycoreState object with quantities initialized to the
-    FV3 tropical cyclone test case (test_case 55).
-
-    This case involves a grid_transformation (done on metric terms)
-    to locally increase resolution.
-    """
-
-    sample_quantity = grid_data.lat
-    shape = (*sample_quantity.data.shape[:2], grid_data.ak.data.shape[0])
-    numpy_state = init_utils.empty_numpy_dycore_state(shape)
-
-    tc_properties = {
-        "hydrostatic": hydrostatic,
-        "dp": 1115.0,
-        "exppr": 1.5,
-        "exppz": 2.0,
-        "gamma": 0.007,
-        "lat_tc": 10.0,
-        "lon_tc": 180.0,
-        "p_ref": 101500.0,
-        "ptop": 1.0,
-        "qtrop": 1e-11,
-        "q00": 0.021,
-        "rp": 282000.0,
-        "Ts0": 302.15,
-        "vort": True,
-        "ztrop": 15000.0,
-        "zp": 7000.0,
-        "zq1": 3000.0,
-        "zq2": 8000.0,
-    }
-
-    calc = _some_inital_calculations(tc_properties)
-
-    ps_output = _initialize_vortex_ps_phis(grid_data, shape, tc_properties, calc)
-    ps, ps_u, ps_v = ps_output["ps"], ps_output["ps_uc"], ps_output["ps_vc"]
-
-    # TODO restart file had different ak, bk. Figure out where they came from;
-    # for now, take from metric terms
-    ak = _define_ak()
-    bk = _define_bk()
-    delp = init_utils.initialize_delp(ps, ak, bk)
-    pe = init_utils.initialize_edge_pressure(delp, tc_properties["ptop"])
-    peln = np.log(pe)
-    pk, pkz = init_utils.initialize_kappa_pressures(pe, peln, tc_properties["ptop"])
-
-    pe_u = init_utils._initialize_edge_pressure_cgrid(
-        ak, bk, ps_u, shape, tc_properties["ptop"]
-    )
-    pe_v = init_utils._initialize_edge_pressure_cgrid(
-        ak, bk, ps_v, shape, tc_properties["ptop"]
-    )
-
-    ud, vd = _initialize_wind_dgrid(
-        grid_data, tc_properties, calc, pe_u, pe_v, ps_u, ps_v, shape
-    )
-    ua, va = _interpolate_winds_dgrid_agrid(grid_data, ud, vd, tc_properties, shape)
-
-    qvapor, pt = _initialize_qvapor_temperature(
-        grid_data, pe, ps, tc_properties, calc, shape
-    )
-    delz, w = _initialize_delz_w(pe, ps, pt, qvapor, tc_properties, calc, shape)
-
-    numpy_state.delp[:] = delp
-    numpy_state.delz[:] = delz
-    numpy_state.pe[:] = pe
-    numpy_state.peln[:] = peln
-    numpy_state.phis[:] = ps_output["phis"]
-    numpy_state.pk[:] = pk
-    numpy_state.pkz[:] = pkz
-    numpy_state.ps[:] = pe[:, :, -1]
-    numpy_state.pt[:] = pt
-    numpy_state.qvapor[:] = qvapor
-    numpy_state.u[:] = ud
-    numpy_state.ua[:] = ua
-    numpy_state.v[:] = vd
-    numpy_state.va[:] = va
-    numpy_state.w[:] = w
-    state = DycoreState.init_from_numpy_arrays(
-        numpy_state.__dict__,
-        sizer=quantity_factory.sizer,
-        backend=sample_quantity.metadata.gt4py_backend,
-    )
-
-    return state
diff --git a/pyFV3/pyFV3/stencils/__init__.py b/pyFV3/pyFV3/stencils/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/pyFV3/pyFV3/stencils/a2b_ord4.py b/pyFV3/pyFV3/stencils/a2b_ord4.py
deleted file mode 100644
index a8521b69..00000000
--- a/pyFV3/pyFV3/stencils/a2b_ord4.py
+++ /dev/null
@@ -1,808 +0,0 @@
-import gt4py.cartesian.gtscript as gtscript
-from gt4py.cartesian.gtscript import (
-    PARALLEL,
-    asin,
-    computation,
-    cos,
-    horizontal,
-    interval,
-    region,
-    sin,
-    sqrt,
-)
-from ndsl.constants import X_DIM, X_INTERFACE_DIM, Y_DIM, Y_INTERFACE_DIM, Z_DIM
-from ndsl.dsl.dace.orchestration import orchestrate
-from ndsl.dsl.stencil import GridIndexing, StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldI, FloatFieldIJ
-from ndsl.grid import GridData
-from ndsl.initialization.allocator import QuantityFactory
-
-from pyFV3.stencils.basic_operations import copy_defn
-
-
-# comact 4-pt cubic interpolation
-c1 = 2.0 / 3.0
-c2 = -1.0 / 6.0
-d1 = 0.375
-d2 = -1.0 / 24.0
-# PPM volume mean form
-b1 = 7.0 / 12.0
-b2 = -1.0 / 12.0
-# 4-pt Lagrange interpolation
-a1 = 9.0 / 16.0
-a2 = -1.0 / 16.0
-
-
-@gtscript.function
-def great_circle_dist(p1a, p1b, p2a, p2b):
-    tb = sin((p1b - p2b) / 2.0) ** 2.0
-    ta = sin((p1a - p2a) / 2.0) ** 2.0
-    return asin(sqrt(tb + cos(p1b) * cos(p2b) * ta)) * 2.0
-
-
-@gtscript.function
-def extrap_corner(
-    p0a,
-    p0b,
-    p1a,
-    p1b,
-    p2a,
-    p2b,
-    qa,
-    qb,
-):
-    x1 = great_circle_dist(p1a, p1b, p0a, p0b)
-    x2 = great_circle_dist(p2a, p2b, p0a, p0b)
-    return qa + x1 / (x2 - x1) * (qa - qb)
-
-
-def _sw_corner(
-    qin: FloatField,
-    qout: FloatField,
-    tmp_qout_edges: FloatField,
-    lon_agrid: FloatFieldIJ,
-    lat_agrid: FloatFieldIJ,
-    lon: FloatFieldIJ,
-    lat: FloatFieldIJ,
-):
-    """
-    Args:
-        qin (in):
-        qout (out):
-        tmp_qout_edges (out):
-        lon_agrid (in):
-        lat_agrid (in):
-        lon (in):
-        lat (in):
-    """
-    with computation(PARALLEL), interval(...):
-        ec1 = extrap_corner(
-            lon[0, 0],
-            lat[0, 0],
-            lon_agrid[0, 0],
-            lat_agrid[0, 0],
-            lon_agrid[1, 1],
-            lat_agrid[1, 1],
-            qin[0, 0, 0],
-            qin[1, 1, 0],
-        )
-        ec2 = extrap_corner(
-            lon[0, 0],
-            lat[0, 0],
-            lon_agrid[-1, 0],
-            lat_agrid[-1, 0],
-            lon_agrid[-2, 1],
-            lat_agrid[-2, 1],
-            qin[-1, 0, 0],
-            qin[-2, 1, 0],
-        )
-        ec3 = extrap_corner(
-            lon[0, 0],
-            lat[0, 0],
-            lon_agrid[0, -1],
-            lat_agrid[0, -1],
-            lon_agrid[1, -2],
-            lat_agrid[1, -2],
-            qin[0, -1, 0],
-            qin[1, -2, 0],
-        )
-
-        qout = (ec1 + ec2 + ec3) * (1.0 / 3.0)
-        tmp_qout_edges = qout
-
-
-def _nw_corner(
-    qin: FloatField,
-    qout: FloatField,
-    tmp_qout_edges: FloatField,
-    lon_agrid: FloatFieldIJ,
-    lat_agrid: FloatFieldIJ,
-    lon: FloatFieldIJ,
-    lat: FloatFieldIJ,
-):
-    """
-    Args:
-        qin (in):
-        qout (out):
-        tmp_qout_edges (out):
-        lon_agrid (in):
-        lat_agrid (in):
-        lon (in):
-        lat (in):
-    """
-    with computation(PARALLEL), interval(...):
-        ec1 = extrap_corner(
-            lon[0, 0],
-            lat[0, 0],
-            lon_agrid[-1, 0],
-            lat_agrid[-1, 0],
-            lon_agrid[-2, 1],
-            lat_agrid[-2, 1],
-            qin[-1, 0, 0],
-            qin[-2, 1, 0],
-        )
-        ec2 = extrap_corner(
-            lon[0, 0],
-            lat[0, 0],
-            lon_agrid[-1, -1],
-            lat_agrid[-1, -1],
-            lon_agrid[-2, -2],
-            lat_agrid[-2, -2],
-            qin[-1, -1, 0],
-            qin[-2, -2, 0],
-        )
-        ec3 = extrap_corner(
-            lon[0, 0],
-            lat[0, 0],
-            lon_agrid[0, 0],
-            lat_agrid[0, 0],
-            lon_agrid[1, 1],
-            lat_agrid[1, 1],
-            qin[0, 0, 0],
-            qin[1, 1, 0],
-        )
-        qout = (ec1 + ec2 + ec3) * (1.0 / 3.0)
-        tmp_qout_edges = qout
-
-
-def _ne_corner(
-    qin: FloatField,
-    qout: FloatField,
-    tmp_qout_edges: FloatField,
-    lon_agrid: FloatFieldIJ,
-    lat_agrid: FloatFieldIJ,
-    lon: FloatFieldIJ,
-    lat: FloatFieldIJ,
-):
-    """
-    Args:
-        qin (in):
-        qout (out):
-        tmp_qout_edges (out):
-        lon_agrid (in):
-        lat_agrid (in):
-        lon (in):
-        lat (in):
-    """
-    with computation(PARALLEL), interval(...):
-        ec1 = extrap_corner(
-            lon[0, 0],
-            lat[0, 0],
-            lon_agrid[-1, -1],
-            lat_agrid[-1, -1],
-            lon_agrid[-2, -2],
-            lat_agrid[-2, -2],
-            qin[-1, -1, 0],
-            qin[-2, -2, 0],
-        )
-        ec2 = extrap_corner(
-            lon[0, 0],
-            lat[0, 0],
-            lon_agrid[0, -1],
-            lat_agrid[0, -1],
-            lon_agrid[1, -2],
-            lat_agrid[1, -2],
-            qin[0, -1, 0],
-            qin[1, -2, 0],
-        )
-        ec3 = extrap_corner(
-            lon[0, 0],
-            lat[0, 0],
-            lon_agrid[-1, 0],
-            lat_agrid[-1, 0],
-            lon_agrid[-2, 1],
-            lat_agrid[-2, 1],
-            qin[-1, 0, 0],
-            qin[-2, 1, 0],
-        )
-        qout = (ec1 + ec2 + ec3) * (1.0 / 3.0)
-        tmp_qout_edges = qout
-
-
-def _se_corner(
-    qin: FloatField,
-    qout: FloatField,
-    tmp_qout_edges: FloatField,
-    lon_agrid: FloatFieldIJ,
-    lat_agrid: FloatFieldIJ,
-    lon: FloatFieldIJ,
-    lat: FloatFieldIJ,
-):
-    """
-    Args:
-        qin (in):
-        qout (out):
-        tmp_qout_edges (out):
-        lon_agrid (in):
-        lat_agrid (in):
-        lon (in):
-        lat (in):
-    """
-    with computation(PARALLEL), interval(...):
-        ec1 = extrap_corner(
-            lon[0, 0],
-            lat[0, 0],
-            lon_agrid[0, -1],
-            lat_agrid[0, -1],
-            lon_agrid[1, -2],
-            lat_agrid[1, -2],
-            qin[0, -1, 0],
-            qin[1, -2, 0],
-        )
-        ec2 = extrap_corner(
-            lon[0, 0],
-            lat[0, 0],
-            lon_agrid[-1, -1],
-            lat_agrid[-1, -1],
-            lon_agrid[-2, -2],
-            lat_agrid[-2, -2],
-            qin[-1, -1, 0],
-            qin[-2, -2, 0],
-        )
-        ec3 = extrap_corner(
-            lon[0, 0],
-            lat[0, 0],
-            lon_agrid[0, 0],
-            lat_agrid[0, 0],
-            lon_agrid[1, 1],
-            lat_agrid[1, 1],
-            qin[0, 0, 0],
-            qin[1, 1, 0],
-        )
-        qout = (ec1 + ec2 + ec3) * (1.0 / 3.0)
-        tmp_qout_edges = qout
-
-
-@gtscript.function
-def lagrange_y_func(qx):
-    return a2 * (qx[0, -2, 0] + qx[0, 1, 0]) + a1 * (qx[0, -1, 0] + qx)
-
-
-@gtscript.function
-def lagrange_x_func(qy):
-    return a2 * (qy[-2, 0, 0] + qy[1, 0, 0]) + a1 * (qy[-1, 0, 0] + qy)
-
-
-def qout_x_edge(
-    qin: FloatField,
-    dxa: FloatFieldIJ,
-    edge_w: FloatFieldIJ,
-    qout: FloatField,
-    tmp_qout_edges: FloatField,
-):
-    """
-    Args:
-        qin (in):
-        dxa (in):
-        edge_w (in):
-        qout (out):
-        tmp_qout_edges (out):
-    """
-    with computation(PARALLEL), interval(...):
-        q2 = (qin[-1, 0, 0] * dxa + qin * dxa[-1, 0]) / (dxa[-1, 0] + dxa)
-        qout = edge_w * q2[0, -1, 0] + (1.0 - edge_w) * q2
-        tmp_qout_edges = qout
-
-
-def qout_y_edge(
-    qin: FloatField,
-    dya: FloatFieldIJ,
-    edge_s: FloatFieldI,
-    qout: FloatField,
-    tmp_qout_edges: FloatField,
-):
-    """
-    Args:
-        qin (in):
-        dya (in):
-        edge_s (in):
-        qout (out):
-        tmp_qout_edges (out):
-    """
-    with computation(PARALLEL), interval(...):
-        q1 = (qin[0, -1, 0] * dya + qin * dya[0, -1]) / (dya[0, -1] + dya)
-        qout = edge_s * q1[-1, 0, 0] + (1.0 - edge_s) * q1
-        tmp_qout_edges = qout
-
-
-@gtscript.function
-def qx_edge_west(qin: FloatField, dxa: FloatFieldIJ):
-    g_in = dxa[1, 0] / dxa
-    g_ou = dxa[-2, 0] / dxa[-1, 0]
-    return 0.5 * (
-        ((2.0 + g_in) * qin - qin[1, 0, 0]) / (1.0 + g_in)
-        + ((2.0 + g_ou) * qin[-1, 0, 0] - qin[-2, 0, 0]) / (1.0 + g_ou)
-    )
-
-
-@gtscript.function
-def qx_edge_west2(qin: FloatField, dxa: FloatFieldIJ):
-    g_in = dxa / dxa[-1, 0]
-    g_ou = dxa[-3, 0] / dxa[-2, 0]
-    qxleft = 0.5 * (
-        ((2.0 + g_in) * qin[-1, 0, 0] - qin) / (1.0 + g_in)
-        + ((2.0 + g_ou) * qin[-2, 0, 0] - qin[-3, 0, 0]) / (1.0 + g_ou)
-    )
-    qxright = b2 * (qin[-1, 0, 0] + qin[2, 0, 0]) + b1 * (qin + qin[1, 0, 0])
-    return (3.0 * (g_in * qin[-1, 0, 0] + qin) - (g_in * qxleft + qxright)) / (
-        2.0 + 2.0 * g_in
-    )
-
-
-@gtscript.function
-def qx_edge_east(qin: FloatField, dxa: FloatFieldIJ):
-    g_in = dxa[-2, 0] / dxa[-1, 0]
-    g_ou = dxa[1, 0] / dxa
-    return 0.5 * (
-        ((2.0 + g_in) * qin[-1, 0, 0] - qin[-2, 0, 0]) / (1.0 + g_in)
-        + ((2.0 + g_ou) * qin - qin[1, 0, 0]) / (1.0 + g_ou)
-    )
-
-
-@gtscript.function
-def qx_edge_east2(qin: FloatField, dxa: FloatFieldIJ):
-    g_in = dxa[-1, 0] / dxa
-    g_ou = dxa[2, 0] / dxa[1, 0]
-    qxright = 0.5 * (
-        ((2.0 + g_in) * qin - qin[-1, 0, 0]) / (1.0 + g_in)
-        + ((2.0 + g_ou) * qin[1, 0, 0] - qin[2, 0, 0]) / (1.0 + g_ou)
-    )
-    qxleft = b2 * (qin[-3, 0, 0] + qin) + b1 * (qin[-2, 0, 0] + qin[-1, 0, 0])
-    return (3.0 * (qin[-1, 0, 0] + g_in * qin) - (g_in * qxright + qxleft)) / (
-        2.0 + 2.0 * g_in
-    )
-
-
-@gtscript.function
-def qy_edge_south(qin: FloatField, dya: FloatFieldIJ):
-    g_in = dya[0, 1] / dya
-    g_ou = dya[0, -2] / dya[0, -1]
-    return 0.5 * (
-        ((2.0 + g_in) * qin - qin[0, 1, 0]) / (1.0 + g_in)
-        + ((2.0 + g_ou) * qin[0, -1, 0] - qin[0, -2, 0]) / (1.0 + g_ou)
-    )
-
-
-@gtscript.function
-def qy_edge_south2(qin: FloatField, dya: FloatFieldIJ):
-    g_in = dya / dya[0, -1]
-    g_ou = dya[0, -3] / dya[0, -2]
-    qy_lower = 0.5 * (
-        ((2.0 + g_in) * qin[0, -1, 0] - qin) / (1.0 + g_in)
-        + ((2.0 + g_ou) * qin[0, -2, 0] - qin[0, -3, 0]) / (1.0 + g_ou)
-    )
-    qy_upper = b2 * (qin[0, -1, 0] + qin[0, 2, 0]) + b1 * (qin + qin[0, 1, 0])
-    return (3.0 * (g_in * qin[0, -1, 0] + qin) - (g_in * qy_lower + qy_upper)) / (
-        2.0 + 2.0 * g_in
-    )
-
-
-@gtscript.function
-def qy_edge_north(qin: FloatField, dya: FloatFieldIJ):
-    g_in = dya[0, -2] / dya[0, -1]
-    g_ou = dya[0, 1] / dya
-    return 0.5 * (
-        ((2.0 + g_in) * qin[0, -1, 0] - qin[0, -2, 0]) / (1.0 + g_in)
-        + ((2.0 + g_ou) * qin - qin[0, 1, 0]) / (1.0 + g_ou)
-    )
-
-
-@gtscript.function
-def qy_edge_north2(qin: FloatField, dya: FloatFieldIJ):
-    g_in = dya[0, -1] / dya
-    g_ou = dya[0, 2] / dya[0, 1]
-    qy_lower = b2 * (qin[0, -3, 0] + qin[0, 0, 0]) + b1 * (
-        qin[0, -2, 0] + qin[0, -1, 0]
-    )
-    qy_upper = 0.5 * (
-        ((2.0 + g_in) * qin - qin[0, -1, 0]) / (1.0 + g_in)
-        + ((2.0 + g_ou) * qin[0, 1, 0] - qin[0, 2, 0]) / (1.0 + g_ou)
-    )
-    return (3.0 * (qin[0, -1, 0] + g_in * qin) - (g_in * qy_upper + qy_lower)) / (
-        2.0 + 2.0 * g_in
-    )
-
-
-def ppm_volume_mean_x(
-    qin: FloatField,
-    qx: FloatField,
-    dxa: FloatFieldIJ,
-):
-    """
-    Args:
-        qin (in):
-        qx (out):
-        dxa (in):
-    """
-    from __externals__ import i_end, i_start
-
-    with computation(PARALLEL), interval(...):
-        qx = b2 * (qin[-2, 0, 0] + qin[1, 0, 0]) + b1 * (qin[-1, 0, 0] + qin)
-        with horizontal(region[i_start, :]):
-            qx = qx_edge_west(qin, dxa)
-        with horizontal(region[i_start + 1, :]):
-            qx = qx_edge_west2(qin, dxa)
-        with horizontal(region[i_end + 1, :]):
-            qx = qx_edge_east(qin, dxa)
-        with horizontal(region[i_end, :]):
-            qx = qx_edge_east2(qin, dxa)
-
-
-def ppm_volume_mean_y(
-    qin: FloatField,
-    qy: FloatField,
-    dya: FloatFieldIJ,
-):
-    """
-    Args:
-        qin (in):
-        qy (out):
-        dya (in):
-    """
-    from __externals__ import j_end, j_start
-
-    with computation(PARALLEL), interval(...):
-        qy = b2 * (qin[0, -2, 0] + qin[0, 1, 0]) + b1 * (qin[0, -1, 0] + qin)
-        with horizontal(region[:, j_start]):
-            qy = qy_edge_south(qin, dya)
-        with horizontal(region[:, j_start + 1]):
-            qy = qy_edge_south2(qin, dya)
-        with horizontal(region[:, j_end + 1]):
-            qy = qy_edge_north(qin, dya)
-        with horizontal(region[:, j_end]):
-            qy = qy_edge_north2(qin, dya)
-
-
-def a2b_interpolation(
-    tmp_qout_edges: FloatField,
-    qout: FloatField,
-    qx: FloatField,
-    qy: FloatField,
-):
-    """
-    Args:
-        tmp_qout_edges (in):
-        qout (out):
-        qx (in):
-        qy (in):
-    """
-    from __externals__ import i_end, i_start, j_end, j_start
-
-    with computation(PARALLEL), interval(...):
-        qxx = a2 * (qx[0, -2, 0] + qx[0, 1, 0]) + a1 * (qx[0, -1, 0] + qx)
-        qyy = a2 * (qy[-2, 0, 0] + qy[1, 0, 0]) + a1 * (qy[-1, 0, 0] + qy)
-        with horizontal(region[:, j_start + 1]):
-            qxx_upper = a2 * (qx[0, -1, 0] + qx[0, 2, 0]) + a1 * (qx + qx[0, 1, 0])
-            qxx = c1 * (qx[0, -1, 0] + qx) + c2 * (tmp_qout_edges[0, -1, 0] + qxx_upper)
-        with horizontal(region[:, j_end]):
-            qxx_lower = a2 * (qx[0, -3, 0] + qx) + a1 * (qx[0, -2, 0] + qx[0, -1, 0])
-            qxx = c1 * (qx[0, -1, 0] + qx) + c2 * (tmp_qout_edges[0, 1, 0] + qxx_lower)
-        with horizontal(region[i_start + 1, :]):
-            qyy_right = a2 * (qy[-1, 0, 0] + qy[2, 0, 0]) + a1 * (qy + qy[1, 0, 0])
-            qyy = c1 * (qy[-1, 0, 0] + qy) + c2 * (tmp_qout_edges[-1, 0, 0] + qyy_right)
-        with horizontal(region[i_end, :]):
-            qyy_left = a2 * (qy[-3, 0, 0] + qy) + a1 * (qy[-2, 0, 0] + qy[-1, 0, 0])
-            qyy = c1 * (qy[-1, 0, 0] + qy) + c2 * (tmp_qout_edges[1, 0, 0] + qyy_left)
-        qout = 0.5 * (qxx + qyy)
-
-
-@gtscript.function
-def doubly_periodic_a2b_ord4(qin):
-    """
-    Grid conversion is much simpler on a doubly-periodic, orthogonal grid so we
-    can bypass most of the above code
-    """
-    qx = b1 * (qin[-1, 0, 0] + qin) + b2 * (qin[-2, 0, 0] + qin[1, 0, 0])
-    qy = b1 * (qin[0, -1, 0] + qin) + b2 * (qin[0, -2, 0] + qin[0, 1, 0])
-    qout = 0.5 * (
-        a1 * (qx[0, -1, 0] + qx + qy[-1, 0, 0] + qy)
-        + a2 * (qx[0, -2, 0] + qx[0, 1, 0] + qy[-2, 0, 0] + qy[1, 0, 0])
-    )
-    return qout
-
-
-def doubly_periodic_a2b_ord4_stencil(qout: FloatField, qin: FloatField):
-    with computation(PARALLEL), interval(...):
-        qout = doubly_periodic_a2b_ord4(qin)
-
-
-class AGrid2BGridFourthOrder:
-    """
-    Fortran name is a2b_ord4, test module is A2B_Ord4
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        grid_data: GridData,
-        grid_type: int,
-        z_dim=Z_DIM,
-        replace: bool = False,
-    ):
-        """
-        Args:
-            stencil_factory: creates gt4py stencils
-            grid_type: integer representing the type of grid
-            z_dim: defines whether vertical dimension is centered or staggered
-            replace: boolean, update qin to the B grid as well
-        """
-        orchestrate(obj=self, config=stencil_factory.config.dace_config)
-        if grid_type != 0 and grid_type != 4:
-            raise RuntimeError(
-                "A-Grid to B-Grid 4th order (a2b_ord4):"
-                f" grid type {grid_type} is not implemented. 0 and 4 available."
-            )
-        self._idx: GridIndexing = stencil_factory.grid_indexing
-        self._stencil_config = stencil_factory.config
-        self.replace = replace
-        self.grid_type = grid_type
-
-        if grid_type < 3:
-            self._dxa = grid_data.dxa
-            self._dya = grid_data.dya
-
-            self._lon_agrid = grid_data.lon_agrid
-            self._lat_agrid = grid_data.lat_agrid
-            self._lon = grid_data.lon
-            self._lat = grid_data.lat
-            # TODO: maybe compute locally edge_* variables
-            # This is the only place the model uses them
-            self._edge_w = grid_data.edge_w
-            self._edge_e = grid_data.edge_e
-            self._edge_s = grid_data.edge_s
-            self._edge_n = grid_data.edge_n
-
-            self._tmp_qx = quantity_factory.zeros(
-                dims=[X_INTERFACE_DIM, Y_DIM, z_dim],
-                units="unknown",
-                dtype=Float,
-            )
-            self._tmp_qy = quantity_factory.zeros(
-                dims=[X_DIM, Y_INTERFACE_DIM, z_dim],
-                units="unknown",
-                dtype=Float,
-            )
-            # TODO: the dimensions of tmp_qout_edges may not be correct, verify
-            # with Lucas and either update the code or remove this comment
-            self._tmp_qout_edges = quantity_factory.zeros(
-                dims=[X_DIM, Y_DIM, z_dim],
-                units="unknown",
-                dtype=Float,
-            )
-
-            _, (z_domain,) = self._idx.get_origin_domain([z_dim])
-            corner_domain = (1, 1, z_domain)
-
-            self._sw_corner_stencil = stencil_factory.from_origin_domain(
-                _sw_corner,
-                origin=self._idx.origin_compute(),
-                domain=corner_domain,
-            )
-            self._nw_corner_stencil = stencil_factory.from_origin_domain(
-                _nw_corner,
-                origin=(self._idx.iec + 1, self._idx.jsc, self._idx.origin[2]),
-                domain=corner_domain,
-            )
-            self._ne_corner_stencil = stencil_factory.from_origin_domain(
-                _ne_corner,
-                origin=(self._idx.iec + 1, self._idx.jec + 1, self._idx.origin[2]),
-                domain=corner_domain,
-            )
-            self._se_corner_stencil = stencil_factory.from_origin_domain(
-                _se_corner,
-                origin=(self._idx.isc, self._idx.jec + 1, self._idx.origin[2]),
-                domain=corner_domain,
-            )
-            js2 = self._idx.jsc + 1 if self._idx.south_edge else self._idx.jsc
-            je1 = self._idx.jec if self._idx.north_edge else self._idx.jec + 1
-            dj2 = je1 - js2 + 1
-
-            # edge_w is singleton in the I-dimension to work around gt4py not yet
-            # supporting J-fields. As a result, the origin has to be zero for
-            # edge_w, anything higher is outside its index range
-            self._qout_x_edge_west = stencil_factory.from_origin_domain(
-                qout_x_edge,
-                origin={
-                    "_all_": (self._idx.isc, js2, self._idx.origin[2]),
-                    "edge_w": (0, js2),
-                },
-                domain=(1, dj2, z_domain),
-            )
-            self._qout_x_edge_east = stencil_factory.from_origin_domain(
-                qout_x_edge,
-                origin={
-                    "_all_": (self._idx.iec + 1, js2, self._idx.origin[2]),
-                    "edge_w": (0, js2),
-                },
-                domain=(1, dj2, z_domain),
-            )
-
-            is2 = self._idx.isc + 1 if self._idx.west_edge else self._idx.isc
-            ie1 = self._idx.iec if self._idx.east_edge else self._idx.iec + 1
-            di2 = ie1 - is2 + 1
-            self._qout_y_edge_south = stencil_factory.from_origin_domain(
-                qout_y_edge,
-                origin=(is2, self._idx.jsc, self._idx.origin[2]),
-                domain=(di2, 1, z_domain),
-            )
-            self._qout_y_edge_north = stencil_factory.from_origin_domain(
-                qout_y_edge,
-                origin=(is2, self._idx.jec + 1, self._idx.origin[2]),
-                domain=(di2, 1, z_domain),
-            )
-
-            self._ppm_volume_mean_x_stencil = stencil_factory.from_dims_halo(
-                ppm_volume_mean_x,
-                compute_dims=[X_INTERFACE_DIM, Y_DIM, z_dim],
-                compute_halos=(0, 2),
-            )
-
-            self._ppm_volume_mean_y_stencil = stencil_factory.from_dims_halo(
-                ppm_volume_mean_y,
-                compute_dims=[X_DIM, Y_INTERFACE_DIM, z_dim],
-                compute_halos=(2, 0),
-            )
-
-            origin, domain = self._idx.get_origin_domain(
-                dims=(X_INTERFACE_DIM, Y_INTERFACE_DIM, z_dim),
-            )
-            origin, domain = self._exclude_tile_edges(origin, domain)
-
-            ax_offsets = self._idx.axis_offsets(
-                origin,
-                domain,
-            )
-            self._a2b_interpolation_stencil = stencil_factory.from_origin_domain(
-                a2b_interpolation, externals=ax_offsets, origin=origin, domain=domain
-            )
-            self._copy_stencil = stencil_factory.from_dims_halo(
-                copy_defn, compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, z_dim]
-            )
-
-        else:  # grid type >= 3:
-            self._doubly_periodic_a2b_ord4 = stencil_factory.from_dims_halo(
-                doubly_periodic_a2b_ord4_stencil,
-                compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, z_dim],
-            )
-            if self.replace:
-                self._copy_stencil = stencil_factory.from_dims_halo(
-                    copy_defn, compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, z_dim]
-                )
-
-    def _exclude_tile_edges(self, origin, domain, dims=("x", "y")):
-        """
-        Args:
-            origin: origin for which to exclude tile edges
-            domain: domain for which to exclude tile edges
-            dims: dimensions on which to exclude tile edges,
-                can include "x" or "y" and defaults to both
-        """
-        origin, domain = list(origin), list(domain)
-        # don't compute last point in tile domain on each edge
-        if self._idx.south_edge and "y" in dims:
-            origin[1] += 1
-            domain[1] -= 1  # must adjust domain to keep endpoint the same
-        if self._idx.north_edge and "y" in dims:
-            domain[1] -= 1
-        if self._idx.west_edge and "x" in dims:
-            origin[0] += 1
-            domain[0] -= 1
-        if self._idx.east_edge and "x" in dims:
-            domain[0] -= 1
-        return tuple(origin), tuple(domain)
-
-    def __call__(self, qin: FloatField, qout: FloatField):
-        """
-        Converts qin from A-grid to B-grid in qout.
-
-        If initialized with replace=True, qin is also updated to the B grid.
-
-        Args:
-            qin (inout): Input on A-grid (intent=in if replace=false)
-            qout (out): Output on B-grid
-        """
-
-        if self.grid_type < 3:
-            self._sw_corner_stencil(
-                qin,
-                qout,
-                self._tmp_qout_edges,
-                self._lon_agrid,
-                self._lat_agrid,
-                self._lon,
-                self._lat,
-            )
-
-            self._nw_corner_stencil(
-                qin,
-                qout,
-                self._tmp_qout_edges,
-                self._lon_agrid,
-                self._lat_agrid,
-                self._lon,
-                self._lat,
-            )
-            self._ne_corner_stencil(
-                qin,
-                qout,
-                self._tmp_qout_edges,
-                self._lon_agrid,
-                self._lat_agrid,
-                self._lon,
-                self._lat,
-            )
-            self._se_corner_stencil(
-                qin,
-                qout,
-                self._tmp_qout_edges,
-                self._lon_agrid,
-                self._lat_agrid,
-                self._lon,
-                self._lat,
-            )
-
-            if self._idx.west_edge:
-                self._qout_x_edge_west(
-                    qin, self._dxa, self._edge_w, qout, self._tmp_qout_edges
-                )
-            if self._idx.east_edge:
-                self._qout_x_edge_east(
-                    qin, self._dxa, self._edge_e, qout, self._tmp_qout_edges
-                )
-
-            if self._idx.south_edge:
-                self._qout_y_edge_south(
-                    qin, self._dya, self._edge_s, qout, self._tmp_qout_edges
-                )
-            if self._idx.north_edge:
-                self._qout_y_edge_north(
-                    qin, self._dya, self._edge_n, qout, self._tmp_qout_edges
-                )
-
-            self._ppm_volume_mean_x_stencil(
-                qin,
-                self._tmp_qx,
-                self._dxa,
-            )
-            self._ppm_volume_mean_y_stencil(
-                qin,
-                self._tmp_qy,
-                self._dya,
-            )
-
-            self._a2b_interpolation_stencil(
-                self._tmp_qout_edges,
-                qout,
-                self._tmp_qx,
-                self._tmp_qy,
-            )
-            if self.replace:
-                self._copy_stencil(
-                    qout,
-                    qin,
-                )
-        else:  # grid type >= 3:
-            self._doubly_periodic_a2b_ord4(qout, qin)
-            if self.replace:
-                self._copy_stencil(qout, qin)
diff --git a/pyFV3/pyFV3/stencils/basic_operations.py b/pyFV3/pyFV3/stencils/basic_operations.py
deleted file mode 100644
index 88376330..00000000
--- a/pyFV3/pyFV3/stencils/basic_operations.py
+++ /dev/null
@@ -1,45 +0,0 @@
-import gt4py.cartesian.gtscript as gtscript
-from gt4py.cartesian.gtscript import PARALLEL, computation, interval
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-
-
-def copy_defn(q_in: FloatField, q_out: FloatField):
-    """Copy q_in to q_out.
-
-    Args:
-        q_in: input field
-        q_out: output field
-    """
-    with computation(PARALLEL), interval(...):
-        q_out = q_in
-
-
-def adjustmentfactor_stencil_defn(adjustment: FloatFieldIJ, q_out: FloatField):
-    with computation(PARALLEL), interval(...):
-        q_out = q_out * adjustment
-
-
-def set_value_defn(q_out: FloatField, value: Float):
-    with computation(PARALLEL), interval(...):
-        q_out = value
-
-
-def adjust_divide_stencil(adjustment: FloatField, q_out: FloatField):
-    with computation(PARALLEL), interval(...):
-        q_out = q_out / adjustment
-
-
-@gtscript.function
-def sign(a, b):
-    asignb = abs(a)
-    if b > 0:
-        asignb = asignb
-    else:
-        asignb = -asignb
-    return asignb
-
-
-@gtscript.function
-def dim(a, b):
-    diff = a - b if a - b > 0 else 0
-    return diff
diff --git a/pyFV3/pyFV3/stencils/c_sw.py b/pyFV3/pyFV3/stencils/c_sw.py
deleted file mode 100644
index 80b504e4..00000000
--- a/pyFV3/pyFV3/stencils/c_sw.py
+++ /dev/null
@@ -1,807 +0,0 @@
-from gt4py.cartesian.gtscript import (  # noqa
-    __INLINED,
-    PARALLEL,
-    computation,
-    horizontal,
-    interval,
-    region,
-)
-from ndsl.constants import X_DIM, X_INTERFACE_DIM, Y_DIM, Y_INTERFACE_DIM, Z_DIM
-from ndsl.dsl.dace.orchestration import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-from ndsl.grid import GridData
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.quantity import Quantity
-from ndsl.stencils import corners
-
-from pyFV3.stencils.d2a2c_vect import DGrid2AGrid2CGridVectors
-
-
-def zero_delpc_ptc(delpc: FloatField, ptc: FloatField):
-    """
-    Args:
-        delpc (out):
-        ptc (out):
-    """
-    with computation(PARALLEL), interval(...):
-        delpc = 0.0
-        ptc = 0.0
-
-
-def divergence_corner(
-    u: FloatField,
-    v: FloatField,
-    ua: FloatField,
-    va: FloatField,
-    dxc: FloatFieldIJ,
-    dyc: FloatFieldIJ,
-    sin_sg1: FloatFieldIJ,
-    sin_sg2: FloatFieldIJ,
-    sin_sg3: FloatFieldIJ,
-    sin_sg4: FloatFieldIJ,
-    cos_sg1: FloatFieldIJ,
-    cos_sg2: FloatFieldIJ,
-    cos_sg3: FloatFieldIJ,
-    cos_sg4: FloatFieldIJ,
-    rarea_c: FloatFieldIJ,
-    divg_d: FloatField,
-):
-    """Calculate divg on d-grid.
-
-    Computed in order to damp the divergence, the damping is applied
-    at the end of d_sw directly to the winds.
-
-    Described in detail in Chapter 8.3 of the FV3 documentation.
-
-    Args:
-        u (in): x-velocity on d-grid
-        v (in): y-velocity on d-grid
-        ua (in): x-velocity on a
-        va (in): y-velocity on a
-        dxc (in): grid spacing in x-direction
-        dyc (in): grid spacing in y-direction
-        sin_sg1 (in): grid sin(sg1)
-        sin_sg2 (in): grid sin(sg2)
-        sin_sg3 (in): grid sin(sg3)
-        sin_sg4 (in): grid sin(sg4)
-        cos_sg1 (in): grid cos(sg1)
-        cos_sg2 (in): grid cos(sg2)
-        cos_sg3 (in): grid cos(sg3)
-        cos_sg4 (in): grid cos(sg4)
-        rarea_c (in): inverse cell areas on c-grid
-        divg_d (out): divergence on d-grid (cell corners)
-    """
-    # TODO: move grid metric terms to externals to import them at compile time
-
-    from __externals__ import grid_type, i_end, i_start, j_end, j_start
-
-    with computation(PARALLEL), interval(...):
-        if __INLINED(grid_type == 4):
-            # with horizontal(region[i_start - 1: i_end + 2, j_start - 1: j_end + 2]):
-            # extend computation into the halo?
-            uf = u * dyc
-            vf = v * dxc
-            divg_d = rarea_c * (vf[0, -1, 0] - vf + uf[-1, 0, 0] - uf)
-
-        else:
-            uf = (
-                (u - 0.25 * (va[0, -1, 0] + va) * (cos_sg4[0, -1] + cos_sg2))
-                * dyc
-                * 0.5
-                * (sin_sg4[0, -1] + sin_sg2)
-            )
-            """c-grid (?) contravariant component of the wind in the x-direction"""
-            # TODO: refactor this into a call to contravariant()
-
-            vf = (
-                (v - 0.25 * (ua[-1, 0, 0] + ua) * (cos_sg3[-1, 0] + cos_sg1))
-                * dxc
-                * 0.5
-                * (sin_sg3[-1, 0] + sin_sg1)
-            )
-
-            divg_d = (vf[0, -1, 0] - vf + uf[-1, 0, 0] - uf) * rarea_c
-
-            # The original code is:
-            # ---------
-            # with horizontal(region[:, j_start], region[:, j_end + 1]):
-            #     uf = u * dyc * 0.5 * (sin_sg4[0, -1] + sin_sg2)
-            # with horizontal(region[i_start, :], region[i_end + 1, :]):
-            #     vf = v * dxc * 0.5 * (sin_sg3[-1, 0] + sin_sg1)
-            # with horizontal(region[i_start, j_start], region[i_end + 1, j_start]):
-            #     divg_d = (-vf + uf[-1, 0, 0] - uf) * rarea_c
-            # with horizontal(region[i_end + 1, j_end + 1], region[i_start, j_end + 1]):
-            #     divg_d = (vf[0, -1, 0] + uf[-1, 0, 0] - uf) * rarea_c
-            # ---------
-            #
-            # Code with regions restrictions:
-            # ---------
-            # variables ending with 1 are the shifted versions
-            # in the future we could use gtscript functions when they support shifts
-
-            with horizontal(region[i_start, :], region[i_end + 1, :]):
-                vf0 = v * dxc * 0.5 * (sin_sg3[-1, 0] + sin_sg1)
-                vf1 = (
-                    v[0, -1, 0] * dxc[0, -1] * 0.5 * (sin_sg3[-1, -1] + sin_sg1[0, -1])
-                )
-                uf1 = (
-                    (
-                        u[-1, 0, 0]
-                        - 0.25
-                        * (va[-1, -1, 0] + va[-1, 0, 0])
-                        * (cos_sg4[-1, -1] + cos_sg2[-1, 0])
-                    )
-                    * dyc[-1, 0]
-                    * 0.5
-                    * (sin_sg4[-1, -1] + sin_sg2[-1, 0])
-                )
-                divg_d = (vf1 - vf0 + uf1 - uf) * rarea_c
-
-            with horizontal(region[:, j_start], region[:, j_end + 1]):
-                uf0 = u * dyc * 0.5 * (sin_sg4[0, -1] + sin_sg2)
-                uf1 = (
-                    u[-1, 0, 0] * dyc[-1, 0] * 0.5 * (sin_sg4[-1, -1] + sin_sg2[-1, 0])
-                )
-                vf1 = (
-                    (
-                        v[0, -1, 0]
-                        - 0.25
-                        * (ua[-1, -1, 0] + ua[0, -1, 0])
-                        * (cos_sg3[-1, -1] + cos_sg1[0, -1])
-                    )
-                    * dxc[0, -1]
-                    * 0.5
-                    * (sin_sg3[-1, -1] + sin_sg1[0, -1])
-                )
-                divg_d = (vf1 - vf + uf1 - uf0) * rarea_c
-
-            with horizontal(region[i_start, j_start], region[i_end + 1, j_start]):
-                uf1 = (
-                    u[-1, 0, 0] * dyc[-1, 0] * 0.5 * (sin_sg4[-1, -1] + sin_sg2[-1, 0])
-                )
-                vf0 = v * dxc * 0.5 * (sin_sg3[-1, 0] + sin_sg1)
-                uf0 = u * dyc * 0.5 * (sin_sg4[0, -1] + sin_sg2)
-                divg_d = (-vf0 + uf1 - uf0) * rarea_c
-
-            with horizontal(region[i_end + 1, j_end + 1], region[i_start, j_end + 1]):
-                vf1 = (
-                    v[0, -1, 0] * dxc[0, -1] * 0.5 * (sin_sg3[-1, -1] + sin_sg1[0, -1])
-                )
-                uf1 = (
-                    u[-1, 0, 0] * dyc[-1, 0] * 0.5 * (sin_sg4[-1, -1] + sin_sg2[-1, 0])
-                )
-                uf0 = u * dyc * 0.5 * (sin_sg4[0, -1] + sin_sg2)
-                divg_d = (vf1 + uf1 - uf0) * rarea_c
-
-            # ---------
-
-
-def geoadjust_ut(
-    ut: FloatField,
-    dy: FloatFieldIJ,
-    sin_sg3: FloatFieldIJ,
-    sin_sg1: FloatFieldIJ,
-    dt2: Float,
-):
-    """
-    take c-grid contravariant wind to compute the 1st order upwind flux
-    Args:
-        ut (out): c-grid contravariant u * dx as input, as output
-            includes metric terms (dt2*dy*sin_sg) needed to compute fluxes,
-            "volume flux" (?)
-        dy (in):
-        sin_sg3 (in):
-        sin_sg1 (in):
-        dt2 (in):
-    """
-    # TODO: describe what ut (out) is as a word or description, and propagate
-    # it to the rest of the code using it
-    with computation(PARALLEL), interval(...):
-        ut[0, 0, 0] = (
-            dt2 * ut * dy * sin_sg3[-1, 0] if ut > 0 else dt2 * ut * dy * sin_sg1
-        )
-
-
-def geoadjust_vt(
-    vt: FloatField,
-    dx: FloatFieldIJ,
-    sin_sg4: FloatFieldIJ,
-    sin_sg2: FloatFieldIJ,
-    dt2: Float,
-):
-    """
-    Args:
-        vt (out):
-        dx (in):
-        sin_sg4 (in):
-        sin_sg2 (in):
-        dt2 (in):
-    """
-    with computation(PARALLEL), interval(...):
-        vt[0, 0, 0] = (
-            dt2 * vt * dx * sin_sg4[0, -1] if vt > 0 else dt2 * vt * dx * sin_sg2
-        )
-
-
-def fill_corners_delp_pt_w(
-    delp_in: FloatField,
-    pt_in: FloatField,
-    w_in: FloatField,
-    delp_out: FloatField,
-    pt_out: FloatField,
-    w_out: FloatField,
-):
-    """
-    Args:
-        delp_in (in):
-        pt_in (in):
-        w_in (in):
-        delp_out (out):
-        pt_out (out):
-        w_out (out):
-    """
-    from __externals__ import fill_corners_func
-
-    with computation(PARALLEL), interval(...):
-        delp_out = fill_corners_func(delp_in)
-        pt_out = fill_corners_func(pt_in)
-        w_out = fill_corners_func(w_in)
-
-
-def compute_nonhydrostatic_fluxes_x(
-    delp: FloatField,
-    pt: FloatField,
-    utc: FloatField,
-    w: FloatField,
-    fx: FloatField,
-    fx1: FloatField,
-    fx2: FloatField,
-):
-    """
-    Computes scalar fluxes
-    Args:
-        delp (in):
-        pt (in):
-        utc (in): metric and wind speed term of the first-order upwind flux
-        w (in):
-        fx (out): heat (entropy) flux, first-order upwind flux of delp
-            in units per second
-        fx1 (out): first-order upwind flux of delp in units per second
-        fx2 (out): flux of veritcal momentum, first-order upwind flux of w
-            in units per second
-    """
-    with computation(PARALLEL), interval(...):
-        fx1 = delp[-1, 0, 0] if utc > 0.0 else delp
-        fx = pt[-1, 0, 0] if utc > 0.0 else pt
-        fx2 = w[-1, 0, 0] if utc > 0.0 else w
-        fx1 = utc * fx1
-        fx = fx1 * fx
-        fx2 = fx1 * fx2
-
-
-def transportdelp_update_vorticity_and_kineticenergy(
-    delp: FloatField,
-    pt: FloatField,
-    utc: FloatField,
-    vtc: FloatField,
-    w: FloatField,
-    rarea: FloatFieldIJ,
-    delpc: FloatField,
-    ptc: FloatField,
-    wc: FloatField,
-    ke: FloatField,
-    vort: FloatField,
-    ua: FloatField,
-    va: FloatField,
-    uc: FloatField,
-    vc: FloatField,
-    u: FloatField,
-    v: FloatField,
-    fx: FloatField,
-    fx1: FloatField,
-    fx2: FloatField,
-    sin_sg1: FloatFieldIJ,
-    cos_sg1: FloatFieldIJ,
-    sin_sg2: FloatFieldIJ,
-    cos_sg2: FloatFieldIJ,
-    sin_sg3: FloatFieldIJ,
-    cos_sg3: FloatFieldIJ,
-    sin_sg4: FloatFieldIJ,
-    cos_sg4: FloatFieldIJ,
-    dt2: Float,
-):
-    """Transport delp then update vorticity and kinetic energy
-
-    steps delpc, ptc, wc.
-    Diagnostically computes ke, vorticity for the start of the timestep
-
-    Args:
-        delp (in): what is transported
-        pt (in): pressure
-        utc (???): x-velocity on C-grid
-        vtc (in): y-velocity on C-grid
-        w (in): z-velocity on C-grid
-        rarea (in): inverse gridcell area
-        delpc (out): updated delp
-        ptc (out): updated pt
-        wc (out): updated w
-        ke (out): kinetic energy, computed with an upstream bias to avoid an instability
-        vort (out): vorticity
-        ua (in): u wind on A-grid
-        va (in): v wind on A-grid
-        uc (in): u wind on C-grid
-        vc (in): v wind on C-grid
-        u (in): u wind on D-grid
-        v (in): v wind on D-grid
-        fx (in):
-        fx1 (in):
-        fx2 (in):
-        sin_sg1 (in):
-        cos_sg1 (in):
-        sin_sg2 (in):
-        cos_sg2 (in):
-        sin_sg3 (in):
-        cos_sg3 (in):
-        sin_sg4 (in):
-        cos_sg4 (in):
-        dt2 (in): length of half a timestep
-    """
-
-    from __externals__ import grid_type, i_end, i_start, j_end, j_start
-
-    with computation(PARALLEL), interval(...):
-        # assume (not grid.nested)
-        # corresponds to x fluxes function, but for y-direction
-        fy1 = delp[0, -1, 0] if vtc > 0.0 else delp
-        fy = pt[0, -1, 0] if vtc > 0.0 else pt
-        fy2 = w[0, -1, 0] if vtc > 0.0 else w
-        fy1 = vtc * fy1
-        fy = fy1 * fy
-        fy2 = fy1 * fy2
-
-        delpc = delp + (fx1 - fx1[1, 0, 0] + fy1 - fy1[0, 1, 0]) * rarea
-        ptc = (pt * delp + (fx - fx[1, 0, 0] + fy - fy[0, 1, 0]) * rarea) / delpc
-        wc = (w * delp + (fx2 - fx2[1, 0, 0] + fy2 - fy2[0, 1, 0]) * rarea) / delpc
-
-    with computation(PARALLEL), interval(...):
-        # update vorticity and kinetic energy
-
-        ke = uc if ua > 0.0 else uc[1, 0, 0]
-        vort = vc if va > 0.0 else vc[0, 1, 0]
-
-        if __INLINED(grid_type < 3):
-            with horizontal(region[:, j_start - 1], region[:, j_end]):
-                vort = vort * sin_sg4 + u[0, 1, 0] * cos_sg4 if va <= 0.0 else vort
-            with horizontal(region[:, j_start], region[:, j_end + 1]):
-                vort = vort * sin_sg2 + u * cos_sg2 if va > 0.0 else vort
-
-            with horizontal(region[i_end, :], region[i_start - 1, :]):
-                ke = ke * sin_sg3 + v[1, 0, 0] * cos_sg3 if ua <= 0.0 else ke
-            with horizontal(region[i_end + 1, :], region[i_start, :]):
-                ke = ke * sin_sg1 + v * cos_sg1 if ua > 0.0 else ke
-
-        ke = 0.5 * dt2 * (ua * ke + va * vort)
-
-
-def circulation_cgrid(
-    uc: FloatField,
-    vc: FloatField,
-    dxc: FloatFieldIJ,
-    dyc: FloatFieldIJ,
-    vort_c: FloatField,
-):
-    """Diagnostically compute vort_c.
-
-    Args:
-        uc (in): x-velocity on C-grid
-        vc (in): y-velocity on C-grid
-        dxc (in): grid spacing in x-dir
-        dyc (in): grid spacing in y-dir
-        vort_c (out): C-grid relative vorticity
-    """
-    from __externals__ import i_end, i_start, j_end, j_start
-
-    with computation(PARALLEL), interval(...):
-        fx = dxc * uc
-        fy = dyc * vc
-        # fx1 and fy1 are the shifted versions of fx and fy and are defined
-        # because temporaries are not allowed to be accessed with offsets in regions.
-        fx1 = dxc[0, -1] * uc[0, -1, 0]
-        fy1 = dyc[-1, 0] * vc[-1, 0, 0]
-
-        vort_c = fx1 - fx - fy1 + fy
-        with horizontal(region[i_start, j_start], region[i_start, j_end + 1]):
-            vort_c = fx1 - fx + fy
-        with horizontal(region[i_end + 1, j_start], region[i_end + 1, j_end + 1]):
-            vort_c = fx1 - fx - fy1
-
-
-def absolute_vorticity(vort: FloatField, fC: FloatFieldIJ, rarea_c: FloatFieldIJ):
-    """
-    Args:
-        vort (out): absolute vorticity
-        fC (in):
-        rarea_c (in):
-    """
-    with computation(PARALLEL), interval(...):
-        vort[0, 0, 0] = fC + rarea_c * vort
-
-
-def update_x_velocity(
-    vorticity: FloatField,
-    ke: FloatField,
-    velocity: FloatField,
-    velocity_c: FloatField,
-    cosa: FloatFieldIJ,
-    sina: FloatFieldIJ,
-    rdxc: FloatFieldIJ,
-    dt2: Float,
-):
-    """
-    Args:
-        vorticity (in):
-        ke (in):
-        velocity (in):
-        velocity_c (out):
-        cosa (in):
-        sina (in):
-        rdxc (in):
-    """
-    from __externals__ import grid_type, i_end, i_start
-
-    with computation(PARALLEL), interval(...):
-        # assume: not __INLINED(spec.grid.nested)
-
-        tmp_flux = dt2 * (velocity - velocity_c * cosa) / sina
-        if __INLINED(grid_type < 3):
-            with horizontal(region[i_start, :], region[i_end + 1, :]):
-                tmp_flux = dt2 * velocity
-
-        flux = vorticity[0, 0, 0] if tmp_flux > 0.0 else vorticity[0, 1, 0]
-        velocity_c = velocity_c + tmp_flux * flux + rdxc * (ke[-1, 0, 0] - ke)
-
-
-def update_y_velocity(
-    vorticity: FloatField,
-    ke: FloatField,
-    velocity: FloatField,
-    velocity_c: FloatField,
-    cosa: FloatFieldIJ,
-    sina: FloatFieldIJ,
-    rdyc: FloatFieldIJ,
-    dt2: Float,
-):
-    """
-    Args:
-        vorticity (in): absolute vorticity
-        ke (in):
-        velocity (in):
-        velocity_c (out): velocity update in y-direction
-        cosa (in):
-        sina (in):
-        rdyc (in):
-    """
-    from __externals__ import grid_type, j_end, j_start
-
-    with computation(PARALLEL), interval(...):
-        # assume: not __INLINED(spec.grid.nested)
-
-        # first-order upwind voriticity flux
-        tmp_flux = dt2 * (velocity - velocity_c * cosa) / sina
-        if __INLINED(grid_type < 3):
-            with horizontal(region[:, j_start], region[:, j_end + 1]):
-                tmp_flux = dt2 * velocity
-
-        flux = vorticity[0, 0, 0] if tmp_flux > 0.0 else vorticity[1, 0, 0]
-        # forward-stepped y velocity
-        # time derivative of vector horizontal wind is equal to curl of vorticity
-        # try to line up with Chapter 5 & 6 of the FV3 documentation
-        velocity_c = velocity_c - tmp_flux * flux + rdyc * (ke[0, -1, 0] - ke)
-
-
-class CGridShallowWaterDynamics:
-    """
-    Fortran name is c_sw
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        grid_data: GridData,
-        nested: bool,
-        grid_type: int,
-        nord: int,
-    ):
-        orchestrate(obj=self, config=stencil_factory.config.dace_config)
-        self.grid_data = grid_data
-        self._dord4 = True
-        self._fC = self.grid_data.fC
-        self._grid_data = grid_data
-        self._grid_type = grid_type
-        # TODO: double-check the dimensions on these, they may be incorrect
-        # as they are only documentation and not used by the code
-        self.delpc = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        """
-        pressure thickness on c-grid forward step
-        """
-        self.ptc = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        """
-        potential temperature on c-grid forward step
-        """
-        self._zero_delpc_ptc = stencil_factory.from_dims_halo(
-            zero_delpc_ptc,
-            compute_dims=[X_DIM, Y_DIM, Z_DIM],
-            compute_halos=(3, 3),
-        )
-
-        self._D2A2CGrid_Vectors = DGrid2AGrid2CGridVectors(
-            stencil_factory,
-            quantity_factory=quantity_factory,
-            grid_data=grid_data,
-            nested=nested,
-            grid_type=grid_type,
-            dord4=self._dord4,
-        )
-
-        def make_quantity() -> Quantity:
-            return quantity_factory.zeros(
-                [X_DIM, Y_DIM, Z_DIM],
-                units="unknown",
-                dtype=Float,
-            )
-
-        # TODO: double-check the dimensions on these, they may be incorrect
-        # as they are only documentation and not used by the code
-        self._tmp_ke = make_quantity()
-        self._tmp_vort = make_quantity()
-        self._tmp_fx = make_quantity()
-        self._tmp_fx1 = make_quantity()
-        self._tmp_fx2 = make_quantity()
-
-        if nord > 0:
-            self._divergence_corner = stencil_factory.from_dims_halo(
-                func=divergence_corner,
-                compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-                externals={"grid_type": grid_type},
-            )
-        else:
-            self._divergence_corner = None
-
-        self._geoadjust_ut = stencil_factory.from_dims_halo(
-            func=geoadjust_ut,
-            compute_dims=[X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            compute_halos=(1, 1),
-        )
-
-        self._geoadjust_vt = stencil_factory.from_dims_halo(
-            func=geoadjust_vt,
-            compute_dims=[X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            compute_halos=(1, 1),
-        )
-
-        if grid_type < 3:
-            self._fill_corners_x_delp_pt_w_stencil = stencil_factory.from_dims_halo(
-                fill_corners_delp_pt_w,
-                externals={"fill_corners_func": corners.fill_corners_2cells_x},
-                compute_dims=[X_DIM, Y_DIM, Z_DIM],
-                compute_halos=(3, 3),
-            )
-
-        self._compute_nonhydro_fluxes_x_stencil = stencil_factory.from_dims_halo(
-            compute_nonhydrostatic_fluxes_x,
-            compute_dims=[X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            compute_halos=(1, 1),
-        )
-
-        if grid_type < 3:
-            self._fill_corners_y_delp_pt_w_stencil = stencil_factory.from_dims_halo(
-                fill_corners_delp_pt_w,
-                externals={"fill_corners_func": corners.fill_corners_2cells_y},
-                compute_dims=[X_DIM, Y_DIM, Z_DIM],
-                compute_halos=(3, 3),
-            )
-
-        self._transportdelp_updatevorticity_and_ke = stencil_factory.from_dims_halo(
-            func=transportdelp_update_vorticity_and_kineticenergy,
-            compute_dims=[X_DIM, Y_DIM, Z_DIM],
-            compute_halos=(1, 1),
-            externals={"grid_type": grid_type},
-        )
-
-        self._circulation_cgrid = stencil_factory.from_dims_halo(
-            func=circulation_cgrid,
-            compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-        )
-        self._absolute_vorticity = stencil_factory.from_dims_halo(
-            func=absolute_vorticity,
-            compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-        )
-
-        self._update_y_velocity = stencil_factory.from_dims_halo(
-            func=update_y_velocity,
-            compute_dims=[X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            externals={
-                "grid_type": grid_type,
-            },
-        )
-
-        self._update_x_velocity = stencil_factory.from_dims_halo(
-            func=update_x_velocity,
-            compute_dims=[X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            externals={"grid_type": grid_type},
-        )
-
-    def __call__(
-        self,
-        delp: FloatField,
-        pt: FloatField,
-        u: FloatField,
-        v: FloatField,
-        w: FloatField,
-        uc: FloatField,
-        vc: FloatField,
-        ua: FloatField,
-        va: FloatField,
-        ut: FloatField,
-        vt: FloatField,
-        divgd: FloatField,
-        omga: FloatField,
-        dt2: Float,
-    ):
-        """
-        C-grid shallow water routine.
-        Advances C-grid winds by half a time step.
-
-        Also advances delp and pt half a timestep, get computed
-        in order to compute the pressure gradient force, since we need that
-        on the half-step for D_SW.
-
-        Args:
-            delp (in): D-grid vertical delta in pressure
-            pt (inout): D-grid potential temperature (only halos get updated)
-            u (in): D-grid x-velocity
-            v (in): D-grid y-velocity
-            w (in): vertical velocity
-            uc (inout): C-grid x-velocity
-            vc (inout): C-grid y-velocity
-            ua (inout): A-grid x-velocity
-            va (inout): A-grid y-velocity
-            ut (out): u * dx
-            vt (out): v * dy
-            divgd (out): D-grid horizontal divergence
-                Computed in order to damp the divergence, the damping is applied
-                at the end of d_sw directly to the winds
-            omga (out): Vertical pressure velocity
-            dt2 (in): Half a model timestep in seconds
-        """
-        # TODO: omga is called "wc" inside stencils, consolidate the naming
-        self._zero_delpc_ptc(
-            self.delpc,
-            self.ptc,
-        )
-        self._D2A2CGrid_Vectors(uc, vc, u, v, ua, va, ut, vt)
-        if self._divergence_corner is not None:
-            self._divergence_corner(
-                u,
-                v,
-                ua,
-                va,
-                self.grid_data.dxc,
-                self.grid_data.dyc,
-                self.grid_data.sin_sg1,
-                self.grid_data.sin_sg2,
-                self.grid_data.sin_sg3,
-                self.grid_data.sin_sg4,
-                self.grid_data.cos_sg1,
-                self.grid_data.cos_sg2,
-                self.grid_data.cos_sg3,
-                self.grid_data.cos_sg4,
-                self.grid_data.rarea_c,
-                divgd,
-            )
-
-        # TODO: what does "geoadjust" mean?
-        # TODO: merge geoadjust routines into compute_nonhydro_fluxes, if possible
-        self._geoadjust_ut(
-            ut,
-            self.grid_data.dy,
-            self.grid_data.sin_sg3,
-            self.grid_data.sin_sg1,
-            dt2,
-        )
-        self._geoadjust_vt(
-            vt,
-            self.grid_data.dx,
-            self.grid_data.sin_sg4,
-            self.grid_data.sin_sg2,
-            dt2,
-        )
-
-        # TODO(eddied): We pass the same fields 2x to avoid GTC validation errors
-        # Aliasing in code is a parallelization risk and
-        # limits our capacity to re-use buffers
-        if self._grid_type < 3:
-            self._fill_corners_x_delp_pt_w_stencil(delp, pt, w, delp, pt, w)
-        # TODO: why is there only a "x" version of this? Is the "y" verison folded
-        # into the next routine?
-        self._compute_nonhydro_fluxes_x_stencil(
-            delp, pt, ut, w, self._tmp_fx, self._tmp_fx1, self._tmp_fx2
-        )
-        if self._grid_type < 3:
-            self._fill_corners_y_delp_pt_w_stencil(delp, pt, w, delp, pt, w)
-        self._transportdelp_updatevorticity_and_ke(
-            delp,
-            pt,
-            ut,
-            vt,
-            w,
-            self.grid_data.rarea,
-            self.delpc,
-            self.ptc,
-            omga,
-            self._tmp_ke,
-            self._tmp_vort,
-            ua,
-            va,
-            uc,
-            vc,
-            u,
-            v,
-            self._tmp_fx,
-            self._tmp_fx1,
-            self._tmp_fx2,
-            self.grid_data.sin_sg1,
-            self.grid_data.cos_sg1,
-            self.grid_data.sin_sg2,
-            self.grid_data.cos_sg2,
-            self.grid_data.sin_sg3,
-            self.grid_data.cos_sg3,
-            self.grid_data.sin_sg4,
-            self.grid_data.cos_sg4,
-            dt2,
-        )
-        # TODO: we can merge circulation cgrid and absolute vorticty
-        # into a single stencil
-        self._circulation_cgrid(
-            uc,
-            vc,
-            self.grid_data.dxc,
-            self.grid_data.dyc,
-            self._tmp_vort,
-        )
-        self._absolute_vorticity(
-            self._tmp_vort,
-            self._fC,
-            self.grid_data.rarea_c,
-        )
-        self._update_y_velocity(
-            self._tmp_vort,
-            self._tmp_ke,
-            u,
-            vc,
-            self.grid_data.cosa_v,
-            self.grid_data.sina_v,
-            self.grid_data.rdyc,
-            dt2,
-        )
-        self._update_x_velocity(
-            self._tmp_vort,
-            self._tmp_ke,
-            v,
-            uc,
-            self.grid_data.cosa_u,
-            self.grid_data.sina_u,
-            self.grid_data.rdxc,
-            dt2,
-        )
-        return self.delpc, self.ptc
diff --git a/pyFV3/pyFV3/stencils/d2a2c_vect.py b/pyFV3/pyFV3/stencils/d2a2c_vect.py
deleted file mode 100644
index c31d7854..00000000
--- a/pyFV3/pyFV3/stencils/d2a2c_vect.py
+++ /dev/null
@@ -1,699 +0,0 @@
-import gt4py.cartesian.gtscript as gtscript
-from gt4py.cartesian.gtscript import PARALLEL, computation, horizontal, interval, region
-from ndsl.constants import X_DIM, Y_DIM, Z_DIM
-from ndsl.dsl.dace.orchestration import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-from ndsl.grid import GridData
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.stencils import corners
-
-from pyFV3.stencils.a2b_ord4 import a1, a2, lagrange_x_func, lagrange_y_func
-
-
-c1 = -2.0 / 14.0
-c2 = 11.0 / 14.0
-c3 = 5.0 / 14.0
-OFFSET = 2
-
-
-def set_tmps(utmp: FloatField, vtmp: FloatField, big_number: Float):
-    with computation(PARALLEL), interval(...):
-        utmp = big_number
-        vtmp = big_number
-
-
-# almost the same as a2b_ord4's version
-@gtscript.function
-def lagrange_y_func_p1(qx):
-    return a2 * (qx[0, -1, 0] + qx[0, 2, 0]) + a1 * (qx + qx[0, 1, 0])
-
-
-def lagrange_interpolation_y_p1(qx: FloatField, qout: FloatField):
-    with computation(PARALLEL), interval(...):
-        qout = lagrange_y_func_p1(qx)
-
-
-@gtscript.function
-def lagrange_x_func_p1(qy):
-    return a2 * (qy[-1, 0, 0] + qy[2, 0, 0]) + a1 * (qy + qy[1, 0, 0])
-
-
-def lagrange_interpolation_x_p1(qy: FloatField, qout: FloatField):
-    with computation(PARALLEL), interval(...):
-        qout = lagrange_x_func_p1(qy)
-
-
-def avg_box(u: FloatField, v: FloatField, utmp: FloatField, vtmp: FloatField):
-    """
-    D2A2C_AVG_OFFSET is an external that describes how far the
-    averaging should go before switching to Lagrangian interpolation. For
-    sufficiently small grids, this should be set to -1, otherwise 3. Note that
-    this makes the stencil code in d2a2c grid-dependent!
-    """
-    from __externals__ import D2A2C_AVG_OFFSET, i_end, i_start, j_end, j_start
-
-    with computation(PARALLEL), interval(...):
-        with horizontal(
-            region[:, : j_start + D2A2C_AVG_OFFSET],
-            region[:, j_end - D2A2C_AVG_OFFSET + 1 :],
-            region[: i_start + D2A2C_AVG_OFFSET, :],
-            region[i_end - D2A2C_AVG_OFFSET + 1 :, :],
-        ):
-            utmp = 0.5 * (u + u[0, 1, 0])
-            vtmp = 0.5 * (v + v[1, 0, 0])
-
-
-def contravariant_components(
-    utmp: FloatField,
-    vtmp: FloatField,
-    cosa_s: FloatFieldIJ,
-    rsin2: FloatFieldIJ,
-    ua: FloatField,
-    va: FloatField,
-):
-    with computation(PARALLEL), interval(...):
-        ua = contravariant(utmp, vtmp, cosa_s, rsin2)
-        va = contravariant(vtmp, utmp, cosa_s, rsin2)
-
-
-def fill_corners_x(utmp: FloatField, vtmp: FloatField, ua: FloatField, va: FloatField):
-    with computation(PARALLEL), interval(...):
-        utmp = corners.fill_corners_3cells_mult_x(
-            utmp, vtmp, sw_mult=-1, se_mult=1, ne_mult=-1, nw_mult=1
-        )
-        ua = corners.fill_corners_2cells_mult_x(
-            ua, va, sw_mult=-1, se_mult=1, ne_mult=-1, nw_mult=1
-        )
-
-
-def ut_main(
-    utmp: FloatField,
-    uc: FloatField,
-    v: FloatField,
-    cosa_u: FloatFieldIJ,
-    rsin_u: FloatFieldIJ,
-    ut: FloatField,
-):
-    with computation(PARALLEL), interval(...):
-        uc = lagrange_x_func(utmp)
-        ut = contravariant(uc, v, cosa_u, rsin_u)
-
-
-def east_west_edges(
-    u: FloatField,
-    ua: FloatField,
-    uc: FloatField,
-    utc: FloatField,
-    utmp: FloatField,
-    v: FloatField,
-    sin_sg1: FloatFieldIJ,
-    sin_sg3: FloatFieldIJ,
-    cosa_u: FloatFieldIJ,
-    rsin_u: FloatFieldIJ,
-    dxa: FloatFieldIJ,
-):
-    from __externals__ import i_end, i_start, local_je, local_js
-
-    with computation(PARALLEL), interval(...):
-        # West
-        with horizontal(region[i_start - 1, local_js - 1 : local_je + 2]):
-            uc = vol_conserv_cubic_interp_func_x(utmp)
-
-        with horizontal(region[i_start, local_js - 1 : local_je + 2]):
-            utc = edge_interpolate4_x(ua, dxa)
-            uc = utc * sin_sg3[-1, 0] if utc > 0 else utc * sin_sg1
-
-        with horizontal(region[i_start + 1, local_js - 1 : local_je + 2]):
-            uc = vol_conserv_cubic_interp_func_x_rev(utmp)
-
-        with horizontal(region[i_start - 1, local_js - 1 : local_je + 2]):
-            utc = contravariant(uc, v, cosa_u, rsin_u)
-
-        with horizontal(region[i_start + 1, local_js - 1 : local_je + 2]):
-            utc = contravariant(uc, v, cosa_u, rsin_u)
-
-        # East
-        with horizontal(region[i_end, local_js - 1 : local_je + 2]):
-            uc = vol_conserv_cubic_interp_func_x(utmp)
-
-        with horizontal(region[i_end + 1, local_js - 1 : local_je + 2]):
-            utc = edge_interpolate4_x(ua, dxa)
-            uc = utc * sin_sg3[-1, 0] if utc > 0 else utc * sin_sg1
-
-        with horizontal(region[i_end + 2, local_js - 1 : local_je + 2]):
-            uc = vol_conserv_cubic_interp_func_x_rev(utmp)
-
-        with horizontal(region[i_end, local_js - 1 : local_je + 2]):
-            utc = contravariant(uc, v, cosa_u, rsin_u)
-
-        with horizontal(region[i_end + 2, local_js - 1 : local_je + 2]):
-            utc = contravariant(uc, v, cosa_u, rsin_u)
-
-
-def fill_corners_y(utmp: FloatField, vtmp: FloatField, ua: FloatField, va: FloatField):
-    with computation(PARALLEL), interval(...):
-        vtmp = corners.fill_corners_3cells_mult_y(
-            vtmp, utmp, sw_mult=-1, se_mult=1, ne_mult=-1, nw_mult=1
-        )
-        va = corners.fill_corners_2cells_mult_y(
-            va, ua, sw_mult=-1, se_mult=1, ne_mult=-1, nw_mult=1
-        )
-
-
-def north_south_edges(
-    v: FloatField,
-    va: FloatField,
-    vc: FloatField,
-    vtc: FloatField,
-    vtmp: FloatField,
-    u: FloatField,
-    sin_sg2: FloatFieldIJ,
-    sin_sg4: FloatFieldIJ,
-    cosa_v: FloatFieldIJ,
-    rsin_v: FloatFieldIJ,
-    dya: FloatFieldIJ,
-):
-    from __externals__ import j_end, j_start, local_ie, local_is, local_je, local_js
-
-    with computation(PARALLEL), interval(...):
-        with horizontal(
-            region[local_is - 1 : local_ie + 2, local_js - 1 : local_je + 3]
-        ):
-            vc = lagrange_y_func(vtmp)
-            vtc = contravariant(vc, u, cosa_v, rsin_v)
-
-        with horizontal(region[local_is - 1 : local_ie + 2, j_start - 1]):
-            vc = vol_conserv_cubic_interp_func_y(vtmp)
-            vtc = contravariant(vc, u, cosa_v, rsin_v)
-
-        with horizontal(region[local_is - 1 : local_ie + 2, j_start]):
-            vtc = edge_interpolate4_y(va, dya)
-            vc = vtc * sin_sg4[0, -1] if vtc > 0 else vtc * sin_sg2
-
-        with horizontal(region[local_is - 1 : local_ie + 2, j_start + 1]):
-            vc = vol_conserv_cubic_interp_func_y_rev(vtmp)
-            vtc = contravariant(vc, u, cosa_v, rsin_v)
-
-        with horizontal(region[local_is - 1 : local_ie + 2, j_end]):
-            vc = vol_conserv_cubic_interp_func_y(vtmp)
-            vtc = contravariant(vc, u, cosa_v, rsin_v)
-
-        with horizontal(region[local_is - 1 : local_ie + 2, j_end + 1]):
-            vtc = edge_interpolate4_y(va, dya)
-            vc = vtc * sin_sg4[0, -1] if vtc > 0 else vtc * sin_sg2
-
-        with horizontal(region[local_is - 1 : local_ie + 2, j_end + 2]):
-            vc = vol_conserv_cubic_interp_func_y_rev(vtmp)
-            vtc = contravariant(vc, u, cosa_v, rsin_v)
-
-
-def vt_main(
-    vtmp: FloatField,
-    vc: FloatField,
-    u: FloatField,
-    cosa_v: FloatFieldIJ,
-    rsin_v: FloatFieldIJ,
-    vt: FloatField,
-):
-    with computation(PARALLEL), interval(...):
-        vc = lagrange_y_func(vtmp)
-        vt = contravariant(vc, u, cosa_v, rsin_v)
-
-
-@gtscript.function
-def contravariant(v1, v2, cosa, rsin2):
-    """
-    Retrieve the contravariant component of the wind from its covariant
-    component and the covariant component in the "other" (x/y) direction.
-
-    For an orthogonal grid, cosa would be 0 and rsin2 would be 1, meaning
-    the contravariant component is equal to the covariant component.
-    However, the gnomonic cubed sphere grid is not orthogonal.
-
-    This equation is only valid within the tile. On the edge of
-    a tile, it has this simpler form:
-
-    u_contra = u / sin(alpha) at the edges
-
-    Args:
-        v1: covariant component of the wind for which we want to get the
-            contravariant component
-        v2: covariant component of the wind for the other direction,
-            i.e. y if v1 is in x, x if v1 is in y
-        cosa: cosine of the angle between the local x-direction and y-direction.
-        rsin2: 1 / (sin(alpha))^2, where alpha is the angle between the local
-            x-direction and y-direction
-
-    Returns:
-        v1_contravariant: contravariant component of v1
-    """
-    # From technical docs on FV3 cubed sphere grid:
-    # The gnomonic cubed sphere grid is not orthogonal, meaning
-    # the u and v vectors have some overlapping component. We can decompose
-    # the total wind U in two ways, as a linear combination of the
-    # coordinate vectors ("contravariant"):
-    #    U = u_contravariant * u_dir + v_contravariant * v_dir
-    # or as the projection of the vector onto the coordinate
-    #    u_covariant = U dot u_dir
-    #    v_covariant = U dot v_dir
-    # The names come from the fact that the covariant vectors vary
-    # (under a change in coordinate system) the same way the coordinate values do,
-    # while the contravariant vectors vary in the "opposite" way.
-    #
-    # equations from FV3 technical documentation
-    # u_cov = u_contra + v_contra * cos(alpha)  (eq 3.4)
-    # v_cov = u_contra * cos(alpha) + v_contra  (eq 3.5)
-    #
-    # u_contra = u_cov - v_contra * cos(alpha)  (1, from 3.4)
-    # v_contra = v_cov - u_contra * cos(alpha)  (2, from 3.5)
-    # u_contra = u_cov - (v_cov - u_contra * cos(alpha)) * cos(alpha)  (from 1 & 2)
-    # u_contra = u_cov - v_cov * cos(alpha) + u_contra * cos2(alpha) (follows)
-    # u_contra * (1 - cos2(alpha)) = u_cov - v_cov * cos(alpha)
-    # u_contra = u_cov/(1 - cos2(alpha)) - v_cov * cos(alpha)/(1 - cos2(alpha))
-    # matches because rsin = 1 /(1 + cos2(alpha)),
-    #                 cosa*rsin = cos(alpha)/(1 + cos2(alpha))
-
-    # recall that:
-    # rsin2 is 1/(sin(alpha))^2
-    # cosa is cos(alpha)
-
-    return (v1 - v2 * cosa) * rsin2
-
-
-def contravariant_stencil(
-    u: FloatField,
-    v: FloatField,
-    cosa: FloatFieldIJ,
-    rsin: FloatFieldIJ,
-    out: FloatField,
-):
-    with computation(PARALLEL), interval(...):
-        out = contravariant(u, v, cosa, rsin)
-
-
-@gtscript.function
-def vol_conserv_cubic_interp_func_x(u):
-    return c1 * u[-2, 0, 0] + c2 * u[-1, 0, 0] + c3 * u
-
-
-@gtscript.function
-def vol_conserv_cubic_interp_func_x_rev(u):
-    return c1 * u[1, 0, 0] + c2 * u + c3 * u[-1, 0, 0]
-
-
-@gtscript.function
-def vol_conserv_cubic_interp_func_y(v):
-    return c1 * v[0, -2, 0] + c2 * v[0, -1, 0] + c3 * v
-
-
-@gtscript.function
-def vol_conserv_cubic_interp_func_y_rev(v):
-    return c1 * v[0, 1, 0] + c2 * v + c3 * v[0, -1, 0]
-
-
-def vol_conserv_cubic_interp_x(utmp: FloatField, uc: FloatField):
-    with computation(PARALLEL), interval(...):
-        uc = vol_conserv_cubic_interp_func_x(utmp)
-
-
-def vol_conserv_cubic_interp_x_rev(utmp: FloatField, uc: FloatField):
-    with computation(PARALLEL), interval(...):
-        uc = vol_conserv_cubic_interp_func_x_rev(utmp)
-
-
-def vol_conserv_cubic_interp_y(vtmp: FloatField, vc: FloatField):
-    with computation(PARALLEL), interval(...):
-        vc = vol_conserv_cubic_interp_func_y(vtmp)
-
-
-def vt_edge(
-    vtmp: FloatField,
-    vc: FloatField,
-    u: FloatField,
-    cosa_v: FloatFieldIJ,
-    rsin_v: FloatFieldIJ,
-    vt: FloatField,
-    rev: int,
-):
-    with computation(PARALLEL), interval(...):
-        vc = (
-            vol_conserv_cubic_interp_func_y(vtmp)
-            if rev == 0
-            else vol_conserv_cubic_interp_func_y_rev(vtmp)
-        )
-        vt = contravariant(vc, u, cosa_v, rsin_v)
-
-
-def uc_x_edge1(
-    ut: FloatField, sin_sg3: FloatFieldIJ, sin_sg1: FloatFieldIJ, uc: FloatField
-):
-    with computation(PARALLEL), interval(...):
-        uc = ut * sin_sg3[-1, 0] if ut > 0 else ut * sin_sg1
-
-
-def vc_y_edge1(
-    vt: FloatField, sin_sg4: FloatFieldIJ, sin_sg2: FloatFieldIJ, vc: FloatField
-):
-    with computation(PARALLEL), interval(...):
-        vc = vt * sin_sg4[0, -1] if vt > 0 else vt * sin_sg2
-
-
-@gtscript.function
-def edge_interpolate4_x(ua, dxa):
-    t1 = dxa[-2, 0] + dxa[-1, 0]
-    t2 = dxa[0, 0] + dxa[1, 0]
-    n1 = (t1 + dxa[-1, 0]) * ua[-1, 0, 0] - dxa[-1, 0] * ua[-2, 0, 0]
-    n2 = (t1 + dxa[0, 0]) * ua[0, 0, 0] - dxa[0, 0] * ua[1, 0, 0]
-    return 0.5 * (n1 / t1 + n2 / t2)
-
-
-@gtscript.function
-def edge_interpolate4_y(va, dya):
-    t1 = dya[0, -2] + dya[0, -1]
-    t2 = dya[0, 0] + dya[0, 1]
-    n1 = (t1 + dya[0, -1]) * va[0, -1, 0] - dya[0, -1] * va[0, -2, 0]
-    n2 = (t1 + dya[0, 0]) * va[0, 0, 0] - dya[0, 0] * va[0, 1, 0]
-    return 0.5 * (n1 / t1 + n2 / t2)
-
-
-class DGrid2AGrid2CGridVectors:
-    """
-    Fortran name d2a2c_vect
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        grid_data: GridData,
-        nested: bool,
-        grid_type: int,
-        dord4: bool,
-    ):
-        if grid_type not in [0, 4]:
-            raise NotImplementedError(f"unimplemented grid_type {grid_type}")
-
-        orchestrate(obj=self, config=stencil_factory.config.dace_config)
-
-        grid_indexing = stencil_factory.grid_indexing
-        self._cosa_s = grid_data.cosa_s
-        self._cosa_u = grid_data.cosa_u
-        self._cosa_v = grid_data.cosa_v
-        self._rsin_u = grid_data.rsin_u
-        self._rsin_v = grid_data.rsin_v
-        self._rsin2 = grid_data.rsin2
-        self._dxa = grid_data.dxa
-        self._dya = grid_data.dya
-        self._sin_sg1 = grid_data.sin_sg1
-        self._sin_sg2 = grid_data.sin_sg2
-        self._sin_sg3 = grid_data.sin_sg3
-        self._sin_sg4 = grid_data.sin_sg4
-        self._grid_type = grid_type
-
-        self._big_number = 1e30  # 1e8 if 32 bit
-        nx = grid_indexing.iec + 1  # grid.npx + 2
-        ny = grid_indexing.jec + 1  # grid.npy + 2
-        i1 = grid_indexing.isc - 1
-        j1 = grid_indexing.jsc - 1
-        id_ = 1 if dord4 else 0
-        pad = 2 + 2 * id_
-        if (grid_type < 3) and (not nested):
-            npt = 4
-            if npt > grid_indexing.domain[0] - 1 or npt > grid_indexing.domain[1] - 1:
-                npt = 0
-            ifirst = (
-                grid_indexing.isc + 2
-                if grid_indexing.west_edge
-                else grid_indexing.isc - 1
-            )
-            ilast = (
-                grid_indexing.iec - 1
-                if grid_indexing.east_edge
-                else grid_indexing.iec + 2
-            )
-
-            jfirst = (
-                grid_indexing.jsc + 2
-                if grid_indexing.south_edge
-                else grid_indexing.jsc - 1
-            )
-            jlast = (
-                grid_indexing.jec - 1
-                if grid_indexing.north_edge
-                else grid_indexing.jec + 2
-            )
-        else:
-            npt = -2
-            ifirst = grid_indexing.isc - 1
-            ilast = grid_indexing.iec + 2
-            jfirst = grid_indexing.jsc - 1
-            jlast = grid_indexing.jec + 2
-
-        self._utmp = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="m/s",
-            dtype=Float,
-        )
-        self._vtmp = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="m/s",
-            dtype=Float,
-        )
-
-        if (grid_type < 3) and (not nested):
-            js1 = npt + OFFSET if grid_indexing.south_edge else grid_indexing.jsc - 1
-            je1 = ny - npt if grid_indexing.north_edge else grid_indexing.jec + 1
-            is1 = npt + OFFSET if grid_indexing.west_edge else grid_indexing.isd
-            ie1 = nx - npt if grid_indexing.east_edge else grid_indexing.ied
-
-            is2 = npt + OFFSET if grid_indexing.west_edge else grid_indexing.isc - 1
-            ie2 = nx - npt if grid_indexing.east_edge else grid_indexing.iec + 1
-            js2 = npt + OFFSET if grid_indexing.south_edge else grid_indexing.jsd
-            je2 = ny - npt if grid_indexing.north_edge else grid_indexing.jed
-
-        else:
-            js1 = grid_indexing.jsc - 1
-            je1 = grid_indexing.jec + 1
-            is1 = grid_indexing.isd
-            ie1 = grid_indexing.ied
-
-            is2 = grid_indexing.isc - 1
-            ie2 = grid_indexing.iec + 1
-            js2 = grid_indexing.jsd
-            je2 = grid_indexing.jed
-
-        idiff = ilast - ifirst + 1
-        jdiff = jlast - jfirst + 1
-
-        self._set_tmps = stencil_factory.from_dims_halo(
-            func=set_tmps,
-            compute_dims=[X_DIM, Y_DIM, Z_DIM],
-            compute_halos=(3, 3),
-        )
-
-        self._lagrange_interpolation_y_p1 = stencil_factory.from_origin_domain(
-            func=lagrange_interpolation_y_p1,
-            origin=(is1, js1, 0),
-            domain=(ie1 - is1 + 1, je1 - js1 + 1, grid_indexing.domain[2]),
-        )
-
-        self._lagrange_interpolation_x_p1 = stencil_factory.from_origin_domain(
-            func=lagrange_interpolation_x_p1,
-            origin=(is2, js2, 0),
-            domain=(ie2 - is2 + 1, je2 - js2 + 1, grid_indexing.domain[2]),
-        )
-
-        origin = grid_indexing.origin_full()
-        domain = grid_indexing.domain_full()
-        ax_offsets = grid_indexing.axis_offsets(origin, domain)
-        if npt == 0:
-            d2a2c_avg_offset = -1
-        else:
-            d2a2c_avg_offset = 3
-
-        if self._grid_type < 3:
-            self._avg_box = stencil_factory.from_dims_halo(
-                func=avg_box,
-                externals={"D2A2C_AVG_OFFSET": d2a2c_avg_offset},
-                compute_dims=[X_DIM, Y_DIM, Z_DIM],
-                compute_halos=(3, 3),
-            )
-
-        self._contravariant_components = stencil_factory.from_origin_domain(
-            func=contravariant_components,
-            origin=grid_indexing.origin_compute(add=(-1 - id_, -1 - id_, 0)),
-            domain=grid_indexing.domain_compute(add=(pad, pad, 0)),
-        )
-        origin_edges = grid_indexing.origin_compute(add=(-3, -3, 0))
-        domain_edges = grid_indexing.domain_compute(add=(6, 6, 0))
-        ax_offsets_edges = grid_indexing.axis_offsets(origin_edges, domain_edges)
-        self._fill_corners_x = stencil_factory.from_origin_domain(
-            func=fill_corners_x,
-            externals=ax_offsets_edges,
-            origin=origin_edges,
-            domain=domain_edges,
-        )
-
-        self._ut_main = stencil_factory.from_origin_domain(
-            func=ut_main,
-            origin=(ifirst, j1, 0),
-            domain=(idiff, grid_indexing.domain[1] + 2, grid_indexing.domain[2]),
-        )
-
-        if grid_type < 3:
-            self._east_west_edges = stencil_factory.from_origin_domain(
-                func=east_west_edges,
-                externals={
-                    "i_end": ax_offsets_edges["i_end"],
-                    "i_start": ax_offsets_edges["i_start"],
-                    "local_je": ax_offsets_edges["local_je"],
-                    "local_js": ax_offsets_edges["local_js"],
-                },
-                origin=origin_edges,
-                domain=domain_edges,
-            )
-
-        # Ydir:
-        self._fill_corners_y = stencil_factory.from_origin_domain(
-            func=fill_corners_y,
-            externals={
-                **ax_offsets_edges,
-            },
-            origin=origin_edges,
-            domain=domain_edges,
-        )
-
-        if grid_type < 3:
-            self._north_south_edges = stencil_factory.from_origin_domain(
-                func=north_south_edges,
-                externals={
-                    "j_end": ax_offsets_edges["j_end"],
-                    "j_start": ax_offsets_edges["j_start"],
-                    "local_ie": ax_offsets_edges["local_ie"],
-                    "local_is": ax_offsets_edges["local_is"],
-                    "local_je": ax_offsets_edges["local_je"],
-                    "local_js": ax_offsets_edges["local_js"],
-                },
-                origin=origin_edges,
-                domain=domain_edges,
-            )
-
-        self._vt_main = stencil_factory.from_origin_domain(
-            func=vt_main,
-            origin=(i1, jfirst, 0),
-            domain=(grid_indexing.domain[0] + 2, jdiff, grid_indexing.domain[2]),
-        )
-
-    def __call__(self, uc, vc, u, v, ua, va, utc, vtc):
-        """
-        Calculate velocity vector from D-grid to A-grid to C-grid.
-
-        Args:
-            uc: C-grid x-velocity (inout)
-            vc: C-grid y-velocity (inout)
-            u: D-grid x-velocity (in)
-            v: D-grid y-velocity (in)
-            ua: A-grid x-velocity (inout)
-            va: A-grid y-velocity (inout)
-            utc: C-grid u * dx (inout)
-            vtc: C-grid v * dy (inout)
-        """
-        self._set_tmps(
-            self._utmp,
-            self._vtmp,
-            self._big_number,
-        )
-
-        self._lagrange_interpolation_y_p1(
-            u,
-            self._utmp,
-        )
-
-        self._lagrange_interpolation_x_p1(
-            v,
-            self._vtmp,
-        )
-
-        # tmp edges
-        if self._grid_type < 3:
-            self._avg_box(
-                u,
-                v,
-                self._utmp,
-                self._vtmp,
-            )
-
-        # contra-variant components at cell center
-        self._contravariant_components(
-            self._utmp,
-            self._vtmp,
-            self._cosa_s,
-            self._rsin2,
-            ua,
-            va,
-        )
-        # Fix the edges
-        # Xdir:
-        self._fill_corners_x(
-            self._utmp,
-            self._vtmp,
-            ua,
-            va,
-        )
-
-        self._ut_main(
-            self._utmp,
-            uc,
-            v,
-            self._cosa_u,
-            self._rsin_u,
-            utc,
-        )
-
-        if self._grid_type < 3:
-            self._east_west_edges(
-                u,
-                ua,
-                uc,
-                utc,
-                self._utmp,
-                v,
-                self._sin_sg1,
-                self._sin_sg3,
-                self._cosa_u,
-                self._rsin_u,
-                self._dxa,
-            )
-
-        # Ydir:
-        self._fill_corners_y(
-            self._utmp,
-            self._vtmp,
-            ua,
-            va,
-        )
-
-        if self._grid_type < 3:
-            self._north_south_edges(
-                v,
-                va,
-                vc,
-                vtc,
-                self._vtmp,
-                u,
-                self._sin_sg2,
-                self._sin_sg4,
-                self._cosa_v,
-                self._rsin_v,
-                self._dya,
-            )
-
-        self._vt_main(
-            self._vtmp,
-            vc,
-            u,
-            self._cosa_v,
-            self._rsin_v,
-            vtc,
-        )
diff --git a/pyFV3/pyFV3/stencils/d_sw.py b/pyFV3/pyFV3/stencils/d_sw.py
deleted file mode 100644
index 6f531a6a..00000000
--- a/pyFV3/pyFV3/stencils/d_sw.py
+++ /dev/null
@@ -1,1303 +0,0 @@
-from typing import Dict, Mapping
-
-import gt4py.cartesian.gtscript as gtscript
-from gt4py.cartesian.gtscript import (
-    __INLINED,
-    PARALLEL,
-    computation,
-    horizontal,
-    interval,
-    region,
-)
-from ndsl.constants import X_DIM, X_INTERFACE_DIM, Y_DIM, Y_INTERFACE_DIM, Z_DIM
-from ndsl.dsl.dace.orchestration import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ, FloatFieldK
-from ndsl.grid import DampingCoefficients, GridData
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.quantity import Quantity
-
-import pyFV3.stencils.delnflux as delnflux
-from pyFV3._config import DGridShallowWaterLagrangianDynamicsConfig
-from pyFV3.stencils.d2a2c_vect import contravariant
-from pyFV3.stencils.delnflux import DelnFluxNoSG
-from pyFV3.stencils.divergence_damping import DivergenceDamping
-from pyFV3.stencils.fvtp2d import FiniteVolumeTransport
-from pyFV3.stencils.fxadv import FiniteVolumeFluxPrep
-from pyFV3.stencils.xtp_u import advect_u_along_x
-from pyFV3.stencils.ytp_v import advect_v_along_y
-
-
-dcon_threshold = 1e-5
-
-
-def flux_capacitor(
-    cx: FloatField,
-    cy: FloatField,
-    xflux: FloatField,
-    yflux: FloatField,
-    crx_adv: FloatField,
-    cry_adv: FloatField,
-    fx: FloatField,
-    fy: FloatField,
-):
-    """Accumulates the flux capacitor and courant number variables
-    Saves the mass fluxes to the "flux capacitor" variables for tracer transport
-    Also updates the accumulated courant numbers
-    Args:
-        cx (inout): accumulated courant number in the x direction
-        cy (inout): accumulated courant number in the y direction
-        xflux (inout): flux capacitor in the x direction, accumlated mass flux
-        yflux (inout): flux capacitor in the y direction, accumlated mass flux
-        crx_adv (in): local courant numver, dt*ut/dx
-        cry_adv (in): local courant number dt*vt/dy
-        fx (in): 1-D x-direction flux
-        fy (in): 1-D y-direction flux
-    """
-    with computation(PARALLEL), interval(...):
-        cx = cx + crx_adv
-        cy = cy + cry_adv
-        xflux = xflux + fx
-        yflux = yflux + fy
-
-
-def heat_diss(
-    fx2: FloatField,
-    fy2: FloatField,
-    w: FloatField,
-    rarea: FloatFieldIJ,
-    heat_source: FloatField,
-    diss_est: FloatField,
-    dw: FloatField,
-    damp_w: FloatFieldK,
-    ke_bg: FloatFieldK,
-    dt: Float,
-):
-    """
-    Calculate heat generation due to loss of kinetic energy
-    due to damping of vertical wind.
-
-    Does nothing for levels where damp_w <= 1e-5.
-
-    diss_est used for stochastic physics only
-
-    Args:
-        fx2 (in): x-flux of vertical wind to apply damping
-        fy2 (in): y-flux of vertical wind to apply damping
-        w (in): vertical wind
-        rarea (in):
-        heat_source (out): heat source due to loss of kinetic energy
-        diss_est (out): heat source due to loss of kinetic energy
-        dw (inout): diffusive update to vertical wind, does not
-            include convergence correction, since damping is numerical
-            and not physical it's not necessary to include.
-        damp_w (in):
-        ke_bg (in):
-    """
-    with computation(PARALLEL), interval(...):
-        heat_source = 0.0
-        diss_est = 0.0
-        if damp_w > 1e-5:
-            dd8 = ke_bg * abs(dt)
-            dw = (fx2 - fx2[1, 0, 0] + fy2 - fy2[0, 1, 0]) * rarea
-            heat_source = dd8 - dw * (w + 0.5 * dw)
-            diss_est = heat_source
-
-
-@gtscript.function
-def flux_increment(gx, gy, rarea):
-    """
-    Args:
-        gx: x-direction flux of some scalar q in units of q * area
-            defined on cell interfaces
-        gy: y-direction flux of some scalar q in units of q * area
-            defined on cell interfaces
-        rarea: 1 / area
-
-    Returns:
-        tendency increment in units of q defined on cell centers
-    """
-    return (gx - gx[1, 0, 0] + gy - gy[0, 1, 0]) * rarea
-
-
-def apply_fluxes(
-    q: FloatField, delp: FloatField, gx: FloatField, gy: FloatField, rarea: FloatFieldIJ
-):
-    """
-    Update q according to fluxes gx and gy.
-
-    Changes the units of q to be pressure-weighted.
-
-    Args:
-        q (inout): any scalar, the fluxes gx and gy are applied and the output is
-            mass-weighted (replaced with units of q * delp)
-        delp (in): pressure thickness of layer
-        gx (in): x-flux of q in units of q * Pa * area
-        gy (in): y-flux of q in units of q * Pa * area
-        rarea (in): 1 / area
-    """
-    # TODO: this function changes the units and therefore meaning of q,
-    # is there any way we can avoid doing so?
-    # the next time w and q_con (passed as q to this routine) are used
-    # is in adjust_w_and_qcon, where they are divided by an updated delp to return
-    # to the original units.
-    with computation(PARALLEL), interval(...):
-        # in the original Fortran, this uses `w` instead of `q`
-        q = q * delp + flux_increment(gx, gy, rarea)
-
-
-@gtscript.function
-def apply_pt_delp_fluxes(
-    pt_x_flux: FloatField,
-    pt_y_flux: FloatField,
-    rarea: FloatFieldIJ,
-    delp_x_flux: FloatField,
-    delp_y_flux: FloatField,
-    pt: FloatField,
-    delp: FloatField,
-):
-    """
-    Args:
-        fx (in):
-        fy (in):
-        pt (inout):
-        delp (inout):
-        gx (in):
-        gy (in):
-        rarea (in):
-    """
-    from __externals__ import inline_q, local_ie, local_is, local_je, local_js
-
-    # original Fortran uses gx/gy for pt fluxes, fx/fy for delp fluxes
-    # TODO: local region only needed for d_sw halo validation
-    # use selective validation instead
-    if __INLINED(inline_q == 0):
-        with horizontal(region[local_is : local_ie + 1, local_js : local_je + 1]):
-            pt = pt * delp + flux_increment(pt_x_flux, pt_y_flux, rarea)
-            delp = delp + flux_increment(delp_x_flux, delp_y_flux, rarea)
-            pt = pt / delp
-    return pt, delp
-
-
-def apply_pt_delp_fluxes_stencil_defn(
-    fx: FloatField,
-    fy: FloatField,
-    pt: FloatField,
-    delp: FloatField,
-    gx: FloatField,
-    gy: FloatField,
-    rarea: FloatFieldIJ,
-):
-    """
-    Args:
-        fx (in):
-        fy (in):
-        pt (inout):
-        delp (inout):
-        gx (in):
-        gy (in):
-        rarea (in):
-    """
-    with computation(PARALLEL), interval(...):
-        pt, delp = apply_pt_delp_fluxes(gx, gy, rarea, fx, fy, pt, delp)
-
-
-def compute_kinetic_energy(
-    vc: FloatField,
-    uc: FloatField,
-    cosa: FloatFieldIJ,
-    rsina: FloatFieldIJ,
-    v: FloatField,
-    vc_contra: FloatField,
-    u: FloatField,
-    uc_contra: FloatField,
-    dx: FloatFieldIJ,
-    dxa: FloatFieldIJ,
-    rdx: FloatFieldIJ,
-    dy: FloatFieldIJ,
-    dya: FloatFieldIJ,
-    rdy: FloatFieldIJ,
-    dt_kinetic_energy_on_cell_corners: FloatField,
-    dt: Float,
-):
-    """
-    Args:
-        vc (in): y-wind on c-grid
-        uc (in): x-wind on c-grid
-        cosa (in):
-        rsina (in):
-        v (in): y-wind on d-grid
-        vc_contra (in): contravariant y-wind on c-grid
-        u (in): x-wind on d-grid
-        uc_contra (in): contravariant x-wind on c-grid
-        dx (in):
-        dxa (in):
-        rdx (in):
-        dy (in):
-        dya (in):
-        rdy (in):
-        dt_kinetic_energy_on_cell_corners (out): kinetic energy on cell corners,
-            as defined in FV3 documentation by equation 6.3, multiplied by dt
-        dt: timestep
-    """
-    from __externals__ import grid_type
-
-    with computation(PARALLEL), interval(...):
-        if __INLINED(grid_type < 3):
-            ub_contra, vb_contra = interpolate_uc_vc_to_cell_corners(
-                uc, vc, cosa, rsina, uc_contra, vc_contra
-            )
-        else:
-            ub_contra = 0.5 * (uc[0, -1, 0] + uc)
-            vb_contra = 0.5 * (vc[-1, 0, 0] + vc)
-        advected_v = advect_v_along_y(v, vb_contra, rdy=rdy, dy=dy, dya=dya, dt=dt)
-        advected_u = advect_u_along_x(u, ub_contra, rdx=rdx, dx=dx, dxa=dxa, dt=dt)
-        # makes sure the kinetic energy part of the governing equation is computed
-        # the same way as the vorticity flux part (in terms of time splitting)
-        # to avoid a Hollingsworth-Kallberg instability
-        dt_kinetic_energy_on_cell_corners = (
-            0.5 * dt * (ub_contra * advected_u + vb_contra * advected_v)
-        )
-        dt_kinetic_energy_on_cell_corners = all_corners_ke(
-            dt_kinetic_energy_on_cell_corners, u, v, uc_contra, vc_contra, dt
-        )
-
-
-@gtscript.function
-def corner_ke(
-    u,
-    v,
-    ut,
-    vt,
-    dt,
-    io1,
-    jo1,
-    io2,
-    vsign,
-):
-    dt6 = dt / 6.0
-
-    return dt6 * (
-        (ut[0, 0, 0] + ut[0, -1, 0]) * ((io1 + 1) * u[0, 0, 0] - (io1 * u[-1, 0, 0]))
-        + (vt[0, 0, 0] + vt[-1, 0, 0]) * ((jo1 + 1) * v[0, 0, 0] - (jo1 * v[0, -1, 0]))
-        + (
-            ((jo1 + 1) * ut[0, 0, 0] - (jo1 * ut[0, -1, 0]))
-            + vsign * ((io1 + 1) * vt[0, 0, 0] - (io1 * vt[-1, 0, 0]))
-        )
-        * ((io2 + 1) * u[0, 0, 0] - (io2 * u[-1, 0, 0]))
-    )
-
-
-@gtscript.function
-def all_corners_ke(ke, u, v, ut, vt, dt):
-    from __externals__ import i_end, i_start, j_end, j_start
-
-    # Assumption: not __INLINED(grid.nested)
-    with horizontal(region[i_start, j_start]):
-        ke = corner_ke(u, v, ut, vt, dt, 0, 0, -1, 1)
-    with horizontal(region[i_end + 1, j_start]):
-        ke = corner_ke(u, v, ut, vt, dt, -1, 0, 0, -1)
-    with horizontal(region[i_end + 1, j_end + 1]):
-        ke = corner_ke(u, v, ut, vt, dt, -1, -1, 0, 1)
-    with horizontal(region[i_start, j_end + 1]):
-        ke = corner_ke(u, v, ut, vt, dt, 0, -1, -1, -1)
-
-    return ke
-
-
-def compute_vorticity(
-    u: FloatField,
-    v: FloatField,
-    dx: FloatFieldIJ,
-    dy: FloatFieldIJ,
-    rarea: FloatFieldIJ,
-    vorticity: FloatField,
-):
-    """
-    Compute cell mean vorticity using Stokes' theorem (using average circulation).
-
-    Args:
-        u (in):
-        v (in):
-        dx (in):
-        dy (in):
-        rarea (in):
-        vorticity (out):
-    """
-    with computation(PARALLEL), interval(...):
-        # cell-mean vorticity is equal to the circulation around the gridcell
-        # divided by the area of the gridcell. It isn't exactly true that
-        # area = dx * dy, so the form below is necessary to get an exact result.
-        rdy_tmp = rarea * dx
-        rdx_tmp = rarea * dy
-        vorticity = (u - u[0, 1, 0] * dx[0, 1] / dx) * rdy_tmp + (
-            v[1, 0, 0] * dy[1, 0] / dy - v
-        ) * rdx_tmp
-
-
-def adjust_w_and_qcon(
-    w: FloatField,
-    delp: FloatField,
-    dw: FloatField,
-    q_con: FloatField,
-    damp_w: FloatFieldK,
-):
-    """
-    Args:
-        w (inout):
-        delp (in):
-        dw (in):
-        q_con (inout):
-        damp_w (in):
-    """
-    with computation(PARALLEL), interval(...):
-        w = w / delp
-        w = w + dw if damp_w > 1e-5 else w
-        # Fortran: #ifdef USE_COND
-        q_con = q_con / delp
-
-
-def vort_differencing(
-    vort: FloatField,
-    vort_x_delta: FloatField,
-    vort_y_delta: FloatField,
-    dcon: FloatFieldK,
-):
-    """
-    Intermediate operation for computing heating due to diffusion
-
-    Args:
-        vort (in):
-        vort_x_delta (out):
-        vort_y_delta (out):
-        dcon (in):
-    """
-    from __externals__ import local_ie, local_is, local_je, local_js
-
-    with computation(PARALLEL), interval(...):
-        # TODO: this should likely be dcon[k] rather than dcon[0] so that this
-        # can be turned on and off per-layer
-        if dcon[0] > dcon_threshold:
-            # Creating a gtscript function for the ub/vb computation
-            # results in an "NotImplementedError" error for Jenkins
-            # Inlining the ub/vb computation in this stencil resolves the Jenkins error
-            with horizontal(region[local_is : local_ie + 1, local_js : local_je + 2]):
-                vort_x_delta = vort - vort[1, 0, 0]
-            with horizontal(region[local_is : local_ie + 2, local_js : local_je + 1]):
-                vort_y_delta = vort - vort[0, 1, 0]
-
-
-# TODO: This is untested and the radius may be incorrect
-@gtscript.function
-def coriolis_force_correction(zh, radius):
-    return 1.0 + (zh + zh[0, 0, 1]) / radius
-
-
-def rel_vorticity_to_abs(
-    relative_vorticity: FloatField,
-    f0: FloatFieldIJ,
-    absolute_vorticity: FloatField,
-):
-    """
-    Args:
-        relative_vorticity (in): a-grid relative vorticity computed before
-            divergence damping
-        f0 (in): planetary vorticity
-        absolute_vorticity (out): absolute vorticity on cell center (a-grid)
-    """
-    with computation(PARALLEL), interval(...):
-        absolute_vorticity = relative_vorticity + f0
-
-
-@gtscript.function
-def u_from_ke(ke, u, dx, fy):
-    """
-    Described in section 5.2 eq 5.3d and 5.3e of FV3 docs.
-
-    Can re-write the velocity equation in a vector-invariant form
-    where no derivatives of velocity are taken:
-
-    du/dt = (y-flux of absolute vorticity) - d/dx(KE) + (pressure gradient term)
-    dv/dt = -(x-flux of absolute vorticity) - d/dy(KE) + (pressure gradient term)
-
-    Equations 6.1d and 6.1e are the discrete form of the above equations.
-
-    The pressure gradient term is added later, not here.
-
-    This is important because then you don't need to worry about how
-    the coordinate vectors are being advected, all advected terms
-    are scalar.
-
-    Args:
-        ke (in): dt * kinetic energy defined on cell corners
-        u (in): x-velocity
-        dx (in): grid cell width
-        fy (in): flux of absolute vorticity in y-direction
-    """
-    return u * dx + ke - ke[1, 0, 0] + fy
-
-
-@gtscript.function
-def v_from_ke(ke, v, dy, fx):
-    # see docstring for u_from_ke
-    return v * dy + ke - ke[0, 1, 0] - fx
-
-
-def u_and_v_from_ke(
-    ke: FloatField,
-    fx: FloatField,
-    fy: FloatField,
-    u: FloatField,
-    v: FloatField,
-    dx: FloatFieldIJ,
-    dy: FloatFieldIJ,
-):
-    """
-    Update the u and v velocities from the kinetic energy and
-    flux of absolute vorticity.
-
-    Does not include the pressure gradient force update to the winds.
-
-    Converts u and v to u*dx and v*dy.
-
-    Args:
-        ke (in): dt*kinetic_energy defined on cell corners
-        fx (in): flux of absolute vorticity in x-direction
-        fy (in): flux of absolute vorticity in y-direction
-        u (inout): On input, u. On output, u * dx
-        v (inout): On input, v. On output, v * dy
-        dx (in):
-        dy (in):
-    """
-    from __externals__ import local_ie, local_is, local_je, local_js
-
-    # TODO: this function does not return u and v, it returns something
-    # like u * dx and v * dy. Rename this function and its inouts.
-    # rename u/v to u_dx and v_dy
-
-    with computation(PARALLEL), interval(...):
-        # TODO: may be able to remove local regions once this stencil and
-        # heat_from_damping are in the same stencil
-        with horizontal(region[local_is : local_ie + 1, local_js : local_je + 2]):
-            u = u_from_ke(ke, u, dx, fy)
-        with horizontal(region[local_is : local_ie + 2, local_js : local_je + 1]):
-            v = v_from_ke(ke, v, dy, fx)
-
-
-@gtscript.function
-def heat_damping_term(ub, vb, gx, gy, rsin2, cosa_s, u2, v2, du2, dv2):
-    return (
-        rsin2
-        * 0.25
-        * (
-            (ub * ub + ub[0, 1, 0] * ub[0, 1, 0] + vb * vb + vb[1, 0, 0] * vb[1, 0, 0])
-            + 2.0 * (gy + gy[0, 1, 0] + gx + gx[1, 0, 0])
-            - cosa_s * (u2 * dv2 + v2 * du2 + du2 * dv2)
-        )
-    )
-
-
-def heat_source_from_vorticity_damping(
-    vort_x_delta: FloatField,
-    vort_y_delta: FloatField,
-    ut: FloatField,
-    vt: FloatField,
-    u: FloatField,
-    v: FloatField,
-    delp: FloatField,
-    rsin2: FloatFieldIJ,
-    cosa_s: FloatFieldIJ,
-    rdx: FloatFieldIJ,
-    rdy: FloatFieldIJ,
-    heat_source: FloatField,
-    dissipation_estimate: FloatField,
-    kinetic_energy_fraction_to_damp: FloatFieldK,
-):
-    """
-    Calculates heat source from vorticity damping implied by energy conservation.
-
-    Described in Section 8.5 of FV3 docs.
-
-    Args:
-        vort_x_delta (in): x finite difference of damped b-grid vorticity
-        vort_y_delta (in): y finite difference of damped b-grid vorticity
-        ut (in): damping flux in x-direction of a-grid relative vorticity
-        vt (in): damping flux in y-direction of a-grid relative vorticity
-        u (in): d-grid x-velocity
-        v (in): d-grid y-velocity
-        delp (in): pressure thickness of layer
-        rsin2 (in):
-        cosa_s (in):
-        rdx (in): 1 / dx
-        rdy (in): 1 / dy
-        heat_source (inout): heat source from vorticity damping
-            implied by energy conservation
-        dissipation_estimate (inout): dissipation estimate, only calculated if
-            calculate_dissipation_estimate is 1. Used for stochastic kinetic
-            energy backscatter (skeb) routine.
-        kinetic_energy_fraction_to_damp (in): the fraction of kinetic energy
-            to explicitly damp and convert into heat.
-    """
-    from __externals__ import (  # noqa (see below)
-        d_con,
-        do_stochastic_ke_backscatter,
-        local_ie,
-        local_is,
-        local_je,
-        local_js,
-    )
-
-    # TODO: rename d_con in the namelist itself
-    # d_con is portion of dissipative kinetic energy restored as heat, turns off
-    # if it's below some threshold
-    # TODO: d_con is passed both as an external ad as an argument
-    # (as kinetic_energy_fraction_to_damp), clean this up
-
-    with computation(PARALLEL), interval(...):
-        ubt = (vort_x_delta + vt) * rdx
-        fy = u * rdx
-        gy = fy * ubt
-        vbt = (vort_y_delta - ut) * rdy
-        fx = v * rdy
-        gx = fx * vbt
-
-        if (
-            kinetic_energy_fraction_to_damp > dcon_threshold
-        ) or do_stochastic_ke_backscatter:
-            u2 = fy + fy[0, 1, 0]
-            du2 = ubt + ubt[0, 1, 0]
-            v2 = fx + fx[1, 0, 0]
-            dv2 = vbt + vbt[1, 0, 0]
-            dampterm = heat_damping_term(
-                ubt, vbt, gx, gy, rsin2, cosa_s, u2, v2, du2, dv2
-            )
-            heat_source = delp * (
-                heat_source - kinetic_energy_fraction_to_damp * dampterm
-            )
-
-        if __INLINED(do_stochastic_ke_backscatter):
-            with horizontal(region[local_is : local_ie + 1, local_js : local_je + 1]):
-                dissipation_estimate -= dampterm
-
-
-def accumulate_heat_source_and_dissipation_estimate(
-    heat_source: FloatField,
-    heat_source_total: FloatField,
-    diss_est: FloatField,
-    diss_est_total: FloatField,
-):
-    with computation(PARALLEL), interval(...):
-        heat_source_total += heat_source
-        diss_est_total += diss_est
-
-
-# TODO(eddied): Had to split this into a separate stencil to get this to validate
-#               with GTC, suspect a merging issue...
-def update_u_and_v(
-    ut: FloatField,
-    vt: FloatField,
-    u: FloatField,
-    v: FloatField,
-    damp_vt: FloatFieldK,
-):
-    """
-    Updates u and v with fluxes resulting from the diffusive flux of vorticity.
-
-    See docstring of u_from_ke for description of equations.
-
-    Args:
-        ut (in): x-direction diffusivie vorticity flux
-        vt (in): y-direction diffusivie vorticity flux
-        u (inout): d-grid x-velocity
-        v (inout): d-grid y-velocity
-        damp_vt (in): column scalar for damping vorticity
-    """
-    from __externals__ import local_ie, local_is, local_je, local_js
-
-    with computation(PARALLEL), interval(...):
-        if damp_vt > 1e-5:
-            with horizontal(region[local_is : local_ie + 1, local_js : local_je + 2]):
-                u += vt
-            with horizontal(region[local_is : local_ie + 2, local_js : local_je + 1]):
-                v -= ut
-
-
-# Set the unique parameters for the smallest
-# k-values, e.g. k = 0, 1, 2 when generating
-# the column namelist
-def set_low_kvals(col: Mapping[str, Quantity], k):
-    for name in ["nord", "nord_w", "d_con"]:
-        col[name].view[k] = 0
-    col["damp_w"].view[k] = col["d2_divg"].view[k]
-
-
-# For the column namelist at a specific k-level
-# set the vorticity parameters if do_vort_damp is true
-def vorticity_damping_option(column, k, do_vort_damp):
-    if do_vort_damp:
-        column["nord_v"].view[k] = 0
-        column["damp_vt"].view[k] = 0.5 * column["d2_divg"].view[k]
-
-
-def lowest_kvals(column, k, do_vort_damp):
-    set_low_kvals(column, k)
-    vorticity_damping_option(column, k, do_vort_damp)
-
-
-def get_column_namelist(
-    config: DGridShallowWaterLagrangianDynamicsConfig,
-    quantity_factory: QuantityFactory,
-):
-    """
-    Generate a dictionary of columns that specify how parameters (such as nord, damp)
-    used in several functions called by D_SW vary over the k-dimension.
-
-    """
-    direct_namelist = ["ke_bg", "d_con", "nord"]
-    all_names = direct_namelist + [
-        "nord_v",
-        "nord_w",
-        "nord_t",
-        "damp_vt",
-        "damp_w",
-        "damp_t",
-        "d2_divg",
-    ]
-    col: Dict[str, Quantity] = {}
-    for name in all_names:
-        # TODO: fill units information
-        col[name] = quantity_factory.zeros(
-            dims=[Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-    for name in direct_namelist:
-        col[name].view[:] = getattr(config, name)
-
-    col["d2_divg"].view[:] = min(0.2, config.d2_bg)
-    col["nord_v"].view[:] = min(2, col["nord"].view[0])
-    col["nord_w"].view[:] = col["nord_v"].view[0]
-    col["nord_t"].view[:] = col["nord_v"].view[0]
-    if config.do_vort_damp:
-        col["damp_vt"].view[:] = config.vtdm4
-    else:
-        col["damp_vt"].view[:] = 0
-    col["damp_w"].view[:] = col["damp_vt"].view[0]
-    col["damp_t"].view[:] = col["damp_vt"].view[0]
-    if (
-        col["d2_divg"].extent[col["d2_divg"].dims.index(Z_DIM)] == 1
-        or config.n_sponge < 0
-    ):
-        col["d2_divg"].view[0] = config.d2_bg
-    else:
-        col["d2_divg"].view[0] = max(0.01, config.d2_bg, config.d2_bg_k1)
-        lowest_kvals(col, 0, config.do_vort_damp)
-        if config.d2_bg_k2 > 0.01:
-            col["d2_divg"].view[1] = max(config.d2_bg, config.d2_bg_k2)
-            lowest_kvals(col, 1, config.do_vort_damp)
-        if config.d2_bg_k2 > 0.05:
-            col["d2_divg"].view[2] = max(config.d2_bg, 0.2 * config.d2_bg_k2)
-            set_low_kvals(col, 2)
-    return col
-
-
-@gtscript.function
-def interpolate_uc_vc_to_cell_corners(
-    uc_cov, vc_cov, cosa, rsina, uc_contra, vc_contra
-):
-    """
-    Convert covariant C-grid winds to contravariant B-grid (cell-corner) winds.
-    """
-    from __externals__ import i_end, i_start, j_end, j_start
-
-    # In the original Fortran, this routine was given dt4 (0.25 * dt)
-    # and dt5 (0.5 * dt), and its outputs were wind times timestep. This has
-    # been refactored so the timestep is later explicitly multiplied, when
-    # the wind is integrated forward in time.
-    # TODO: ask Lucas why we interpolate then convert to contravariant in tile center,
-    # but convert to contravariant and then interpolate on tile edges.
-    ub_cov = 0.5 * (uc_cov[0, -1, 0] + uc_cov)
-    vb_cov = 0.5 * (vc_cov[-1, 0, 0] + vc_cov)
-    ub_contra = contravariant(ub_cov, vb_cov, cosa, rsina)
-    vb_contra = contravariant(vb_cov, ub_cov, cosa, rsina)
-    # ASSUME : if __INLINED(namelist.grid_type < 3):
-    with horizontal(region[:, j_start], region[:, j_end + 1]):
-        ub_contra = 0.25 * (
-            -uc_contra[0, -2, 0]
-            + 3.0 * (uc_contra[0, -1, 0] + uc_contra)
-            - uc_contra[0, 1, 0]
-        )
-    with horizontal(region[i_start, :], region[i_end + 1, :]):
-        ub_contra = 0.5 * (uc_contra[0, -1, 0] + uc_contra)
-    with horizontal(region[i_start, :], region[i_end + 1, :]):
-        vb_contra = 0.25 * (
-            -vc_contra[-2, 0, 0]
-            + 3.0 * (vc_contra[-1, 0, 0] + vc_contra)
-            - vc_contra[1, 0, 0]
-        )
-    with horizontal(region[:, j_start], region[:, j_end + 1]):
-        vb_contra = 0.5 * (vc_contra[-1, 0, 0] + vc_contra)
-
-    return ub_contra, vb_contra
-
-
-class DGridShallowWaterLagrangianDynamics:
-    """
-    Fortran name is the d_sw subroutine
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        grid_data: GridData,
-        damping_coefficients: DampingCoefficients,
-        column_namelist,
-        nested: bool,
-        stretched_grid: bool,
-        config: DGridShallowWaterLagrangianDynamicsConfig,
-    ):
-        orchestrate(obj=self, config=stencil_factory.config.dace_config)
-        self.grid_data = grid_data
-        self._f0 = self.grid_data.fC_agrid
-        self._d_con = config.d_con
-        self._do_stochastic_ke_backscatter = config.do_skeb
-
-        self.grid_indexing = stencil_factory.grid_indexing
-        self._grid_type = config.grid_type
-        if config.inline_q:
-            raise NotImplementedError(
-                "D-Grid Shallow Water Lagrangian Dynamics (D_SW):"
-                " inline_q not implemented."
-            )
-        if config.d_ext > 0:
-            raise NotImplementedError(
-                "D-Grid Shallow Water Lagrangian Dynamics (D_SW):"
-                " untested d_ext > 0. need to call a2b_ord2, not implemented."
-            )
-        # TODO: in theory, we should check if damp_vt > 1e-5 for each k-level and
-        # only compute delnflux for k-levels where this is true
-        all_damp_vt_above_dcon = (
-            column_namelist["damp_vt"].view[:] > dcon_threshold
-        ).all()
-        if not all_damp_vt_above_dcon:
-            raise NotImplementedError(
-                "D-Grid Shallow Water Lagrangian Dynamics (D_SW):"
-                " damp_vt misconfiguration, some are above a d_con of"
-                f" {dcon_threshold}."
-            )
-        # TODO: in theory, we should check if damp_w > 1e-5 for each k-level and
-        # only compute delnflux for k-levels where this is true
-        all_damp_w_above_dcon = (
-            column_namelist["damp_w"].view[:] > dcon_threshold
-        ).all()
-        if not all_damp_w_above_dcon:
-            raise NotImplementedError(
-                "D-Grid Shallow Water Lagrangian Dynamics (D_SW):"
-                f" damp_w misconfiguration, some are above a d_con of {dcon_threshold}."
-            )
-
-        # only compute for k-levels where this is true
-        self.hydrostatic = config.hydrostatic
-        if self.hydrostatic:
-            raise NotImplementedError(
-                "D-Grid Shallow Water Lagrangian Dynamics (D_SW):"
-                " Hydrostatic is not implemented"
-            )
-
-        def make_quantity():
-            return quantity_factory.zeros(
-                [X_DIM, Y_DIM, Z_DIM],
-                units="unknown",
-                dtype=Float,
-            )
-
-        self._tmp_heat_s = make_quantity()
-        self._tmp_diss_e = make_quantity()
-        self._vort_x_delta = make_quantity()
-        self._vort_y_delta = make_quantity()
-        self._dt_kinetic_energy_on_cell_corners = make_quantity()
-        self._abs_vorticity_agrid = make_quantity()
-        self._damped_rel_vorticity_agrid = make_quantity()
-        self._uc_contra = make_quantity()
-        self._vc_contra = make_quantity()
-        self._tmp_ut = make_quantity()
-        self._tmp_vt = make_quantity()
-        self._tmp_fx = make_quantity()
-        self._tmp_fy = make_quantity()
-        self._tmp_gx = make_quantity()
-        self._tmp_gy = make_quantity()
-        self._tmp_dw = make_quantity()
-        self._tmp_wk = make_quantity()
-        self._vorticity_agrid = make_quantity()
-        self._vorticity_bgrid_damped = make_quantity()
-        self._tmp_fx2 = make_quantity()
-        self._tmp_fy2 = make_quantity()
-        self._column_namelist = column_namelist
-
-        self.delnflux_nosg_w = DelnFluxNoSG(
-            stencil_factory,
-            damping_coefficients,
-            grid_data.rarea,
-            self._column_namelist["nord_w"],
-        )
-        self.delnflux_nosg_v = DelnFluxNoSG(
-            stencil_factory,
-            damping_coefficients,
-            grid_data.rarea,
-            self._column_namelist["nord_v"],
-        )
-        self.fvtp2d_dp = FiniteVolumeTransport(
-            stencil_factory=stencil_factory,
-            quantity_factory=quantity_factory,
-            grid_data=grid_data,
-            damping_coefficients=damping_coefficients,
-            grid_type=config.grid_type,
-            hord=config.hord_dp,
-            nord=self._column_namelist["nord_v"],
-            damp_c=self._column_namelist["damp_vt"],
-        )
-        self.fvtp2d_dp_t = FiniteVolumeTransport(
-            stencil_factory=stencil_factory,
-            quantity_factory=quantity_factory,
-            grid_data=grid_data,
-            damping_coefficients=damping_coefficients,
-            grid_type=config.grid_type,
-            hord=config.hord_dp,
-            nord=self._column_namelist["nord_t"],
-            damp_c=self._column_namelist["damp_t"],
-        )
-        self.fvtp2d_tm = FiniteVolumeTransport(
-            stencil_factory=stencil_factory,
-            quantity_factory=quantity_factory,
-            grid_data=grid_data,
-            damping_coefficients=damping_coefficients,
-            grid_type=config.grid_type,
-            hord=config.hord_tm,
-            nord=self._column_namelist["nord_v"],
-            damp_c=self._column_namelist["damp_vt"],
-        )
-        self.fvtp2d_vt_nodelnflux = FiniteVolumeTransport(
-            stencil_factory=stencil_factory,
-            quantity_factory=quantity_factory,
-            grid_data=grid_data,
-            damping_coefficients=damping_coefficients,
-            grid_type=config.grid_type,
-            hord=config.hord_vt,
-        )
-        self.fv_prep = FiniteVolumeFluxPrep(
-            stencil_factory=stencil_factory,
-            grid_data=grid_data,
-            grid_type=self._grid_type,
-        )
-        self.divergence_damping = DivergenceDamping(
-            stencil_factory,
-            quantity_factory=quantity_factory,
-            grid_data=grid_data,
-            damping_coefficients=damping_coefficients,
-            nested=nested,
-            stretched_grid=stretched_grid,
-            dddmp=config.dddmp,
-            d4_bg=config.d4_bg,
-            nord=config.nord,
-            grid_type=config.grid_type,
-            nord_col=column_namelist["nord"],
-            d2_bg=column_namelist["d2_divg"],
-        )
-
-        self._apply_pt_delp_fluxes = stencil_factory.from_dims_halo(
-            func=apply_pt_delp_fluxes_stencil_defn,
-            compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-            externals={
-                "inline_q": config.inline_q,
-            },
-        )
-        self._compute_kinetic_energy = stencil_factory.from_dims_halo(
-            func=compute_kinetic_energy,
-            compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-            externals={
-                "iord": config.hord_mt,
-                "jord": config.hord_mt,
-                "mord": config.hord_mt,
-                "xt_minmax": False,
-                "yt_minmax": False,
-                "grid_type": config.grid_type,
-            },
-        )
-        self._apply_fluxes = stencil_factory.from_dims_halo(
-            func=apply_fluxes, compute_dims=[X_DIM, Y_DIM, Z_DIM]
-        )
-        self._flux_capacitor_stencil = stencil_factory.from_dims_halo(
-            func=flux_capacitor,
-            compute_dims=[X_DIM, Y_DIM, Z_DIM],
-            compute_halos=(3, 3),
-        )
-        self._vort_differencing_stencil = stencil_factory.from_dims_halo(
-            func=vort_differencing,
-            compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-        )
-        self._u_and_v_from_ke_stencil = stencil_factory.from_dims_halo(
-            func=u_and_v_from_ke, compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM]
-        )
-
-        if config.do_f3d:
-            raise NotImplementedError("do_f3d is not implemented")
-
-        self._rel_vorticity_to_abs = stencil_factory.from_dims_halo(
-            func=rel_vorticity_to_abs,
-            compute_dims=[X_DIM, Y_DIM, Z_DIM],
-            compute_halos=(3, 3),
-        )
-        self._adjust_w_and_qcon_stencil = stencil_factory.from_dims_halo(
-            func=adjust_w_and_qcon,
-            compute_dims=[X_DIM, Y_DIM, Z_DIM],
-        )
-        self._heat_diss_stencil = stencil_factory.from_dims_halo(
-            func=heat_diss,
-            compute_dims=[X_DIM, Y_DIM, Z_DIM],
-        )
-        self._heat_source_from_vorticity_damping_stencil = (
-            stencil_factory.from_dims_halo(
-                func=heat_source_from_vorticity_damping,
-                compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-                externals={
-                    "do_stochastic_ke_backscatter": config.do_skeb,
-                    "d_con": config.d_con,
-                },
-            )
-        )
-
-        if (self._d_con > 1.0e-5) or (self._do_stochastic_ke_backscatter):
-            self._accumulate_heat_source_and_dissipation_estimate_stencil = (
-                stencil_factory.from_dims_halo(
-                    func=accumulate_heat_source_and_dissipation_estimate,
-                    compute_dims=[X_DIM, Y_DIM, Z_DIM],
-                )
-            )
-
-        self._compute_vorticity_stencil = stencil_factory.from_dims_halo(
-            compute_vorticity,
-            compute_dims=[X_DIM, Y_DIM, Z_DIM],
-            compute_halos=(3, 3),
-        )
-        self._update_u_and_v_stencil = stencil_factory.from_dims_halo(
-            update_u_and_v, compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM]
-        )
-        self._delnflux_damp_vt = delnflux.calc_damp(
-            damp_c=self._column_namelist["damp_vt"],
-            da_min=damping_coefficients.da_min_c,
-            nord=self._column_namelist["nord_v"],
-        )
-        self._delnflux_damp_w = delnflux.calc_damp(
-            damp_c=self._column_namelist["damp_w"],
-            da_min=damping_coefficients.da_min_c,
-            nord=self._column_namelist["nord_w"],
-        )
-
-    def __call__(
-        self,
-        delpc,
-        delp,
-        pt,
-        u,
-        v,
-        w,
-        uc,
-        vc,
-        ua,
-        va,
-        divgd,
-        mfx,
-        mfy,
-        cx,
-        cy,
-        crx,
-        cry,
-        xfx,
-        yfx,
-        q_con,
-        zh,
-        heat_source,
-        diss_est,
-        dt,
-    ):
-        """
-        D-Grid shallow water routine, peforms a full-timestep advance
-        of the D-grid winds and other prognostic variables using Lagrangian
-        dynamics on the cubed-sphere.
-
-        Described by Lin 1997, Lin 2004 and Harris 2013.
-
-        Args:
-            delpc (inout): C-grid  vertical delta in pressure
-            delp (inout): D-grid vertical delta in pressure
-            pt (inout): D-grid potential teperature
-            u (inout): D-grid x-velocity
-            v (inout): D-grid y-velocity
-            w (inout): vertical velocity
-            uc (in): C-grid x-velocity
-            vc (in): C-grid y-velocity
-            ua (in): A-grid x-velocity
-            va (in) A-grid y-velocity
-            divgd (inout): D-grid horizontal divergence, used for divergence
-                damping. TODO: Variable gets re-used for other purposes causing
-                it to be inout, can we refactor those?
-                corner handling, higher-order divergence damping temporary
-            mfx (inout): accumulated x mass flux
-            mfy (inout): accumulated y mass flux
-            cx (inout): accumulated Courant number in the x direction
-            cy (inout): accumulated Courant number in the y direction
-            crx (out): local courant number in the x direction
-            cry (out): local courant number in the y direction
-            xfx (out): flux of area in x-direction, in units of m^2
-            yfx (out): flux of area in y-direction, in units of m^2
-            q_con (inout): total condensate mixing ratio,
-                used for ideal gas law calculation
-            zh (in): geopotential height defined on layer interfaces
-            heat_source (inout):  accumulated heat source
-            diss_est (inout): dissipation estimate
-            dt (in): acoustic timestep in seconds
-        """
-        # uc_contra/vc_contra are ut/vt in the original Fortran
-        # TODO: when these stencils can be merged investigate whether
-        # we can refactor fv_prep into two separate function calls,
-        # the chain looks something like:
-        #   uc_contra, vc_contra = f(uc, vc, ...)
-        #   xfx, yfx = g(uc_contra, vc_contra, ...)
-
-        self.fv_prep(uc, vc, crx, cry, xfx, yfx, self._uc_contra, self._vc_contra, dt)
-
-        # TODO: the structure of much of this is to get fluxes from fvtp2d and then
-        # apply them in various similar stencils - can these steps be merged?
-
-        # [DaCe] Remove CopiedCorners
-        self.fvtp2d_dp(
-            delp,
-            crx,
-            cry,
-            xfx,
-            yfx,
-            self._tmp_fx,
-            self._tmp_fy,
-        )
-
-        # TODO: part of flux_capacitor_stencil (updating cx, cy)
-        # should be mergeable with fv_prep, the other part (updating xflux, yflux)
-        # should be mergeable with any compute domain stencil in this object
-
-        # fluxes are accumulated over substeps so we can later apply them in
-        # tracer advection
-        self._flux_capacitor_stencil(
-            cx, cy, mfx, mfy, crx, cry, self._tmp_fx, self._tmp_fy
-        )
-
-        # TODO: output value for tmp_wk here is never used, refactor so it is
-        # not unnecessarily computed
-        # compute diffusive flux for veritcal velocity
-        self.delnflux_nosg_w(
-            w,
-            self._tmp_fx2,
-            self._tmp_fy2,
-            self._delnflux_damp_w,
-            self._tmp_wk,
-        )
-        # gets the heat tendency due to w dissipation, and the
-        # w update implied by the fluxes
-        self._heat_diss_stencil(
-            self._tmp_fx2,
-            self._tmp_fy2,
-            w,
-            self.grid_data.rarea,
-            self._tmp_heat_s,
-            self._tmp_diss_e,
-            self._tmp_dw,
-            self._column_namelist["damp_w"],
-            self._column_namelist["ke_bg"],
-            dt,
-        )
-
-        # compute and apply advective fluxes for w and q_con so that we can
-        # apply them at the same time as we apply w dissipative fluxes
-        self.fvtp2d_vt_nodelnflux(
-            w,
-            crx,
-            cry,
-            xfx,
-            yfx,
-            self._tmp_gx,
-            self._tmp_gy,
-            x_mass_flux=self._tmp_fx,
-            y_mass_flux=self._tmp_fy,
-        )
-
-        self._apply_fluxes(
-            w,
-            delp,
-            self._tmp_gx,
-            self._tmp_gy,
-            self.grid_data.rarea,
-        )
-        # Fortran: #ifdef USE_COND
-        # [DaCe] Remove CopiedCorners
-        self.fvtp2d_dp_t(
-            q_con,
-            crx,
-            cry,
-            xfx,
-            yfx,
-            self._tmp_gx,
-            self._tmp_gy,
-            mass=delp,
-            x_mass_flux=self._tmp_fx,
-            y_mass_flux=self._tmp_fy,
-        )
-
-        self._apply_fluxes(
-            q_con, delp, self._tmp_gx, self._tmp_gy, self.grid_data.rarea
-        )
-
-        # Fortran #endif //USE_COND
-
-        # [DaCe] Remove CopiedCorners
-        self.fvtp2d_tm(
-            pt,
-            crx,
-            cry,
-            xfx,
-            yfx,
-            self._tmp_gx,
-            self._tmp_gy,
-            mass=delp,
-            x_mass_flux=self._tmp_fx,
-            y_mass_flux=self._tmp_fy,
-        )
-
-        self._apply_pt_delp_fluxes(
-            gx=self._tmp_gx,
-            gy=self._tmp_gy,
-            rarea=self.grid_data.rarea,
-            fx=self._tmp_fx,
-            fy=self._tmp_fy,
-            pt=pt,
-            delp=delp,
-        )
-
-        self._adjust_w_and_qcon_stencil(
-            w, delp, self._tmp_dw, q_con, self._column_namelist["damp_w"]
-        )
-        # at this point, pt, delp, w and q_con have been stepped forward in time
-        # the rest of this function updates the winds
-        self._compute_kinetic_energy(
-            vc=vc,
-            uc=uc,
-            cosa=self.grid_data.cosa,
-            rsina=self.grid_data.rsina,
-            v=v,
-            vc_contra=self._vc_contra,
-            u=u,
-            uc_contra=self._uc_contra,
-            dx=self.grid_data.dx,
-            dxa=self.grid_data.dxa,
-            rdx=self.grid_data.rdx,
-            dy=self.grid_data.dy,
-            dya=self.grid_data.dya,
-            rdy=self.grid_data.rdy,
-            dt_kinetic_energy_on_cell_corners=self._dt_kinetic_energy_on_cell_corners,
-            dt=dt,
-        )
-
-        self._compute_vorticity_stencil(
-            u,
-            v,
-            self.grid_data.dx,
-            self.grid_data.dy,
-            self.grid_data.rarea,
-            self._vorticity_agrid,
-        )
-
-        self.divergence_damping(
-            u,
-            v,
-            va,
-            self._vorticity_bgrid_damped,
-            ua,
-            divgd,
-            vc,
-            uc,
-            delpc,
-            self._dt_kinetic_energy_on_cell_corners,
-            # a-grid relative vorticity computed before divergence damping
-            self._vorticity_agrid,
-            dt,
-        )
-
-        # Vorticity transport
-        self._rel_vorticity_to_abs(
-            self._vorticity_agrid, self._f0, self._abs_vorticity_agrid
-        )
-
-        # [DaCe] Unroll CopiedCorners see __init__
-        self.fvtp2d_vt_nodelnflux(
-            self._abs_vorticity_agrid,
-            crx,
-            cry,
-            xfx,
-            yfx,
-            self._tmp_fx,  # flux of absolute vorticity
-            self._tmp_fy,
-        )
-
-        self._u_and_v_from_ke_stencil(
-            self._dt_kinetic_energy_on_cell_corners,
-            self._tmp_fx,
-            self._tmp_fy,
-            u,
-            v,
-            self.grid_data.dx,
-            self.grid_data.dy,
-        )
-
-        self.delnflux_nosg_v(
-            self._vorticity_agrid,
-            self._tmp_ut,
-            self._tmp_vt,
-            self._delnflux_damp_vt,
-            self._damped_rel_vorticity_agrid,
-        )
-        # TODO(eddied): These stencils were split to ensure GTC verification,
-        # merge them if you can
-        self._vort_differencing_stencil(
-            self._vorticity_bgrid_damped,
-            self._vort_x_delta,
-            self._vort_y_delta,
-            self._column_namelist["d_con"],
-        )
-        self._heat_source_from_vorticity_damping_stencil(
-            self._vort_x_delta,
-            self._vort_y_delta,
-            self._tmp_ut,
-            self._tmp_vt,
-            u,
-            v,
-            delp,
-            self.grid_data.rsin2,
-            self.grid_data.cosa_s,
-            self.grid_data.rdx,
-            self.grid_data.rdy,
-            self._tmp_heat_s,
-            self._tmp_diss_e,
-            self._column_namelist["d_con"],
-        )
-
-        if (self._d_con > 1.0e-5) or (self._do_stochastic_ke_backscatter):
-            self._accumulate_heat_source_and_dissipation_estimate_stencil(
-                self._tmp_heat_s, heat_source, self._tmp_diss_e, diss_est
-            )
-
-        self._update_u_and_v_stencil(
-            self._tmp_ut,
-            self._tmp_vt,
-            u,
-            v,
-            self._column_namelist["damp_vt"],
-        )
diff --git a/pyFV3/pyFV3/stencils/del2cubed.py b/pyFV3/pyFV3/stencils/del2cubed.py
deleted file mode 100644
index ba097b47..00000000
--- a/pyFV3/pyFV3/stencils/del2cubed.py
+++ /dev/null
@@ -1,202 +0,0 @@
-import ndsl.stencils.corners as corners
-from gt4py.cartesian.gtscript import PARALLEL, computation, horizontal, interval, region
-from ndsl.constants import X_DIM, X_INTERFACE_DIM, Y_DIM, Y_INTERFACE_DIM, Z_DIM
-from ndsl.dsl.dace.orchestration import orchestrate
-from ndsl.dsl.stencil import StencilFactory, get_stencils_with_varied_bounds
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ, cast_to_index3d
-from ndsl.grid import DampingCoefficients
-from ndsl.initialization.allocator import QuantityFactory
-
-from pyFV3.stencils.basic_operations import copy_defn
-
-
-#
-# Flux value stencils
-# ---------------------
-def compute_zonal_flux(flux: FloatField, a_in: FloatField, del_term: FloatFieldIJ):
-    with computation(PARALLEL), interval(...):
-        flux = del_term * (a_in[-1, 0, 0] - a_in)
-
-
-def compute_meridional_flux(flux: FloatField, a_in: FloatField, del_term: FloatFieldIJ):
-    with computation(PARALLEL), interval(...):
-        flux = del_term * (a_in[0, -1, 0] - a_in)
-
-
-#
-# corner_fill
-#
-# Stencil that copies/fills in the appropriate corner values for qdel
-# ------------------------------------------------------------------------
-def corner_fill(q_in: FloatField, q_out: FloatField):
-    from __externals__ import i_end, i_start, j_end, j_start
-
-    # Fills the same scalar value into three locations in q for each corner
-    with computation(PARALLEL), interval(...):
-        third = 1.0 / 3.0
-
-        q_out = q_in
-        with horizontal(region[i_start, j_start]):
-            q_out = (q_in[0, 0, 0] + q_in[-1, 0, 0] + q_in[0, -1, 0]) * third
-        with horizontal(region[i_start - 1, j_start]):
-            q_out = (q_in[1, 0, 0] + q_in[0, 0, 0] + q_in[1, -1, 0]) * third
-        with horizontal(region[i_start, j_start - 1]):
-            q_out = (q_in[0, 1, 0] + q_in[-1, 1, 0] + q_in[0, 0, 0]) * third
-
-        with horizontal(region[i_end, j_start]):
-            q_out = (q_in[0, 0, 0] + q_in[1, 0, 0] + q_in[0, -1, 0]) * third
-        with horizontal(region[i_end + 1, j_start]):
-            q_out = (q_in[-1, 0, 0] + q_in[0, 0, 0] + q_in[-1, -1, 0]) * third
-        with horizontal(region[i_end, j_start - 1]):
-            q_out = (q_in[0, 1, 0] + q_in[1, 1, 0] + q_in[0, 0, 0]) * third
-
-        with horizontal(region[i_end, j_end]):
-            q_out = (q_in[0, 0, 0] + q_in[1, 0, 0] + q_in[0, 1, 0]) * third
-        with horizontal(region[i_end + 1, j_end]):
-            q_out = (q_in[-1, 0, 0] + q_in[0, 0, 0] + q_in[-1, 1, 0]) * third
-        with horizontal(region[i_end, j_end + 1]):
-            q_out = (q_in[0, -1, 0] + q_in[1, -1, 0] + q_in[0, 0, 0]) * third
-
-        with horizontal(region[i_start, j_end]):
-            q_out = (q_in[0, 0, 0] + q_in[-1, 0, 0] + q_in[0, 1, 0]) * third
-        with horizontal(region[i_start - 1, j_end]):
-            q_out = (q_in[1, 0, 0] + q_in[0, 0, 0] + q_in[1, 1, 0]) * third
-        with horizontal(region[i_start, j_end + 1]):
-            q_out = (q_in[0, -1, 0] + q_in[-1, -1, 0] + q_in[0, 0, 0]) * third
-
-
-#
-# Q update stencil
-# ------------------
-def update_q(
-    q: FloatField, rarea: FloatFieldIJ, fx: FloatField, fy: FloatField, cd: Float
-):
-    with computation(PARALLEL), interval(...):
-        q += cd * rarea * (fx - fx[1, 0, 0] + fy - fy[0, 1, 0])
-
-
-class HyperdiffusionDamping:
-    """
-    Fortran name is del2_cubed
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        damping_coefficients: DampingCoefficients,
-        rarea,
-        nmax: int,
-    ):
-        """
-        Args:
-            grid: pyFV3 grid object
-        """
-        orchestrate(obj=self, config=stencil_factory.config.dace_config)
-        grid_indexing = stencil_factory.grid_indexing
-        self._del6_u = damping_coefficients.del6_u
-        self._del6_v = damping_coefficients.del6_v
-        self._rarea = rarea
-
-        # the units of these temporaries are relative to the input units,
-        # so they are undefined
-        self._fx = quantity_factory.zeros(
-            dims=[X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            units="undefined",
-            dtype=Float,
-        )
-        self._fy = quantity_factory.zeros(
-            dims=[X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            units="undefined",
-            dtype=Float,
-        )
-        self._q = quantity_factory.zeros(
-            dims=[X_DIM, Y_DIM, Z_DIM],
-            units="undefined",
-            dtype=Float,
-        )
-
-        self._corner_fill = stencil_factory.from_dims_halo(
-            func=corner_fill,
-            compute_dims=[X_DIM, Y_DIM, Z_DIM],
-            compute_halos=(3, 3),
-        )
-
-        self._copy_corners_x: corners.CopyCorners = corners.CopyCorners(
-            direction="x", stencil_factory=stencil_factory
-        )
-
-        self._ntimes = int(min(3, nmax))
-        origins = []
-        domains_x = []
-        domains_y = []
-        domains = []
-        for n_halo in range(self._ntimes - 1, -1, -1):
-            origin, domain = grid_indexing.get_origin_domain(
-                [X_DIM, Y_DIM, Z_DIM], halos=(n_halo, n_halo)
-            )
-            _, domain_x = grid_indexing.get_origin_domain(
-                [X_INTERFACE_DIM, Y_DIM, Z_DIM], halos=(n_halo, n_halo)
-            )
-            _, domain_y = grid_indexing.get_origin_domain(
-                [X_DIM, Y_INTERFACE_DIM, Z_DIM], halos=(n_halo, n_halo)
-            )
-            origins.append(cast_to_index3d(origin))
-            domains.append(cast_to_index3d(domain))
-            domains_x.append(cast_to_index3d(domain_x))
-            domains_y.append(cast_to_index3d(domain_y))
-
-        self._compute_zonal_flux = get_stencils_with_varied_bounds(
-            compute_zonal_flux, origins, domains_x, stencil_factory=stencil_factory
-        )
-
-        self._copy_corners_y: corners.CopyCorners = corners.CopyCorners(
-            direction="y", stencil_factory=stencil_factory
-        )
-        """Stencil responsible for doing corners updates in y-direction."""
-
-        self._compute_meridional_flux = get_stencils_with_varied_bounds(
-            compute_meridional_flux, origins, domains_y, stencil_factory=stencil_factory
-        )
-
-        """Stencil responsible for doing corners updates in x-direction."""
-        self._copy_stencil = stencil_factory.from_dims_halo(
-            func=copy_defn,
-            compute_dims=[X_DIM, Y_DIM, Z_DIM],
-            compute_halos=(3, 3),
-        )
-
-        self._update_q = get_stencils_with_varied_bounds(
-            update_q, origins, domains, stencil_factory=stencil_factory
-        )
-
-    def __call__(self, qdel: FloatField, cd: Float):
-        """
-        Perform hyperdiffusion damping/filtering.
-
-        Args:
-            qdel (inout): Variable to be filtered
-            nmax: Number of times to apply filtering
-            cd: Damping coeffcient
-        """
-
-        for n in range(self._ntimes):
-            nt = self._ntimes - (n + 1)
-
-            # Fill in appropriate corner values
-            self._corner_fill(qdel, self._q)
-
-            if nt > 0:
-                self._copy_corners_x(self._q)
-
-            self._compute_zonal_flux[n](self._fx, self._q, self._del6_v)
-
-            if nt > 0:
-                self._copy_corners_y(self._q)
-
-            self._compute_meridional_flux[n](self._fy, self._q, self._del6_u)
-
-            self._copy_stencil(self._q, qdel)
-
-            # Update q values
-            self._update_q[n](qdel, self._rarea, self._fx, self._fy, cd)
diff --git a/pyFV3/pyFV3/stencils/delnflux.py b/pyFV3/pyFV3/stencils/delnflux.py
deleted file mode 100644
index ba617208..00000000
--- a/pyFV3/pyFV3/stencils/delnflux.py
+++ /dev/null
@@ -1,1276 +0,0 @@
-from typing import Optional
-
-import gt4py.cartesian.gtscript as gtscript
-from gt4py.cartesian.gtscript import (
-    __INLINED,
-    PARALLEL,
-    computation,
-    horizontal,
-    interval,
-    region,
-)
-from ndsl.constants import X_DIM, X_INTERFACE_DIM, Y_DIM, Y_INTERFACE_DIM, Z_DIM
-from ndsl.dsl.dace.orchestration import orchestrate
-from ndsl.dsl.stencil import StencilFactory, get_stencils_with_varied_bounds
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ, FloatFieldK
-from ndsl.grid import DampingCoefficients
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.quantity import Quantity
-
-
-def calc_damp(damp_c: Quantity, da_min: Float, nord: Quantity) -> Quantity:
-    if damp_c.dims != nord.dims or damp_c.data.shape != nord.data.shape:
-        raise NotImplementedError(
-            "current implementation requires damp_c and nord to have "
-            "identical data shape and dims"
-        )
-    data = (damp_c.data * da_min) ** (nord.data + 1)
-    return Quantity(
-        data=data,
-        dims=damp_c.dims,
-        # TODO: find and document units
-        units="unknown",
-        origin=damp_c.origin,
-        extent=damp_c.extent,
-        gt4py_backend=damp_c.gt4py_backend,
-    )
-
-
-def fx_calc_stencil_nord(q: FloatField, del6_v: FloatFieldIJ, fx: FloatField):
-    """
-    Args:
-        q (in):
-        del6_v (in):
-        fx (out):
-    """
-    from __externals__ import (
-        local_ie,
-        local_is,
-        local_je,
-        local_js,
-        nord0,
-        nord1,
-        nord2,
-        nord3,
-    )
-
-    with computation(PARALLEL), interval(0, 1):
-        if __INLINED(nord0 == 0):
-            with horizontal(region[local_is : local_ie + 2, local_js : local_je + 1]):
-                fx = fx_calculation(q, del6_v)
-        else:
-            fx = fx_calculation(q, del6_v)
-    with computation(PARALLEL), interval(1, 2):
-        if __INLINED(nord1 == 0):
-            with horizontal(region[local_is : local_ie + 2, local_js : local_je + 1]):
-                fx = fx_calculation(q, del6_v)
-        else:
-            fx = fx_calculation(q, del6_v)
-    with computation(PARALLEL), interval(2, 3):
-        if __INLINED(nord2 == 0):
-            with horizontal(region[local_is : local_ie + 2, local_js : local_je + 1]):
-                fx = fx_calculation(q, del6_v)
-        else:
-            fx = fx_calculation(q, del6_v)
-    with computation(PARALLEL), interval(3, None):
-        if __INLINED(nord3 == 0):
-            with horizontal(region[local_is : local_ie + 2, local_js : local_je + 1]):
-                fx = fx_calculation(q, del6_v)
-        else:
-            fx = fx_calculation(q, del6_v)
-
-
-def fy_calc_stencil_nord(q: FloatField, del6_u: FloatFieldIJ, fy: FloatField):
-    """
-    Args:
-        q (in):
-        del6_u (in):
-        fy (out):
-    """
-    from __externals__ import (
-        local_ie,
-        local_is,
-        local_je,
-        local_js,
-        nord0,
-        nord1,
-        nord2,
-        nord3,
-    )
-
-    with computation(PARALLEL), interval(0, 1):
-        if __INLINED(nord0 == 0):
-            with horizontal(region[local_is : local_ie + 1, local_js : local_je + 2]):
-                fy = fy_calculation(q, del6_u)
-        else:
-            fy = fy_calculation(q, del6_u)
-    with computation(PARALLEL), interval(1, 2):
-        if __INLINED(nord1 == 0):
-            with horizontal(region[local_is : local_ie + 1, local_js : local_je + 2]):
-                fy = fy_calculation(q, del6_u)
-        else:
-            fy = fy_calculation(q, del6_u)
-    with computation(PARALLEL), interval(2, 3):
-        if __INLINED(nord2 == 0):
-            with horizontal(region[local_is : local_ie + 1, local_js : local_je + 2]):
-                fy = fy_calculation(q, del6_u)
-        else:
-            fy = fy_calculation(q, del6_u)
-    with computation(PARALLEL), interval(3, None):
-        if __INLINED(nord3 == 0):
-            with horizontal(region[local_is : local_ie + 1, local_js : local_je + 2]):
-                fy = fy_calculation(q, del6_u)
-        else:
-            fy = fy_calculation(q, del6_u)
-
-
-def fx_calc_stencil_column(q: FloatField, del6_v: FloatFieldIJ, fx: FloatField):
-    from __externals__ import nord0, nord1, nord2, nord3
-
-    with computation(PARALLEL), interval(0, 1):
-        if __INLINED(nord0 > 0):
-            fx = fx_calculation_neg(q, del6_v)
-    with computation(PARALLEL), interval(1, 2):
-        if __INLINED(nord1 > 0):
-            fx = fx_calculation_neg(q, del6_v)
-    with computation(PARALLEL), interval(2, 3):
-        if __INLINED(nord2 > 0):
-            fx = fx_calculation_neg(q, del6_v)
-    with computation(PARALLEL), interval(3, None):
-        if __INLINED(nord3 > 0):
-            fx = fx_calculation_neg(q, del6_v)
-
-
-def fy_calc_stencil_column(q: FloatField, del6_u: FloatFieldIJ, fy: FloatField):
-    from __externals__ import nord0, nord1, nord2, nord3
-
-    with computation(PARALLEL), interval(0, 1):
-        if __INLINED(nord0 > 0):
-            fy = fy_calculation_neg(q, del6_u)
-    with computation(PARALLEL), interval(1, 2):
-        if __INLINED(nord1 > 0):
-            fy = fy_calculation_neg(q, del6_u)
-    with computation(PARALLEL), interval(2, 3):
-        if __INLINED(nord2 > 0):
-            fy = fy_calculation_neg(q, del6_u)
-    with computation(PARALLEL), interval(3, None):
-        if __INLINED(nord3 > 0):
-            fy = fy_calculation_neg(q, del6_u)
-
-
-@gtscript.function
-def fx_calculation(q: FloatField, del6_v: FloatField):
-    return del6_v * (q[-1, 0, 0] - q)
-
-
-@gtscript.function
-def fx_calculation_neg(q: FloatField, del6_v: FloatField):
-    return -del6_v * (q[-1, 0, 0] - q)
-
-
-@gtscript.function
-def fy_calculation(q: FloatField, del6_u: FloatField):
-    return del6_u * (q[0, -1, 0] - q)
-
-
-@gtscript.function
-def fy_calculation_neg(q: FloatField, del6_u: FloatField):
-    return -del6_u * (q[0, -1, 0] - q)
-
-
-def d2_highorder_stencil(
-    fx: FloatField, fy: FloatField, rarea: FloatFieldIJ, d2: FloatField
-):
-    from __externals__ import nord0, nord1, nord2, nord3
-
-    with computation(PARALLEL), interval(0, 1):
-        if __INLINED(nord0 > 0):
-            d2 = d2_highorder(fx, fy, rarea)
-    with computation(PARALLEL), interval(1, 2):
-        if __INLINED(nord1 > 0):
-            d2 = d2_highorder(fx, fy, rarea)
-    with computation(PARALLEL), interval(2, 3):
-        if __INLINED(nord2 > 0):
-            d2 = d2_highorder(fx, fy, rarea)
-    with computation(PARALLEL), interval(3, None):
-        if __INLINED(nord3 > 0):
-            d2 = d2_highorder(fx, fy, rarea)
-
-
-@gtscript.function
-def d2_highorder(fx: FloatField, fy: FloatField, rarea: FloatField):
-    d2 = (fx - fx[1, 0, 0] + fy - fy[0, 1, 0]) * rarea
-    return d2
-
-
-def d2_damp_interval(q: FloatField, d2: FloatField, damp: FloatFieldK):
-    """
-    q (in):
-    d2 (out):
-    damp (in):
-    """
-    from __externals__ import (
-        local_ie,
-        local_is,
-        local_je,
-        local_js,
-        nord0,
-        nord1,
-        nord2,
-        nord3,
-    )
-
-    with computation(PARALLEL), interval(0, 1):
-        if __INLINED(nord0 == 0):
-            with horizontal(
-                region[local_is - 1 : local_ie + 2, local_js - 1 : local_je + 2]
-            ):
-                d2 = damp * q
-        else:
-            d2 = damp * q
-    with computation(PARALLEL), interval(1, 2):
-        if __INLINED(nord1 == 0):
-            with horizontal(
-                region[local_is - 1 : local_ie + 2, local_js - 1 : local_je + 2]
-            ):
-                d2 = damp * q
-        else:
-            d2 = damp * q
-    with computation(PARALLEL), interval(2, 3):
-        if __INLINED(nord2 == 0):
-            with horizontal(
-                region[local_is - 1 : local_ie + 2, local_js - 1 : local_je + 2]
-            ):
-                d2 = damp * q
-        else:
-            d2 = damp * q
-    with computation(PARALLEL), interval(3, None):
-        if __INLINED(nord3 == 0):
-            with horizontal(
-                region[local_is - 1 : local_ie + 2, local_js - 1 : local_je + 2]
-            ):
-                d2 = damp * q
-        else:
-            d2 = damp * q
-
-
-def copy_stencil_interval(q_in: FloatField, q_out: FloatField):
-    """
-    Args:
-        q_in (in):
-        q_out (out):
-    """
-    from __externals__ import (
-        local_ie,
-        local_is,
-        local_je,
-        local_js,
-        nord0,
-        nord1,
-        nord2,
-        nord3,
-    )
-
-    with computation(PARALLEL), interval(0, 1):
-        if __INLINED(nord0 == 0):
-            with horizontal(
-                region[local_is - 1 : local_ie + 2, local_js - 1 : local_je + 2]
-            ):
-                q_out = q_in
-        else:
-            q_out = q_in
-    with computation(PARALLEL), interval(1, 2):
-        if __INLINED(nord1 == 0):
-            with horizontal(
-                region[local_is - 1 : local_ie + 2, local_js - 1 : local_je + 2]
-            ):
-                q_out = q_in
-        else:
-            q_out = q_in
-    with computation(PARALLEL), interval(2, 3):
-        if __INLINED(nord2 == 0):
-            with horizontal(
-                region[local_is - 1 : local_ie + 2, local_js - 1 : local_je + 2]
-            ):
-                q_out = q_in
-        else:
-            q_out = q_in
-    with computation(PARALLEL), interval(3, None):
-        if __INLINED(nord3 == 0):
-            with horizontal(
-                region[local_is - 1 : local_ie + 2, local_js - 1 : local_je + 2]
-            ):
-                q_out = q_in
-        else:
-            q_out = q_in
-
-
-def add_diffusive_component(
-    fx: FloatField, fx2: FloatField, fy: FloatField, fy2: FloatField
-):
-    with computation(PARALLEL), interval(...):
-        fx = fx + fx2
-        fy = fy + fy2
-
-
-def diffusive_damp(
-    fx: FloatField,
-    fx2: FloatField,
-    fy: FloatField,
-    fy2: FloatField,
-    mass: FloatField,
-    damp: FloatFieldK,
-):
-    with computation(PARALLEL), interval(...):
-        fx = fx + 0.5 * damp * (mass[-1, 0, 0] + mass) * fx2
-        fy = fy + 0.5 * damp * (mass[0, -1, 0] + mass) * fy2
-
-
-def copy_corners_y_nord(q_in: FloatField, q_out: FloatField):
-    """
-    Args:
-        q_in (in):
-        q_out (out):
-    """
-    from __externals__ import i_end, i_start, j_end, j_start, nord0, nord1, nord2, nord3
-
-    with computation(PARALLEL), interval(0, 1):
-        if __INLINED(nord0 > 0):
-            with horizontal(
-                region[i_start - 3, j_start - 3], region[i_start - 3, j_end + 3]
-            ):
-                q_out = q_in[5, 0, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 3], region[i_start - 3, j_end + 2]
-            ):
-                q_out = q_in[4, 1, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 3], region[i_start - 3, j_end + 1]
-            ):
-                q_out = q_in[3, 2, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 2], region[i_start - 2, j_end + 3]
-            ):
-                q_out = q_in[4, -1, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 2], region[i_start - 2, j_end + 2]
-            ):
-                q_out = q_in[3, 0, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 2], region[i_start - 2, j_end + 1]
-            ):
-                q_out = q_in[2, 1, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 1], region[i_start - 1, j_end + 3]
-            ):
-                q_out = q_in[3, -2, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 1], region[i_start - 1, j_end + 2]
-            ):
-                q_out = q_in[2, -1, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 1], region[i_start - 1, j_end + 1]
-            ):
-                q_out = q_in[1, 0, 0]
-            with horizontal(
-                region[i_end + 1, j_start - 3], region[i_end + 3, j_end + 1]
-            ):
-                q_out = q_in[-3, 2, 0]
-            with horizontal(
-                region[i_end + 2, j_start - 3], region[i_end + 3, j_end + 2]
-            ):
-                q_out = q_in[-4, 1, 0]
-            with horizontal(
-                region[i_end + 3, j_start - 3], region[i_end + 3, j_end + 3]
-            ):
-                q_out = q_in[-5, 0, 0]
-            with horizontal(
-                region[i_end + 1, j_start - 2], region[i_end + 2, j_end + 1]
-            ):
-                q_out = q_in[-2, 1, 0]
-            with horizontal(
-                region[i_end + 2, j_start - 2], region[i_end + 2, j_end + 2]
-            ):
-                q_out = q_in[-3, 0, 0]
-            with horizontal(
-                region[i_end + 3, j_start - 2], region[i_end + 2, j_end + 3]
-            ):
-                q_out = q_in[-4, -1, 0]
-            with horizontal(
-                region[i_end + 1, j_start - 1], region[i_end + 1, j_end + 1]
-            ):
-                q_out = q_in[-1, 0, 0]
-            with horizontal(
-                region[i_end + 2, j_start - 1], region[i_end + 1, j_end + 2]
-            ):
-                q_out = q_in[-2, -1, 0]
-            with horizontal(
-                region[i_end + 3, j_start - 1], region[i_end + 1, j_end + 3]
-            ):
-                q_out = q_in[-3, -2, 0]
-    with computation(PARALLEL), interval(1, 2):
-        if __INLINED(nord1 > 0):
-            with horizontal(
-                region[i_start - 3, j_start - 3], region[i_start - 3, j_end + 3]
-            ):
-                q_out = q_in[5, 0, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 3], region[i_start - 3, j_end + 2]
-            ):
-                q_out = q_in[4, 1, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 3], region[i_start - 3, j_end + 1]
-            ):
-                q_out = q_in[3, 2, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 2], region[i_start - 2, j_end + 3]
-            ):
-                q_out = q_in[4, -1, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 2], region[i_start - 2, j_end + 2]
-            ):
-                q_out = q_in[3, 0, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 2], region[i_start - 2, j_end + 1]
-            ):
-                q_out = q_in[2, 1, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 1], region[i_start - 1, j_end + 3]
-            ):
-                q_out = q_in[3, -2, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 1], region[i_start - 1, j_end + 2]
-            ):
-                q_out = q_in[2, -1, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 1], region[i_start - 1, j_end + 1]
-            ):
-                q_out = q_in[1, 0, 0]
-            with horizontal(
-                region[i_end + 1, j_start - 3], region[i_end + 3, j_end + 1]
-            ):
-                q_out = q_in[-3, 2, 0]
-            with horizontal(
-                region[i_end + 2, j_start - 3], region[i_end + 3, j_end + 2]
-            ):
-                q_out = q_in[-4, 1, 0]
-            with horizontal(
-                region[i_end + 3, j_start - 3], region[i_end + 3, j_end + 3]
-            ):
-                q_out = q_in[-5, 0, 0]
-            with horizontal(
-                region[i_end + 1, j_start - 2], region[i_end + 2, j_end + 1]
-            ):
-                q_out = q_in[-2, 1, 0]
-            with horizontal(
-                region[i_end + 2, j_start - 2], region[i_end + 2, j_end + 2]
-            ):
-                q_out = q_in[-3, 0, 0]
-            with horizontal(
-                region[i_end + 3, j_start - 2], region[i_end + 2, j_end + 3]
-            ):
-                q_out = q_in[-4, -1, 0]
-            with horizontal(
-                region[i_end + 1, j_start - 1], region[i_end + 1, j_end + 1]
-            ):
-                q_out = q_in[-1, 0, 0]
-            with horizontal(
-                region[i_end + 2, j_start - 1], region[i_end + 1, j_end + 2]
-            ):
-                q_out = q_in[-2, -1, 0]
-            with horizontal(
-                region[i_end + 3, j_start - 1], region[i_end + 1, j_end + 3]
-            ):
-                q_out = q_in[-3, -2, 0]
-
-    with computation(PARALLEL), interval(2, 3):
-        if __INLINED(nord2 > 0):
-            with horizontal(
-                region[i_start - 3, j_start - 3], region[i_start - 3, j_end + 3]
-            ):
-                q_out = q_in[5, 0, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 3], region[i_start - 3, j_end + 2]
-            ):
-                q_out = q_in[4, 1, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 3], region[i_start - 3, j_end + 1]
-            ):
-                q_out = q_in[3, 2, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 2], region[i_start - 2, j_end + 3]
-            ):
-                q_out = q_in[4, -1, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 2], region[i_start - 2, j_end + 2]
-            ):
-                q_out = q_in[3, 0, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 2], region[i_start - 2, j_end + 1]
-            ):
-                q_out = q_in[2, 1, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 1], region[i_start - 1, j_end + 3]
-            ):
-                q_out = q_in[3, -2, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 1], region[i_start - 1, j_end + 2]
-            ):
-                q_out = q_in[2, -1, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 1], region[i_start - 1, j_end + 1]
-            ):
-                q_out = q_in[1, 0, 0]
-            with horizontal(
-                region[i_end + 1, j_start - 3], region[i_end + 3, j_end + 1]
-            ):
-                q_out = q_in[-3, 2, 0]
-            with horizontal(
-                region[i_end + 2, j_start - 3], region[i_end + 3, j_end + 2]
-            ):
-                q_out = q_in[-4, 1, 0]
-            with horizontal(
-                region[i_end + 3, j_start - 3], region[i_end + 3, j_end + 3]
-            ):
-                q_out = q_in[-5, 0, 0]
-            with horizontal(
-                region[i_end + 1, j_start - 2], region[i_end + 2, j_end + 1]
-            ):
-                q_out = q_in[-2, 1, 0]
-            with horizontal(
-                region[i_end + 2, j_start - 2], region[i_end + 2, j_end + 2]
-            ):
-                q_out = q_in[-3, 0, 0]
-            with horizontal(
-                region[i_end + 3, j_start - 2], region[i_end + 2, j_end + 3]
-            ):
-                q_out = q_in[-4, -1, 0]
-            with horizontal(
-                region[i_end + 1, j_start - 1], region[i_end + 1, j_end + 1]
-            ):
-                q_out = q_in[-1, 0, 0]
-            with horizontal(
-                region[i_end + 2, j_start - 1], region[i_end + 1, j_end + 2]
-            ):
-                q_out = q_in[-2, -1, 0]
-            with horizontal(
-                region[i_end + 3, j_start - 1], region[i_end + 1, j_end + 3]
-            ):
-                q_out = q_in[-3, -2, 0]
-    with computation(PARALLEL), interval(3, None):
-        if __INLINED(nord3 > 0):
-            with horizontal(
-                region[i_start - 3, j_start - 3], region[i_start - 3, j_end + 3]
-            ):
-                q_out = q_in[5, 0, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 3], region[i_start - 3, j_end + 2]
-            ):
-                q_out = q_in[4, 1, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 3], region[i_start - 3, j_end + 1]
-            ):
-                q_out = q_in[3, 2, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 2], region[i_start - 2, j_end + 3]
-            ):
-                q_out = q_in[4, -1, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 2], region[i_start - 2, j_end + 2]
-            ):
-                q_out = q_in[3, 0, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 2], region[i_start - 2, j_end + 1]
-            ):
-                q_out = q_in[2, 1, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 1], region[i_start - 1, j_end + 3]
-            ):
-                q_out = q_in[3, -2, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 1], region[i_start - 1, j_end + 2]
-            ):
-                q_out = q_in[2, -1, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 1], region[i_start - 1, j_end + 1]
-            ):
-                q_out = q_in[1, 0, 0]
-            with horizontal(
-                region[i_end + 1, j_start - 3], region[i_end + 3, j_end + 1]
-            ):
-                q_out = q_in[-3, 2, 0]
-            with horizontal(
-                region[i_end + 2, j_start - 3], region[i_end + 3, j_end + 2]
-            ):
-                q_out = q_in[-4, 1, 0]
-            with horizontal(
-                region[i_end + 3, j_start - 3], region[i_end + 3, j_end + 3]
-            ):
-                q_out = q_in[-5, 0, 0]
-            with horizontal(
-                region[i_end + 1, j_start - 2], region[i_end + 2, j_end + 1]
-            ):
-                q_out = q_in[-2, 1, 0]
-            with horizontal(
-                region[i_end + 2, j_start - 2], region[i_end + 2, j_end + 2]
-            ):
-                q_out = q_in[-3, 0, 0]
-            with horizontal(
-                region[i_end + 3, j_start - 2], region[i_end + 2, j_end + 3]
-            ):
-                q_out = q_in[-4, -1, 0]
-            with horizontal(
-                region[i_end + 1, j_start - 1], region[i_end + 1, j_end + 1]
-            ):
-                q_out = q_in[-1, 0, 0]
-            with horizontal(
-                region[i_end + 2, j_start - 1], region[i_end + 1, j_end + 2]
-            ):
-                q_out = q_in[-2, -1, 0]
-            with horizontal(
-                region[i_end + 3, j_start - 1], region[i_end + 1, j_end + 3]
-            ):
-                q_out = q_in[-3, -2, 0]
-
-
-def copy_corners_x_nord(q_in: FloatField, q_out: FloatField):
-    """
-    Args:
-        q_in (in):
-        q_out (out):
-    """
-    from __externals__ import i_end, i_start, j_end, j_start, nord0, nord1, nord2, nord3
-
-    with computation(PARALLEL), interval(0, 1):
-        if __INLINED(nord0 > 0):
-            with horizontal(
-                region[i_start - 3, j_start - 3], region[i_end + 3, j_start - 3]
-            ):
-                q_out = q_in[0, 5, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 3], region[i_end + 3, j_start - 2]
-            ):
-                q_out = q_in[-1, 4, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 3], region[i_end + 3, j_start - 1]
-            ):
-                q_out = q_in[-2, 3, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 2], region[i_end + 2, j_start - 3]
-            ):
-                q_out = q_in[1, 4, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 2], region[i_end + 2, j_start - 2]
-            ):
-                q_out = q_in[0, 3, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 2], region[i_end + 2, j_start - 1]
-            ):
-                q_out = q_in[-1, 2, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 1], region[i_end + 1, j_start - 3]
-            ):
-                q_out = q_in[2, 3, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 1], region[i_end + 1, j_start - 2]
-            ):
-                q_out = q_in[1, 2, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 1], region[i_end + 1, j_start - 1]
-            ):
-                q_out = q_in[0, 1, 0]
-            with horizontal(
-                region[i_start - 3, j_end + 1], region[i_end + 1, j_end + 3]
-            ):
-                q_out = q_in[2, -3, 0]
-            with horizontal(
-                region[i_start - 2, j_end + 1], region[i_end + 1, j_end + 2]
-            ):
-                q_out = q_in[1, -2, 0]
-            with horizontal(
-                region[i_start - 1, j_end + 1], region[i_end + 1, j_end + 1]
-            ):
-                q_out = q_in[0, -1, 0]
-            with horizontal(
-                region[i_start - 3, j_end + 2], region[i_end + 2, j_end + 3]
-            ):
-                q_out = q_in[1, -4, 0]
-            with horizontal(
-                region[i_start - 2, j_end + 2], region[i_end + 2, j_end + 2]
-            ):
-                q_out = q_in[0, -3, 0]
-            with horizontal(
-                region[i_start - 1, j_end + 2], region[i_end + 2, j_end + 1]
-            ):
-                q_out = q_in[-1, -2, 0]
-            with horizontal(
-                region[i_start - 3, j_end + 3], region[i_end + 3, j_end + 3]
-            ):
-                q_out = q_in[0, -5, 0]
-            with horizontal(
-                region[i_start - 2, j_end + 3], region[i_end + 3, j_end + 2]
-            ):
-                q_out = q_in[-1, -4, 0]
-            with horizontal(
-                region[i_start - 1, j_end + 3], region[i_end + 3, j_end + 1]
-            ):
-                q_out = q_in[-2, -3, 0]
-    with computation(PARALLEL), interval(1, 2):
-        if __INLINED(nord1 > 0):
-            with horizontal(
-                region[i_start - 3, j_start - 3], region[i_end + 3, j_start - 3]
-            ):
-                q_out = q_in[0, 5, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 3], region[i_end + 3, j_start - 2]
-            ):
-                q_out = q_in[-1, 4, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 3], region[i_end + 3, j_start - 1]
-            ):
-                q_out = q_in[-2, 3, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 2], region[i_end + 2, j_start - 3]
-            ):
-                q_out = q_in[1, 4, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 2], region[i_end + 2, j_start - 2]
-            ):
-                q_out = q_in[0, 3, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 2], region[i_end + 2, j_start - 1]
-            ):
-                q_out = q_in[-1, 2, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 1], region[i_end + 1, j_start - 3]
-            ):
-                q_out = q_in[2, 3, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 1], region[i_end + 1, j_start - 2]
-            ):
-                q_out = q_in[1, 2, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 1], region[i_end + 1, j_start - 1]
-            ):
-                q_out = q_in[0, 1, 0]
-            with horizontal(
-                region[i_start - 3, j_end + 1], region[i_end + 1, j_end + 3]
-            ):
-                q_out = q_in[2, -3, 0]
-            with horizontal(
-                region[i_start - 2, j_end + 1], region[i_end + 1, j_end + 2]
-            ):
-                q_out = q_in[1, -2, 0]
-            with horizontal(
-                region[i_start - 1, j_end + 1], region[i_end + 1, j_end + 1]
-            ):
-                q_out = q_in[0, -1, 0]
-            with horizontal(
-                region[i_start - 3, j_end + 2], region[i_end + 2, j_end + 3]
-            ):
-                q_out = q_in[1, -4, 0]
-            with horizontal(
-                region[i_start - 2, j_end + 2], region[i_end + 2, j_end + 2]
-            ):
-                q_out = q_in[0, -3, 0]
-            with horizontal(
-                region[i_start - 1, j_end + 2], region[i_end + 2, j_end + 1]
-            ):
-                q_out = q_in[-1, -2, 0]
-            with horizontal(
-                region[i_start - 3, j_end + 3], region[i_end + 3, j_end + 3]
-            ):
-                q_out = q_in[0, -5, 0]
-            with horizontal(
-                region[i_start - 2, j_end + 3], region[i_end + 3, j_end + 2]
-            ):
-                q_out = q_in[-1, -4, 0]
-            with horizontal(
-                region[i_start - 1, j_end + 3], region[i_end + 3, j_end + 1]
-            ):
-                q_out = q_in[-2, -3, 0]
-
-    with computation(PARALLEL), interval(2, 3):
-        if __INLINED(nord2 > 0):
-            with horizontal(
-                region[i_start - 3, j_start - 3], region[i_end + 3, j_start - 3]
-            ):
-                q_out = q_in[0, 5, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 3], region[i_end + 3, j_start - 2]
-            ):
-                q_out = q_in[-1, 4, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 3], region[i_end + 3, j_start - 1]
-            ):
-                q_out = q_in[-2, 3, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 2], region[i_end + 2, j_start - 3]
-            ):
-                q_out = q_in[1, 4, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 2], region[i_end + 2, j_start - 2]
-            ):
-                q_out = q_in[0, 3, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 2], region[i_end + 2, j_start - 1]
-            ):
-                q_out = q_in[-1, 2, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 1], region[i_end + 1, j_start - 3]
-            ):
-                q_out = q_in[2, 3, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 1], region[i_end + 1, j_start - 2]
-            ):
-                q_out = q_in[1, 2, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 1], region[i_end + 1, j_start - 1]
-            ):
-                q_out = q_in[0, 1, 0]
-            with horizontal(
-                region[i_start - 3, j_end + 1], region[i_end + 1, j_end + 3]
-            ):
-                q_out = q_in[2, -3, 0]
-            with horizontal(
-                region[i_start - 2, j_end + 1], region[i_end + 1, j_end + 2]
-            ):
-                q_out = q_in[1, -2, 0]
-            with horizontal(
-                region[i_start - 1, j_end + 1], region[i_end + 1, j_end + 1]
-            ):
-                q_out = q_in[0, -1, 0]
-            with horizontal(
-                region[i_start - 3, j_end + 2], region[i_end + 2, j_end + 3]
-            ):
-                q_out = q_in[1, -4, 0]
-            with horizontal(
-                region[i_start - 2, j_end + 2], region[i_end + 2, j_end + 2]
-            ):
-                q_out = q_in[0, -3, 0]
-            with horizontal(
-                region[i_start - 1, j_end + 2], region[i_end + 2, j_end + 1]
-            ):
-                q_out = q_in[-1, -2, 0]
-            with horizontal(
-                region[i_start - 3, j_end + 3], region[i_end + 3, j_end + 3]
-            ):
-                q_out = q_in[0, -5, 0]
-            with horizontal(
-                region[i_start - 2, j_end + 3], region[i_end + 3, j_end + 2]
-            ):
-                q_out = q_in[-1, -4, 0]
-            with horizontal(
-                region[i_start - 1, j_end + 3], region[i_end + 3, j_end + 1]
-            ):
-                q_out = q_in[-2, -3, 0]
-    with computation(PARALLEL), interval(3, None):
-        if __INLINED(nord3 > 0):
-            with horizontal(
-                region[i_start - 3, j_start - 3], region[i_end + 3, j_start - 3]
-            ):
-                q_out = q_in[0, 5, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 3], region[i_end + 3, j_start - 2]
-            ):
-                q_out = q_in[-1, 4, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 3], region[i_end + 3, j_start - 1]
-            ):
-                q_out = q_in[-2, 3, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 2], region[i_end + 2, j_start - 3]
-            ):
-                q_out = q_in[1, 4, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 2], region[i_end + 2, j_start - 2]
-            ):
-                q_out = q_in[0, 3, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 2], region[i_end + 2, j_start - 1]
-            ):
-                q_out = q_in[-1, 2, 0]
-            with horizontal(
-                region[i_start - 3, j_start - 1], region[i_end + 1, j_start - 3]
-            ):
-                q_out = q_in[2, 3, 0]
-            with horizontal(
-                region[i_start - 2, j_start - 1], region[i_end + 1, j_start - 2]
-            ):
-                q_out = q_in[1, 2, 0]
-            with horizontal(
-                region[i_start - 1, j_start - 1], region[i_end + 1, j_start - 1]
-            ):
-                q_out = q_in[0, 1, 0]
-            with horizontal(
-                region[i_start - 3, j_end + 1], region[i_end + 1, j_end + 3]
-            ):
-                q_out = q_in[2, -3, 0]
-            with horizontal(
-                region[i_start - 2, j_end + 1], region[i_end + 1, j_end + 2]
-            ):
-                q_out = q_in[1, -2, 0]
-            with horizontal(
-                region[i_start - 1, j_end + 1], region[i_end + 1, j_end + 1]
-            ):
-                q_out = q_in[0, -1, 0]
-            with horizontal(
-                region[i_start - 3, j_end + 2], region[i_end + 2, j_end + 3]
-            ):
-                q_out = q_in[1, -4, 0]
-            with horizontal(
-                region[i_start - 2, j_end + 2], region[i_end + 2, j_end + 2]
-            ):
-                q_out = q_in[0, -3, 0]
-            with horizontal(
-                region[i_start - 1, j_end + 2], region[i_end + 2, j_end + 1]
-            ):
-                q_out = q_in[-1, -2, 0]
-            with horizontal(
-                region[i_start - 3, j_end + 3], region[i_end + 3, j_end + 3]
-            ):
-                q_out = q_in[0, -5, 0]
-            with horizontal(
-                region[i_start - 2, j_end + 3], region[i_end + 3, j_end + 2]
-            ):
-                q_out = q_in[-1, -4, 0]
-            with horizontal(
-                region[i_start - 1, j_end + 3], region[i_end + 3, j_end + 1]
-            ):
-                q_out = q_in[-2, -3, 0]
-
-
-class DelnFlux:
-    """
-    Fortran name is deln_flux
-    The test class is DelnFlux
-
-    This class computes the fluxes for damping and also applies them.
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        damping_coefficients: DampingCoefficients,
-        rarea: Quantity,
-        nord_col: Quantity,
-        damp_c: Quantity,
-    ):
-        """
-        nord sets the order of damping to apply:
-        nord = 0:   del-2
-        nord = 1:   del-4
-        nord = 2:   del-6
-
-        nord and damp_c define the damping coefficient used in DelnFluxNoSG
-        """
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-        )
-        self._no_compute = False
-        if (damp_c.view[:] <= 1e-4).all():
-            self._no_compute = True
-        elif (damp_c.view[:-1] <= 1e-4).any():
-            raise NotImplementedError(
-                "damp_c currently must be always greater than 10^-4 for delnflux"
-            )
-        grid_indexing = stencil_factory.grid_indexing
-        nk = grid_indexing.domain[2]
-        self._origin = grid_indexing.origin_full()
-
-        self._fx2 = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="undefined",
-            dtype=Float,
-        )
-        self._fy2 = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="undefined",
-            dtype=Float,
-        )
-        self._d2 = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="undefined",
-            dtype=Float,
-        )
-
-        self._add_diffusive_stencil = stencil_factory.from_dims_halo(
-            func=add_diffusive_component,
-            compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-        )
-        self._diffusive_damp_stencil = stencil_factory.from_dims_halo(
-            func=diffusive_damp, compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM]
-        )
-
-        self._damp = calc_damp(
-            damp_c=damp_c, da_min=damping_coefficients.da_min, nord=nord_col
-        )
-
-        self.delnflux_nosg = DelnFluxNoSG(
-            stencil_factory, damping_coefficients, rarea, nord_col, nk=nk
-        )
-
-    def __call__(
-        self,
-        q: FloatField,
-        fx: FloatField,
-        fy: FloatField,
-        d2: Optional["FloatField"] = None,
-        mass: Optional["FloatField"] = None,
-    ):
-        """
-        Del-n damping for fluxes, where n = 2 * nord + 2
-        Args:
-            q: Field for which to calculate damped fluxes (in)
-            fx: x-flux on A-grid (inout)
-            fy: y-flux on A-grid (inout)
-            d2: A damped copy of the q field (in)
-            mass: Mass to weight the diffusive flux by (in)
-        """
-        if self._no_compute is True:
-            return fx, fy
-
-        # [DaCe] Optional d2 gets reduced to subset 0 in DaCe parsing leading to a
-        # parsing error
-        # Original code:
-        # if d2 is None:
-        #     d2 = self._d2
-        # fx2 and fy2 are local variables containing the diffusive flux, which
-        # gets added to the base flux below
-        if d2 is None:
-            self.delnflux_nosg(q, self._fx2, self._fy2, self._damp, self._d2, mass)
-        else:
-            self.delnflux_nosg(q, self._fx2, self._fy2, self._damp, d2, mass)
-
-        if mass is None:
-            self._add_diffusive_stencil(fx, self._fx2, fy, self._fy2)
-        else:
-            # TODO: To join these stencils you need to overcompute, making the edges
-            # 'wrong', but not actually used, separating now for comparison sanity.
-
-            # diffusive_damp(fx, fx2, fy, fy2, mass, damp, origin=diffuse_origin,
-            # domain=(grid.nic + 1, grid.njc + 1, nk))
-            self._diffusive_damp_stencil(fx, self._fx2, fy, self._fy2, mass, self._damp)
-
-        return fx, fy
-
-
-class DelnFluxNoSG:
-    """
-    This contains the mechanics of del6_vt and some of deln_flux from
-    the Fortran code, since they are very similar routines. The test class
-    is Del6VtFlux
-
-    SG stands for signsg
-
-    This class only computes damping fluxes, and does not apply them.
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        damping_coefficients: DampingCoefficients,
-        rarea: Quantity,
-        nord: Quantity,
-        nk: Optional[int] = None,
-    ):
-        """
-        nord sets the order of damping to apply:
-        nord = 0:   del-2
-        nord = 1:   del-4
-        nord = 2:   del-6
-        """
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-        )
-        grid_indexing = stencil_factory.grid_indexing
-        self._del6_u = damping_coefficients.del6_u
-        self._del6_v = damping_coefficients.del6_v
-        self._rarea = rarea
-        nord.data[:] = nord.data[:].round().astype(int)
-        self._nmax = int(max(nord.view[:]))
-        if self._nmax > 3:
-            raise ValueError("nord must be less than 3")
-        if not all(n in [0, 2, 3] for n in nord.view[:]):
-            raise NotImplementedError("nord must have values 0, 2, or 3")
-        i1 = grid_indexing.isc - 1 - self._nmax
-        i2 = grid_indexing.iec + 1 + self._nmax
-        j1 = grid_indexing.jsc - 1 - self._nmax
-        j2 = grid_indexing.jec + 1 + self._nmax
-        if nk is None:
-            nk = grid_indexing.domain[2]
-        nk = nk
-        origin_d2 = (i1, j1, 0)
-        domain_d2 = (i2 - i1 + 1, j2 - j1 + 1, nk)
-        f1_ny = grid_indexing.jec - grid_indexing.jsc + 1 + 2 * self._nmax
-        f1_nx = grid_indexing.iec - grid_indexing.isc + 2 + 2 * self._nmax
-        fx_origin = (grid_indexing.isc - self._nmax, grid_indexing.jsc - self._nmax, 0)
-        self._nord = nord
-
-        if nk <= 3:
-            raise NotImplementedError("nk must be more than 3 for DelnFluxNoSG")
-
-        preamble_ax_offsets = grid_indexing.axis_offsets(origin_d2, domain_d2)
-        fx_ax_offsets = grid_indexing.axis_offsets(fx_origin, (f1_nx, f1_ny, nk))
-        fy_ax_offsets = grid_indexing.axis_offsets(
-            fx_origin, (f1_nx - 1, f1_ny + 1, nk)
-        )
-
-        origins_d2 = []
-        domains_d2 = []
-        origins_flux = []
-        domains_fx = []
-        domains_fy = []
-
-        for n in range(self._nmax):
-            nt = self._nmax - 1 - n
-            nt_ny = grid_indexing.jec - grid_indexing.jsc + 3 + 2 * nt
-            nt_nx = grid_indexing.iec - grid_indexing.isc + 3 + 2 * nt
-            origins_d2.append(
-                (grid_indexing.isc - nt - 1, grid_indexing.jsc - nt - 1, 0)
-            )
-            domains_d2.append((nt_nx, nt_ny, nk))
-            origins_flux.append((grid_indexing.isc - nt, grid_indexing.jsc - nt, 0))
-            domains_fx.append((nt_nx - 1, nt_ny - 2, nk))
-            domains_fy.append((nt_nx - 2, nt_ny - 1, nk))
-
-        nord_dictionary = {
-            "nord0": float(nord.view[0]),
-            "nord1": float(nord.view[1]),
-            "nord2": float(nord.view[2]),
-            "nord3": float(nord.view[3]),
-        }
-        nord_dictionary["nord0"] = Float(nord_dictionary["nord0"])
-        nord_dictionary["nord1"] = Float(nord_dictionary["nord1"])
-        nord_dictionary["nord2"] = Float(nord_dictionary["nord2"])
-        nord_dictionary["nord3"] = Float(nord_dictionary["nord3"])
-
-        self._d2_damp = stencil_factory.from_origin_domain(
-            d2_damp_interval,
-            externals={
-                **nord_dictionary,
-                **preamble_ax_offsets,
-            },
-            origin=origin_d2,
-            domain=domain_d2,
-        )
-
-        self._copy_stencil_interval = stencil_factory.from_origin_domain(
-            copy_stencil_interval,
-            externals={
-                **nord_dictionary,
-                **preamble_ax_offsets,
-            },
-            origin=origin_d2,
-            domain=domain_d2,
-        )
-
-        self._d2_stencil = get_stencils_with_varied_bounds(
-            d2_highorder_stencil,
-            origins_d2,
-            domains_d2,
-            stencil_factory=stencil_factory,
-            externals={**nord_dictionary},
-        )
-        self._column_conditional_fx_calculation = get_stencils_with_varied_bounds(
-            fx_calc_stencil_column,
-            origins_flux,
-            domains_fx,
-            stencil_factory=stencil_factory,
-            externals={**nord_dictionary},
-        )
-        self._column_conditional_fy_calculation = get_stencils_with_varied_bounds(
-            fy_calc_stencil_column,
-            origins_flux,
-            domains_fy,
-            stencil_factory=stencil_factory,
-            externals={**nord_dictionary},
-        )
-        self._fx_calc_stencil = stencil_factory.from_origin_domain(
-            fx_calc_stencil_nord,
-            externals={**fx_ax_offsets, **nord_dictionary},
-            origin=fx_origin,
-            domain=(f1_nx, f1_ny, nk),
-        )
-        self._fy_calc_stencil = stencil_factory.from_origin_domain(
-            fy_calc_stencil_nord,
-            externals={**fy_ax_offsets, **nord_dictionary},
-            origin=fx_origin,
-            domain=(f1_nx - 1, f1_ny + 1, nk),
-        )
-        corner_origin, corner_domain = grid_indexing.get_origin_domain(
-            dims=[X_DIM, Y_DIM, Z_DIM],
-            halos=(grid_indexing.n_halo, grid_indexing.n_halo),
-        )
-        corner_domain = corner_domain[:2] + (nk,)
-        corner_axis_offsets = grid_indexing.axis_offsets(corner_origin, corner_domain)
-
-        self._copy_corners_x_nord = stencil_factory.from_origin_domain(
-            copy_corners_x_nord,
-            externals={**corner_axis_offsets, **nord_dictionary},
-            origin=corner_origin,
-            domain=corner_domain,
-        )
-        self._copy_corners_y_nord = stencil_factory.from_origin_domain(
-            copy_corners_y_nord,
-            externals={**corner_axis_offsets, **nord_dictionary},
-            origin=corner_origin,
-            domain=corner_domain,
-        )
-
-    def __call__(self, q, fx2, fy2, damp_c, d2, mass=None):
-        """
-        Computes flux fields which would apply del-n damping to q,
-        where n is set by nord.
-
-        Can compute diffusion at 2nd, 4th, 6th-order but expresses it as a flux
-        so that it's conservative. Doesn't apply those fluxes in this object.
-
-        Args:
-            q (in): Field for which to calculate damping fluxes
-            fx2 (out): x-flux on A grid to apply damping to q
-            fy2 (out): y-flux on A grid to apply damping to q
-            damp_c (in): damping coefficient for q
-            d2 (out): higher-order damped version of q
-            mass (unused): if given, apply d2 damping (does not use this as input)
-        """
-
-        if mass is None:
-            self._d2_damp(q, d2, damp_c)
-        else:
-            self._copy_stencil_interval(q, d2)
-
-        self._copy_corners_x_nord(d2, d2)
-
-        self._fx_calc_stencil(d2, self._del6_v, fx2)
-
-        self._copy_corners_y_nord(d2, d2)
-
-        self._fy_calc_stencil(d2, self._del6_u, fy2)
-
-        for n in range(self._nmax):
-            self._d2_stencil[n](
-                fx2,
-                fy2,
-                self._rarea,
-                d2,
-            )
-
-            self._copy_corners_x_nord(d2, d2)
-
-            self._column_conditional_fx_calculation[n](
-                d2,
-                self._del6_v,
-                fx2,
-            )
-
-            self._copy_corners_y_nord(d2, d2)
-
-            self._column_conditional_fy_calculation[n](
-                d2,
-                self._del6_u,
-                fy2,
-            )
diff --git a/pyFV3/pyFV3/stencils/divergence_damping.py b/pyFV3/pyFV3/stencils/divergence_damping.py
deleted file mode 100644
index 31fee96f..00000000
--- a/pyFV3/pyFV3/stencils/divergence_damping.py
+++ /dev/null
@@ -1,713 +0,0 @@
-import gt4py.cartesian.gtscript as gtscript
-import ndsl.stencils.corners as corners
-from gt4py.cartesian.gtscript import (
-    __INLINED,
-    PARALLEL,
-    computation,
-    horizontal,
-    interval,
-    region,
-    sqrt,
-)
-from ndsl.constants import X_DIM, X_INTERFACE_DIM, Y_DIM, Y_INTERFACE_DIM, Z_DIM
-from ndsl.dsl.dace.orchestration import dace_inhibitor, orchestrate
-from ndsl.dsl.stencil import StencilFactory, get_stencils_with_varied_bounds
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ, FloatFieldK
-from ndsl.grid import DampingCoefficients, GridData
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.quantity import Quantity
-
-import pyFV3.stencils.basic_operations as basic
-from pyFV3.stencils.a2b_ord4 import AGrid2BGridFourthOrder, doubly_periodic_a2b_ord4
-from pyFV3.stencils.d2a2c_vect import contravariant
-
-
-@gtscript.function
-def damp_tmp(q, da_min_c, d2_bg, dddmp):
-    mintmp = min(0.2, dddmp * abs(q))
-    damp = da_min_c * max(d2_bg, mintmp)
-    return damp
-
-
-def compute_u_contra_dyc(
-    u: FloatField,
-    va: FloatField,
-    vc: FloatField,
-    cosa_v: FloatFieldIJ,
-    sina_v: FloatFieldIJ,
-    dyc: FloatFieldIJ,
-    sin_sg2: FloatFieldIJ,
-    sin_sg4: FloatFieldIJ,
-    u_contra_dyc: FloatField,
-):
-    """
-
-    Args:
-        u (in):
-        va (in):
-        vc (in):
-        cosa_v (in):
-        sina_v (in):
-        dyc (in):
-        sin_sg2 (in):
-        sin_sg4 (in):
-        u_contra_dyc (out): contravariant u-wind on d-grid
-    """
-    from __externals__ import j_end, j_start
-
-    with computation(PARALLEL), interval(...):
-        # TODO: why does vc_from_va sometimes have different sign than vc?
-        vc_from_va = 0.5 * (va[0, -1, 0] + va)
-        # TODO: why do we use vc_from_va and not just vc?
-        u_contra = contravariant(u, vc_from_va, cosa_v, sina_v)
-        with horizontal(region[:, j_start], region[:, j_end + 1]):
-            u_contra = u * sin_sg4[0, -1] if vc > 0 else u * sin_sg2
-        u_contra_dyc = u_contra * dyc
-
-
-def compute_v_contra_dxc(
-    v: FloatField,
-    ua: FloatField,
-    cosa_u: FloatFieldIJ,
-    sina_u: FloatFieldIJ,
-    dxc: FloatFieldIJ,
-    v_contra_dxc: FloatField,
-    uc: FloatField,
-    sin_sg3: FloatFieldIJ,
-    sin_sg1: FloatFieldIJ,
-):
-    """
-    Args:
-        v (in):
-        ua (in):
-        cosa_u (in):
-        sina_u (in):
-        dxc (in):
-        vort (out): contravariant v-wind on d-grid
-        uc (in):
-        sin_sg3 (in):
-        sin_sg1 (in):
-    """
-    from __externals__ import i_end, i_start
-
-    with computation(PARALLEL), interval(...):
-        # TODO: why does uc_from_ua sometimes have different sign than uc?
-        uc_from_ua = 0.5 * (ua[-1, 0, 0] + ua)
-        # TODO: why do we use uc_from_ua and not just uc?
-        v_contra = contravariant(v, uc_from_ua, cosa_u, sina_u)
-        with horizontal(region[i_start, :], region[i_end + 1, :]):
-            v_contra = v * sin_sg3[-1, 0] if uc > 0 else v * sin_sg1
-        v_contra_dxc = v_contra * dxc
-
-
-def delpc_computation(
-    u_contra_dxc: FloatField,
-    rarea_c: FloatFieldIJ,
-    delpc: FloatField,  # TODO: rename to divergence_on_cell_corners
-    v_contra_dyc: FloatField,
-):
-    """
-    Args:
-        u_contra_dyc (in): contravariant u-wind on d-grid * dxc
-        rarea_c (in):
-        delpc (out): convergence of wind on cell centers
-        v_contra_dxc (in): contravariant v-wind on d-grid * dyc
-    """
-    from __externals__ import i_end, i_start, j_end, j_start
-
-    with computation(PARALLEL), interval(...):
-        delpc = (
-            v_contra_dyc[0, -1, 0]
-            - v_contra_dyc
-            + u_contra_dxc[-1, 0, 0]
-            - u_contra_dxc
-        )
-
-    # dual quadrilateral becomes dual triangle, at the corners, so there is
-    # an extraneous term in the divergence calculation. This is always
-    # done using the y-component, though it could be done with either
-    # the y- or x-component (they should be identical).
-    with computation(PARALLEL), interval(...):
-        with horizontal(region[i_start, j_start], region[i_end + 1, j_start]):
-            delpc = delpc - v_contra_dyc[0, -1, 0]
-        with horizontal(region[i_start, j_end + 1], region[i_end + 1, j_end + 1]):
-            delpc = delpc + v_contra_dyc
-
-    with computation(PARALLEL), interval(...):
-        delpc = rarea_c * delpc
-
-
-def damping(
-    delpc: FloatField,
-    vort: FloatField,
-    ke: FloatField,
-    d2_bg: FloatFieldK,
-    da_min_c: Float,
-    dddmp: Float,
-    dt: Float,
-):
-    """
-    Args:
-        delpc (in): divergence at cell corner
-        vort (out):
-        ke (inout):
-        d2_bg (in):
-    """
-    with computation(PARALLEL), interval(...):
-        delpcdt = delpc * dt
-        damp = damp_tmp(delpcdt, da_min_c, d2_bg, dddmp)
-        vort = damp * delpc
-        ke += vort
-
-
-def damping_nord_highorder_stencil(
-    vort: FloatField,
-    ke: FloatField,
-    delpc: FloatField,
-    divg_d: FloatField,
-    d2_bg: FloatFieldK,
-    da_min_c: Float,
-    dddmp: Float,
-    dd8: Float,
-):
-    """
-    Args:
-        vort (inout): linear combination of second-order and higher-order
-            divergence damping, on output is the damping term itself
-        ke (inout): on input, is the kinetic energy, on output also includes
-            the damping term vort
-        delpc (in): divergence on cell corners
-        divg_d (in): higher-order divergence on d-grid
-        d2_bg (in): background second-order divergence damping coefficient
-    """
-    # TODO: propagate variable renaming into this routine
-    with computation(PARALLEL), interval(...):
-        damp = damp_tmp(vort, da_min_c, d2_bg, dddmp)
-        vort = damp * delpc + dd8 * divg_d
-        ke = ke + vort
-
-
-def vc_from_divg(divg_d: FloatField, divg_u: FloatFieldIJ, vc: FloatField):
-    """
-    Args:
-        divg_d (in): divergence on d-grid
-        divg_u (in): metric term, divg_u = sina_v * dyc / dx
-        uv (out): intermediate component of hyperdiffusion defined on
-            same grid as c-grid y-wind
-    """
-    with computation(PARALLEL), interval(...):
-        vc = (divg_d[1, 0, 0] - divg_d) * divg_u
-
-
-def uc_from_divg(divg_d: FloatField, divg_v: FloatFieldIJ, uc: FloatField):
-    """
-    Args:
-        divg_d (in): divergence on d-grid
-        divg_v (in): metric term, divg_v = sina_u * dxc / dy
-        uc (out): intermediate component of hyperdiffusion defined on
-            same grid as c-grid x-wind
-    """
-    with computation(PARALLEL), interval(...):
-        uc = (divg_d[0, 1, 0] - divg_d) * divg_v
-
-
-def redo_divg_d(
-    uc: FloatField,
-    vc: FloatField,
-    divg_d: FloatField,
-    adjustment_factor: FloatFieldIJ,
-):
-    """
-    Args:
-        uc (in): intermediate component of hyperdiffusion defined on
-            same grid as c-grid x-wind
-        vc (in): intermediate component of hyperdiffusion defined on
-            same grid as c-grid y-wind
-        divg_d (out): updated divergence for hyperdiffusion on d-grid
-        adjustment_factor (in):
-    """
-    from __externals__ import do_adjustment, i_end, i_start, j_end, j_start
-
-    with computation(PARALLEL), interval(...):
-        divg_d = uc[0, -1, 0] - uc + vc[-1, 0, 0] - vc
-
-    with computation(PARALLEL), interval(...):
-        with horizontal(region[i_start, j_start], region[i_end + 1, j_start]):
-            divg_d = divg_d - uc[0, -1, 0]
-        with horizontal(region[i_start, j_end + 1], region[i_end + 1, j_end + 1]):
-            divg_d = divg_d + uc
-
-    with computation(PARALLEL), interval(...):
-        if __INLINED(do_adjustment):
-            divg_d = divg_d * adjustment_factor
-
-
-def smagorinsky_diffusion_approx(delpc: FloatField, vort: FloatField, absdt: Float):
-    """
-    Args:
-        delpc (in): divergence on cell corners
-        vort (inout): local eddy diffusivity
-        absdt (in): abs(dt)
-    """
-    with computation(PARALLEL), interval(...):
-        vort = absdt * (delpc ** 2.0 + vort ** 2.0) ** 0.5
-
-
-def smag_corner(
-    u: FloatField,
-    v: FloatField,
-    dx: FloatFieldIJ,
-    dxc: FloatFieldIJ,
-    dy: FloatFieldIJ,
-    dyc: FloatFieldIJ,
-    rarea: FloatFieldIJ,
-    rarea_c: FloatFieldIJ,
-    smag_c: FloatField,
-    dt: Float,
-):
-    """
-    Smagorinsky diffusion for a doubly-periodic domain
-    Args:
-        u (in): d-grid u wind
-        v (in): d-grid v wind
-        dx (in): Distance between grid corners along the x-direction
-        dxc (in): Distance between grid centers along the x-direction
-        dy (in): Distance between grid corners along the y-direction
-        dyc (in): Distance between grid centers along the y-direction
-        rarea (in): 1/cell area
-        rarea_c (in): 1/ c-grid cell area
-        smag_c (out): tension shear strain on cell corners
-        dt (in): timestep
-    """
-
-    with computation(PARALLEL), interval(...):
-        # compute tension strain at corners:
-        shear = 0.0
-
-        ut = u * dyc
-        vt = v * dxc
-        smag_c_t = rarea_c * (vt[0, -1, 0] - vt - ut[-1, 0, 0] + ut)
-
-        # compute shear strain:
-        vt2 = u * dx
-        ut2 = v * dy
-        wk = rarea * (vt2 - vt2[0, 1, 0] + ut2 - ut2[1, 0, 0])
-
-        shear = doubly_periodic_a2b_ord4(wk)
-        smag_c = dt * sqrt(shear ** 2 + smag_c_t ** 2)
-
-
-class DivergenceDamping:
-    """
-    A large section in Fortran's d_sw that applies divergence damping
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        grid_data: GridData,
-        damping_coefficients: DampingCoefficients,
-        nested: bool,
-        stretched_grid: bool,
-        dddmp,
-        d4_bg,
-        nord: int,
-        grid_type,
-        nord_col: Quantity,
-        d2_bg: FloatFieldK,
-    ):
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-        )
-        self.grid_indexing = stencil_factory.grid_indexing
-        if nested:
-            raise NotImplementedError("Divergence Dampoing: nested not implemented.")
-        # TODO: make dddmp a compile-time external, instead of runtime scalar
-        self._dddmp = dddmp
-        # TODO: make da_min_c a compile-time external, instead of runtime scalar
-        self._damping_coefficients = damping_coefficients
-        self._stretched_grid = stretched_grid
-        self._d4_bg = d4_bg
-        self._grid_type = grid_type
-        self._nord_column = nord_col
-        self._d2_bg_column = d2_bg
-        self._rarea = grid_data.rarea
-        self._rarea_c = grid_data.rarea_c
-        self._sin_sg1 = grid_data.sin_sg1
-        self._sin_sg2 = grid_data.sin_sg2
-        self._sin_sg3 = grid_data.sin_sg3
-        self._sin_sg4 = grid_data.sin_sg4
-        self._cosa_u = grid_data.cosa_u
-        self._cosa_v = grid_data.cosa_v
-        self._sina_u = grid_data.sina_u
-        self._sina_v = grid_data.sina_v
-        self._dx = grid_data.dx
-        self._dy = grid_data.dy
-        self._dxc = grid_data.dxc
-        self._dyc = grid_data.dyc
-        # TODO: maybe compute locally divg_* grid variables
-        # They parallel the del6_* variables a lot
-        # so may want to pair together if you move
-        self._divg_u = damping_coefficients.divg_u
-        self._divg_v = damping_coefficients.divg_v
-
-        nonzero_nord_k = 0
-        # everything below the sponge layer (k=3 to npz) would use nord, everything
-        # within the sponge layer uses the same higher nord value equal to the
-        # first nonzero value in nord_column
-        # k = 1, 2 nord = 0
-        # k = 3 to npz nord = user speicfied nord
-
-        # refer to https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere/blob/main/model/dyn_core.F90#L693  # noqa: E501
-        # for comparison
-        self._nonzero_nord = int(nord)
-        for k in range(self._nord_column.extent[0]):
-            if self._nord_column.view[k] > 0:
-                nonzero_nord_k = k
-                self._nonzero_nord = int(self._nord_column.view[k])
-                break
-
-        kstart = nonzero_nord_k
-        nk = self.grid_indexing.domain[2] - kstart
-        self._do_zero_order = nonzero_nord_k > 0
-        low_k_stencil_factory = stencil_factory.restrict_vertical(
-            k_start=0, nk=nonzero_nord_k
-        )
-        high_k_stencil_factory = stencil_factory.restrict_vertical(
-            k_start=nonzero_nord_k
-        )
-
-        self._compute_u_contra_dyc = low_k_stencil_factory.from_dims_halo(
-            compute_u_contra_dyc,
-            compute_dims=[X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            compute_halos=(1, 0),
-        )
-
-        self._compute_v_contra_dxc = low_k_stencil_factory.from_dims_halo(
-            compute_v_contra_dxc,
-            compute_dims=[X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            compute_halos=(0, 1),
-        )
-
-        self._delpc_computation = low_k_stencil_factory.from_dims_halo(
-            delpc_computation,
-            compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-            compute_halos=(0, 0),
-        )
-
-        self.u_contra_dyc = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="m^2/s",
-            dtype=Float,
-        )
-        self.v_contra_dxc = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="m^2/s",
-            dtype=Float,
-        )
-
-        self._damping = low_k_stencil_factory.from_dims_halo(
-            damping,
-            compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-            compute_halos=(0, 0),
-        )
-
-        self._copy_computeplus = high_k_stencil_factory.from_dims_halo(
-            func=basic.copy_defn,
-            compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-            compute_halos=(0, 0),
-        )
-        self.fill_corners_bgrid_x = corners.FillCornersBGrid(
-            direction="x",
-            stencil_factory=high_k_stencil_factory,
-        )
-
-        origins = []
-        origins_v = []
-        origins_u = []
-        domains = []
-        domains_v = []
-        domains_u = []
-        for n in range(1, self._nonzero_nord + 1):
-            nt = self._nonzero_nord - n
-            nint = self.grid_indexing.domain[0] + 2 * nt + 1
-            njnt = self.grid_indexing.domain[1] + 2 * nt + 1
-            js = self.grid_indexing.jsc - nt
-            is_ = self.grid_indexing.isc - nt
-            origins_v.append((is_ - 1, js, kstart))
-            domains_v.append((nint + 1, njnt, nk))
-            origins_u.append((is_, js - 1, kstart))
-            domains_u.append((nint, njnt + 1, nk))
-            origins.append((is_, js, kstart))
-            domains.append((nint, njnt, nk))
-
-        self._vc_from_divg_stencils = get_stencils_with_varied_bounds(
-            vc_from_divg,
-            origins=origins_v,
-            domains=domains_v,
-            stencil_factory=stencil_factory,
-        )
-
-        self.fill_corners_bgrid_y = corners.FillCornersBGrid(
-            direction="y",
-            stencil_factory=high_k_stencil_factory,
-        )
-
-        self._uc_from_divg_stencils = get_stencils_with_varied_bounds(
-            uc_from_divg,
-            origins=origins_u,
-            domains=domains_u,
-            stencil_factory=stencil_factory,
-        )
-
-        self._fill_corners_dgrid_stencil = high_k_stencil_factory.from_dims_halo(
-            func=corners.fill_corners_dgrid_defn,
-            compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-            compute_halos=(self.grid_indexing.n_halo, self.grid_indexing.n_halo),
-        )
-
-        self._redo_divg_d_stencils = get_stencils_with_varied_bounds(
-            redo_divg_d,
-            origins=origins,
-            domains=domains,
-            stencil_factory=stencil_factory,
-            externals={"do_adjustment": not stretched_grid},
-        )
-
-        self._set_value = high_k_stencil_factory.from_dims_halo(
-            func=basic.set_value_defn,
-            compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-            compute_halos=(self.grid_indexing.n_halo, self.grid_indexing.n_halo),
-        )
-
-        if self._grid_type < 3:
-            self.a2b_ord4 = AGrid2BGridFourthOrder(
-                stencil_factory=high_k_stencil_factory,
-                quantity_factory=quantity_factory,
-                grid_data=grid_data,
-                grid_type=self._grid_type,
-                replace=False,
-            )
-
-            self._smagorinksy_diffusion_approx_stencil = (
-                high_k_stencil_factory.from_dims_halo(
-                    func=smagorinsky_diffusion_approx,
-                    compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-                    compute_halos=(0, 0),
-                )
-            )
-        else:
-            self._smag_corner = high_k_stencil_factory.from_dims_halo(
-                func=smag_corner,
-                externals={
-                    "replace": False,
-                },
-                compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-                compute_halos=(0, 0),
-            )
-
-        self._damping_nord_highorder_stencil = high_k_stencil_factory.from_dims_halo(
-            func=damping_nord_highorder_stencil,
-            compute_dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-            compute_halos=(0, 0),
-        )
-
-    # We need to use a getter for da_min & da_min_c in order to go around a DaCe inline
-    # behavior. As part of the automatic optimization process, DaCe tries to inline
-    # as many scalars as possible.
-    # The grid is _not_ passed as an input to the top level function we orchestrate,
-    # so its scalar values will be inlined.
-
-    # 'alas, our distributed compilation system works by compiling a 3,3 layout
-    # top tile, then using those 9 caches on every layout upward.
-    # This setup leads to the values of da_min/da_min_c from the 3,3 layout
-    # to be inlined in the generated code. Those variables are used in runtime
-    # calculation (kinetic energy, etc.) which obviously leads to misbehaving numerics
-    # and errors when the 3,3 layout values are used on larger layouts
-
-    # The solution we implement here is making use of the fact that callbacks
-    # are never inlined in dace optimization. the current workaround uses the
-    # following functions.
-
-    # An alternative would be to pass the Grid or the DampingCoefficients to DaCe,
-    # clearly flagging it has a dynamic piece of memory (which would
-    # cancel any inlining) but the feature to do that (dace.struct)
-    # is currently in disarray.
-    # N.B.: another solution is to pass da_min and da_min_c as input, put it seems
-    # odd and adds a lot of boilerplate throughout the model code.
-
-    @dace_inhibitor
-    def _get_da_min_c(self) -> float:
-        return self._damping_coefficients.da_min_c
-
-    @dace_inhibitor
-    def _get_da_min(self) -> float:
-        return self._damping_coefficients.da_min
-
-    def __call__(
-        self,
-        u: FloatField,
-        v: FloatField,
-        va: FloatField,
-        damped_rel_vort_bgrid: FloatField,
-        ua: FloatField,
-        divg_d: FloatField,
-        vc: FloatField,
-        uc: FloatField,
-        delpc: FloatField,
-        ke: FloatField,
-        rel_vort_agrid: FloatField,
-        dt: Float,
-    ):
-        """
-        Adds another form of diffusive flux that acts on the divergence field.
-        To apply diffusion you can take the gradient of the divergence field and add
-        it into the components of the velocity equation. This gives
-        second-order diffusion, which is quite diffusive. But if we apply this
-        iteratively, we can get 4th, 6th, 8th, etc. order diffusion.
-
-        Explained in detail in section 8.3 of the FV3 documentation.
-
-        Applies both a background second-order diffusion (with strength controlled by
-        d2_bg passed on init) and a higher-order hyperdiffusion.
-
-        Args:
-            u (in): x-velocity on d-grid
-            v (in): y-velocity on d-grid
-            va (in):
-            damped_rel_vort_bgrid (out): damped relative vorticity on b-grid
-            ua (in):
-            divg_d (inout): finite volume divergence defined on cell corners,
-                output value is not used later in D_SW
-            vc (inout):
-            uc (inout):
-            delpc (out): finite volume divergence defined on cell corners
-            ke (inout): dt times the kinetic energy defined on cell corners,
-                at input time must be accurate for the input winds.
-                Gets updated to remain accurate for the output winds,
-                as described in section 8.3 of the FV3 documentation.
-            rel_vort_agrid (in): a-grid relative vorticity computed before
-                divergence damping
-                gets converted by a2b_ord4 and put into v_contra_dxc
-            dt (in): timestep
-        """
-        # TODO: is there anything we can do to APIs to make it clear that divg_d is not
-        #       really an output variable of DivergenceDamping?
-        # in the original Fortran, u_contra_dyc is "ptc" and v_contra_dxc is "vort"
-        # TODO: what does do_zero_order signify, why is it false/true?
-        if self._do_zero_order:
-            # This is used in the sponge layer, 2nd order damping
-            # TODO: delpc is an output of this but is never used. Inside the helper
-            # function, use a stencil temporary or temporary storage instead
-            self._compute_u_contra_dyc(
-                u,
-                va,
-                vc,
-                self._cosa_v,
-                self._sina_v,
-                self._dyc,
-                self._sin_sg2,
-                self._sin_sg4,
-                self.u_contra_dyc,
-            )
-
-            self._compute_v_contra_dxc(
-                v,
-                ua,
-                self._cosa_u,
-                self._sina_u,
-                self._dxc,
-                self.v_contra_dxc,
-                uc,
-                self._sin_sg3,
-                self._sin_sg1,
-            )
-
-            self._delpc_computation(
-                self.u_contra_dyc,
-                self._rarea_c,
-                delpc,
-                self.v_contra_dxc,
-            )
-
-            da_min_c: Float = self._get_da_min_c()
-            self._damping(
-                delpc,
-                damped_rel_vort_bgrid,
-                ke,
-                self._d2_bg_column,
-                da_min_c,
-                self._dddmp,
-                dt,
-            )
-        self._copy_computeplus(divg_d, delpc)
-        for n in range(self._nonzero_nord):
-            fillc = (
-                (n + 1 != self._nonzero_nord)
-                and self._grid_type < 3
-                and (
-                    self.grid_indexing.sw_corner
-                    or self.grid_indexing.se_corner
-                    or self.grid_indexing.ne_corner
-                    or self.grid_indexing.nw_corner
-                )
-            )
-            if fillc:
-                self.fill_corners_bgrid_x(divg_d)
-            self._vc_from_divg_stencils[n](divg_d, self._divg_u, vc)
-            if fillc:
-                self.fill_corners_bgrid_y(divg_d)
-            self._uc_from_divg_stencils[n](divg_d, self._divg_v, uc)
-
-            # TODO(eddied): We pass the same fields 2x to avoid GTC validation errors
-            if fillc:
-                self._fill_corners_dgrid_stencil(vc, vc, uc, uc, -1.0)
-            self._redo_divg_d_stencils[n](uc, vc, divg_d, self._rarea_c)
-
-        if self._dddmp < 1e-5:
-            self._set_value(damped_rel_vort_bgrid, 0.0)
-        else:
-            # TODO: what is wk/v_contra_dxc here?
-            # take the cell centered relative vorticity and regrid it to cell corners
-            # for smagorinsky diffusion
-            #
-            if self._grid_type < 3:
-                self.a2b_ord4(rel_vort_agrid, damped_rel_vort_bgrid)
-                self._smagorinksy_diffusion_approx_stencil(
-                    delpc,
-                    damped_rel_vort_bgrid,
-                    abs(dt),
-                )
-            else:
-                self._smag_corner(
-                    u,
-                    v,
-                    self._dx,
-                    self._dxc,
-                    self._dy,
-                    self._dyc,
-                    self._rarea,
-                    self._rarea_c,
-                    damped_rel_vort_bgrid,
-                    abs(dt),
-                )
-
-        da_min: Float = self._get_da_min()
-        if self._stretched_grid:
-            # reference https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere/blob/main/model/sw_core.F90#L1422 # noqa: E501
-            dd8 = da_min * self._d4_bg ** (self._nonzero_nord + 1)
-        else:
-            dd8 = (da_min_c * self._d4_bg) ** (self._nonzero_nord + 1)
-
-        self._damping_nord_highorder_stencil(
-            damped_rel_vort_bgrid,
-            ke,
-            delpc,
-            divg_d,
-            self._d2_bg_column,
-            da_min_c,
-            self._dddmp,
-            dd8,
-        )
diff --git a/pyFV3/pyFV3/stencils/dyn_core.py b/pyFV3/pyFV3/stencils/dyn_core.py
deleted file mode 100644
index 4927258c..00000000
--- a/pyFV3/pyFV3/stencils/dyn_core.py
+++ /dev/null
@@ -1,1013 +0,0 @@
-from typing import Dict, Mapping, Optional
-
-import ndsl.constants as constants
-from dace.frontend.python.interface import nounroll as dace_nounroll
-from gt4py.cartesian.gtscript import (
-    __INLINED,
-    BACKWARD,
-    FORWARD,
-    PARALLEL,
-    computation,
-    horizontal,
-    interval,
-    region,
-)
-from ndsl.checkpointer import Checkpointer, NullCheckpointer
-from ndsl.comm.communicator import Communicator
-from ndsl.constants import (
-    X_DIM,
-    X_INTERFACE_DIM,
-    Y_DIM,
-    Y_INTERFACE_DIM,
-    Z_DIM,
-    Z_INTERFACE_DIM,
-)
-from ndsl.dsl.dace.orchestration import dace_inhibitor, orchestrate
-from ndsl.dsl.dace.wrapped_halo_exchange import WrappedHaloUpdater
-from ndsl.dsl.stencil import GridIndexing, StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-from ndsl.grid import DampingCoefficients, GridData
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.quantity import Quantity
-
-import pyFV3.stencils.basic_operations as basic
-import pyFV3.stencils.d_sw as d_sw
-import pyFV3.stencils.nh_p_grad as nh_p_grad
-import pyFV3.stencils.pe_halo as pe_halo
-import pyFV3.stencils.ray_fast as ray_fast
-import pyFV3.stencils.temperature_adjust as temperature_adjust
-import pyFV3.stencils.updatedzc as updatedzc
-import pyFV3.stencils.updatedzd as updatedzd
-from pyFV3._config import AcousticDynamicsConfig
-from pyFV3.dycore_state import DycoreState
-from pyFV3.stencils.c_sw import CGridShallowWaterDynamics
-from pyFV3.stencils.del2cubed import HyperdiffusionDamping
-from pyFV3.stencils.pk3_halo import PK3Halo
-from pyFV3.stencils.riem_solver3 import NonhydrostaticVerticalSolver
-from pyFV3.stencils.riem_solver_c import NonhydrostaticVerticalSolverCGrid
-
-
-HUGE_R = 1.0e40
-
-
-def zero_data(
-    mfxd: FloatField,
-    mfyd: FloatField,
-    cxd: FloatField,
-    cyd: FloatField,
-    heat_source: FloatField,
-    diss_estd: FloatField,
-    first_timestep: bool,
-):
-    """
-    Args:
-        mfxd (out): mass flux in x direction
-        mfyd (out): mass flux in y direction
-        cxd (out): courant number in x direction
-        cyd (out): courant number in y direction
-        heat_source (out): heat accumulated from diffusion of kinetic energy
-            gets applied at the end of all acoustic steps
-        diss_estd (out): how much energy is dissipated, is mainly captured
-            to send to the stochastic physics (in contrast to heat_source)
-        first_timestep (in): is this the first acoustic timestep?
-    """
-    with computation(PARALLEL), interval(...):
-        mfxd = 0.0
-        mfyd = 0.0
-        cxd = 0.0
-        cyd = 0.0
-        if first_timestep:
-            with horizontal(region[3:-3, 3:-3]):
-                heat_source = 0.0
-                diss_estd = 0.0
-
-
-def gz_from_surface_height_and_thicknesses(
-    zs: FloatFieldIJ, delz: FloatField, gz: FloatField
-):
-    """
-    Args:
-        zs (in): surface height
-        delz (in): layer thickness
-        gz (out): geopotential height
-    """
-    with computation(BACKWARD):
-        with interval(-1, None):
-            gz[0, 0, 0] = zs
-        with interval(0, -1):
-            gz[0, 0, 0] = gz[0, 0, 1] - delz
-
-
-def interface_pressure_from_toa_pressure_and_thickness(
-    delp: FloatField, pem: FloatField, ptop: Float
-):
-    """
-    Args:
-        delp (in): pressure thickness of atmospheric layer
-        pem (out): interface pressure
-        ptop (in): pressure at top of atmosphere
-    """
-    with computation(FORWARD):
-        with interval(0, 1):
-            pem[0, 0, 0] = ptop
-        with interval(1, None):
-            pem[0, 0, 0] = pem[0, 0, -1] + delp
-
-
-def compute_geopotential(zh: FloatField, gz: FloatField):
-    with computation(PARALLEL), interval(...):
-        gz = zh * constants.GRAV
-
-
-def p_grad_c_stencil(
-    rdxc: FloatFieldIJ,
-    rdyc: FloatFieldIJ,
-    uc: FloatField,
-    vc: FloatField,
-    delpc: FloatField,
-    pkc: FloatField,
-    gz: FloatField,
-    dt2: Float,
-):
-    """
-    Update C-grid winds from the backwards-in-time pressure gradient force
-
-    When this is run the C-grid winds have almost been completely
-    updated by computing the momentum equation terms, but the pressure
-    gradient force term has not yet been applied. This stencil completes
-    the equation and Arakawa C-grid winds have been advected half a timestep
-    upon completing this stencil.
-
-    Args:
-        rdxc (in):
-        rdyc (in):
-        uc (inout): x-velocity on the C-grid, has been updated due to advection
-            but not yet due to pressure gradient force
-        vc (inout): y-velocity on the C-grid, has been updated due to advection
-            but not yet due to pressure gradient force
-        delpc (in): vertical delta in pressure
-        pkc (in): pressure if non-hydrostatic,
-            (edge pressure)**(moist kappa) if hydrostatic
-        gz (in):  height of the model grid cells (m)
-        dt2 (in): half a model timestep (for C-grid update) in seconds
-    """
-    from __externals__ import hydrostatic
-
-    # derivation in Lin 1997 https://doi.org/10.1002/qj.49712354214
-    # FV3 documentation Section 6.6
-
-    with computation(PARALLEL), interval(...):
-        if __INLINED(hydrostatic):
-            wk = pkc[0, 0, 1] - pkc
-        else:
-            wk = delpc
-        # wk is pressure gradient
-        uc = uc + dt2 * rdxc / (wk[-1, 0, 0] + wk) * (
-            (gz[-1, 0, 1] - gz) * (pkc[0, 0, 1] - pkc[-1, 0, 0])
-            + (gz[-1, 0, 0] - gz[0, 0, 1]) * (pkc[-1, 0, 1] - pkc)
-        )
-
-        vc = vc + dt2 * rdyc / (wk[0, -1, 0] + wk) * (
-            (gz[0, -1, 1] - gz) * (pkc[0, 0, 1] - pkc[0, -1, 0])
-            + (gz[0, -1, 0] - gz[0, 0, 1]) * (pkc[0, -1, 1] - pkc)
-        )
-
-
-def get_nk_heat_dissipation(
-    config: d_sw.DGridShallowWaterLagrangianDynamicsConfig, npz: int
-) -> int:
-    # determines whether to convert dissipated kinetic energy into heat in the full
-    # column, not at all, or in 1 or 2 of the top of atmosphere sponge layers
-    if config.convert_ke or config.vtdm4 > 1.0e-4:
-        nk_heat_dissipation = npz
-    else:
-        if config.d2_bg_k1 < 1.0e-3:
-            nk_heat_dissipation = 0
-        else:
-            if config.d2_bg_k2 < 1.0e-3:
-                nk_heat_dissipation = 1
-            else:
-                nk_heat_dissipation = 2
-    return nk_heat_dissipation
-
-
-def dyncore_temporaries(
-    quantity_factory: QuantityFactory,
-) -> Mapping[str, Quantity]:
-    temporaries: Dict[str, Quantity] = {}
-    for name in ["ut", "vt", "gz", "zh", "pem", "pkc", "pk3", "heat_source", "cappa"]:
-        # TODO: the dimensions of ut and vt may not be correct,
-        #       because they are not used. double-check and correct as needed.
-        temporaries[name] = quantity_factory.zeros(
-            dims=[X_DIM, Y_DIM, Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-    for name in ["gz", "pkc", "zh"]:
-        temporaries[name] = quantity_factory.zeros(
-            dims=[X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-    temporaries["divgd"] = quantity_factory.zeros(
-        dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-        units="unknown",
-        dtype=Float,
-    )
-    temporaries["ws3"] = quantity_factory.zeros(
-        dims=[X_DIM, Y_DIM],
-        units="unknown",
-        dtype=Float,
-    )
-    for name in ["crx", "xfx"]:
-        temporaries[name] = quantity_factory.zeros(
-            dims=[X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-    for name in ["cry", "yfx"]:
-        temporaries[name] = quantity_factory.zeros(
-            dims=[X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-    return temporaries
-
-
-class AcousticDynamics:
-    """
-    Fortran name is dyn_core
-    Peforms the Lagrangian acoustic dynamics described by Lin 2004
-    """
-
-    class _HaloUpdaters(object):
-        """Encapsulate all HaloUpdater objects"""
-
-        def __init__(
-            self,
-            comm: Communicator,
-            grid_indexing: GridIndexing,
-            quantity_factory: QuantityFactory,
-            state: DycoreState,
-            cappa: Quantity,
-            gz: Quantity,
-            zh: Quantity,
-            divgd: Quantity,
-            heat_source: Quantity,
-            pkc: Quantity,
-        ):
-            # Define the memory specification required
-            # Those can be re-used as they are read-only descriptors
-            full_size_xyz_halo_spec = quantity_factory.get_quantity_halo_spec(
-                dims=[X_DIM, Y_DIM, Z_DIM],
-                n_halo=grid_indexing.n_halo,
-                dtype=Float,
-            )
-            full_size_xyiz_halo_spec = quantity_factory.get_quantity_halo_spec(
-                dims=[X_DIM, Y_INTERFACE_DIM, Z_DIM],
-                n_halo=grid_indexing.n_halo,
-                dtype=Float,
-            )
-            full_size_xiyz_halo_spec = quantity_factory.get_quantity_halo_spec(
-                dims=[X_INTERFACE_DIM, Y_DIM, Z_DIM],
-                n_halo=grid_indexing.n_halo,
-                dtype=Float,
-            )
-            full_size_xyzi_halo_spec = quantity_factory.get_quantity_halo_spec(
-                dims=[X_DIM, Y_DIM, Z_INTERFACE_DIM],
-                n_halo=grid_indexing.n_halo,
-                dtype=Float,
-            )
-            full_size_xiyiz_halo_spec = quantity_factory.get_quantity_halo_spec(
-                dims=[X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-                n_halo=grid_indexing.n_halo,
-                dtype=Float,
-            )
-
-            # Build the HaloUpdater. We could build one updater per specification group
-            # but because of call overlap between different variable, we kept the
-            # straighforward solution of one HaloUpdater per group of updated variable.
-            # It also makes the code in call() more readable
-            # [DaCe] Wrapping call to a DaCe readable halo updater
-            #        Biggest parsing issue is that DaCe cannot do
-            #        quantities at runtime paradigm
-            self.q_con__cappa = WrappedHaloUpdater(
-                comm.get_scalar_halo_updater([full_size_xyz_halo_spec] * 2),
-                dict(q_con=state.q_con, cappa=cappa),
-                ["q_con", "cappa"],
-            )
-            self.delp__pt = WrappedHaloUpdater(
-                comm.get_scalar_halo_updater([full_size_xyz_halo_spec] * 2),
-                state,
-                ["delp", "pt"],
-            )
-            self.u__v = WrappedHaloUpdater(
-                comm.get_vector_halo_updater(
-                    [full_size_xyiz_halo_spec], [full_size_xiyz_halo_spec]
-                ),
-                state,
-                ["u"],
-                ["v"],
-            )
-            self.w = WrappedHaloUpdater(
-                comm.get_scalar_halo_updater([full_size_xyz_halo_spec]),
-                state,
-                ["w"],
-            )
-            self.gz = WrappedHaloUpdater(
-                comm.get_scalar_halo_updater([full_size_xyzi_halo_spec]),
-                {"gz": gz},
-                ["gz"],
-            )
-            self.delp__pt__q_con = WrappedHaloUpdater(
-                comm.get_scalar_halo_updater([full_size_xyz_halo_spec] * 3),
-                state,
-                ["delp", "pt", "q_con"],
-            )
-            self.zh = WrappedHaloUpdater(
-                comm.get_scalar_halo_updater([full_size_xyzi_halo_spec]),
-                {"zh": zh},
-                ["zh"],
-            )
-            self.divgd = WrappedHaloUpdater(
-                comm.get_scalar_halo_updater([full_size_xiyiz_halo_spec]),
-                {"divgd": divgd},
-                ["divgd"],
-            )
-            self.heat_source = WrappedHaloUpdater(
-                comm.get_scalar_halo_updater([full_size_xyz_halo_spec]),
-                {"heat_source": heat_source},
-                ["heat_source"],
-            )
-            if grid_indexing.domain[0] == grid_indexing.domain[1]:
-                full_3Dfield_2pts_halo_spec = quantity_factory.get_quantity_halo_spec(
-                    dims=[X_DIM, Y_DIM, Z_INTERFACE_DIM],
-                    n_halo=2,
-                    dtype=Float,
-                )
-                self.pkc = WrappedHaloUpdater(
-                    comm.get_scalar_halo_updater([full_3Dfield_2pts_halo_spec]),
-                    {"pkc": pkc},
-                    ["pkc"],
-                )
-            else:
-                self.pkc = comm.get_scalar_halo_updater([full_size_xyzi_halo_spec])
-            self.uc__vc = WrappedHaloUpdater(
-                comm.get_vector_halo_updater(
-                    [full_size_xiyz_halo_spec], [full_size_xyiz_halo_spec]
-                ),
-                state,
-                ["uc"],
-                ["vc"],
-            )
-            self.interface_uc__vc = WrappedHaloUpdater(
-                None, state, ["u"], ["v"], comm=comm
-            )
-
-    def __init__(
-        self,
-        comm: Communicator,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        grid_data: GridData,
-        damping_coefficients: DampingCoefficients,
-        grid_type,
-        nested,
-        stretched_grid,
-        config: AcousticDynamicsConfig,
-        phis: FloatFieldIJ,
-        wsd: FloatFieldIJ,
-        state,  # [DaCe] hack to get around quantity as parameters for halo updates
-        checkpointer: Optional[Checkpointer] = None,
-    ):
-        """
-        Args:
-            comm: object for tile or cubed-sphere inter-process communication
-            stencil_factory: creates stencils
-            quantity_factory: creates quantities
-            grid_data: metric terms defining the grid
-            damping_coefficients: damping configuration
-            grid_type: grid geometry used
-            nested: if the grid contains a nested, high-res region
-            stretched_grid: if the grid is stretched so tile faces cover different areas
-            config: configuration settings
-            pfull: atmospheric Eulerian grid reference pressure (Pa)
-            phis: surface geopotential height
-            checkpointer: if given, used to perform operations on model data
-                at specific points in model execution, such as testing against
-                reference data
-        """
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            dace_compiletime_args=["state"],
-        )
-
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            method_to_orchestrate="_checkpoint_csw",
-            dace_compiletime_args=["state", "tag"],
-        )
-
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            method_to_orchestrate="_checkpoint_dsw_in",
-            dace_compiletime_args=["state", "tag"],
-        )
-
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            method_to_orchestrate="_checkpoint_dsw_out",
-            dace_compiletime_args=["state", "tag"],
-        )
-
-        self.call_checkpointer = checkpointer is not None
-        if checkpointer is None:
-            self.checkpointer: Checkpointer = NullCheckpointer()
-        else:
-            self.checkpointer = checkpointer
-        grid_indexing = stencil_factory.grid_indexing
-        self.config = config
-        if config.d_ext != 0:
-            raise RuntimeError("Acoustics (dyn_core): d_ext != 0 is not implemented")
-        if config.beta != 0:
-            raise RuntimeError("Acoustics (dyn_core): beta != 0 is not implemented")
-        if config.use_logp:
-            raise RuntimeError("Acoustics (dyn_core): use_logp=True is not implemented")
-        self._da_min = damping_coefficients.da_min
-        self.grid_data = grid_data
-        self._ptop = grid_data.ptop
-        self._pfull = grid_data.p
-        self._wsd = wsd
-        self._nk_heat_dissipation = get_nk_heat_dissipation(
-            config.d_grid_shallow_water,
-            npz=grid_indexing.domain[2],
-        )
-        self.nonhydrostatic_pressure_gradient = (
-            nh_p_grad.NonHydrostaticPressureGradient(
-                stencil_factory,
-                quantity_factory=quantity_factory,
-                grid_data=grid_data,
-                grid_type=config.grid_type,
-            )
-        )
-        self._akap = Float(constants.KAPPA)
-
-        temporaries = dyncore_temporaries(quantity_factory)
-        self._heat_source = temporaries["heat_source"]
-        self._divgd = temporaries["divgd"]
-        self._gz = temporaries["gz"]
-        self._pkc = temporaries["pkc"]
-        self._zh = temporaries["zh"]
-        self.cappa = temporaries["cappa"]
-        self._ut = temporaries["ut"]
-        self._vt = temporaries["vt"]
-        self._pem = temporaries["pem"]
-        self._pk3 = temporaries["pk3"]
-        self._crx = temporaries["crx"]
-        self._cry = temporaries["cry"]
-        self._xfx = temporaries["xfx"]
-        self._yfx = temporaries["yfx"]
-        self._ws3 = temporaries["ws3"]
-
-        if not config.hydrostatic:
-            self._pk3.data[:] = HUGE_R
-
-        column_namelist = d_sw.get_column_namelist(
-            config.d_grid_shallow_water, quantity_factory=quantity_factory
-        )
-        if not config.hydrostatic:
-            # To write lower dimensional storages, these need to be 3D
-            # then converted to lower dimensional
-            self._dp_ref = grid_data.dp_ref
-            self._zs = quantity_factory.zeros(
-                [X_DIM, Y_DIM],
-                units="m",
-                dtype=Float,
-            )
-            self._zs.data[:] = self._zs.np.asarray(
-                phis.data / constants.GRAV, dtype=self._zs.data.dtype
-            )
-
-            self.update_height_on_d_grid = updatedzd.UpdateHeightOnDGrid(
-                stencil_factory,
-                quantity_factory=quantity_factory,
-                damping_coefficients=damping_coefficients,
-                grid_data=grid_data,
-                grid_type=grid_type,
-                hord_tm=config.hord_tm,
-                column_namelist=column_namelist,
-            )
-            self.vertical_solver = NonhydrostaticVerticalSolver(
-                stencil_factory,
-                quantity_factory=quantity_factory,
-                config=config.riemann,
-            )
-            self.vertical_solver_cgrid = NonhydrostaticVerticalSolverCGrid(
-                stencil_factory, quantity_factory=quantity_factory, p_fac=config.p_fac
-            )
-            origin, domain = grid_indexing.get_origin_domain(
-                [X_DIM, Y_DIM, Z_INTERFACE_DIM], halos=(2, 2)
-            )
-            self._compute_geopotential_stencil = stencil_factory.from_origin_domain(
-                compute_geopotential,
-                origin=origin,
-                domain=domain,
-            )
-        self.dgrid_shallow_water_lagrangian_dynamics = (
-            d_sw.DGridShallowWaterLagrangianDynamics(
-                stencil_factory,
-                quantity_factory=quantity_factory,
-                grid_data=grid_data,
-                damping_coefficients=damping_coefficients,
-                column_namelist=column_namelist,
-                nested=nested,
-                stretched_grid=stretched_grid,
-                config=config.d_grid_shallow_water,
-            )
-        )
-
-        self.cgrid_shallow_water_lagrangian_dynamics = CGridShallowWaterDynamics(
-            stencil_factory,
-            quantity_factory=quantity_factory,
-            grid_data=grid_data,
-            nested=nested,
-            grid_type=config.grid_type,
-            nord=config.nord,
-        )
-
-        self._gz_from_surface_height_and_thickness = stencil_factory.from_origin_domain(
-            gz_from_surface_height_and_thicknesses,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(add=(0, 0, 1)),
-        )
-        self._interface_pressure_from_toa_pressure_and_thickness = (
-            stencil_factory.from_origin_domain(
-                interface_pressure_from_toa_pressure_and_thickness,
-                origin=grid_indexing.origin_compute(add=(-1, -1, 0)),
-                domain=grid_indexing.domain_compute(add=(2, 2, 0)),
-            )
-        )
-
-        self._p_grad_c = stencil_factory.from_origin_domain(
-            p_grad_c_stencil,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(add=(1, 1, 0)),
-            externals={"hydrostatic": config.hydrostatic},
-        )
-
-        self.update_geopotential_height_on_c_grid = (
-            updatedzc.UpdateGeopotentialHeightOnCGrid(
-                stencil_factory,
-                quantity_factory=quantity_factory,
-                area=grid_data.area,
-                dp_ref=grid_data.dp_ref,
-                grid_type=config.grid_type,
-            )
-        )
-
-        self._zero_data = stencil_factory.from_origin_domain(
-            zero_data,
-            origin=grid_indexing.origin_full(),
-            domain=grid_indexing.domain_full(),
-        )
-        ax_offsets_pe = grid_indexing.axis_offsets(
-            grid_indexing.origin_full(),
-            grid_indexing.domain_full(add=(0, 0, 1)),
-        )
-        self._edge_pe_stencil = stencil_factory.from_origin_domain(
-            pe_halo.edge_pe,
-            origin=grid_indexing.origin_full(),
-            domain=grid_indexing.domain_full(add=(0, 0, 1)),
-            externals={**ax_offsets_pe},
-            skip_passes=("PruneKCacheFills",),
-        )
-        """The stencil object responsible for updating the interface pressure"""
-
-        self._do_del2cubed = self._nk_heat_dissipation != 0 and config.d_con > 1.0e-5
-
-        if self._do_del2cubed:
-            nf_ke = min(3, config.nord + 1)
-            self._hyperdiffusion = HyperdiffusionDamping(
-                stencil_factory,
-                quantity_factory=quantity_factory,
-                damping_coefficients=damping_coefficients,
-                rarea=grid_data.rarea,
-                nmax=nf_ke,
-            )
-        if config.rf_fast:
-            self._rayleigh_damping = ray_fast.RayleighDamping(
-                stencil_factory,
-                rf_cutoff=config.rf_cutoff,
-                tau=config.tau,
-                hydrostatic=config.hydrostatic,
-            )
-        self._apply_diffusive_heating = stencil_factory.from_origin_domain(
-            temperature_adjust.apply_diffusive_heating,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.restrict_vertical(
-                nk=self._nk_heat_dissipation
-            ).domain_compute(),
-        )
-        self._pk3_halo = PK3Halo(stencil_factory, quantity_factory)
-        self._copy_stencil = stencil_factory.from_origin_domain(
-            basic.copy_defn,
-            origin=grid_indexing.origin_full(),
-            domain=grid_indexing.domain_full(add=(0, 0, 1)),
-        )
-
-        # Halo updaters
-        self._halo_updaters = AcousticDynamics._HaloUpdaters(
-            comm,
-            grid_indexing,
-            quantity_factory,
-            state,
-            cappa=self.cappa,
-            gz=self._gz,
-            zh=self._zh,
-            divgd=self._divgd,
-            heat_source=self._heat_source,
-            pkc=self._pkc,
-        )
-
-    # See divergence_damping.py, _get_da_min for explanation of this function
-    @dace_inhibitor
-    def _get_da_min(self) -> float:
-        return self._da_min
-
-    def _checkpoint_csw(self, state: DycoreState, tag: str):
-        if self.call_checkpointer:
-            self.checkpointer(
-                f"C_SW-{tag}",
-                delpd=state.delp,
-                ptd=state.pt,
-                ud=state.u,
-                vd=state.v,
-                wd=state.w,
-                ucd=state.uc,
-                vcd=state.vc,
-                uad=state.ua,
-                vad=state.va,
-                utd=self._ut,
-                vtd=self._vt,
-                divgdd=self._divgd,
-            )
-
-    def _checkpoint_dsw_in(self, state: DycoreState):
-        if self.call_checkpointer:
-            self.checkpointer(
-                "D_SW-In",
-                ucd=state.uc,
-                vcd=state.vc,
-                wd=state.w,
-                # delpc is a temporary and not a variable in D_SW savepoint
-                delpcd=self._vt,
-                delpd=state.delp,
-                ud=state.u,
-                vd=state.v,
-                ptd=state.pt,
-                uad=state.ua,
-                vad=state.va,
-                zhd=self._zh,
-                divgdd=self._divgd,
-                xfxd=self._xfx,
-                yfxd=self._yfx,
-                mfxd=state.mfxd,
-                mfyd=state.mfyd,
-            )
-
-    def _checkpoint_dsw_out(self, state: DycoreState):
-        if self.call_checkpointer:
-            self.checkpointer(
-                "D_SW-Out",
-                ucd=state.uc,
-                vcd=state.vc,
-                wd=state.w,
-                delpcd=self._vt,
-                delpd=state.delp,
-                ud=state.u,
-                vd=state.v,
-                ptd=state.pt,
-                uad=state.ua,
-                vad=state.va,
-                divgdd=self._divgd,
-                xfxd=self._xfx,
-                yfxd=self._yfx,
-                mfxd=state.mfxd,
-                mfyd=state.mfyd,
-            )
-
-    # TODO: fix me - we shouldn't need a function here, Dace is fudging the types
-    # See https://github.com/GEOS-ESM/pace/issues/9
-    @dace_inhibitor
-    def dt_acoustic_substep(self, timestep: Float) -> Float:
-        return timestep / self.config.n_split
-
-    # TODO: Same as above
-    @dace_inhibitor
-    def dt2(self, dt_acoustic_substep: Float) -> Float:
-        return 0.5 * dt_acoustic_substep
-
-    def __call__(
-        self,
-        state: DycoreState,
-        timestep: Float,  # time to step forward by in seconds
-        n_map=1,  # [DaCe] replaces state.n_map
-    ):
-        # u, v, w, delz, delp, pt, pe, pk, phis, wsd, omga, ua, va, uc, vc, mfxd,
-        # mfyd, cxd, cyd, pkz, peln, q_con, ak, bk, diss_estd, cappa, mdt, n_split,
-        # akap, ptop, n_map, comm):
-        end_step = n_map == self.config.k_split
-        # dt = state.mdt / self.config.n_split
-        dt_acoustic_substep: Float = self.dt_acoustic_substep(timestep)
-        dt2: Float = self.dt2(dt_acoustic_substep)
-        n_split = self.config.n_split
-        # NOTE: In Fortran model the halo update starts happens in fv_dynamics, not here
-        self._halo_updaters.q_con__cappa.start()
-        self._halo_updaters.delp__pt.start()
-        self._halo_updaters.u__v.start()
-        self._halo_updaters.q_con__cappa.wait()
-
-        self._zero_data(
-            state.mfxd,
-            state.mfyd,
-            state.cxd,
-            state.cyd,
-            self._heat_source,
-            state.diss_estd,
-            n_map == 1,
-        )
-
-        # "acoustic" loop
-        # called this because its timestep is usually limited by horizontal sound-wave
-        # processes. Note this is often not the limiting factor near the poles, where
-        # the speed of the polar night jets can exceed two-thirds of the speed of sound.
-        for it in dace_nounroll(range(n_split)):
-            # the Lagrangian dynamics have two parts. First we advance the C-grid winds
-            # by half a time step (c_sw). Then the C-grid winds are used to define
-            # advective fluxes to advance the D-grid prognostic fields a full time step
-            # (the rest of the routines).
-            #
-            # Along-surface flux terms (mass, heat, vertical momentum, vorticity,
-            # kinetic energy gradient terms) are evaluated forward-in-time.
-            #
-            # The pressure gradient force and elastic terms are then evaluated
-            # backwards-in-time, to improve stability.
-            remap_step = False
-            if self.config.breed_vortex_inline or (it == n_split - 1):
-                remap_step = True
-            if not self.config.hydrostatic:
-                self._halo_updaters.w.start()
-                if it == 0:
-                    self._gz_from_surface_height_and_thickness(
-                        self._zs,
-                        state.delz,
-                        self._gz,
-                    )
-                    self._halo_updaters.gz.start()
-            if it == 0:
-                self._halo_updaters.delp__pt.wait()
-
-            if it == n_split - 1 and end_step:
-                if self.config.use_old_omega:
-                    self._interface_pressure_from_toa_pressure_and_thickness(
-                        state.delp,
-                        self._pem,
-                        self._ptop,
-                    )
-
-            self._halo_updaters.u__v.wait()
-            if not self.config.hydrostatic:
-                self._halo_updaters.w.wait()
-
-            # compute the c-grid winds at t + 1/2 timestep
-            self._checkpoint_csw(state, tag="In")
-            self.cgrid_shallow_water_lagrangian_dynamics(
-                state.delp,
-                state.pt,
-                state.u,
-                state.v,
-                state.w,
-                state.uc,
-                state.vc,
-                state.ua,
-                state.va,
-                self._ut,
-                self._vt,
-                self._divgd,
-                state.omga,
-                dt2,
-            )
-            self._checkpoint_csw(state, tag="Out")
-
-            # TODO: Computing the pressure gradient outside of C_SW was originally done
-            # so that we could transpose into a vertical-first memory ordering for the
-            # gz computation, now that we have gt4py we should pull this into C_SW.
-            if self.config.nord > 0:
-                self._halo_updaters.divgd.start()
-            if not self.config.hydrostatic:
-                # TODO: is there some way we can avoid aliasing gz and zh, so that
-                # gz is always a geopotential and zh is always a height?
-                if it == 0:
-                    self._halo_updaters.gz.wait()
-                    self._copy_stencil(
-                        self._gz,
-                        self._zh,
-                    )
-                else:
-                    self._copy_stencil(
-                        self._zh,
-                        self._gz,
-                    )
-            if not self.config.hydrostatic:
-                self.update_geopotential_height_on_c_grid(
-                    self._zs, self._ut, self._vt, self._gz, self._ws3, dt2
-                )
-                # TODO (floriand): Due to DaCe VRAM pooling creating a memory
-                # leak with the usage pattern of those two fields
-                # We use the C_SW internal to workaround it e.g.:
-                #  - self.cgrid_shallow_water_lagrangian_dynamics.delpc
-                #  - self.cgrid_shallow_water_lagrangian_dynamics.ptc
-                # DaCe has already a fix on their side and it awaits release
-                # issue
-                self.vertical_solver_cgrid(
-                    dt2,
-                    self.cappa,
-                    self._ptop,
-                    state.phis,
-                    self._ws3,
-                    self.cgrid_shallow_water_lagrangian_dynamics.ptc,
-                    state.q_con,
-                    self.cgrid_shallow_water_lagrangian_dynamics.delpc,
-                    self._gz,
-                    self._pkc,
-                    state.omga,
-                )
-
-            self._p_grad_c(
-                self.grid_data.rdxc,
-                self.grid_data.rdyc,
-                state.uc,
-                state.vc,
-                self.cgrid_shallow_water_lagrangian_dynamics.delpc,
-                self._pkc,
-                self._gz,
-                dt2,
-            )
-            self._halo_updaters.uc__vc.start()
-            if self.config.nord > 0:
-                self._halo_updaters.divgd.wait()
-            self._halo_updaters.uc__vc.wait()
-            # use the computed c-grid winds to evolve the d-grid winds forward
-            # by 1 timestep
-            self._checkpoint_dsw_in(state)
-            self.dgrid_shallow_water_lagrangian_dynamics(
-                self._vt,
-                state.delp,
-                state.pt,
-                state.u,
-                state.v,
-                state.w,
-                state.uc,
-                state.vc,
-                state.ua,
-                state.va,
-                self._divgd,
-                state.mfxd,
-                state.mfyd,
-                state.cxd,
-                state.cyd,
-                self._crx,
-                self._cry,
-                self._xfx,
-                self._yfx,
-                state.q_con,
-                self._zh,
-                self._heat_source,
-                state.diss_estd,
-                dt_acoustic_substep,
-            )
-            self._checkpoint_dsw_out(state)
-            # note that uc and vc are not needed at all past this point.
-            # they will be re-computed from scratch on the next acoustic timestep.
-
-            self._halo_updaters.delp__pt__q_con.update()
-
-            # Not used unless we implement other betas and alternatives to nh_p_grad
-            # if self.namelist.d_ext > 0:
-            #    raise 'Unimplemented namelist option d_ext > 0'
-
-            # TODO: should the dycore have hydrostatic and non-hydrostatic modes,
-            # or would we make a new class for the non-hydrostatic mode?
-            if not self.config.hydrostatic:
-                # without explicit arg names, numpy does not run
-                self.update_height_on_d_grid(
-                    surface_height=self._zs,
-                    height=self._zh,
-                    courant_number_x=self._crx,
-                    courant_number_y=self._cry,
-                    x_area_flux=self._xfx,
-                    y_area_flux=self._yfx,
-                    ws=self._wsd,
-                    dt=dt_acoustic_substep,
-                )
-                self.vertical_solver(
-                    remap_step,
-                    dt_acoustic_substep,
-                    self.cappa,
-                    self._ptop,
-                    self._zs,
-                    self._wsd,
-                    state.delz,
-                    state.q_con,
-                    state.delp,
-                    state.pt,
-                    self._zh,
-                    state.pe,
-                    self._pkc,
-                    self._pk3,
-                    state.pk,
-                    state.peln,
-                    state.w,
-                )
-
-                self._halo_updaters.zh.start()
-                self._halo_updaters.pkc.start()
-                if remap_step:
-                    # TODO: can this be moved to the start of the remapping routine?
-                    self._edge_pe_stencil(state.pe, state.delp, self._ptop)
-                if self.config.use_logp:
-                    raise NotImplementedError(
-                        "unimplemented namelist option use_logp=True"
-                    )
-                else:
-                    self._pk3_halo(self._pk3, state.delp, self._ptop, self._akap)
-            if not self.config.hydrostatic:
-                self._halo_updaters.zh.wait()
-                self._compute_geopotential_stencil(
-                    self._zh,
-                    self._gz,
-                )
-                self._halo_updaters.pkc.wait()
-
-                self.nonhydrostatic_pressure_gradient(
-                    state.u,
-                    state.v,
-                    self._pkc,
-                    self._gz,
-                    self._pk3,
-                    state.delp,
-                    dt_acoustic_substep,
-                    self._ptop,
-                    self._akap,
-                )
-
-            if self.config.rf_fast:
-                # TODO: Pass through ks, or remove, inconsistent representation vs
-                # Fortran.
-                self._rayleigh_damping(
-                    u=state.u,
-                    v=state.v,
-                    w=state.w,
-                    dp=self._dp_ref,
-                    pfull=self._pfull,
-                    dt=dt_acoustic_substep,
-                    ptop=self._ptop,
-                )
-
-            if it != n_split - 1:
-                # [DaCe] this should be a reuse of
-                #        self._halo_updaters.u__v but it creates
-                #        parameter generation issues, and therefore has been duplicated
-                self._halo_updaters.u__v.start()
-            else:
-                if self.config.grid_type < 4:
-                    self._halo_updaters.interface_uc__vc.interface()
-
-        # we are here
-
-        if self._do_del2cubed:
-            self._halo_updaters.heat_source.update()
-            # TODO: move dependence on da_min into init of hyperdiffusion class
-            da_min: Float = self._get_da_min()
-            cd = constants.CNST_0P20 * da_min
-            # we want to diffuse the heat source from damping before we apply it,
-            # so that we don't reinforce the same grid-scale patterns we're trying
-            # to damp
-            self._hyperdiffusion(self._heat_source, cd)
-            if not self.config.hydrostatic:
-                delt_time_factor = abs(dt_acoustic_substep * self.config.delt_max)
-                # TODO: it looks like state.pkz is being used as a temporary here,
-                # and overwritten at the start of remapping. See if we can make it
-                # an internal temporary of this stencil.
-                self._apply_diffusive_heating(
-                    state.delp,
-                    state.delz,
-                    self.cappa,
-                    self._heat_source,
-                    state.pt,
-                    delt_time_factor,
-                )
diff --git a/pyFV3/pyFV3/stencils/fillz.py b/pyFV3/pyFV3/stencils/fillz.py
deleted file mode 100644
index 0a119047..00000000
--- a/pyFV3/pyFV3/stencils/fillz.py
+++ /dev/null
@@ -1,171 +0,0 @@
-import typing
-from typing import Dict
-
-import ndsl.dsl.gt4py_utils as utils
-from gt4py.cartesian.gtscript import BACKWARD, FORWARD, PARALLEL, computation, interval
-from ndsl.constants import X_DIM, Y_DIM, Z_DIM
-from ndsl.dsl.dace import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ, IntFieldIJ
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.quantity import Quantity
-
-
-@typing.no_type_check
-def fix_tracer(
-    q: FloatField,
-    dp: FloatField,
-    zfix: IntFieldIJ,
-    sum0: FloatFieldIJ,
-    sum1: FloatFieldIJ,
-):
-    """
-    Args:
-        q (inout):
-        dp (in):
-        zfix (out):
-        sum0 (out):
-        sum1 (out):
-    """
-    # TODO: can we make everything except q and dp temporaries?
-    # reset fields
-    with computation(FORWARD), interval(...):
-        zfix = 0
-        sum0 = 0.0
-        sum1 = 0.0
-    with computation(PARALLEL), interval(...):
-        lower_fix = 0.0
-        upper_fix = 0.0
-    # fix_top:
-    with computation(BACKWARD):
-        with interval(1, 2):
-            if q[0, 0, -1] < 0.0:
-                q = (
-                    q + q[0, 0, -1] * dp[0, 0, -1] / dp
-                )  # move enough mass up so that the top layer isn't negative
-        with interval(0, 1):
-            if q < 0:
-                q = 0
-            dm = q * dp
-    # fix_interior:
-    with computation(FORWARD), interval(1, -1):
-        # if a higher layer borrowed from this one, account for that here
-        if lower_fix[0, 0, -1] != 0.0:
-            q = q - (lower_fix[0, 0, -1] / dp)
-        if q < 0.0:
-            zfix += 1
-            if q[0, 0, -1] > 0.0:
-                # Borrow from the layer above
-                dq = (
-                    q[0, 0, -1] * dp[0, 0, -1]
-                    if q[0, 0, -1] * dp[0, 0, -1] < -(q * dp)
-                    else -(q * dp)
-                )
-                q = q + dq / dp
-                upper_fix = dq
-            if (q < 0.0) and (q[0, 0, 1] > 0.0):
-                # borrow from the layer below
-                dq = (
-                    q[0, 0, 1] * dp[0, 0, 1]
-                    if q[0, 0, 1] * dp[0, 0, 1] < -(q * dp)
-                    else -(q * dp)
-                )
-                q = q + dq / dp
-                lower_fix = dq
-    with computation(PARALLEL), interval(0, -1):
-        if upper_fix[0, 0, 1] != 0.0:
-            # If a lower layer borrowed from this one, account for that here
-            q = q - upper_fix[0, 0, 1] / dp
-        dm = q * dp
-        dm_pos = dm if dm > 0.0 else 0.0
-    # fix_bottom:
-    with computation(FORWARD), interval(-1, None):
-        # the 2nd-to-last layer borrowed from this one, account for that here
-        if lower_fix[0, 0, -1] != 0.0:
-            q = q - (lower_fix[0, 0, -1] / dp)
-        qup = q[0, 0, -1] * dp[0, 0, -1]
-        qly = -q * dp
-        dup = qup if qup < qly else qly
-        if (q < 0.0) and (q[0, 0, -1] > 0.0):
-            zfix += 1
-            q = q + (dup / dp)
-            upper_fix = dup
-        dm = q * dp
-        dm_pos = dm if dm > 0.0 else 0.0
-    with computation(PARALLEL), interval(-2, -1):
-        # if the bottom layer borrowed from this one, adjust
-        if upper_fix[0, 0, 1] != 0.0:
-            q = q - (upper_fix[0, 0, 1] / dp)
-            dm = q * dp
-            dm_pos = dm if dm > 0.0 else 0.0  # now we gotta update these too
-    with computation(FORWARD), interval(1, None):
-        sum0 += dm
-        sum1 += dm_pos
-    # final_check
-    with computation(PARALLEL), interval(1, None):
-        fac = sum0 / sum1 if sum0 > 0.0 else 0.0
-        if zfix > 0 and fac > 0.0:
-            q = fac * dm / dp if fac * dm / dp > 0.0 else 0.0
-
-
-class FillNegativeTracerValues:
-    """
-    Fix tracer values to prevent negative masses.
-
-    Fortran name is `fillz`
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        nq: int,
-        tracers: Dict[str, Quantity],
-    ):
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            dace_compiletime_args=["tracers"],
-        )
-        self._nq = int(nq)
-        self._fix_tracer_stencil = stencil_factory.from_dims_halo(
-            fix_tracer,
-            compute_dims=[X_DIM, Y_DIM, Z_DIM],
-        )
-
-        # Setting initial value of upper_fix to zero is only needed for validation.
-        # The values in the compute domain are set to zero in the stencil.
-        self._zfix = quantity_factory.zeros([X_DIM, Y_DIM], units="unknown", dtype=int)
-        self._sum0 = quantity_factory.zeros(
-            [X_DIM, Y_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        self._sum1 = quantity_factory.zeros(
-            [X_DIM, Y_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-
-        self._filtered_tracer_dict = {
-            name: tracers[name] for name in utils.tracer_variables[0 : self._nq]
-        }
-
-    def __call__(
-        self,
-        dp2: FloatField,
-        tracers: Dict[str, Quantity],
-    ):
-        """
-        Args:
-            dp2 (in): pressure thickness of atmospheric layer
-            tracers (inout): tracers to fix negative masses in
-        """
-        for tracer_name in self._filtered_tracer_dict.keys():
-            self._fix_tracer_stencil(
-                tracers[tracer_name],
-                dp2,
-                self._zfix,
-                self._sum0,
-                self._sum1,
-            )
diff --git a/pyFV3/pyFV3/stencils/fv_dynamics.py b/pyFV3/pyFV3/stencils/fv_dynamics.py
deleted file mode 100644
index 034c0c94..00000000
--- a/pyFV3/pyFV3/stencils/fv_dynamics.py
+++ /dev/null
@@ -1,655 +0,0 @@
-from datetime import timedelta
-from typing import Mapping, Optional
-
-import ndsl.dsl.gt4py_utils as utils
-from dace.frontend.python.interface import nounroll as dace_no_unroll
-from gt4py.cartesian.gtscript import PARALLEL, computation, interval
-from ndsl.checkpointer import Checkpointer, NullCheckpointer
-from ndsl.comm.communicator import Communicator
-from ndsl.comm.mpi import MPI
-from ndsl.constants import KAPPA, NQ, X_DIM, Y_DIM, Z_DIM, Z_INTERFACE_DIM, ZVIR
-from ndsl.dsl.dace.orchestration import dace_inhibitor, orchestrate
-from ndsl.dsl.dace.wrapped_halo_exchange import WrappedHaloUpdater
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField
-from ndsl.grid import DampingCoefficients, GridData
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.logging import ndsl_log
-from ndsl.performance.timer import NullTimer, Timer
-from ndsl.quantity import Quantity
-from ndsl.stencils.c2l_ord import CubedToLatLon
-
-import pyFV3.stencils.moist_cv as moist_cv
-from pyFV3._config import DynamicalCoreConfig
-from pyFV3.dycore_state import DycoreState
-from pyFV3.stencils import fvtp2d, tracer_2d_1l
-from pyFV3.stencils.basic_operations import copy_defn
-from pyFV3.stencils.del2cubed import HyperdiffusionDamping
-from pyFV3.stencils.dyn_core import AcousticDynamics
-from pyFV3.stencils.neg_adj3 import AdjustNegativeTracerMixingRatio
-from pyFV3.stencils.remapping import LagrangianToEulerian
-
-
-def pt_to_potential_density_pt(
-    pkz: FloatField, dp_initial: FloatField, q_con: FloatField, pt: FloatField
-):
-    """
-    Args:
-        pkz (in):
-        dp_initial (in):
-        q_con (in):
-        pt (out): temperature when input, "potential density temperature" when output
-    """
-    # TODO: why and how is pt being adjusted? update docstring and/or name
-    # TODO: split pt into two variables for different in/out meanings
-    with computation(PARALLEL), interval(...):
-        pt = pt * (1.0 + dp_initial) * (1.0 - q_con) / pkz
-
-
-def omega_from_w(delp: FloatField, delz: FloatField, w: FloatField, omega: FloatField):
-    """
-    Args:
-        delp (in): vertical layer thickness in Pa
-        delz (in): vertical layer thickness in m
-        w (in): vertical wind in m/s
-        omga (out): vertical wind in Pa/s
-    """
-    with computation(PARALLEL), interval(...):
-        omega = delp / delz * w
-
-
-def fvdyn_temporaries(
-    quantity_factory: QuantityFactory,
-) -> Mapping[str, Quantity]:
-    tmps = {}
-    for name in ["te_2d", "te0_2d", "wsd"]:
-        quantity = quantity_factory.zeros(
-            dims=[X_DIM, Y_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        tmps[name] = quantity
-    for name in ["dp1", "cvm"]:
-        quantity = quantity_factory.zeros(
-            dims=[X_DIM, Y_DIM, Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        tmps[name] = quantity
-    return tmps
-
-
-@dace_inhibitor
-def log_on_rank_0(msg: str):
-    """Print when rank is 0 - outside of DaCe critical path"""
-    if not MPI or MPI.COMM_WORLD.Get_rank() == 0:
-        ndsl_log.info(msg)
-
-
-class DynamicalCore:
-    """
-    Corresponds to fv_dynamics in original Fortran sources.
-    """
-
-    def __init__(
-        self,
-        comm: Communicator,
-        grid_data: GridData,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        damping_coefficients: DampingCoefficients,
-        config: DynamicalCoreConfig,
-        phis: Quantity,
-        state: DycoreState,
-        timestep: timedelta,
-        checkpointer: Optional[Checkpointer] = None,
-    ):
-        """
-        Args:
-            comm: object for cubed sphere or tile inter-process communication
-            grid_data: metric terms defining the model grid
-            stencil_factory: creates stencils
-            damping_coefficients: damping configuration/constants
-            config: configuration of dynamical core, for example as would be set by
-                the namelist in the Fortran model
-            phis: surface geopotential height
-            state: model state
-            timestep: model timestep
-            checkpointer: if given, used to perform operations on model data
-                at specific points in model execution, such as testing against
-                reference data
-        """
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            method_to_orchestrate="step_dynamics",
-            dace_compiletime_args=["state", "timer"],
-        )
-
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            method_to_orchestrate="compute_preamble",
-            dace_compiletime_args=["state", "is_root_rank"],
-        )
-
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            method_to_orchestrate="_compute",
-            dace_compiletime_args=["state", "timer"],
-        )
-
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            method_to_orchestrate="_checkpoint_fvdynamics",
-            dace_compiletime_args=["state", "tag"],
-        )
-
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            method_to_orchestrate="_checkpoint_remapping_in",
-            dace_compiletime_args=[
-                "state",
-            ],
-        )
-
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            method_to_orchestrate="_checkpoint_remapping_out",
-            dace_compiletime_args=["state"],
-        )
-
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            method_to_orchestrate="_checkpoint_tracer_advection_in",
-            dace_compiletime_args=["state"],
-        )
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            method_to_orchestrate="_checkpoint_tracer_advection_out",
-            dace_compiletime_args=["state"],
-        )
-        if timestep == timedelta(seconds=0):
-            raise RuntimeError(
-                "Bad dynamical core configuration:"
-                " the atmospheric timestep is 0 seconds!"
-            )
-        # nested and stretched_grid are options in the Fortran code which we
-        # have not implemented, so they are hard-coded here.
-        self.call_checkpointer = checkpointer is not None
-        if checkpointer is None:
-            self.checkpointer: Checkpointer = NullCheckpointer()
-        else:
-            self.checkpointer = checkpointer
-        nested = False
-        stretched_grid = False
-        grid_indexing = stencil_factory.grid_indexing
-        if not config.moist_phys:
-            raise NotImplementedError(
-                "Dynamical core (fv_dynamics):"
-                " fvsetup is only implemented for moist_phys=true."
-            )
-        if config.nwat != 6:
-            raise NotImplementedError(
-                "Dynamical core (fv_dynamics):"
-                f" nwat=={config.nwat} is not implemented."
-                " Only nwat=6 has been implemented."
-            )
-        self.comm_rank = comm.rank
-        self.grid_data = grid_data
-        self.grid_indexing = grid_indexing
-        self._da_min = damping_coefficients.da_min
-        self.config = config
-
-        tracer_transport = fvtp2d.FiniteVolumeTransport(
-            stencil_factory=stencil_factory,
-            quantity_factory=quantity_factory,
-            grid_data=grid_data,
-            damping_coefficients=damping_coefficients,
-            grid_type=config.grid_type,
-            hord=config.hord_tr,
-        )
-
-        self.tracers = {}
-        for name in utils.tracer_variables[0:NQ]:
-            self.tracers[name] = state.__dict__[name]
-
-        temporaries = fvdyn_temporaries(quantity_factory)
-        self._te_2d = temporaries["te_2d"]
-        self._te0_2d = temporaries["te0_2d"]
-        self._wsd = temporaries["wsd"]
-        self._dp_initial = temporaries["dp1"]
-        self._cvm = temporaries["cvm"]
-
-        # Build advection stencils
-        self.tracer_advection = tracer_2d_1l.TracerAdvection(
-            stencil_factory,
-            quantity_factory,
-            tracer_transport,
-            self.grid_data,
-            comm,
-            self.tracers,
-        )
-        self._ak = grid_data.ak
-        self._bk = grid_data.bk
-        self._phis = phis
-        self._ptop = self.grid_data.ptop
-        self._pfull = grid_data.p
-        self._fv_setup_stencil = stencil_factory.from_origin_domain(
-            moist_cv.fv_setup,
-            externals={
-                "nwat": self.config.nwat,
-                "moist_phys": self.config.moist_phys,
-            },
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(),
-        )
-        self._pt_to_potential_density_pt = stencil_factory.from_origin_domain(
-            pt_to_potential_density_pt,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(),
-        )
-        self._omega_from_w = stencil_factory.from_origin_domain(
-            omega_from_w,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(),
-        )
-        self._copy_stencil = stencil_factory.from_origin_domain(
-            copy_defn,
-            origin=grid_indexing.origin_full(),
-            domain=grid_indexing.domain_full(),
-        )
-        self.acoustic_dynamics = AcousticDynamics(
-            comm=comm,
-            stencil_factory=stencil_factory,
-            quantity_factory=quantity_factory,
-            grid_data=grid_data,
-            damping_coefficients=damping_coefficients,
-            grid_type=config.grid_type,
-            nested=nested,
-            stretched_grid=stretched_grid,
-            config=self.config.acoustic_dynamics,
-            phis=self._phis,
-            wsd=self._wsd,
-            state=state,
-            checkpointer=checkpointer,
-        )
-        self._hyperdiffusion = HyperdiffusionDamping(
-            stencil_factory,
-            quantity_factory,
-            damping_coefficients,
-            grid_data.rarea,
-            self.config.nf_omega,
-        )
-        self._cubed_to_latlon = CubedToLatLon(
-            state,
-            stencil_factory,
-            quantity_factory,
-            grid_data,
-            self.config.grid_type,
-            config.c2l_ord,
-            comm,
-        )
-        self._cappa = self.acoustic_dynamics.cappa
-
-        if not (not self.config.inline_q and NQ != 0):
-            raise NotImplementedError(
-                "Dynamical core (fv_dynamics):"
-                "tracer_2d not implemented. z_tracer available"
-            )
-        self._adjust_tracer_mixing_ratio = AdjustNegativeTracerMixingRatio(
-            stencil_factory,
-            quantity_factory=quantity_factory,
-            check_negative=self.config.check_negative,
-            hydrostatic=self.config.hydrostatic,
-        )
-
-        self._lagrangian_to_eulerian_obj = LagrangianToEulerian(
-            stencil_factory=stencil_factory,
-            quantity_factory=quantity_factory,
-            config=config.remapping,
-            area_64=grid_data.area_64,
-            nq=NQ,
-            pfull=self._pfull,
-            tracers=self.tracers,
-            checkpointer=checkpointer,
-        )
-
-        full_xyz_spec = quantity_factory.get_quantity_halo_spec(
-            dims=[X_DIM, Y_DIM, Z_DIM],
-            n_halo=grid_indexing.n_halo,
-            dtype=Float,
-        )
-        self._omega_halo_updater = WrappedHaloUpdater(
-            comm.get_scalar_halo_updater([full_xyz_spec]), state, ["omga"], comm=comm
-        )
-        self._n_split = config.n_split
-        self._k_split = config.k_split
-        self._conserve_total_energy = config.consv_te
-        self._timestep = timestep.total_seconds()
-
-    # See divergence_damping.py, _get_da_min for explanation of this function
-    @dace_inhibitor
-    def _get_da_min(self) -> float:
-        return self._da_min
-
-    def _checkpoint_fvdynamics(self, state: DycoreState, tag: str):
-        if self.call_checkpointer:
-            self.checkpointer(
-                f"FVDynamics-{tag}",
-                u=state.u,
-                v=state.v,
-                w=state.w,
-                delz=state.delz,
-                # ua is not checked as its halo values differ from Fortran,
-                # this can be re-enabled if no longer comparing to Fortran, if the
-                # Fortran is updated to match the Python, or if the checkpointer
-                # can check only the compute domain values
-                # ua=state.ua,
-                va=state.va,
-                uc=state.uc,
-                vc=state.vc,
-                qvapor=state.qvapor,
-            )
-
-    def _checkpoint_remapping_in(
-        self,
-        state: DycoreState,
-    ):
-        if self.call_checkpointer:
-            self.checkpointer(
-                "Remapping-In",
-                pt=state.pt,
-                delp=state.delp,
-                delz=state.delz,
-                peln=state.peln.transpose(
-                    [X_DIM, Z_INTERFACE_DIM, Y_DIM]
-                ),  # [x, z, y] fortran data
-                u=state.u,
-                v=state.v,
-                w=state.w,
-                ua=state.ua,
-                va=state.va,
-                cappa=self._cappa,
-                pk=state.pk,
-                pe=state.pe.transpose(
-                    [X_DIM, Z_INTERFACE_DIM, Y_DIM]
-                ),  # [x, z, y] fortran data
-                phis=state.phis,
-                te_2d=self._te0_2d,
-                ps=state.ps,
-                wsd=self._wsd,
-                omga=state.omga,
-                dp1=self._dp_initial,
-            )
-
-    def _checkpoint_remapping_out(
-        self,
-        state: DycoreState,
-    ):
-        if self.call_checkpointer:
-            self.checkpointer(
-                "Remapping-Out",
-                pt=state.pt,
-                delp=state.delp,
-                delz=state.delz,
-                peln=state.peln.transpose(
-                    [X_DIM, Z_INTERFACE_DIM, Y_DIM]
-                ),  # [x, z, y] fortran data
-                u=state.u,
-                v=state.v,
-                w=state.w,
-                cappa=self._cappa,
-                pkz=state.pkz,
-                pk=state.pk,
-                pe=state.pe.transpose(
-                    [X_DIM, Z_INTERFACE_DIM, Y_DIM]
-                ),  # [x, z, y] fortran data
-                dp1=self._dp_initial,
-            )
-
-    def _checkpoint_tracer_advection_in(
-        self,
-        state: DycoreState,
-    ):
-        if self.call_checkpointer:
-            self.checkpointer(
-                "Tracer2D1L-In",
-                dp1=self._dp_initial,
-                mfxd=state.mfxd,
-                mfyd=state.mfyd,
-                cxd=state.cxd,
-                cyd=state.cyd,
-            )
-
-    def _checkpoint_tracer_advection_out(
-        self,
-        state: DycoreState,
-    ):
-        if self.call_checkpointer:
-            self.checkpointer(
-                "Tracer2D1L-Out",
-                dp1=self._dp_initial,
-                mfxd=state.mfxd,
-                mfyd=state.mfyd,
-                cxd=state.cxd,
-                cyd=state.cyd,
-            )
-
-    def step_dynamics(
-        self,
-        state: DycoreState,
-        timer: Timer = NullTimer(),
-    ):
-        """
-        Step the model state forward by one timestep.
-
-        Args:
-            timer: keep time of model sections
-            state: model prognostic state and inputs
-        """
-        self._checkpoint_fvdynamics(state=state, tag="In")
-        self._compute(state, timer)
-        self._checkpoint_fvdynamics(state=state, tag="Out")
-
-    def compute_preamble(self, state: DycoreState, is_root_rank: bool):
-        if self.config.hydrostatic:
-            raise NotImplementedError("Hydrostatic is not implemented")
-        if __debug__:
-            log_on_rank_0("FV Setup")
-
-        self._fv_setup_stencil(
-            state.qvapor,
-            state.qliquid,
-            state.qrain,
-            state.qsnow,
-            state.qice,
-            state.qgraupel,
-            state.q_con,
-            self._cvm,
-            state.pkz,
-            state.pt,
-            self._cappa,
-            state.delp,
-            state.delz,
-            self._dp_initial,
-        )
-
-        if self._conserve_total_energy > 0:
-            raise NotImplementedError(
-                "Dynamical Core (fv_dynamics): compute total energy is not implemented"
-            )
-
-        if (not self.config.rf_fast) and self.config.tau != 0:
-            raise NotImplementedError(
-                "Dynamical Core (fv_dynamics): Rayleigh_Super,"
-                " called when rf_fast=False and tau !=0, is not implemented"
-            )
-
-        if self.config.adiabatic and self.config.kord_tm > 0:
-            raise NotImplementedError(
-                "Dynamical Core (fv_dynamics): Adiabatic with positive kord_tm"
-                " is not implemented."
-            )
-        else:
-            if __debug__:
-                log_on_rank_0("Adjust pt")
-            self._pt_to_potential_density_pt(
-                state.pkz,
-                self._dp_initial,
-                state.q_con,
-                state.pt,
-            )
-
-    def __call__(self, *args, **kwargs):
-        return self.step_dynamics(*args, **kwargs)
-
-    def _compute(self, state: DycoreState, timer: Timer):
-        last_step = False
-        self.compute_preamble(
-            state,
-            is_root_rank=self.comm_rank == 0,
-        )
-
-        for k_split in dace_no_unroll(range(self._k_split)):
-            n_map = k_split + 1
-            last_step = k_split == self._k_split - 1
-            # TODO: why are we copying delp to dp1? what is dp1?
-            self._copy_stencil(
-                state.delp,
-                self._dp_initial,
-            )
-            if __debug__:
-                log_on_rank_0("DynCore")
-            with timer.clock("DynCore"):
-                self.acoustic_dynamics(
-                    state,
-                    timestep=self._timestep / self._k_split,
-                    n_map=n_map,
-                )
-            if self.config.z_tracer:
-                if __debug__:
-                    log_on_rank_0("TracerAdvection")
-                with timer.clock("TracerAdvection"):
-                    self._checkpoint_tracer_advection_in(state)
-                    self.tracer_advection(
-                        self.tracers,
-                        self._dp_initial,
-                        state.mfxd,
-                        state.mfyd,
-                        state.cxd,
-                        state.cyd,
-                    )
-                    self._checkpoint_tracer_advection_out(state)
-            else:
-                raise NotImplementedError("z_tracer=False is not implemented")
-
-            # 1 is shallow water model, don't need vertical remapping
-            # 2 and 3 are also simple baroclinic models that don't need
-            # vertical remapping. > 4 implies this is a full physics model
-            if self.grid_indexing.domain[2] > 4:
-                # nq is actually given by ncnst - pnats,
-                # where those are given in atmosphere.F90 by:
-                # ncnst = Atm(mytile)%ncnst
-                # pnats = Atm(mytile)%flagstruct%pnats
-                # here we hard-coded it because 8 is the only supported value,
-                # refactor this later!
-
-                # do_omega = self.namelist.hydrostatic and last_step
-                # TODO: Determine a better way to do this, polymorphic fields perhaps?
-                # issue is that set_val in map_single expects a 3D field for the
-                # "surface" array
-                if __debug__:
-                    log_on_rank_0("Remapping")
-                with timer.clock("Remapping"):
-                    self._checkpoint_remapping_in(state)
-
-                    # TODO: When NQ=9, we shouldn't need to pass qcld explicitly
-                    #       since it's in self.tracers. It should not be an issue since
-                    #       we don't have self.tracers & qcld computation at the same
-                    #       time
-                    #       When NQ=8, we do need qcld passed explicitely
-                    self._lagrangian_to_eulerian_obj(
-                        self.tracers,
-                        state.pt,
-                        state.delp,
-                        state.delz,
-                        state.peln,
-                        state.u,
-                        state.v,
-                        state.w,
-                        self._cappa,
-                        state.q_con,
-                        state.qcld,
-                        state.pkz,
-                        state.pk,
-                        state.pe,
-                        state.phis,
-                        state.ps,
-                        self._wsd,
-                        self._ak,
-                        self._bk,
-                        self._dp_initial,
-                        self._ptop,
-                        KAPPA,
-                        ZVIR,
-                        last_step,
-                        self._conserve_total_energy,
-                        self._timestep / self._k_split,
-                    )
-                    self._checkpoint_remapping_out(state)
-                # TODO: can we pull this block out of the loop intead of
-                # using an if-statement?
-                if last_step:
-                    da_min: Float = self._get_da_min()
-                    if not self.config.hydrostatic:
-                        if __debug__:
-                            log_on_rank_0("Omega")
-                        # TODO: GFDL should implement the "vulcan omega" update,
-                        # use hydrostatic omega instead of this conversion
-                        self._omega_from_w(
-                            state.delp,
-                            state.delz,
-                            state.w,
-                            state.omga,
-                        )
-                    if self.config.nf_omega > 0:
-                        if __debug__:
-                            log_on_rank_0("Del2Cubed")
-                        self._omega_halo_updater.update()
-                        self._hyperdiffusion(state.omga, 0.18 * da_min)
-
-        if __debug__:
-            log_on_rank_0("Neg Adj 3")
-        self._adjust_tracer_mixing_ratio(
-            state.qvapor,
-            state.qliquid,
-            state.qrain,
-            state.qsnow,
-            state.qice,
-            state.qgraupel,
-            state.qcld,
-            state.pt,
-            state.delp,
-        )
-
-        if __debug__:
-            log_on_rank_0("CubedToLatLon")
-        # convert d-grid x-wind and y-wind to
-        # cell-centered zonal and meridional winds
-        # TODO: make separate variables for the internal-temporary
-        # usage of ua and va, and rename state.ua and state.va
-        # to reflect that they are cell center
-        # zonal and meridional wind
-        self._cubed_to_latlon(
-            state.u,
-            state.v,
-            state.ua,
-            state.va,
-        )
diff --git a/pyFV3/pyFV3/stencils/fv_subgridz.py b/pyFV3/pyFV3/stencils/fv_subgridz.py
deleted file mode 100644
index 1bf09148..00000000
--- a/pyFV3/pyFV3/stencils/fv_subgridz.py
+++ /dev/null
@@ -1,971 +0,0 @@
-# mypy: ignore-errors
-import collections
-
-import gt4py.cartesian.gtscript as gtscript
-import ndsl.dsl.gt4py_utils as utils
-from gt4py.cartesian.gtscript import (
-    __INLINED,
-    BACKWARD,
-    PARALLEL,
-    computation,
-    interval,
-)
-from ndsl.constants import (
-    C_ICE,
-    C_LIQ,
-    CP_AIR,
-    CP_VAP,
-    CV_AIR,
-    CV_VAP,
-    GRAV,
-    RDGAS,
-    X_DIM,
-    Y_DIM,
-    Z_DIM,
-    ZVIR,
-)
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.quantity import Quantity
-
-from pyFV3.dycore_state import DycoreState
-from pyFV3.stencils.basic_operations import dim
-
-
-RK = CP_AIR / RDGAS + 1.0
-G2 = 0.5 * GRAV
-T1_MIN = 160.0
-T2_MIN = 165.0
-T2_MAX = 315.0
-T3_MAX = 325.0
-USTAR2 = 1.0e-4
-RI_MAX = 1.0
-RI_MIN = 0.25
-
-
-@gtscript.function
-def standard_cm(cpm, cvm, q0_vapor, q0_liquid, q0_rain, q0_ice, q0_snow, q0_graupel):
-    q_liq = q0_liquid + q0_rain
-    q_sol = q0_ice + q0_snow + q0_graupel
-    cpm = (
-        (1.0 - (q0_vapor + q_liq + q_sol)) * CP_AIR
-        + q0_vapor * CP_VAP
-        + q_liq * C_LIQ
-        + q_sol * C_ICE
-    )
-    cvm = (
-        (1.0 - (q0_vapor + q_liq + q_sol)) * CV_AIR
-        + q0_vapor * CV_VAP
-        + q_liq * C_LIQ
-        + q_sol * C_ICE
-    )
-    return cpm, cvm
-
-
-@gtscript.function
-def tvol(gz, u0, v0, w0):
-    return gz + 0.5 * (u0 ** 2 + v0 ** 2 + w0 ** 2)
-
-
-def init(
-    gz: FloatField,
-    t0: FloatField,
-    u0: FloatField,
-    v0: FloatField,
-    w0: FloatField,
-    static_energy: FloatField,
-    cvm: FloatField,
-    cpm: FloatField,
-    total_energy: FloatField,
-    ua: FloatField,
-    va: FloatField,
-    w: FloatField,
-    ta: FloatField,
-    delz: FloatField,
-    q0_vapor: FloatField,
-    q0_liquid: FloatField,
-    q0_rain: FloatField,
-    q0_ice: FloatField,
-    q0_snow: FloatField,
-    q0_graupel: FloatField,
-    q0_o3mr: FloatField,
-    q0_sgs_tke: FloatField,
-    q0_cld: FloatField,
-    qvapor: FloatField,
-    qliquid: FloatField,
-    qrain: FloatField,
-    qice: FloatField,
-    qsnow: FloatField,
-    qgraupel: FloatField,
-    qo3mr: FloatField,
-    qsgs_tke: FloatField,
-    qcld: FloatField,
-):
-    with computation(PARALLEL), interval(...):
-        t0 = ta
-        u0 = ua
-        v0 = va
-        w0 = w
-        # TODO: in a loop over tracers
-        q0_vapor = qvapor
-        q0_liquid = qliquid
-        q0_rain = qrain
-        q0_ice = qice
-        q0_snow = qsnow
-        q0_graupel = qgraupel
-        q0_o3mr = qo3mr
-        q0_sgs_tke = qsgs_tke
-        q0_cld = qcld
-        gzh = 0.0
-    with computation(BACKWARD), interval(0, -1):
-        # note only for nwat = 6
-        cpm, cvm = standard_cm(
-            cpm, cvm, q0_vapor, q0_liquid, q0_rain, q0_ice, q0_snow, q0_graupel
-        )
-        gz = gzh[0, 0, 1] - G2 * delz
-        tmp = tvol(gz, u0, v0, w0)
-        static_energy = cpm * t0 + tmp
-        total_energy = cvm * t0 + tmp
-        gzh = gzh[0, 0, 1] - GRAV * delz
-
-
-@gtscript.function
-def qcon_func(q0_liquid, q0_ice, q0_snow, q0_rain, q0_graupel):
-    return q0_liquid + q0_ice + q0_snow + q0_rain + q0_graupel
-
-
-@gtscript.function
-def adjust_cvm(
-    cpm,
-    cvm,
-    q0_vapor,
-    q0_liquid,
-    q0_rain,
-    q0_ice,
-    q0_snow,
-    q0_graupel,
-    gz,
-    u0,
-    v0,
-    w0,
-    t0,
-    total_energy,
-    static_energy,
-):
-    """
-    Non-hydrostatic under constant volume heating/cooling
-    """
-    cpm, cvm = standard_cm(
-        cpm, cvm, q0_vapor, q0_liquid, q0_rain, q0_ice, q0_snow, q0_graupel
-    )
-    tv = tvol(gz, u0, v0, w0)
-    t0 = (total_energy - tv) / cvm
-    static_energy = cpm * t0 + tv
-    return cpm, cvm, t0, static_energy
-
-
-@gtscript.function
-def compute_richardson_number(
-    t0, q0_vapor, qcon, pkz, delp, peln, gz, u0, v0, xvir, t_max, t_min
-):
-    tv1 = t0[0, 0, -1] * (1.0 + xvir * q0_vapor[0, 0, -1] - qcon[0, 0, -1])
-    tv2 = t0 * (1.0 + xvir * q0_vapor - qcon)
-    pt1 = tv1 / pkz[0, 0, -1]
-    pt2 = tv2 / pkz
-    ri = (
-        (gz[0, 0, -1] - gz)
-        * (pt1 - pt2)
-        / (
-            0.5
-            * (pt1 + pt2)
-            * ((u0[0, 0, -1] - u0) ** 2 + (v0[0, 0, -1] - v0) ** 2 + USTAR2)
-        )
-    )
-    if tv1 > t_max and tv1 > tv2:
-        ri = 0
-    elif tv2 < t_min:
-        ri = ri if ri < 0.1 else 0.1
-    ri_ref = (
-        RI_MIN
-        + (RI_MAX - RI_MIN) * dim(400.0e2, delp / (peln[0, 0, 1] - peln)) / 200.0e2
-    )
-    if RI_MAX < ri_ref:
-        ri_ref = RI_MAX
-    return ri, ri_ref
-
-
-@gtscript.function
-def compute_mass_flux(ri, ri_ref, delp, ratio):
-    max_ri_ratio = ri / ri_ref
-    mc = 0.0
-    if max_ri_ratio < 0.0:
-        max_ri_ratio = 0.0
-    if ri < ri_ref:
-        mc = (
-            ratio
-            * delp[0, 0, -1]
-            * delp
-            / (delp[0, 0, -1] + delp)
-            * (1.0 - max_ri_ratio) ** 2.0
-        )
-    return mc
-
-
-@gtscript.function
-def kh_adjust_down(mc, delp, q0, h0):
-    h0 = mc * (q0 - q0[0, 0, -1])
-    return q0 - h0 / delp, h0
-
-
-@gtscript.function
-def kh_adjust_energy_down(mc, delp, static_energy, total_energy, h0):
-    h0 = mc * (static_energy - static_energy[0, 0, -1])
-    return total_energy - h0 / delp, h0
-
-
-@gtscript.function
-def kh_adjust_up(delp, h0, q0):
-    return q0 + h0[0, 0, 1] / delp
-
-
-def m_loop(
-    u0: FloatField,
-    v0: FloatField,
-    w0: FloatField,
-    t0: FloatField,
-    static_energy: FloatField,
-    gz: FloatField,
-    delp: FloatField,
-    peln: FloatField,
-    pkz: FloatField,
-    q0_vapor: FloatField,
-    q0_liquid: FloatField,
-    q0_rain: FloatField,
-    q0_ice: FloatField,
-    q0_snow: FloatField,
-    q0_graupel: FloatField,
-    q0_o3mr: FloatField,
-    q0_sgs_tke: FloatField,
-    q0_cld: FloatField,
-    total_energy: FloatField,
-    cpm: FloatField,
-    cvm: FloatField,
-    t_min: Float,
-    ratio: Float,
-):
-    from __externals__ import t_max, xvir
-
-    with computation(PARALLEL), interval(...):
-        qcon = qcon_func(q0_liquid, q0_ice, q0_snow, q0_rain, q0_graupel)
-        h0_vapor = 0.0
-        h0_liquid = 0.0
-        h0_rain = 0.0
-        h0_ice = 0.0
-        h0_snow = 0.0
-        h0_graupel = 0.0
-        h0_o3mr = 0.0
-        h0_sgs_tke = 0.0
-        h0_cld = 0.0
-        h0_u = 0.0
-        h0_v = 0.0
-        h0_w = 0.0
-        h0_total_energy = 0.0
-        ri = 0.0
-        ref = 0.0
-    with computation(BACKWARD):
-        with interval(-1, None):
-            ri, ri_ref = compute_richardson_number(
-                t0, q0_vapor, qcon, pkz, delp, peln, gz, u0, v0, xvir, t_max, t_min
-            )
-            mc = compute_mass_flux(ri, ri_ref, delp, ratio)
-            if ri < ri_ref:
-                # TODO: loop over tracers not hardcoded
-                # Note combining into functions breaks
-                # validation, may want to try again with changes to gt4py
-                q0_vapor, h0_vapor = kh_adjust_down(mc, delp, q0_vapor, h0_vapor)
-                q0_liquid, h0_liquid = kh_adjust_down(mc, delp, q0_liquid, h0_liquid)
-                q0_rain, h0_rain = kh_adjust_down(mc, delp, q0_rain, h0_rain)
-                q0_ice, h0_ice = kh_adjust_down(mc, delp, q0_ice, h0_ice)
-                q0_snow, h0_snow = kh_adjust_down(mc, delp, q0_snow, h0_snow)
-                q0_graupel, h0_graupel = kh_adjust_down(
-                    mc, delp, q0_graupel, h0_graupel
-                )
-                q0_o3mr, h0_o3mr = kh_adjust_down(mc, delp, q0_o3mr, h0_o3mr)
-                q0_sgs_tke, h0_sgs_tke = kh_adjust_down(
-                    mc, delp, q0_sgs_tke, h0_sgs_tke
-                )
-                q0_cld, h0_cld = kh_adjust_down(mc, delp, q0_cld, h0_cld)
-                u0, h0_u = kh_adjust_down(mc, delp, u0, h0_u)
-                v0, h0_v = kh_adjust_down(mc, delp, v0, h0_v)
-                w0, h0_w = kh_adjust_down(mc, delp, w0, h0_w)
-                total_energy, h0_total_energy = kh_adjust_energy_down(
-                    mc, delp, static_energy, total_energy, h0_total_energy
-                )
-            cpm, cvm, t0, static_energy = adjust_cvm(
-                cpm,
-                cvm,
-                q0_vapor,
-                q0_liquid,
-                q0_rain,
-                q0_ice,
-                q0_snow,
-                q0_graupel,
-                gz,
-                u0,
-                v0,
-                w0,
-                t0,
-                total_energy,
-                static_energy,
-            )
-        with interval(4, -1):
-            if ri[0, 0, 1] < ri_ref[0, 0, 1]:
-                q0_vapor = kh_adjust_up(delp, h0_vapor, q0_vapor)
-                q0_liquid = kh_adjust_up(delp, h0_liquid, q0_liquid)
-                q0_rain = kh_adjust_up(delp, h0_rain, q0_rain)
-                q0_ice = kh_adjust_up(delp, h0_ice, q0_ice)
-                q0_snow = kh_adjust_up(delp, h0_snow, q0_snow)
-                q0_graupel = kh_adjust_up(delp, h0_graupel, q0_graupel)
-                q0_o3mr = kh_adjust_up(delp, h0_o3mr, q0_o3mr)
-                q0_sgs_tke = kh_adjust_up(delp, h0_sgs_tke, q0_sgs_tke)
-                q0_cld = kh_adjust_up(delp, h0_cld, q0_cld)
-                qcon = qcon_func(q0_liquid, q0_ice, q0_snow, q0_rain, q0_graupel)
-                u0 = kh_adjust_up(delp, h0_u, u0)
-                v0 = kh_adjust_up(delp, h0_v, v0)
-                w0 = kh_adjust_up(delp, h0_w, w0)
-                total_energy = kh_adjust_up(delp, h0_total_energy, total_energy)
-            cpm, cvm, t0, static_energy = adjust_cvm(
-                cpm,
-                cvm,
-                q0_vapor,
-                q0_liquid,
-                q0_rain,
-                q0_ice,
-                q0_snow,
-                q0_graupel,
-                gz,
-                u0,
-                v0,
-                w0,
-                t0,
-                total_energy,
-                static_energy,
-            )
-            ri, ri_ref = compute_richardson_number(
-                t0, q0_vapor, qcon, pkz, delp, peln, gz, u0, v0, xvir, t_max, t_min
-            )
-            mc = compute_mass_flux(ri, ri_ref, delp, ratio)
-            if ri < ri_ref:
-                q0_vapor, h0_vapor = kh_adjust_down(mc, delp, q0_vapor, h0_vapor)
-                q0_liquid, h0_liquid = kh_adjust_down(mc, delp, q0_liquid, h0_liquid)
-                q0_rain, h0_rain = kh_adjust_down(mc, delp, q0_rain, h0_rain)
-                q0_ice, h0_ice = kh_adjust_down(mc, delp, q0_ice, h0_ice)
-                q0_snow, h0_snow = kh_adjust_down(mc, delp, q0_snow, h0_snow)
-                q0_graupel, h0_graupel = kh_adjust_down(
-                    mc, delp, q0_graupel, h0_graupel
-                )
-                q0_o3mr, h0_o3mr = kh_adjust_down(mc, delp, q0_o3mr, h0_o3mr)
-                q0_sgs_tke, h0_sgs_tke = kh_adjust_down(
-                    mc, delp, q0_sgs_tke, h0_sgs_tke
-                )
-                q0_cld, h0_cld = kh_adjust_down(mc, delp, q0_cld, h0_cld)
-                u0, h0_u = kh_adjust_down(mc, delp, u0, h0_u)
-                v0, h0_v = kh_adjust_down(mc, delp, v0, h0_v)
-                w0, h0_w = kh_adjust_down(mc, delp, w0, h0_w)
-                total_energy, h0_total_energy = kh_adjust_energy_down(
-                    mc, delp, static_energy, total_energy, h0_total_energy
-                )
-            cpm, cvm, t0, static_energy = adjust_cvm(
-                cpm,
-                cvm,
-                q0_vapor,
-                q0_liquid,
-                q0_rain,
-                q0_ice,
-                q0_snow,
-                q0_graupel,
-                gz,
-                u0,
-                v0,
-                w0,
-                t0,
-                total_energy,
-                static_energy,
-            )
-        with interval(3, 4):
-            # TODO: this is repetitive, but using functions did not work as
-            # expected. spend some more time here so not so much needs
-            # to be repeated just to multiply ri_ref by a constant
-            if ri[0, 0, 1] < ri_ref[0, 0, 1]:
-                q0_vapor = kh_adjust_up(delp, h0_vapor, q0_vapor)
-                q0_liquid = kh_adjust_up(delp, h0_liquid, q0_liquid)
-                q0_rain = kh_adjust_up(delp, h0_rain, q0_rain)
-                q0_ice = kh_adjust_up(delp, h0_ice, q0_ice)
-                q0_snow = kh_adjust_up(delp, h0_snow, q0_snow)
-                q0_graupel = kh_adjust_up(delp, h0_graupel, q0_graupel)
-                q0_o3mr = kh_adjust_up(delp, h0_o3mr, q0_o3mr)
-                q0_sgs_tke = kh_adjust_up(delp, h0_sgs_tke, q0_sgs_tke)
-                q0_cld = kh_adjust_up(delp, h0_cld, q0_cld)
-                qcon = qcon_func(q0_liquid, q0_ice, q0_snow, q0_rain, q0_graupel)
-                u0 = kh_adjust_up(delp, h0_u, u0)
-                v0 = kh_adjust_up(delp, h0_v, v0)
-                w0 = kh_adjust_up(delp, h0_w, w0)
-                total_energy = kh_adjust_up(delp, h0_total_energy, total_energy)
-
-            cpm, cvm, t0, static_energy = adjust_cvm(
-                cpm,
-                cvm,
-                q0_vapor,
-                q0_liquid,
-                q0_rain,
-                q0_ice,
-                q0_snow,
-                q0_graupel,
-                gz,
-                u0,
-                v0,
-                w0,
-                t0,
-                total_energy,
-                static_energy,
-            )
-            ri, ri_ref = compute_richardson_number(
-                t0, q0_vapor, qcon, pkz, delp, peln, gz, u0, v0, xvir, t_max, t_min
-            )
-            # TODO, can we just check if index(K) == 3?
-            ri_ref = ri_ref * 1.5
-            mc = compute_mass_flux(ri, ri_ref, delp, ratio)
-            if ri < ri_ref:
-                q0_vapor, h0_vapor = kh_adjust_down(mc, delp, q0_vapor, h0_vapor)
-                q0_liquid, h0_liquid = kh_adjust_down(mc, delp, q0_liquid, h0_liquid)
-                q0_rain, h0_rain = kh_adjust_down(mc, delp, q0_rain, h0_rain)
-                q0_ice, h0_ice = kh_adjust_down(mc, delp, q0_ice, h0_ice)
-                q0_snow, h0_snow = kh_adjust_down(mc, delp, q0_snow, h0_snow)
-                q0_graupel, h0_graupel = kh_adjust_down(
-                    mc, delp, q0_graupel, h0_graupel
-                )
-                q0_o3mr, h0_o3mr = kh_adjust_down(mc, delp, q0_o3mr, h0_o3mr)
-                q0_sgs_tke, h0_sgs_tke = kh_adjust_down(
-                    mc, delp, q0_sgs_tke, h0_sgs_tke
-                )
-                q0_cld, h0_cld = kh_adjust_down(mc, delp, q0_cld, h0_cld)
-                u0, h0_u = kh_adjust_down(mc, delp, u0, h0_u)
-                v0, h0_v = kh_adjust_down(mc, delp, v0, h0_v)
-                w0, h0_w = kh_adjust_down(mc, delp, w0, h0_w)
-                total_energy, h0_total_energy = kh_adjust_energy_down(
-                    mc, delp, static_energy, total_energy, h0_total_energy
-                )
-            cpm, cvm, t0, static_energy = adjust_cvm(
-                cpm,
-                cvm,
-                q0_vapor,
-                q0_liquid,
-                q0_rain,
-                q0_ice,
-                q0_snow,
-                q0_graupel,
-                gz,
-                u0,
-                v0,
-                w0,
-                t0,
-                total_energy,
-                static_energy,
-            )
-        with interval(2, 3):
-            if ri[0, 0, 1] < ri_ref[0, 0, 1]:
-                q0_vapor = kh_adjust_up(delp, h0_vapor, q0_vapor)
-                q0_liquid = kh_adjust_up(delp, h0_liquid, q0_liquid)
-                q0_rain = kh_adjust_up(delp, h0_rain, q0_rain)
-                q0_ice = kh_adjust_up(delp, h0_ice, q0_ice)
-                q0_snow = kh_adjust_up(delp, h0_snow, q0_snow)
-                q0_graupel = kh_adjust_up(delp, h0_graupel, q0_graupel)
-                q0_o3mr = kh_adjust_up(delp, h0_o3mr, q0_o3mr)
-                q0_sgs_tke = kh_adjust_up(delp, h0_sgs_tke, q0_sgs_tke)
-                q0_cld = kh_adjust_up(delp, h0_cld, q0_cld)
-                qcon = qcon_func(q0_liquid, q0_ice, q0_snow, q0_rain, q0_graupel)
-                u0 = kh_adjust_up(delp, h0_u, u0)
-                v0 = kh_adjust_up(delp, h0_v, v0)
-                w0 = kh_adjust_up(delp, h0_w, w0)
-                total_energy = kh_adjust_up(delp, h0_total_energy, total_energy)
-
-            cpm, cvm, t0, static_energy = adjust_cvm(
-                cpm,
-                cvm,
-                q0_vapor,
-                q0_liquid,
-                q0_rain,
-                q0_ice,
-                q0_snow,
-                q0_graupel,
-                gz,
-                u0,
-                v0,
-                w0,
-                t0,
-                total_energy,
-                static_energy,
-            )
-            ri, ri_ref = compute_richardson_number(
-                t0, q0_vapor, qcon, pkz, delp, peln, gz, u0, v0, xvir, t_max, t_min
-            )
-            ri_ref = ri_ref * 2.0
-            mc = compute_mass_flux(ri, ri_ref, delp, ratio)
-            if ri < ri_ref:
-                q0_vapor, h0_vapor = kh_adjust_down(mc, delp, q0_vapor, h0_vapor)
-                q0_liquid, h0_liquid = kh_adjust_down(mc, delp, q0_liquid, h0_liquid)
-                q0_rain, h0_rain = kh_adjust_down(mc, delp, q0_rain, h0_rain)
-                q0_ice, h0_ice = kh_adjust_down(mc, delp, q0_ice, h0_ice)
-                q0_snow, h0_snow = kh_adjust_down(mc, delp, q0_snow, h0_snow)
-                q0_graupel, h0_graupel = kh_adjust_down(
-                    mc, delp, q0_graupel, h0_graupel
-                )
-                q0_o3mr, h0_o3mr = kh_adjust_down(mc, delp, q0_o3mr, h0_o3mr)
-                q0_sgs_tke, h0_sgs_tke = kh_adjust_down(
-                    mc, delp, q0_sgs_tke, h0_sgs_tke
-                )
-                q0_cld, h0_cld = kh_adjust_down(mc, delp, q0_cld, h0_cld)
-                u0, h0_u = kh_adjust_down(mc, delp, u0, h0_u)
-                v0, h0_v = kh_adjust_down(mc, delp, v0, h0_v)
-                w0, h0_w = kh_adjust_down(mc, delp, w0, h0_w)
-                total_energy, h0_total_energy = kh_adjust_energy_down(
-                    mc, delp, static_energy, total_energy, h0_total_energy
-                )
-            cpm, cvm, t0, static_energy = adjust_cvm(
-                cpm,
-                cvm,
-                q0_vapor,
-                q0_liquid,
-                q0_rain,
-                q0_ice,
-                q0_snow,
-                q0_graupel,
-                gz,
-                u0,
-                v0,
-                w0,
-                t0,
-                total_energy,
-                static_energy,
-            )
-        with interval(1, 2):
-            if ri[0, 0, 1] < ri_ref[0, 0, 1]:
-                q0_vapor = kh_adjust_up(delp, h0_vapor, q0_vapor)
-                q0_liquid = kh_adjust_up(delp, h0_liquid, q0_liquid)
-                q0_rain = kh_adjust_up(delp, h0_rain, q0_rain)
-                q0_ice = kh_adjust_up(delp, h0_ice, q0_ice)
-                q0_snow = kh_adjust_up(delp, h0_snow, q0_snow)
-                q0_graupel = kh_adjust_up(delp, h0_graupel, q0_graupel)
-                q0_o3mr = kh_adjust_up(delp, h0_o3mr, q0_o3mr)
-                q0_sgs_tke = kh_adjust_up(delp, h0_sgs_tke, q0_sgs_tke)
-                q0_cld = kh_adjust_up(delp, h0_cld, q0_cld)
-                qcon = qcon_func(q0_liquid, q0_ice, q0_snow, q0_rain, q0_graupel)
-                u0 = kh_adjust_up(delp, h0_u, u0)
-                v0 = kh_adjust_up(delp, h0_v, v0)
-                w0 = kh_adjust_up(delp, h0_w, w0)
-                total_energy = kh_adjust_up(delp, h0_total_energy, total_energy)
-
-            cpm, cvm, t0, static_energy = adjust_cvm(
-                cpm,
-                cvm,
-                q0_vapor,
-                q0_liquid,
-                q0_rain,
-                q0_ice,
-                q0_snow,
-                q0_graupel,
-                gz,
-                u0,
-                v0,
-                w0,
-                t0,
-                total_energy,
-                static_energy,
-            )
-            ri, ri_ref = compute_richardson_number(
-                t0, q0_vapor, qcon, pkz, delp, peln, gz, u0, v0, xvir, t_max, t_min
-            )
-            ri_ref = ri_ref * 4.0
-            mc = compute_mass_flux(ri, ri_ref, delp, ratio)
-            if ri < ri_ref:
-                q0_vapor, h0_vapor = kh_adjust_down(mc, delp, q0_vapor, h0_vapor)
-                q0_liquid, h0_liquid = kh_adjust_down(mc, delp, q0_liquid, h0_liquid)
-                q0_rain, h0_rain = kh_adjust_down(mc, delp, q0_rain, h0_rain)
-                q0_ice, h0_ice = kh_adjust_down(mc, delp, q0_ice, h0_ice)
-                q0_snow, h0_snow = kh_adjust_down(mc, delp, q0_snow, h0_snow)
-                q0_graupel, h0_graupel = kh_adjust_down(
-                    mc, delp, q0_graupel, h0_graupel
-                )
-                q0_o3mr, h0_o3mr = kh_adjust_down(mc, delp, q0_o3mr, h0_o3mr)
-                q0_sgs_tke, h0_sgs_tke = kh_adjust_down(
-                    mc, delp, q0_sgs_tke, h0_sgs_tke
-                )
-                q0_cld, h0_cld = kh_adjust_down(mc, delp, q0_cld, h0_cld)
-                u0, h0_u = kh_adjust_down(mc, delp, u0, h0_u)
-                v0, h0_v = kh_adjust_down(mc, delp, v0, h0_v)
-                w0, h0_w = kh_adjust_down(mc, delp, w0, h0_w)
-                total_energy, h0_total_energy = kh_adjust_energy_down(
-                    mc, delp, static_energy, total_energy, h0_total_energy
-                )
-            cpm, cvm, t0, static_energy = adjust_cvm(
-                cpm,
-                cvm,
-                q0_vapor,
-                q0_liquid,
-                q0_rain,
-                q0_ice,
-                q0_snow,
-                q0_graupel,
-                gz,
-                u0,
-                v0,
-                w0,
-                t0,
-                total_energy,
-                static_energy,
-            )
-        with interval(0, 1):
-            if ri[0, 0, 1] < ri_ref[0, 0, 1]:
-                q0_vapor = kh_adjust_up(delp, h0_vapor, q0_vapor)
-                q0_liquid = kh_adjust_up(delp, h0_liquid, q0_liquid)
-                q0_rain = kh_adjust_up(delp, h0_rain, q0_rain)
-                q0_ice = kh_adjust_up(delp, h0_ice, q0_ice)
-                q0_snow = kh_adjust_up(delp, h0_snow, q0_snow)
-                q0_graupel = kh_adjust_up(delp, h0_graupel, q0_graupel)
-                q0_o3mr = kh_adjust_up(delp, h0_o3mr, q0_o3mr)
-                q0_sgs_tke = kh_adjust_up(delp, h0_sgs_tke, q0_sgs_tke)
-                q0_cld = kh_adjust_up(delp, h0_cld, q0_cld)
-                qcon = qcon_func(q0_liquid, q0_ice, q0_snow, q0_rain, q0_graupel)
-                u0 = kh_adjust_up(delp, h0_u, u0)
-                v0 = kh_adjust_up(delp, h0_v, v0)
-                w0 = kh_adjust_up(delp, h0_w, w0)
-                total_energy = kh_adjust_up(delp, h0_total_energy, total_energy)
-
-            cpm, cvm, t0, static_energy = adjust_cvm(
-                cpm,
-                cvm,
-                q0_vapor,
-                q0_liquid,
-                q0_rain,
-                q0_ice,
-                q0_snow,
-                q0_graupel,
-                gz,
-                u0,
-                v0,
-                w0,
-                t0,
-                total_energy,
-                static_energy,
-            )
-
-
-@gtscript.function
-def readjust_by_frac(a0, a, fra):
-    return a + (a0 - a) * fra
-
-
-def finalize(
-    u0: FloatField,
-    v0: FloatField,
-    w0: FloatField,
-    t0: FloatField,
-    ua: FloatField,
-    va: FloatField,
-    ta: FloatField,
-    w: FloatField,
-    u_dt: FloatField,
-    v_dt: FloatField,
-    q0_vapor: FloatField,
-    q0_liquid: FloatField,
-    q0_rain: FloatField,
-    q0_ice: FloatField,
-    q0_snow: FloatField,
-    q0_graupel: FloatField,
-    q0_o3mr: FloatField,
-    q0_sgs_tke: FloatField,
-    q0_cld: FloatField,
-    qvapor: FloatField,
-    qliquid: FloatField,
-    qrain: FloatField,
-    qice: FloatField,
-    qsnow: FloatField,
-    qgraupel: FloatField,
-    qo3mr: FloatField,
-    qsgs_tke: FloatField,
-    qcld: FloatField,
-    timestep: Float,
-):
-    from __externals__ import fv_sg_adj, hydrostatic
-
-    with computation(PARALLEL), interval(...):
-        fra = timestep / fv_sg_adj
-        if fra < 1.0:
-            t0 = readjust_by_frac(t0, ta, fra)
-            u0 = readjust_by_frac(u0, ua, fra)
-            v0 = readjust_by_frac(v0, va, fra)
-            if __INLINED(not hydrostatic):
-                w0 = readjust_by_frac(w0, w, fra)
-            q0_vapor = readjust_by_frac(q0_vapor, qvapor, fra)
-            q0_liquid = readjust_by_frac(q0_liquid, qliquid, fra)
-            q0_rain = readjust_by_frac(q0_rain, qrain, fra)
-            q0_ice = readjust_by_frac(q0_ice, qice, fra)
-            q0_snow = readjust_by_frac(q0_snow, qsnow, fra)
-            q0_graupel = readjust_by_frac(q0_graupel, qgraupel, fra)
-            q0_o3mr = readjust_by_frac(q0_o3mr, qo3mr, fra)
-            q0_sgs_tke = readjust_by_frac(q0_sgs_tke, qsgs_tke, fra)
-            q0_cld = readjust_by_frac(q0_cld, qcld, fra)
-        rdt = 1.0 / timestep
-        u_dt = rdt * (u0 - ua)
-        v_dt = rdt * (v0 - va)
-        ta = t0
-        ua = u0
-        va = v0
-        w = w0
-        qvapor = q0_vapor
-        qliquid = q0_liquid
-        qrain = q0_rain
-        qice = q0_ice
-        qsnow = q0_snow
-        qgraupel = q0_graupel
-        qo3mr = q0_o3mr
-        qsgs_tke = q0_sgs_tke
-        qcld = q0_cld
-
-
-ArgSpec = collections.namedtuple(
-    "ArgSpec", ["arg_name", "standard_name", "units", "intent"]
-)
-
-
-class DryConvectiveAdjustment:
-    """
-    Corresponds to fv_subgrid_z in Fortran's fv_sg module
-    """
-
-    arg_specs = (
-        ArgSpec("delp", "pressure_thickness_of_atmospheric_layer", "Pa", intent="in"),
-        ArgSpec("delz", "vertical_thickness_of_atmospheric_layer", "m", intent="in"),
-        ArgSpec("pe", "interface_pressure", "Pa", intent="in"),
-        ArgSpec(
-            "pkz",
-            "layer_mean_pressure_raised_to_power_of_kappa",
-            "unknown",
-            intent="in",
-        ),
-        ArgSpec("peln", "logarithm_of_interface_pressure", "ln(Pa)", intent="in"),
-        ArgSpec("pt", "air_temperature", "degK", intent="inout"),
-        ArgSpec("ua", "eastward_wind", "m/s", intent="inout"),
-        ArgSpec("va", "northward_wind", "m/s", intent="inout"),
-        ArgSpec("w", "vertical_wind", "m/s", intent="inout"),
-        ArgSpec("qvapor", "specific_humidity", "kg/kg", intent="inout"),
-        ArgSpec("qliquid", "cloud_water_mixing_ratio", "kg/kg", intent="inout"),
-        ArgSpec("qrain", "rain_mixing_ratio", "kg/kg", intent="inout"),
-        ArgSpec("qsnow", "snow_mixing_ratio", "kg/kg", intent="inout"),
-        ArgSpec("qice", "cloud_ice_mixing_ratio", "kg/kg", intent="inout"),
-        ArgSpec("qgraupel", "graupel_mixing_ratio", "kg/kg", intent="inout"),
-        ArgSpec("qo3mr", "ozone_mixing_ratio", "kg/kg", intent="inout"),
-        ArgSpec("qsgs_tke", "turbulent_kinetic_energy", "m**2/s**2", intent="inout"),
-        ArgSpec("qcld", "cloud_fraction", "", intent="inout"),
-        ArgSpec(
-            "u_dt", "eastward_wind_tendency_due_to_physics", "m/s**2", intent="inout"
-        ),
-        ArgSpec(
-            "v_dt", "northward_wind_tendency_due_to_physics", "m/s**2", intent="inout"
-        ),
-    )
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        nwat: int,
-        fv_sg_adj: Float,
-        n_sponge: int,
-        hydrostatic: bool,
-    ):
-        if hydrostatic:
-            raise NotImplementedError(
-                "DryConvectiveAdjustment (fv_subgridz):"
-                " Hydrostatic is not implemented"
-            )
-        grid_indexing = stencil_factory.grid_indexing
-        self._k_sponge = n_sponge
-        if self._k_sponge is not None and self._k_sponge < 3:
-            raise ValueError(
-                "DryConvectiveAdjustment (fv_subgridz): n_sponge < 3 is invalid."
-            )
-        else:
-            self._k_sponge = grid_indexing.domain[2]
-        if self._k_sponge < min(grid_indexing.domain[2], 24):
-            t_max = T2_MAX
-        else:
-            t_max = T3_MAX
-        if nwat == 0:
-            xvir = 0.0
-        else:
-            xvir = ZVIR
-        self._m = 3
-        self._fv_sg_adj = float(fv_sg_adj)
-        self._is = grid_indexing.isc
-        self._js = grid_indexing.jsc
-        kbot_domain = (grid_indexing.domain[0], grid_indexing.domain[1], self._k_sponge)
-        origin = grid_indexing.origin_compute()
-
-        self._init_stencil = stencil_factory.from_origin_domain(
-            init,
-            origin=origin,
-            domain=(
-                grid_indexing.domain[0],
-                grid_indexing.domain[1],
-                self._k_sponge + 1,
-            ),
-        )
-        self._m_loop_stencil = stencil_factory.from_origin_domain(
-            m_loop,
-            externals={"t_max": t_max, "xvir": xvir},
-            origin=origin,
-            domain=kbot_domain,
-        )
-        self._finalize_stencil = stencil_factory.from_origin_domain(
-            finalize,
-            externals={
-                "hydrostatic": hydrostatic,
-                "fv_sg_adj": fv_sg_adj,
-            },
-            origin=origin,
-            domain=kbot_domain,
-        )
-
-        def make_quantity():
-            return quantity_factory.zeros([X_DIM, Y_DIM, Z_DIM], units="unknown")
-
-        self._q0 = {}
-        for tracername in utils.tracer_variables:
-            self._q0[tracername] = make_quantity()
-        self._tmp_u0 = make_quantity()
-        self._tmp_v0 = make_quantity()
-        self._tmp_w0 = make_quantity()
-        self._tmp_gz = make_quantity()
-        self._tmp_t0 = make_quantity()
-        self._tmp_static_energy = make_quantity()
-        self._tmp_total_energy = make_quantity()
-        self._tmp_cvm = make_quantity()
-        self._tmp_cpm = make_quantity()
-        self._ratios = {0: 0.25, 1: 0.5, 2: 0.999}
-
-    def __call__(
-        self,
-        state: DycoreState,
-        u_dt: Quantity,
-        v_dt: Quantity,
-        timestep: Float,
-    ):
-        """
-        Performs dry convective adjustment mixing on the subgrid vertical scale.
-        Args:
-            state: see arg_specs, includes mainly windspeed, temperature,
-                   pressure and tracer variables that are in the DycoreState
-            u_dt: x-wind tendency for the dry convective windspeed adjustment
-            v_dt: y-wind tendency for the dry convective windspeed adjustment
-            timestep:  time to progress forward in seconds
-        """
-        if state.pe[self._is, self._js, 0] < 2.0:
-            t_min = T1_MIN
-        else:
-            t_min = T2_MIN
-
-        self._init_stencil(
-            self._tmp_gz,
-            self._tmp_t0,
-            self._tmp_u0,
-            self._tmp_v0,
-            self._tmp_w0,
-            self._tmp_static_energy,
-            self._tmp_cvm,
-            self._tmp_cpm,
-            self._tmp_total_energy,
-            state.ua,
-            state.va,
-            state.w,
-            state.pt,
-            state.delz,
-            self._q0["qvapor"],
-            self._q0["qliquid"],
-            self._q0["qrain"],
-            self._q0["qice"],
-            self._q0["qsnow"],
-            self._q0["qgraupel"],
-            self._q0["qo3mr"],
-            self._q0["qsgs_tke"],
-            self._q0["qcld"],
-            state.qvapor,
-            state.qliquid,
-            state.qrain,
-            state.qice,
-            state.qsnow,
-            state.qgraupel,
-            state.qo3mr,
-            state.qsgs_tke,
-            state.qcld,
-        )
-
-        for n in range(self._m):
-            self._m_loop_stencil(
-                self._tmp_u0,
-                self._tmp_v0,
-                self._tmp_w0,
-                self._tmp_t0,
-                self._tmp_static_energy,
-                self._tmp_gz,
-                state.delp,
-                state.peln,
-                state.pkz,
-                self._q0["qvapor"],
-                self._q0["qliquid"],
-                self._q0["qrain"],
-                self._q0["qice"],
-                self._q0["qsnow"],
-                self._q0["qgraupel"],
-                self._q0["qo3mr"],
-                self._q0["qsgs_tke"],
-                self._q0["qcld"],
-                self._tmp_total_energy,
-                self._tmp_cpm,
-                self._tmp_cvm,
-                t_min,
-                self._ratios[n],
-            )
-
-        self._finalize_stencil(
-            self._tmp_u0,
-            self._tmp_v0,
-            self._tmp_w0,
-            self._tmp_t0,
-            state.ua,
-            state.va,
-            state.pt,
-            state.w,
-            u_dt,
-            v_dt,
-            self._q0["qvapor"],
-            self._q0["qliquid"],
-            self._q0["qrain"],
-            self._q0["qice"],
-            self._q0["qsnow"],
-            self._q0["qgraupel"],
-            self._q0["qo3mr"],
-            self._q0["qsgs_tke"],
-            self._q0["qcld"],
-            state.qvapor,
-            state.qliquid,
-            state.qrain,
-            state.qice,
-            state.qsnow,
-            state.qgraupel,
-            state.qo3mr,
-            state.qsgs_tke,
-            state.qcld,
-            timestep,
-        )
diff --git a/pyFV3/pyFV3/stencils/fvtp2d.py b/pyFV3/pyFV3/stencils/fvtp2d.py
deleted file mode 100644
index d69f9fdc..00000000
--- a/pyFV3/pyFV3/stencils/fvtp2d.py
+++ /dev/null
@@ -1,368 +0,0 @@
-from typing import Optional
-
-import gt4py.cartesian.gtscript as gtscript
-import ndsl.stencils.corners as corners
-from gt4py.cartesian.gtscript import PARALLEL, computation, horizontal, interval, region
-from ndsl.constants import X_DIM, Y_DIM, Z_DIM
-from ndsl.dsl.dace.orchestration import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-from ndsl.grid import DampingCoefficients, GridData
-from ndsl.initialization.allocator import QuantityFactory
-
-from pyFV3.stencils.delnflux import DelnFlux
-from pyFV3.stencils.xppm import XPiecewiseParabolic
-from pyFV3.stencils.yppm import YPiecewiseParabolic
-
-
-@gtscript.function
-def apply_x_flux_divergence(q: FloatField, q_x_flux: FloatField) -> FloatField:
-    """
-    Update a scalar q according to its flux in the x direction.
-    """
-    return q + q_x_flux - q_x_flux[1, 0, 0]
-
-
-@gtscript.function
-def apply_y_flux_divergence(q: FloatField, q_y_flux: FloatField) -> FloatField:
-    """
-    Update a scalar q according to its flux in the x direction.
-    """
-    return q + q_y_flux - q_y_flux[0, 1, 0]
-
-
-def q_i_stencil(
-    q: FloatField,
-    area: FloatFieldIJ,
-    y_area_flux: FloatField,
-    q_advected_along_y: FloatField,
-    q_i: FloatField,
-):
-    """
-    Args:
-        q (in):
-        area (in):
-        y_area_flux (in):
-        q_advected_along_y (in):
-        q_i (out):
-    """
-    with computation(PARALLEL), interval(...):
-        fyy = y_area_flux * q_advected_along_y
-        # note the units of area cancel out, because area is present in all
-        # terms in the numerator and denominator of q_i
-        # corresponds to FV3 documentation eq 4.18, q_i = f(q)
-        q_i = (q * area + fyy - fyy[0, 1, 0]) / (
-            area + y_area_flux - y_area_flux[0, 1, 0]
-        )
-
-
-def q_j_stencil(
-    q: FloatField,
-    area: FloatFieldIJ,
-    x_area_flux: FloatField,
-    fx2: FloatField,
-    q_j: FloatField,
-):
-    """
-    Args:
-        q (in):
-        area (in):
-        x_area_flux (in):
-        fx2 (in):
-        q_j (out):
-    """
-    with computation(PARALLEL), interval(...):
-        fx1 = x_area_flux * fx2
-        area_with_x_flux = apply_x_flux_divergence(area, x_area_flux)
-        q_j = (q * area + fx1 - fx1[1, 0, 0]) / area_with_x_flux
-
-
-def final_fluxes(
-    q_advected_y_x_advected_mean: FloatField,
-    q_x_advected_mean: FloatField,
-    q_advected_x_y_advected_mean: FloatField,
-    q_y_advected_mean: FloatField,
-    x_unit_flux: FloatField,
-    y_unit_flux: FloatField,
-    x_flux: FloatField,
-    y_flux: FloatField,
-):
-    """
-    Compute final x and y fluxes of q from different numerical representations.
-
-    Corresponds roughly to eq. 4.17 of FV3 documentation, except that the flux
-    is in units of q rather than in units of q per interface area per time.
-    This corresponds to eq 4.17 with both sides multiplied by
-    e.g. x_unit_flux / u^* (similarly for y/v).
-
-    Combining the advection operators in this way is done to cancel leading-order
-    numerical splitting error.
-
-    Args:
-        q_advected_y_x_advected_mean (in):
-        q_x_advected_mean (in):
-        q_advected_x_y_advected_mean (in):
-        q_y_advected_mean (in):
-        x_unit_flux (in):
-        y_unit_flux (in):
-        x_flux (out):
-        y_flux (out):
-    """
-    with computation(PARALLEL), interval(...):
-        with horizontal(region[:, :-1]):
-            x_flux = (
-                0.5 * (q_advected_y_x_advected_mean + q_x_advected_mean) * x_unit_flux
-            )
-        with horizontal(region[:-1, :]):
-            y_flux = (
-                0.5 * (q_advected_x_y_advected_mean + q_y_advected_mean) * y_unit_flux
-            )
-
-
-class FiniteVolumeTransport:
-    """
-    Equivalent of Fortran FV3 subroutine fv_tp_2d, done in 3 dimensions.
-    Tested on serialized data with FvTp2d
-    ONLY USE_SG=False compiler flag implements
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        grid_data: GridData,
-        damping_coefficients: DampingCoefficients,
-        grid_type: int,
-        hord,
-        nord=None,
-        damp_c=None,
-    ):
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-        )
-
-        # use a shorter alias for grid_indexing here to avoid very verbose lines
-        idx = stencil_factory.grid_indexing
-        self._area = grid_data.area
-        origin = idx.origin_compute()
-
-        def make_quantity():
-            return quantity_factory.zeros(
-                [X_DIM, Y_DIM, Z_DIM],
-                units="unknown",
-                dtype=Float,
-            )
-
-        self._q_advected_y = make_quantity()
-        self._q_advected_x = make_quantity()
-        self._q_x_advected_mean = make_quantity()
-        self._q_y_advected_mean = make_quantity()
-        self._q_advected_x_y_advected_mean = make_quantity()
-        self._q_advected_y_x_advected_mean = make_quantity()
-        self._nord = nord
-        self._damp_c = damp_c
-        ord_outer = hord
-        ord_inner = 8 if hord == 10 else hord
-        if (self._nord is not None) and (self._damp_c is not None):
-            # [DaCe] Use _do_delnflux instead of a None function
-            # to have DaCe parsing working
-            self._do_delnflux = True
-            self.delnflux: Optional[DelnFlux] = DelnFlux(
-                stencil_factory=stencil_factory,
-                quantity_factory=quantity_factory,
-                damping_coefficients=damping_coefficients,
-                rarea=grid_data.rarea,
-                nord_col=self._nord,
-                damp_c=self._damp_c,
-            )
-        else:
-            # This triggers dace parsing error:
-            # self.delnflux = None
-            self._do_delnflux = False
-
-        self._copy_corners_y: corners.CopyCorners = corners.CopyCorners(
-            "y", stencil_factory
-        )
-        self.y_piecewise_parabolic_inner = YPiecewiseParabolic(
-            stencil_factory=stencil_factory,
-            dya=grid_data.dya,
-            grid_type=grid_type,
-            jord=ord_inner,
-            origin=idx.origin_compute(add=(-idx.n_halo, 0, 0)),
-            domain=idx.domain_compute(add=(1 + 2 * idx.n_halo, 1, 1)),
-        )
-        self.q_i_stencil = stencil_factory.from_origin_domain(
-            q_i_stencil,
-            origin=idx.origin_full(add=(0, 3, 0)),
-            domain=idx.domain_full(add=(0, -3, 1)),
-        )
-        self.x_piecewise_parabolic_outer = XPiecewiseParabolic(
-            stencil_factory=stencil_factory,
-            dxa=grid_data.dxa,
-            grid_type=grid_type,
-            iord=ord_outer,
-            origin=idx.origin_compute(),
-            domain=idx.domain_compute(add=(1, 1, 1)),
-        )
-
-        self._copy_corners_x: corners.CopyCorners = corners.CopyCorners(
-            "x", stencil_factory
-        )
-        self.x_piecewise_parabolic_inner = XPiecewiseParabolic(
-            stencil_factory=stencil_factory,
-            dxa=grid_data.dxa,
-            grid_type=grid_type,
-            iord=ord_inner,
-            origin=idx.origin_compute(add=(0, -idx.n_halo, 0)),
-            domain=idx.domain_compute(add=(1, 1 + 2 * idx.n_halo, 1)),
-        )
-        self.q_j_stencil = stencil_factory.from_origin_domain(
-            q_j_stencil,
-            origin=idx.origin_full(add=(3, 0, 0)),
-            domain=idx.domain_full(add=(-3, 0, 1)),
-        )
-        self.y_piecewise_parabolic_outer = YPiecewiseParabolic(
-            stencil_factory=stencil_factory,
-            dya=grid_data.dya,
-            grid_type=grid_type,
-            jord=ord_outer,
-            origin=idx.origin_compute(),
-            domain=idx.domain_compute(add=(1, 1, 1)),
-        )
-        self.stencil_transport_flux = stencil_factory.from_origin_domain(
-            final_fluxes,
-            origin=idx.origin_compute(),
-            domain=idx.domain_compute(add=(1, 1, 1)),
-        )
-
-    def _transport_flux(self, x_unit_flux, y_unit_flux, q_x_flux, q_y_flux):
-        self.stencil_transport_flux(
-            self._q_advected_y_x_advected_mean,
-            self._q_x_advected_mean,
-            self._q_advected_x_y_advected_mean,
-            self._q_y_advected_mean,
-            x_unit_flux,
-            y_unit_flux,
-            q_x_flux,
-            q_y_flux,
-        )
-
-    def __call__(
-        self,
-        q,
-        crx,
-        cry,
-        x_area_flux,
-        y_area_flux,
-        q_x_flux,
-        q_y_flux,
-        x_mass_flux=None,
-        y_mass_flux=None,
-        mass=None,
-    ):
-        """
-        Calculate fluxes for horizontal finite volume transport.
-
-        Defined in Putman and Lin 2007 (PL07). Corresponds to equation 4.17
-        in the FV3 documentation.
-
-        Divergence terms are handled by advecting the weighting used in
-        the units of the scalar, and dividing by its divergence. For example,
-        temperature (pt in the Fortran) and tracers are mass weighted, so
-        the final tendency is
-        e.g. (convergence of tracer) / (convergence of gridcell mass). This
-        is described in eq 17 of PL07. pressure thickness and vorticity
-        by contrast are area weighted.
-
-        Args:
-            q (in): scalar to be transported
-            crx (in): Courant number in x-direction
-            cry (in): Courant number in y-direction
-            x_area_flux (in): flux of area in x-direction, in units of m^2
-            y_area_flux (in): flux of area in y-direction, in units of m^2
-            q_x_flux (out): transport flux of q in x-direction in units q * m^2,
-                corresponding to X in eq 4.17 of FV3 documentation
-            q_y_flux (out): transport flux of q in y-direction in units q * m^2,
-                corresponding to Y in eq 4.17 of FV3 documentation
-            x_mass_flux (in): mass flux in x-direction,
-                corresponds to F(rho^* = 1) in PL07 eq 17, if not given
-                then q is assumed to have per-area units
-            y_mass_flux (in): mass flux in x-direction,
-                corresponds to G(rho^* = 1) in PL07 eq 18, if not given
-                then q is assumed to have per-area units
-            mass (in): ??? passed along to damping code, if scalar is per-mass
-                (as opposed to per-area) then this must be provided for
-                damping to be correct
-        """
-        # TODO [DaCe] dace.frontend.python.common.DaceSyntaxError:
-        # Keyword "Raise" disallowed
-        # if (
-        #     self.delnflux is not None
-        #     and mass is None
-        #     and (x_mass_flux is not None or y_mass_flux is not None)
-        # ):
-        #     raise ValueError(
-        #         "when damping is enabled, mass must be given if mass flux is given"
-        #     )
-
-        # TODO [DaCe] Original aliasing failing code
-        # if x_mass_flux is None:
-        #     x_unit_flux = x_area_flux
-        # else:
-        #     x_unit_flux = x_mass_flux
-        # if y_mass_flux is None:
-        #     y_unit_flux = y_area_flux
-        # else:
-        #     y_unit_flux = y_mass_flux
-
-        # TODO: consider whether to refactor xppm/yppm to output fluxes by also taking
-        # y_area_flux as an input (flux = area_flux * advected_mean), since a flux is
-        # easier to understand than the current output. This would be like merging
-        # yppm with q_i_stencil and xppm with q_j_stencil.
-        self._copy_corners_y(q)
-        self.y_piecewise_parabolic_inner(q, cry, self._q_y_advected_mean)
-        # q_y_advected_mean is 1/Delta_area * curly-F, where curly-F is defined in
-        # equation 4.3 of the FV3 documentation and Delta_area is the advected area
-        # (y_area_flux)
-        self.q_i_stencil(
-            q,
-            self._area,
-            y_area_flux,
-            self._q_y_advected_mean,
-            self._q_advected_y,
-        )  # q_advected_y out is f(q) in eq 4.18 of FV3 documentation
-        self.x_piecewise_parabolic_outer(
-            self._q_advected_y, crx, self._q_advected_y_x_advected_mean
-        )
-        # q_advected_y_x_advected_mean is now rho^n + F(rho^y) in PL07 eq 16
-
-        self._copy_corners_x(q)
-        # similarly below for x<->y
-        self.x_piecewise_parabolic_inner(q, crx, self._q_x_advected_mean)
-        self.q_j_stencil(
-            q,
-            self._area,
-            x_area_flux,
-            self._q_x_advected_mean,
-            self._q_advected_x,
-        )
-        self.y_piecewise_parabolic_outer(
-            self._q_advected_x, cry, self._q_advected_x_y_advected_mean
-        )
-
-        # TODO [DACE]: due to an aliiasing issue (see above for original code)
-        # we duplicate the code here
-        if x_mass_flux is None:
-            if y_mass_flux is None:
-                self._transport_flux(x_area_flux, y_area_flux, q_x_flux, q_y_flux)
-            else:
-                self._transport_flux(x_area_flux, y_mass_flux, q_x_flux, q_y_flux)
-        else:
-            if y_mass_flux is None:
-                self._transport_flux(x_mass_flux, y_area_flux, q_x_flux, q_y_flux)
-            else:
-                self._transport_flux(x_mass_flux, y_mass_flux, q_x_flux, q_y_flux)
-
-        if self._do_delnflux:
-            self.delnflux(q, q_x_flux, q_y_flux, mass=mass)
diff --git a/pyFV3/pyFV3/stencils/fxadv.py b/pyFV3/pyFV3/stencils/fxadv.py
deleted file mode 100644
index f71d9c5c..00000000
--- a/pyFV3/pyFV3/stencils/fxadv.py
+++ /dev/null
@@ -1,691 +0,0 @@
-from gt4py.cartesian.gtscript import (
-    __INLINED,
-    PARALLEL,
-    computation,
-    horizontal,
-    interval,
-    region,
-)
-from ndsl.dsl.dace import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-from ndsl.grid import GridData
-
-from pyFV3.stencils.d2a2c_vect import contravariant
-
-
-def main_uc_vc_contra(
-    uc: FloatField,
-    vc: FloatField,
-    cosa_u: FloatFieldIJ,
-    rsin_u: FloatFieldIJ,
-    cosa_v: FloatFieldIJ,
-    rsin_v: FloatFieldIJ,
-    uc_contra: FloatField,
-    vc_contra: FloatField,
-):
-    """
-    Args:
-        uc (in): covariant c-grid x-wind
-        vc (in): covariant c-grid y-wind
-        cosa_u (in): ???
-        rsin_u (in): ???
-        cosa_v (in): ???
-        rsin_v (in): ???
-        uc_contra (out): contravariant c-grid x-wind
-        vc_contra (out): contravariant c-grid y-wind
-    """
-    from __externals__ import (
-        grid_type,
-        j_end,
-        j_start,
-        local_ie,
-        local_is,
-        local_je,
-        local_js,
-    )
-
-    with computation(PARALLEL), interval(...):
-        if __INLINED(grid_type < 3):
-            utmp = uc_contra
-            with horizontal(region[local_is - 1 : local_ie + 3, :]):
-                # for C-grid, v must be regridded to lie at the same point as u
-                v = 0.25 * (vc[-1, 0, 0] + vc + vc[-1, 1, 0] + vc[0, 1, 0])
-                uc_contra = contravariant(uc, v, cosa_u, rsin_u)
-            # TODO: investigate whether this region operation is necessary
-            with horizontal(
-                region[:, j_start - 1 : j_start + 1], region[:, j_end : j_end + 2]
-            ):
-                uc_contra = utmp
-
-            with horizontal(region[:, local_js - 1 : local_je + 3]):
-                # for C-grid, u must be regridded to lie at same point as v
-                u = 0.25 * (uc[0, -1, 0] + uc[1, -1, 0] + uc + uc[1, 0, 0])
-                vc_contra = contravariant(vc, u, cosa_v, rsin_v)
-        else:
-            uc_contra = uc
-            vc_contra = vc
-
-
-def uc_contra_y_edge(
-    uc: FloatField,
-    sin_sg1: FloatFieldIJ,
-    sin_sg3: FloatFieldIJ,
-    uc_contra: FloatField,
-):
-    """
-    On the edges, the definition of contravariant C-grid wind is ambiguous,
-    so we use the average normal vector as the new normal vector.
-
-    This uses the upstream value of the metric term sin_sg (on both sides)
-    instead of some kind of average to modify the rsin2 term used in the
-    covariant -> contravariant conversion.
-
-    ucontra = uc / sin(alpha) at the edges
-
-    Args:
-        uc (in):
-        sin_sg1 (in):
-        sin_sg3 (in):
-        uc_contra (out):
-    """
-    from __externals__ import i_end, i_start
-
-    with computation(PARALLEL), interval(...):
-        with horizontal(region[i_start, :], region[i_end + 1, :]):
-            uc_contra = (uc / sin_sg3[-1, 0]) if (uc > 0) else (uc / sin_sg1)
-
-
-def vc_contra_y_edge(
-    vc: FloatField, cosa_v: FloatFieldIJ, uc_contra: FloatField, vc_contra: FloatField
-):
-    """
-    Args:
-        vc (in):
-        cosa_v (in):
-        uc_contra (in):
-        vc_contra (inout):
-    """
-    from __externals__ import i_end, i_start, j_end, j_start, local_je, local_js
-
-    # This works for 6 ranks, but not 54:
-    # with horizontal(region[i_start - 1: i_start + 1, j_start + 2:j_end], \
-    #                region[i_end : i_end + 2, j_start+2:j_end]):
-    #    vt = vc - 0.25 * cosa_v * (
-    #        ut[0, -1, 0] + ut[1, -1, 0] + ut + ut[1, 0, 0]
-    #    )
-    # original bounds with stencil calls
-    # j1 = grid().js + 2 if grid().south_edge else grid().js
-    # j2 = grid().je if grid().north_edge else grid().je + 2
-    # TODO: this is a hack, copying vt to vtmp to 'correct' the edges
-    # Can we *just* apply edge calculations in the correct regions without overcomputing
-    # rank 0, 1, 2: local_js + 2:local_je + 2
-    # rank 3, 4, 5: local_js:local_je + 2
-    # rank 6, 7, 8: local_js:local_je
-    with computation(PARALLEL), interval(...):
-        vtmp = vc_contra
-        with horizontal(
-            region[i_start - 1 : i_start + 1, local_js : local_je + 2],
-            region[i_end : i_end + 2, local_js : local_je + 2],
-        ):
-            u_contra = 0.25 * (
-                uc_contra[0, -1, 0]
-                + uc_contra[1, -1, 0]
-                + uc_contra
-                + uc_contra[1, 0, 0]
-            )
-            vc_contra = contravariant(vc, u_contra, cosa_v, 1.0)
-        with horizontal(
-            region[i_start - 1 : i_start + 1, j_start : j_start + 2],
-            region[i_end : i_end + 2, j_start : j_start + 2],
-            region[i_start - 1 : i_start + 1, j_end : j_end + 2],
-            region[i_end : i_end + 2, j_end : j_end + 2],
-        ):
-            vc_contra = vtmp
-
-
-def vc_contra_x_edge(
-    vc: FloatField,
-    sin_sg2: FloatFieldIJ,
-    sin_sg4: FloatFieldIJ,
-    vc_contra: FloatField,
-):
-    """
-    Args:
-        vc (in):
-        sin_sg2 (in):
-        sin_sg4 (in):
-        vc_contra (out):
-    """
-    from __externals__ import j_end, j_start
-
-    with computation(PARALLEL), interval(...):
-        with horizontal(region[:, j_start], region[:, j_end + 1]):
-            vc_contra = (vc / sin_sg4[0, -1]) if (vc > 0) else (vc / sin_sg2)
-
-
-def uc_contra_x_edge(
-    uc: FloatField, cosa_u: FloatFieldIJ, vc_contra: FloatField, uc_contra: FloatField
-):
-    """
-    Args:
-        uc (in):
-        cosa_u (in):
-        vc_contra (in):
-        uc_contra (inout):
-    """
-    from __externals__ import i_end, i_start, j_end, j_start, local_ie, local_is
-
-    with computation(PARALLEL), interval(...):
-        # TODO: parallel to what done for the vt_y_edge section
-        utmp = uc_contra
-        with horizontal(
-            region[local_is : local_ie + 2, j_start - 1 : j_start + 1],
-            region[local_is : local_ie + 2, j_end : j_end + 2],
-        ):
-            v_contra = 0.25 * (
-                vc_contra[-1, 0, 0]
-                + vc_contra
-                + vc_contra[-1, 1, 0]
-                + vc_contra[0, 1, 0]
-            )
-            uc_contra = contravariant(uc, v_contra, cosa_u, 1.0)
-        with horizontal(
-            region[i_start : i_start + 2, j_start - 1 : j_start + 1],
-            region[i_start : i_start + 2, j_end : j_end + 2],
-            region[i_end : i_end + 2, j_start - 1 : j_start + 1],
-            region[i_end : i_end + 2, j_end : j_end + 2],
-        ):
-            uc_contra = utmp
-
-
-def uc_contra_corners(
-    cosa_u: FloatFieldIJ,
-    cosa_v: FloatFieldIJ,
-    uc: FloatField,
-    vc: FloatField,
-    uc_contra: FloatField,
-    uc_contra_copy: FloatField,
-    vc_contra: FloatField,
-):
-    """
-    The following code (and vt_corners) solves a 2x2 system to
-    get the interior parallel-to-edge uc,vc values near the corners
-    (ex: for the sw corner ut(2,1) and vt(1,2) are solved for simultaneously).
-    It then computes the halo uc, vc values so as to be consistent with the
-    computations on the facing panel.
-
-    The system solved is:
-        ut(2,1) = uc(2,1) - avg(vt)*cosa_u(2,1)
-        vt(1,2) = vc(1,2) - avg(ut)*cosa_v(1,2)
-        in which avg(vt) includes vt(1,2) and avg(ut) includes ut(2,1)
-
-    Args:
-        cosa_u (in):
-        cosa_v (in):
-        uc (in):
-        vc (in):
-        uc_contra (out):
-        uc_contra_copy (in): the covariant u-wind on ??? grid
-        vc_contra (in):
-    """
-    from __externals__ import i_end, i_start, j_end, j_start
-
-    with computation(PARALLEL), interval(...):
-        damp = 1.0 / (1.0 - 0.0625 * cosa_u * cosa_v[-1, 0])
-        with horizontal(region[i_start + 1, j_start - 1], region[i_start + 1, j_end]):
-            # we can derive why there's a 0.25 and not 1/3rd factor below, based on the
-            # system being solved as documented above
-            # use Kramer's rule to solve the 2x2 matrix instead of Gaussian elimination
-            # we verified the math works out.
-            uc_contra = (
-                uc
-                - 0.25
-                * cosa_u
-                * (
-                    vc_contra[-1, 1, 0]
-                    + vc_contra[0, 1, 0]
-                    + vc_contra
-                    + vc[-1, 0, 0]
-                    - 0.25
-                    * cosa_v[-1, 0]
-                    * (
-                        uc_contra_copy[-1, 0, 0]
-                        + uc_contra_copy[-1, -1, 0]
-                        + uc_contra_copy[0, -1, 0]
-                    )
-                )
-            ) * damp
-        damp = 1.0 / (1.0 - 0.0625 * cosa_u * cosa_v[-1, 1])
-        with horizontal(region[i_start + 1, j_start], region[i_start + 1, j_end + 1]):
-            damp = 1.0 / (1.0 - 0.0625 * cosa_u * cosa_v[-1, 1])
-            uc_contra = (
-                uc
-                - 0.25
-                * cosa_u
-                * (
-                    vc_contra[-1, 0, 0]
-                    + vc_contra
-                    + vc_contra[0, 1, 0]
-                    + vc[-1, 1, 0]
-                    - 0.25
-                    * cosa_v[-1, 1]
-                    * (
-                        uc_contra_copy[-1, 0, 0]
-                        + uc_contra_copy[-1, 1, 0]
-                        + uc_contra_copy[0, 1, 0]
-                    )
-                )
-            ) * damp
-        damp = 1.0 / (1.0 - 0.0625 * cosa_u * cosa_v)
-        with horizontal(region[i_end, j_start - 1], region[i_end, j_end]):
-            uc_contra = (
-                uc
-                - 0.25
-                * cosa_u
-                * (
-                    vc_contra[0, 1, 0]
-                    + vc_contra[-1, 1, 0]
-                    + vc_contra[-1, 0, 0]
-                    + vc
-                    - 0.25
-                    * cosa_v
-                    * (
-                        uc_contra_copy[1, 0, 0]
-                        + uc_contra_copy[1, -1, 0]
-                        + uc_contra_copy[0, -1, 0]
-                    )
-                )
-            ) * damp
-        damp = 1.0 / (1.0 - 0.0625 * cosa_u * cosa_v[0, 1])
-        with horizontal(region[i_end, j_start], region[i_end, j_end + 1]):
-            uc_contra = (
-                uc
-                - 0.25
-                * cosa_u
-                * (
-                    vc_contra
-                    + vc_contra[-1, 0, 0]
-                    + vc_contra[-1, 1, 0]
-                    + vc[0, 1, 0]
-                    - 0.25
-                    * cosa_v[0, 1]
-                    * (
-                        uc_contra_copy[1, 0, 0]
-                        + uc_contra_copy[1, 1, 0]
-                        + uc_contra_copy[0, 1, 0]
-                    )
-                )
-            ) * damp
-
-
-def vc_contra_corners(
-    cosa_u: FloatFieldIJ,
-    cosa_v: FloatFieldIJ,
-    uc: FloatField,
-    vc: FloatField,
-    ut: FloatField,
-    vc_contra: FloatField,
-    vc_contra_copy: FloatField,
-):
-    """
-    Args:
-        cosa_u (in):
-        cosa_v (in):
-        uc (in):
-        vc (in):
-        ut (in):
-        vc_contra (out):
-        vc_contra_copy (in): the covariant v-wind on ??? grid
-    """
-    from __externals__ import i_end, i_start, j_end, j_start
-
-    with computation(PARALLEL), interval(...):
-        damp = 1.0 / (1.0 - 0.0625 * cosa_u[0, -1] * cosa_v)
-        with horizontal(region[i_start - 1, j_start + 1], region[i_end, j_start + 1]):
-            vc_contra = (
-                vc
-                - 0.25
-                * cosa_v
-                * (
-                    ut[1, -1, 0]
-                    + ut[1, 0, 0]
-                    + ut
-                    + uc[0, -1, 0]
-                    - 0.25
-                    * cosa_u[0, -1]
-                    * (
-                        vc_contra_copy[0, -1, 0]
-                        + vc_contra_copy[-1, -1, 0]
-                        + vc_contra_copy[-1, 0, 0]
-                    )
-                )
-            ) * damp
-        damp = 1.0 / (1.0 - 0.0625 * cosa_u[1, -1] * cosa_v)
-        with horizontal(region[i_start, j_start + 1], region[i_end + 1, j_start + 1]):
-            vc_contra = (
-                vc
-                - 0.25
-                * cosa_v
-                * (
-                    ut[0, -1, 0]
-                    + ut
-                    + ut[1, 0, 0]
-                    + uc[1, -1, 0]
-                    - 0.25
-                    * cosa_u[1, -1]
-                    * (
-                        vc_contra_copy[0, -1, 0]
-                        + vc_contra_copy[1, -1, 0]
-                        + vc_contra_copy[1, 0, 0]
-                    )
-                )
-            ) * damp
-        damp = 1.0 / (1.0 - 0.0625 * cosa_u[1, 0] * cosa_v)
-        with horizontal(region[i_end + 1, j_end], region[i_start, j_end]):
-            vc_contra = (
-                vc
-                - 0.25
-                * cosa_v
-                * (
-                    ut
-                    + ut[0, -1, 0]
-                    + ut[1, -1, 0]
-                    + uc[1, 0, 0]
-                    - 0.25
-                    * cosa_u[1, 0]
-                    * (
-                        vc_contra_copy[0, 1, 0]
-                        + vc_contra_copy[1, 1, 0]
-                        + vc_contra_copy[1, 0, 0]
-                    )
-                )
-            ) * damp
-        damp = 1.0 / (1.0 - 0.0625 * cosa_u * cosa_v)
-        with horizontal(region[i_end, j_end], region[i_start - 1, j_end]):
-            vc_contra = (
-                vc
-                - 0.25
-                * cosa_v
-                * (
-                    ut[1, 0, 0]
-                    + ut[1, -1, 0]
-                    + ut[0, -1, 0]
-                    + uc
-                    - 0.25
-                    * cosa_u
-                    * (
-                        vc_contra_copy[0, 1, 0]
-                        + vc_contra_copy[-1, 1, 0]
-                        + vc_contra_copy[-1, 0, 0]
-                    )
-                )
-            ) * damp
-
-
-"""
-# Single stencil version to use when possible with gt backends
-def fxadv_stencil(
-    cosa_u: FloatFieldIJ,
-    cosa_v: FloatFieldIJ,
-    rsin_u: FloatFieldIJ,
-    rsin_v: FloatFieldIJ,
-    sin_sg1: FloatFieldIJ,
-    sin_sg2: FloatFieldIJ,
-    sin_sg3: FloatFieldIJ,
-    sin_sg4: FloatFieldIJ,
-    uc: FloatField,
-    vc: FloatField,
-    ut: FloatField,
-    vt: FloatField,
-    dt: Float,
-):
-    with computation(PARALLEL), interval(...):
-        ut = main_ut(uc, vc, cosa_u, rsin_u, ut)
-        ut = ut_y_edge(uc, sin_sg1, sin_sg3, ut, dt)
-        vt = main_vt(uc, vc, cosa_v, rsin_v, vt)
-        vt = vt_y_edge(vc, cosa_v, ut, vt)
-        vt = vt_x_edge(vc, sin_sg2, sin_sg4, vt, dt)
-        ut = ut_x_edge(uc, cosa_u, vt, ut)
-        ut = ut_corners(uc, vc, cosa_u, cosa_v, ut, vt)
-        vt = vt_corners(uc, vc, cosa_u, cosa_v, ut, vt)
-"""
-
-
-def fxadv_fluxes_stencil(
-    sin_sg1: FloatFieldIJ,
-    sin_sg2: FloatFieldIJ,
-    sin_sg3: FloatFieldIJ,
-    sin_sg4: FloatFieldIJ,
-    rdxa: FloatFieldIJ,
-    rdya: FloatFieldIJ,
-    dy: FloatFieldIJ,
-    dx: FloatFieldIJ,
-    crx: FloatField,
-    cry: FloatField,
-    x_area_flux: FloatField,
-    y_area_flux: FloatField,
-    uc_contra: FloatField,
-    vc_contra: FloatField,
-    dt: Float,
-):
-    """
-    Args:
-        sin_sg1 (in):
-        sin_sg2 (in):
-        sin_sg3 (in):
-        sin_sg4 (in):
-        rdxa (in):
-        rdya (in):
-        dy (in):
-        dx (in):
-        crx (out):
-        cry (out):
-        x_area_flux (out):
-        y_area_flux (out):
-        uc_contra (in):
-        vc_contra (in):
-    """
-    from __externals__ import local_ie, local_is, local_je, local_js
-
-    with computation(PARALLEL), interval(...):
-        with horizontal(region[local_is : local_ie + 2, :]):
-            if uc_contra > 0:
-                crx = dt * uc_contra * rdxa[-1, 0]
-                x_area_flux = dy * dt * uc_contra * sin_sg3[-1, 0]
-            else:
-                crx = dt * uc_contra * rdxa
-                x_area_flux = dy * dt * uc_contra * sin_sg1
-        with horizontal(region[:, local_js : local_je + 2]):
-            if vc_contra > 0:
-                cry = dt * vc_contra * rdya[0, -1]
-                y_area_flux = dx * dt * vc_contra * sin_sg4[0, -1]
-            else:
-                cry = dt * vc_contra * rdya
-                y_area_flux = dx * dt * vc_contra * sin_sg2
-
-
-class FiniteVolumeFluxPrep:
-    """
-    A large section of code near the beginning of Fortran's d_sw subroutinw
-    Known in this repo as FxAdv,
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        grid_data: GridData,
-        grid_type: int,
-    ):
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-        )
-        grid_indexing = stencil_factory.grid_indexing
-        self._grid_type = grid_type
-        self._tile_interior = not (
-            grid_indexing.west_edge
-            or grid_indexing.east_edge
-            or grid_indexing.north_edge
-            or grid_indexing.south_edge
-        )
-        self._dx = grid_data.dx
-        self._dy = grid_data.dy
-        self._rdxa = grid_data.rdxa
-        self._rdya = grid_data.rdya
-        self._cosa_u = grid_data.cosa_u
-        self._cosa_v = grid_data.cosa_v
-        self._rsin_u = grid_data.rsin_u
-        self._rsin_v = grid_data.rsin_v
-        self._sin_sg1 = grid_data.sin_sg1
-        self._sin_sg2 = grid_data.sin_sg2
-        self._sin_sg3 = grid_data.sin_sg3
-        self._sin_sg4 = grid_data.sin_sg4
-        origin = grid_indexing.origin_full()
-        domain = grid_indexing.domain_full()
-        ax_offsets = grid_indexing.axis_offsets(origin, domain)
-        kwargs = {"externals": ax_offsets, "origin": origin, "domain": domain}
-        origin_corners = grid_indexing.origin_full(add=(1, 1, 0))
-        domain_corners = grid_indexing.domain_full(add=(-1, -1, 0))
-        corner_offsets = grid_indexing.axis_offsets(origin_corners, domain_corners)
-        kwargs_corners = {
-            "externals": corner_offsets,
-            "origin": origin_corners,
-            "domain": domain_corners,
-        }
-        self._main_uc_vc_contra_stencil = stencil_factory.from_origin_domain(
-            main_uc_vc_contra,
-            externals={"grid_type": grid_type, **ax_offsets},
-            origin=origin,
-            domain=domain,
-        )
-        if self._grid_type < 3:
-            self._uc_contra_y_edge_stencil = stencil_factory.from_origin_domain(
-                uc_contra_y_edge, **kwargs
-            )
-            self._vc_contra_y_edge_stencil = stencil_factory.from_origin_domain(
-                vc_contra_y_edge, **kwargs
-            )
-            self._vc_contra_x_edge_stencil = stencil_factory.from_origin_domain(
-                vc_contra_x_edge, **kwargs
-            )
-            self._uc_contra_x_edge_stencil = stencil_factory.from_origin_domain(
-                uc_contra_x_edge, **kwargs
-            )
-            self._uc_contra_corners_stencil = stencil_factory.from_origin_domain(
-                uc_contra_corners, **kwargs_corners
-            )
-            self._vc_contra_corners_stencil = stencil_factory.from_origin_domain(
-                vc_contra_corners, **kwargs_corners
-            )
-        self._fxadv_fluxes_stencil = stencil_factory.from_origin_domain(
-            fxadv_fluxes_stencil, **kwargs
-        )
-        # self._set_nans = get_set_nan_func(
-        #     grid_indexing,
-        #     dims=[X_DIM, Y_DIM, Z_DIM],
-        #     n_halo=((2, 2), (2, 2)),
-        # )
-
-    def __call__(
-        self,
-        uc,
-        vc,
-        crx,
-        cry,
-        x_area_flux,
-        y_area_flux,
-        uc_contra,
-        vc_contra,
-        dt,
-    ):
-        """
-        Updates flux operators and courant numbers for fvtp2d
-        To start off D_SW after the C-grid winds have been advanced half a timestep,
-        and and compute finite volume transport on the D-grid (e.g.Putman and Lin 2007),
-        this module prepares terms such as parts of equations 7 and 13 in Putnam and
-        Lin, 2007, that get consumed by fvtp2d and ppm methods.
-
-        Described in sections 3.2 and 4.2 of the FV3 documentation.
-
-        Args:
-            uc (in): covariant x-velocity on the C-grid
-            vc (in): covariant y-velocity on the C-grid
-            crx (out): Courant number, x direction
-            cry (out): Courant number, y direction
-            x_area_flux (out): flux of area in x-direction, in units of m^2
-            y_area_flux (out): flux of area in y-direction, in units of m^2
-            uc_contra (out): contravariant x-velocity on C-grid
-            vc_contra (out): contravariant y-velocity on C-grid
-            dt (in): acoustic timestep in seconds
-        """
-
-        # in the original Fortran code, uc_contra is named ut and vc_contra is vt
-
-        self._main_uc_vc_contra_stencil(
-            uc,
-            vc,
-            self._cosa_u,
-            self._rsin_u,
-            self._cosa_v,
-            self._rsin_v,
-            uc_contra,
-            vc_contra,
-        )
-        if self._grid_type < 3:
-            if not self._tile_interior:
-                self._uc_contra_y_edge_stencil(
-                    uc, self._sin_sg1, self._sin_sg3, uc_contra
-                )
-                self._vc_contra_y_edge_stencil(
-                    vc,
-                    self._cosa_v,
-                    uc_contra,
-                    vc_contra,
-                )
-                self._vc_contra_x_edge_stencil(
-                    vc, self._sin_sg2, self._sin_sg4, vc_contra
-                )
-                self._uc_contra_x_edge_stencil(
-                    uc,
-                    self._cosa_u,
-                    vc_contra,
-                    uc_contra,
-                )
-                # NOTE: this is aliasing memory
-                self._uc_contra_corners_stencil(
-                    self._cosa_u,
-                    self._cosa_v,
-                    uc,
-                    vc,
-                    uc_contra,
-                    uc_contra,
-                    vc_contra,
-                )
-                # NOTE: this is aliasing memory
-                self._vc_contra_corners_stencil(
-                    self._cosa_u,
-                    self._cosa_v,
-                    uc,
-                    vc,
-                    uc_contra,
-                    vc_contra,
-                    vc_contra,
-                )
-        self._fxadv_fluxes_stencil(
-            self._sin_sg1,
-            self._sin_sg2,
-            self._sin_sg3,
-            self._sin_sg4,
-            self._rdxa,
-            self._rdya,
-            self._dy,
-            self._dx,
-            crx,
-            cry,
-            x_area_flux,
-            y_area_flux,
-            uc_contra,
-            vc_contra,
-            dt,
-        )
diff --git a/pyFV3/pyFV3/stencils/map_single.py b/pyFV3/pyFV3/stencils/map_single.py
deleted file mode 100644
index c576585b..00000000
--- a/pyFV3/pyFV3/stencils/map_single.py
+++ /dev/null
@@ -1,208 +0,0 @@
-from typing import Optional, Sequence
-
-from gt4py.cartesian.gtscript import FORWARD, PARALLEL, computation, interval
-from ndsl.constants import X_DIM, Y_DIM, Z_DIM
-from ndsl.dsl.dace import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ, IntFieldIJ  # noqa: F401
-from ndsl.initialization.allocator import QuantityFactory
-
-from pyFV3.stencils.basic_operations import copy_defn
-from pyFV3.stencils.remap_profile import RemapProfile
-
-
-def set_dp(dp1: FloatField, pe1: FloatField, lev: IntFieldIJ):
-    with computation(PARALLEL), interval(...):
-        dp1 = pe1[0, 0, 1] - pe1
-    with computation(FORWARD), interval(0, 1):
-        lev = 0
-
-
-def lagrangian_contributions(
-    q: FloatField,
-    pe1: FloatField,
-    pe2: FloatField,
-    q4_1: FloatField,
-    q4_2: FloatField,
-    q4_3: FloatField,
-    q4_4: FloatField,
-    dp1: FloatField,
-    lev: IntFieldIJ,
-):
-    """
-    Args:
-        q (out):
-        pe1 (in):
-        pe2 (in):
-        q4_1 (in):
-        q4_2 (in):
-        q4_3 (in):
-        q4_4 (in):
-        dp1 (in):
-        lev (inout):
-    """
-    # TODO: Can we make lev a 2D temporary?
-    with computation(FORWARD), interval(...):
-        pl = (pe2 - pe1[0, 0, lev]) / dp1[0, 0, lev]
-        if pe2[0, 0, 1] <= pe1[0, 0, lev + 1]:
-            pr = (pe2[0, 0, 1] - pe1[0, 0, lev]) / dp1[0, 0, lev]
-            q = (
-                q4_2[0, 0, lev]
-                + 0.5
-                * (q4_4[0, 0, lev] + q4_3[0, 0, lev] - q4_2[0, 0, lev])
-                * (pr + pl)
-                - q4_4[0, 0, lev] * 1.0 / 3.0 * (pr * (pr + pl) + pl * pl)
-            )
-        else:
-            qsum = (pe1[0, 0, lev + 1] - pe2) * (
-                q4_2[0, 0, lev]
-                + 0.5
-                * (q4_4[0, 0, lev] + q4_3[0, 0, lev] - q4_2[0, 0, lev])
-                * (1.0 + pl)
-                - q4_4[0, 0, lev] * 1.0 / 3.0 * (1.0 + pl * (1.0 + pl))
-            )
-            lev = lev + 1
-            while pe1[0, 0, lev + 1] < pe2[0, 0, 1]:
-                qsum += dp1[0, 0, lev] * q4_1[0, 0, lev]
-                lev = lev + 1
-            dp = pe2[0, 0, 1] - pe1[0, 0, lev]
-            esl = dp / dp1[0, 0, lev]
-            qsum += dp * (
-                q4_2[0, 0, lev]
-                + 0.5
-                * esl
-                * (
-                    q4_3[0, 0, lev]
-                    - q4_2[0, 0, lev]
-                    + q4_4[0, 0, lev] * (1.0 - (2.0 / 3.0) * esl)
-                )
-            )
-            q = qsum / (pe2[0, 0, 1] - pe2)
-        lev = lev - 1
-
-
-class MapSingle:
-    """
-    Fortran name is map_single, test classes are Map1_PPM_2d, Map_Scalar_2d
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        kord: int,
-        mode: int,
-        dims: Sequence[str],
-    ):
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-        )
-
-        # TODO: consider refactoring to take in origin and domain
-        grid_indexing = stencil_factory.grid_indexing
-
-        def make_quantity():
-            return quantity_factory.zeros(
-                [X_DIM, Y_DIM, Z_DIM],
-                units="unknown",
-                dtype=Float,
-            )
-
-        self._dp1 = make_quantity()
-        self._q4_1 = make_quantity()
-        self._q4_2 = make_quantity()
-        self._q4_3 = make_quantity()
-        self._q4_4 = make_quantity()
-        self._tmp_qs = quantity_factory.zeros(
-            [X_DIM, Y_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        self._lev = quantity_factory.zeros([X_DIM, Y_DIM], units="", dtype=int)
-
-        self._copy_stencil = stencil_factory.from_dims_halo(
-            copy_defn,
-            compute_dims=dims,
-        )
-
-        self._set_dp = stencil_factory.from_dims_halo(
-            set_dp,
-            compute_dims=dims,
-        )
-
-        self._remap_profile = RemapProfile(
-            stencil_factory,
-            quantity_factory,
-            kord,
-            mode,
-            dims=dims,
-        )
-
-        self._lagrangian_contributions = stencil_factory.from_dims_halo(
-            lagrangian_contributions,
-            compute_dims=dims,
-        )
-
-    @property
-    def i_extent(self):
-        return self._extents[0]
-
-    @property
-    def j_extent(self):
-        return self._extents[1]
-
-    def __call__(
-        self,
-        q1: FloatField,
-        pe1: FloatField,
-        pe2: FloatField,
-        qs: Optional["FloatFieldIJ"] = None,
-        qmin: Float = 0.0,
-    ):
-        """
-        Compute x-flux using the PPM method.
-
-        Args:
-            q1 (out): Remapped field on Eulerian grid
-            pe1 (in): Lagrangian pressure levels
-            pe2 (in): Eulerian pressure levels
-            qs (in): Bottom boundary condition
-            qmin (in): Minimum allowed value of the remapped field
-        """
-
-        self._copy_stencil(q1, self._q4_1)
-        self._set_dp(self._dp1, pe1, self._lev)
-
-        if qs is None:
-            self._remap_profile(
-                self._tmp_qs,
-                self._q4_1,
-                self._q4_2,
-                self._q4_3,
-                self._q4_4,
-                self._dp1,
-                qmin,
-            )
-        else:
-            self._remap_profile(
-                qs,
-                self._q4_1,
-                self._q4_2,
-                self._q4_3,
-                self._q4_4,
-                self._dp1,
-                qmin,
-            )
-        self._lagrangian_contributions(
-            q1,
-            pe1,
-            pe2,
-            self._q4_1,
-            self._q4_2,
-            self._q4_3,
-            self._q4_4,
-            self._dp1,
-            self._lev,
-        )
-        return q1
diff --git a/pyFV3/pyFV3/stencils/mapn_tracer.py b/pyFV3/pyFV3/stencils/mapn_tracer.py
deleted file mode 100644
index 64933336..00000000
--- a/pyFV3/pyFV3/stencils/mapn_tracer.py
+++ /dev/null
@@ -1,88 +0,0 @@
-from typing import Dict
-
-import ndsl.dsl.gt4py_utils as utils
-from ndsl.constants import X_DIM, Y_DIM, Z_DIM
-from ndsl.dsl.dace.orchestration import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.quantity import Quantity
-
-from pyFV3.stencils.fillz import FillNegativeTracerValues
-from pyFV3.stencils.map_single import MapSingle
-
-
-class MapNTracer:
-    """
-    Fortran code is mapn_tracer, test class is MapN_Tracer_2d
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        kord: int,
-        nq: int,
-        fill: bool,
-        tracers: Dict[str, Quantity],
-    ):
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            dace_compiletime_args=["tracers"],
-        )
-        self._nq = int(nq)
-        self._qs = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-
-        kord_tracer = [kord] * self._nq
-        kord_tracer[5] = 9  # qcld
-
-        self._list_of_remap_objects = [
-            MapSingle(
-                stencil_factory,
-                quantity_factory,
-                kord_tracer[i],
-                0,
-                dims=[X_DIM, Y_DIM, Z_DIM],
-            )
-            for i in range(len(kord_tracer))
-        ]
-
-        if fill:
-            self._fill_negative_tracers = True
-            self._fillz = FillNegativeTracerValues(
-                stencil_factory,
-                quantity_factory,
-                self._nq,
-                tracers,
-            )
-        else:
-            self._fill_negative_tracers = False
-
-    def __call__(
-        self,
-        pe1: FloatField,
-        pe2: FloatField,
-        dp2: FloatField,
-        tracers: Dict[str, Quantity],
-    ):
-        """
-        Remaps the tracer species onto the Eulerian grid
-        and optionally fills negative values in the tracer fields
-        Assumes the minimum value is 0 for each tracer
-
-        Args:
-            pe1 (in): Lagrangian pressure levels
-            pe2 (in): Eulerian pressure levels
-            dp2 (in): Difference in pressure between Eulerian levels
-            tracers (inout): tracers to be remapped
-        """
-        for i, q in enumerate(utils.tracer_variables[0 : self._nq]):
-            self._list_of_remap_objects[i](tracers[q], pe1, pe2, self._qs)
-
-        if self._fill_negative_tracers is True:
-            self._fillz(dp2, tracers)
diff --git a/pyFV3/pyFV3/stencils/moist_cv.py b/pyFV3/pyFV3/stencils/moist_cv.py
deleted file mode 100644
index a467d781..00000000
--- a/pyFV3/pyFV3/stencils/moist_cv.py
+++ /dev/null
@@ -1,233 +0,0 @@
-import gt4py.cartesian.gtscript as gtscript
-import ndsl.constants as constants
-from gt4py.cartesian.gtscript import (
-    __INLINED,
-    PARALLEL,
-    computation,
-    exp,
-    interval,
-    log,
-)
-from ndsl.dsl.typing import Float, FloatField
-
-
-@gtscript.function
-def set_cappa(qvapor, cvm, r_vir):
-    cappa = constants.RDGAS / (constants.RDGAS + cvm / (1.0 + r_vir * qvapor))
-    return cappa
-
-
-@gtscript.function
-def moist_cvm(qvapor, gz, ql, qs):
-    cvm = (
-        (1.0 - (qvapor + gz)) * constants.CV_AIR
-        + qvapor * constants.CV_VAP
-        + ql * constants.C_LIQ
-        + qs * constants.C_ICE
-    )
-    return cvm
-
-
-@gtscript.function
-def moist_cv_nwat6_fn(
-    qvapor: FloatField,
-    qliquid: FloatField,
-    qrain: FloatField,
-    qsnow: FloatField,
-    qice: FloatField,
-    qgraupel: FloatField,
-):
-    ql = qliquid + qrain
-    qs = qice + qsnow + qgraupel
-    gz = ql + qs
-    cvm = moist_cvm(qvapor, gz, ql, qs)
-    return cvm, gz
-
-
-@gtscript.function
-def moist_pt_func(
-    qvapor: FloatField,
-    qliquid: FloatField,
-    qrain: FloatField,
-    qsnow: FloatField,
-    qice: FloatField,
-    qgraupel: FloatField,
-    q_con: FloatField,
-    pt: FloatField,
-    cappa: FloatField,
-    delp: FloatField,
-    delz: FloatField,
-    r_vir: Float,
-):
-    cvm, gz = moist_cv_nwat6_fn(
-        qvapor, qliquid, qrain, qsnow, qice, qgraupel
-    )  # if (nwat == 6) else moist_cv_default_fn(constants.CV_AIR)
-    q_con = gz
-    cappa = set_cappa(qvapor, cvm, r_vir)
-    pt = pt * exp(cappa / (1.0 - cappa) * log(constants.RDG * delp / delz * pt))
-    return cvm, gz, q_con, cappa, pt
-
-
-@gtscript.function
-def last_pt(
-    pt: FloatField,
-    dtmp: Float,
-    pkz: FloatField,
-    gz: FloatField,
-    qv: FloatField,
-    zvir: Float,
-):
-    return (pt + dtmp * pkz) / ((1.0 + zvir * qv) * (1.0 - gz))
-
-
-def moist_pt_last_step(
-    qvapor: FloatField,
-    qliquid: FloatField,
-    qrain: FloatField,
-    qsnow: FloatField,
-    qice: FloatField,
-    qgraupel: FloatField,
-    gz: FloatField,
-    pt: FloatField,
-    pkz: FloatField,
-    dtmp: Float,
-    r_vir: Float,
-):
-    """
-    Args:
-        qvapor (in):
-        qliquid (in):
-        qrain (in):
-        qsnow (in):
-        qice (in):
-        qgraupel (in):
-        gz (out):
-        pt (inout):
-        pkz (in):
-        dtmp (in):
-        r_vir (in):
-    """
-    with computation(PARALLEL), interval(...):
-        # if nwat == 2:
-        #    gz = qliquid if qliquid > 0. else 0.
-        #    qv = qvapor if qvapor > 0. else 0.
-        #    pt = last_pt(pt, dtmp, pkz, gz, qv, r_vir)
-        # elif nwat == 6:
-        gz = qliquid + qrain + qice + qsnow + qgraupel
-        pt = last_pt(pt, dtmp, pkz, gz, qvapor, r_vir)
-        # else:
-        #    cvm, gz = moist_cv_nwat6_fn(qvapor, qliquid, qrain, qsnow, qice, qgraupel)
-        #    pt = last_pt(pt, dtmp, pkz, gz, qvapor, zvir)
-
-
-@gtscript.function
-def compute_pkz_func(delp, delz, pt, cappa):
-    # TODO use the exponential form for closer answer matching
-    return exp(cappa * log(constants.RDG * delp / delz * pt))
-
-
-def moist_pkz(
-    qvapor: FloatField,
-    qliquid: FloatField,
-    qrain: FloatField,
-    qsnow: FloatField,
-    qice: FloatField,
-    qgraupel: FloatField,
-    q_con: FloatField,
-    gz: FloatField,
-    cvm: FloatField,
-    pkz: FloatField,
-    pt: FloatField,
-    cappa: FloatField,
-    delp: FloatField,
-    delz: FloatField,
-    r_vir: Float,
-):
-    """
-    Args:
-        qvapor (in):
-        qliquid (in):
-        qrain (in):
-        qsnow (in):
-        qice (in):
-        qgraupel (in):
-        q_con (out):
-        gz (out):
-        cvm (out):
-        pkz (out):
-        pt (in):
-        cappa (out):
-        delp (in):
-        delz (in):
-        r_vir (in):
-    """
-    # TODO: What is happening with q_con and gz here?
-    with computation(PARALLEL), interval(...):
-        cvm, gz = moist_cv_nwat6_fn(
-            qvapor, qliquid, qrain, qsnow, qice, qgraupel
-        )  # if (nwat == 6) else moist_cv_default_fn(constants.CV_AIR)
-        q_con[0, 0, 0] = gz
-        cappa = set_cappa(qvapor, cvm, r_vir)
-        pkz = compute_pkz_func(delp, delz, pt, cappa)
-
-
-def fv_setup(
-    qvapor: FloatField,
-    qliquid: FloatField,
-    qrain: FloatField,
-    qsnow: FloatField,
-    qice: FloatField,
-    qgraupel: FloatField,
-    q_con: FloatField,
-    cvm: FloatField,
-    pkz: FloatField,
-    pt: FloatField,
-    cappa: FloatField,
-    delp: FloatField,
-    delz: FloatField,
-    dp1: FloatField,
-):
-    """
-    Args:
-        qvapor (in):
-        qliquid (in):
-        qrain (in):
-        qsnow (in):
-        qice (in):
-        qgraupel (in):
-        q_con (out):
-        cvm (out):
-        pkz (out): p^(cappa)
-        pt (in):
-        cappa (out): Rd / Cp
-        delp (in):
-        delz (in):
-        dp1 (out):
-    """
-    # without moist_cappa, we use a constant heat capacity for everything
-    # variable heat capacity takes into account the mixing ratios of condensates
-    # this is more accurate
-
-    # TODO: what is being set up here, and how? update docstring
-    with computation(PARALLEL), interval(...):
-        from __externals__ import moist_phys
-
-        if __INLINED(moist_phys):
-            cvm, q_con = moist_cv_nwat6_fn(
-                qvapor, qliquid, qrain, qsnow, qice, qgraupel
-            )  # if (nwat == 6) else moist_cv_default_fn(constants.CV_AIR)
-            dp1 = constants.ZVIR * qvapor
-            cappa = constants.RDGAS / (constants.RDGAS + cvm / (1.0 + dp1))
-            pkz = exp(
-                cappa
-                * log(constants.RDG * delp * pt * (1.0 + dp1) * (1.0 - q_con) / delz)
-            )
-            # TODO: find documentation reference
-            # (1.0 + dp1) * (1.0 - q_con) takes out condensate mass,
-            # described in more detail in fv3 docs
-            # condensates don't obey ideal gas law so they must be taken out
-        else:
-            dp1 = 0
-            pkz = exp(constants.KAPPA * log(constants.RDG * delp * pt / delz))
-            # cell mean pressure based on ideal gas law, raised to cappa
-            # exponential log structure is faster on most processors
diff --git a/pyFV3/pyFV3/stencils/neg_adj3.py b/pyFV3/pyFV3/stencils/neg_adj3.py
deleted file mode 100644
index 36761756..00000000
--- a/pyFV3/pyFV3/stencils/neg_adj3.py
+++ /dev/null
@@ -1,430 +0,0 @@
-import gt4py.cartesian.gtscript as gtscript
-import ndsl.constants as constants
-from gt4py.cartesian.gtscript import BACKWARD, FORWARD, PARALLEL, computation, interval
-from ndsl.constants import X_DIM, Y_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-from ndsl.initialization.allocator import QuantityFactory
-
-
-ZVIR = constants.RVGAS / constants.RDGAS - 1.0
-
-
-@gtscript.function
-def fix_negative_ice(qvapor, qice, qsnow, qgraupel, qrain, qliquid, pt, lcpk, icpk, dq):
-    qsum = qice + qsnow
-    if qsum > 0.0:
-        if qice < 0.0:
-            qice = 0.0
-            qsnow = qsum
-        elif qsnow < 0.0:
-            qsnow = 0.0
-            qice = qsum
-    else:
-        qice = 0.0
-        qsnow = 0.0
-        qgraupel = qgraupel + qsum
-    if qgraupel < 0.0:
-        dq = qsnow if qsnow < -qgraupel else -qgraupel
-        qsnow = qsnow - dq
-        qgraupel = qgraupel + dq
-        if qgraupel < 0.0:
-            dq = qice if qice < -qgraupel else -qgraupel
-            qice = qice - dq
-            qgraupel = qgraupel + dq
-    # If qgraupel still negative, borrow from rain water
-    if qgraupel < 0.0 and qrain > 0.0:
-        dq = qrain if qrain < -qgraupel else -qgraupel
-        qgraupel = qgraupel + dq
-        qliquid = qliquid - dq
-        pt = pt + dq * icpk  # conserve total energy
-    # If qgraupel is still negative then borrow from cloud water: phase change
-    if qgraupel < 0.0 and qliquid > 0.0:
-        dq = qliquid if qliquid < -qgraupel else -qgraupel
-        qgraupel = qgraupel + dq
-        qliquid = qliquid - dq
-        pt = pt + dq * icpk
-    # Last resort; borrow from water vapor
-    if qgraupel < 0.0 and qvapor > 0.0:
-        dq = 0.999 * qvapor if 0.999 * qvapor < -qgraupel else -qgraupel
-        qgraupel = qgraupel + dq
-        qvapor = qvapor - dq
-        pt = pt + dq * (icpk + lcpk)
-    return qvapor, qice, qsnow, qgraupel, qrain, qliquid, pt
-
-
-@gtscript.function
-def fix_negative_liq(qvapor, qice, qsnow, qgraupel, qrain, qliquid, pt, lcpk, icpk, dq):
-    qsum = qliquid + qrain
-    pos_qgraupel = 0.0 if 0.0 > qgraupel else qgraupel
-    qrain_tmp = 0.0
-    dq1 = 0.0
-    if qsum > 0.0:
-        if qrain < 0.0:
-            qrain = 0.0
-            qliquid = qsum
-        elif qliquid < 0.0:
-            qliquid = 0.0
-            qrain = qsum
-    else:
-        qliquid = 0.0
-        qrain_tmp = qsum
-        dq = pos_qgraupel if pos_qgraupel < -qrain_tmp else -qrain_tmp
-        qrain_tmp = qrain_tmp + dq
-        qgraupel = qgraupel - dq
-        pt = pt - dq * icpk
-        # fill negative rain with available qice & qsnow (cooling)
-        if qrain < 0.0:
-            dq = qice + qsnow if (qice + qsnow) < -qrain_tmp else -qrain_tmp
-            qrain_tmp = qrain_tmp + dq
-            dq1 = dq if dq < qsnow else qsnow
-            qsnow = qsnow - dq1
-            qice = qice + dq1 - dq
-            pt = pt - dq * icpk
-        qrain = qrain_tmp
-        # fix negative rain water with available vapor
-        if qrain < 0.0 and qvapor > 0.0:
-            dq = 0.999 * qvapor if 0.999 * qvapor < -qrain else -qrain
-            qvapor = qvapor - dq
-            qrain = qrain + dq
-            pt = pt + dq * lcpk
-    return qvapor, qice, qsnow, qgraupel, qrain, qliquid, pt
-
-
-def fix_neg_water(
-    pt: FloatField,
-    qvapor: FloatField,
-    qliquid: FloatField,
-    qrain: FloatField,
-    qsnow: FloatField,
-    qice: FloatField,
-    qgraupel: FloatField,
-    lv00: Float,
-    d0_vap: Float,
-):
-    """
-    Args:
-        pt (inout):
-        qvapor (inout):
-        qliquid (inout):
-        qrain (inout):
-        qsnow (inout):
-        qice (inout):
-        qgraupel (inout):
-    """
-    with computation(PARALLEL), interval(...):
-        q_liq = 0.0 if 0.0 > qliquid + qrain else qliquid + qrain
-        q_sol = 0.0 if 0.0 > qice + qsnow else qice + qsnow
-        cpm = (
-            (1.0 - (qvapor + q_liq + q_sol)) * constants.CV_AIR
-            + qvapor * constants.CV_VAP
-            + q_liq * constants.C_LIQ
-            + q_sol * constants.C_ICE
-        )
-        lcpk = (lv00 + d0_vap * pt) / cpm
-        icpk = (constants.LI0 + constants.DC_ICE * pt) / cpm
-        dq = 0.0
-        qvapor, qice, qsnow, qgraupel, qrain, qliquid, pt = fix_negative_ice(
-            qvapor, qice, qsnow, qgraupel, qrain, qliquid, pt, lcpk, icpk, dq
-        )
-        qvapor, qice, qsnow, qgraupel, qrain, qliquid, pt = fix_negative_liq(
-            qvapor, qice, qsnow, qgraupel, qrain, qliquid, pt, lcpk, icpk, dq
-        )
-        # Fast moist physics: Saturation adjustment
-        # no GFS_PHYS compiler flag -- additional saturation adjustment calculations!
-
-
-def fillq(q: FloatField, dp: FloatField, sum1: FloatFieldIJ, sum2: FloatFieldIJ):
-    """
-    Args:
-        q (inout):
-        dp (in):
-        sum1 (out):
-        sum2 (out):
-    """
-    with computation(FORWARD), interval(...):
-        # reset accumulating fields
-        sum1 = 0.0
-        sum2 = 0.0
-    with computation(FORWARD), interval(...):
-        if q > 0:
-            sum1 = sum1 + q * dp
-    with computation(BACKWARD), interval(...):
-        if q < 0.0 and sum1 >= 0:
-            dq = sum1 if sum1 < -q * dp else -q * dp
-            sum1 = sum1 - dq
-            sum2 = sum2 + dq
-            q = q + dq / dp
-    with computation(BACKWARD), interval(...):
-        if q > 0.0 and sum1 >= 1e-12 and sum2 > 0:
-            dq = sum2 if sum2 < q * dp else q * dp
-            sum2 = sum2 - dq
-            q = q - dq / dp
-
-
-# Stencil version
-def fix_water_vapor_down(qvapor: FloatField, dp: FloatField):
-    """
-    Args:
-        qvapor (inout):
-        dp (in):
-    """
-    with computation(PARALLEL), interval(...):
-        upper_fix = 0.0  # type: FloatField
-        lower_fix = 0.0  # type: FloatField
-    with computation(BACKWARD):
-        with interval(1, 2):
-            if qvapor[0, 0, -1] < 0:  # top level is negative
-                # reduce level 1 by that amount to compensate:
-                qvapor = qvapor + qvapor[0, 0, -1] * dp[0, 0, -1] / dp
-        with interval(0, 1):
-            if qvapor < 0.0:
-                qvapor = 0.0  # top level is now 0
-    with computation(FORWARD), interval(1, -1):
-        dq = qvapor[0, 0, -1] * dp[0, 0, -1]
-        # if we borrowed from this level to fix the upper level, account for that here:
-        if lower_fix[0, 0, -1] != 0:
-            qvapor += lower_fix[0, 0, -1] / dp
-        # if we're now negative and can borrow from above do so:
-        if (qvapor < 0) and (qvapor[0, 0, -1] > 0):
-            dq = dq if dq < -qvapor * dp else -qvapor * dp
-            upper_fix = dq
-            qvapor += dq / dp
-        if qvapor < 0:  # If still negative borrow from below
-            lower_fix = qvapor * dp
-            qvapor = 0
-    with computation(PARALLEL), interval(0, -2):
-        # if we had to borrow from upper levels before account for that in this loop
-        if upper_fix[0, 0, 1] != 0:
-            qvapor = qvapor - upper_fix[0, 0, 1] / dp
-    with computation(PARALLEL), interval(-1, None):
-        # if we borrowed from the bottom level account for that here:
-        if lower_fix[0, 0, -1] > 0:
-            qvapor = qvapor + lower_fix / dp
-        # Here we're re-using upper_fix to represent the current version of
-        # qvapor[k_bot] fixed from above. We could also re-use lower_fix instead of
-        # dp_bot, but that's probably over-optimized for now
-        upper_fix = qvapor
-        # If we didn't have to worry about float valitation and negative column
-        # mass we could set qvapor[k_bot] to 0 here...
-        dp_bottom = dp
-    with computation(BACKWARD), interval(0, -1):
-        dp_bottom = dp_bottom[0, 0, 1]
-        dq = qvapor * dp
-        # (if qvapor[kbot] isn't negative we will just loop through and do nothing)
-        # if the level below us is negative and we are positive:
-        if (upper_fix[0, 0, 1] < 0) and (qvapor > 0):
-            # AND if we have enough mass to fill the level below us:
-            if dq >= -upper_fix[0, 0, 1] * dp_bottom:
-                # set dq to the amount needed to fill the level below us
-                dq = -upper_fix[0, 0, 1] * dp_bottom
-                # (otherwise dq is all of the vapor mass)
-            qvapor = qvapor - dq / dp  # subtract dq from current mass
-            upper_fix = upper_fix[0, 0, 1] + dq / dp_bottom  # add mass to qvapor[kbot]
-        # if qvapor[kbot] is still negative move to the next level
-        else:
-            upper_fix = upper_fix[
-                0, 0, 1
-            ]  # now upper_fix[k] is q[kbot] after adjusting
-    # after that loop upper_fix[ktop] = qvapot[kbot] so bring that value back to kbot
-    with computation(FORWARD), interval(1, None):
-        upper_fix = upper_fix[0, 0, -1]
-    with computation(PARALLEL), interval(-1, None):
-        qvapor = upper_fix  # and finally set qvapor[kbot]
-
-
-def fix_neg_cloud(dp: FloatField, qcld: FloatField):
-    with computation(FORWARD), interval(1, -1):
-        if qcld[0, 0, -1] < 0.0:
-            qcld = qcld + qcld[0, 0, -1] * dp[0, 0, -1] / dp
-    with computation(PARALLEL), interval(1, -1):
-        if qcld < 0.0:
-            qcld = 0.0
-    with computation(FORWARD):
-        with interval(-2, -1):
-            if qcld[0, 0, 1] < 0.0 and qcld > 0:
-                dq = (
-                    -qcld * dp
-                    if -qcld * dp < qcld[0, 0, 1] * dp[0, 0, 1]
-                    else qcld[0, 0, 1] * dp[0, 0, 1]
-                )
-                qcld = qcld - dq / dp
-        with interval(-1, None):
-            if qcld < 0 and qcld[0, 0, -1] > 0.0:
-                dq = (
-                    -qcld * dp
-                    if -qcld * dp < qcld[0, 0, -1] * dp[0, 0, -1]
-                    else qcld[0, 0, -1] * dp[0, 0, -1]
-                )
-                qcld = qcld + dq / dp
-                qcld = 0.0 if 0.0 > qcld else qcld
-
-
-"""
-Nonstencil code for reference:
-
-def fix_water_vapor_nonstencil(grid, qvapor, dp):
-    k = 0
-    for j in range(grid.js, grid.je + 1):
-        for i in range(grid.is_, grid.ie + 1):
-            if qvapor[i, j, k] < 0.0:
-                qvapor[i, j, k + 1] = (
-                    qvapor[i, j, k + 1]
-                    + qvapor[i, j, k] * dp[i, j, k] / dp[i, j, k + 1]
-                )
-
-    kbot = grid_indexing.domain[2] - 1
-    for j in range(grid.js, grid.je + 1):
-        for k in range(1, kbot - 1):
-            for i in range(grid.is_, grid.ie + 1):
-                if qvapor[i, j, k] < 0 and qvapor[i, j, k - 1] > 0.0:
-                    dq = min(
-                        -qvapor[i, j, k] * dp[i, j, k],
-                        qvapor[i, j, k - 1] * dp[i, j, k - 1],
-                    )
-                    qvapor[i, j, k - 1] -= dq / dp[i, j, k - 1]
-                    qvapor[i, j, k] += dq / dp[i, j, k]
-                if qvapor[i, j, k] < 0.0:
-                    qvapor[i, j, k + 1] += (
-                        qvapor[i, j, k] * dp[i, j, k] / dp[i, j, k + 1]
-                    )
-                    qvapor[i, j, k] = 0.0
-
-
-def fix_water_vapor_bottom(grid, qvapor, dp):
-    kbot = grid_indexing.domain[2] - 1
-    for j in range(grid.js, grid.je + 1):
-        for i in range(grid.is_, grid.ie + 1):
-            if qvapor[i, j, kbot] < 0:
-                fix_water_vapor_k_loop(i, j, kbot, qvapor, dp)
-
-
-def fix_water_vapor_k_loop(i, j, kbot, qvapor, dp):
-    for k in range(kbot - 1, -1, -1):
-        if qvapor[i, j, kbot] >= 0.0:
-            return
-        if qvapor[i, j, k] > 0.0:
-            dq = min(
-                -qvapor[i, j, kbot] * dp[i, j, kbot], qvapor[i, j, k] * dp[i, j, k]
-            )
-            qvapor[i, j, k] = qvapor[i, j, k] - dq / dp[i, j, k]
-            qvapor[i, j, kbot] = qvapor[i, j, kbot] + dq / dp[i, j, kbot]
-"""
-
-
-class AdjustNegativeTracerMixingRatio:
-    """Adjust tracer mixing ratios to fix negative values
-
-    Named neg_adj3 in fortran
-
-    Args:
-        qvapor: Water vapor mixing ration (inout)
-        qliquid: Liquid water mixing ration (inout)
-        qrain: Rain mixing ration (inout)
-        qsnow: Snow mixing ration (inout)
-        qice: Ice mixing ration (inout)
-        qgraupel: Graupel mixing ration (inout)
-        qcld: Cloud mixing ration (inout)
-        pt: Air temperature (in)
-        delp: Pressur thickness of atmosphere layers (in)
-        delz: Vertical thickness of atmosphere layers (in)
-        peln: Logarithm of interface pressure (in)
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        check_negative: bool,
-        hydrostatic: bool,
-    ):
-        grid_indexing = stencil_factory.grid_indexing
-        self._sum1 = quantity_factory.zeros(
-            [X_DIM, Y_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        self._sum2 = quantity_factory.zeros(
-            [X_DIM, Y_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        if check_negative:
-            raise NotImplementedError(
-                "Unimplemented namelist value check_negative=True"
-            )
-        if hydrostatic:
-            self._d0_vap = constants.CP_VAP - constants.C_LIQ
-            raise NotImplementedError(
-                "Adjust Negative Tracer Mixing Ratio (neg_adj3):"
-                " Hydrostatic is not implemented"
-            )
-        else:
-            self._d0_vap = constants.CV_VAP - constants.C_LIQ
-        self._lv00 = constants.HLV - self._d0_vap * constants.TICE
-
-        self._fix_neg_water = stencil_factory.from_origin_domain(
-            func=fix_neg_water,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(),
-        )
-        self._fillq = stencil_factory.from_origin_domain(
-            func=fillq,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(),
-        )
-        self._fix_water_vapor_down = stencil_factory.from_origin_domain(
-            func=fix_water_vapor_down,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(),
-        )
-        self._fix_neg_cloud = stencil_factory.from_origin_domain(
-            func=fix_neg_cloud,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(),
-        )
-
-    def __call__(
-        self,
-        qvapor,
-        qliquid,
-        qrain,
-        qsnow,
-        qice,
-        qgraupel,
-        qcld,
-        pt,
-        delp,
-    ):
-        """
-        Args:
-            qvapor (inout):
-            qliquid (inout):
-            qrain (inout):
-            qsnow (inout):
-            qice (inout):
-            qgraupel (inout):
-            qcld (inout):
-            pt (inout):
-            delp (in):
-        """
-        # TODO: remove delz and peln from args
-        self._fix_neg_water(
-            pt,
-            qvapor,
-            qliquid,
-            qrain,
-            qsnow,
-            qice,
-            qgraupel,
-            self._lv00,
-            self._d0_vap,
-        )
-        # TODO - optimisation: those could be merged into one stencil. To keep
-        # the physical meaning we could keep the structure as @gtstencil.function
-        # TODO: when gt4py supports 2D temporaries, refactor sum1 and sum2 to internal
-        # stencil temporaries
-        self._fillq(qgraupel, delp, self._sum1, self._sum2)
-        self._fillq(qrain, delp, self._sum1, self._sum2)
-        self._fix_water_vapor_down(qvapor, delp)
-        self._fix_neg_cloud(delp, qcld)
diff --git a/pyFV3/pyFV3/stencils/nh_p_grad.py b/pyFV3/pyFV3/stencils/nh_p_grad.py
deleted file mode 100644
index c0e063fc..00000000
--- a/pyFV3/pyFV3/stencils/nh_p_grad.py
+++ /dev/null
@@ -1,265 +0,0 @@
-from gt4py.cartesian.gtscript import PARALLEL, computation, interval
-from ndsl.constants import X_DIM, Y_DIM, Z_INTERFACE_DIM
-from ndsl.dsl.dace import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-from ndsl.grid import GridData
-from ndsl.initialization.allocator import QuantityFactory
-
-from pyFV3.stencils.a2b_ord4 import AGrid2BGridFourthOrder
-
-
-def set_k0_and_calc_wk(
-    pp: FloatField, pk3: FloatField, wk: FloatField, top_value: Float
-):
-    """
-    Args:
-        pp (inout):
-        pk3 (inout):
-        wk (out): delta (pressure to the kappa) computed on corners
-    """
-    with computation(PARALLEL):
-        with interval(0, 1):
-            pp[0, 0, 0] = 0.0
-            pk3[0, 0, 0] = top_value
-            wk = pk3[0, 0, 1] - pk3[0, 0, 0]
-        with interval(1, None):
-            wk = pk3[0, 0, 1] - pk3[0, 0, 0]
-
-
-def calc_u(
-    u: FloatField,
-    wk: FloatField,
-    wk1: FloatField,
-    gz: FloatField,
-    pk3: FloatField,
-    pp: FloatField,
-    rdx: FloatFieldIJ,
-    dt: Float,
-):
-    """
-    Args:
-        u (inout):
-        wk (in):
-        wk1 (in):
-        gz (in):
-        pk3 (in):
-        pp (in):
-        rdx (in):
-    """
-    with computation(PARALLEL), interval(...):
-        # hydrostatic contribution
-        du = (
-            dt
-            / (wk[0, 0, 0] + wk[1, 0, 0])
-            * (
-                (gz[0, 0, 1] - gz[1, 0, 0]) * (pk3[1, 0, 1] - pk3[0, 0, 0])
-                + (gz[0, 0, 0] - gz[1, 0, 1]) * (pk3[0, 0, 1] - pk3[1, 0, 0])
-            )
-        )
-        # hydrostatic + nonhydrostatic contribution
-        u[0, 0, 0] = (
-            u[0, 0, 0]
-            + du[0, 0, 0]
-            + dt
-            / (wk1[0, 0, 0] + wk1[1, 0, 0])
-            * (
-                (gz[0, 0, 1] - gz[1, 0, 0]) * (pp[1, 0, 1] - pp[0, 0, 0])
-                + (gz[0, 0, 0] - gz[1, 0, 1]) * (pp[0, 0, 1] - pp[1, 0, 0])
-            )
-        ) * rdx
-
-
-def calc_v(
-    v: FloatField,
-    wk: FloatField,
-    wk1: FloatField,
-    gz: FloatField,
-    pk3: FloatField,
-    pp: FloatField,
-    rdy: FloatFieldIJ,
-    dt: Float,
-):
-    """
-    Args:
-        v (inout):
-        wk (in):
-        wk1 (in):
-        gz (in):
-        pk3 (in):
-        pp (in):
-        rdy (in):
-    """
-    with computation(PARALLEL), interval(...):
-        # hydrostatic contribution
-        dv = (
-            dt
-            / (wk[0, 0, 0] + wk[0, 1, 0])
-            * (
-                (gz[0, 0, 1] - gz[0, 1, 0]) * (pk3[0, 1, 1] - pk3[0, 0, 0])
-                + (gz[0, 0, 0] - gz[0, 1, 1]) * (pk3[0, 0, 1] - pk3[0, 1, 0])
-            )
-        )
-        # hydrostatic + nonhydrostatic contribution
-        v[0, 0, 0] = (
-            v[0, 0, 0]
-            + dv[0, 0, 0]
-            + dt
-            / (wk1[0, 0, 0] + wk1[0, 1, 0])
-            * (
-                (gz[0, 0, 1] - gz[0, 1, 0]) * (pp[0, 1, 1] - pp[0, 0, 0])
-                + (gz[0, 0, 0] - gz[0, 1, 1]) * (pp[0, 0, 1] - pp[0, 1, 0])
-            )
-        ) * rdy
-
-
-class NonHydrostaticPressureGradient:
-    """
-    Apply nonhydrostatic pressure gradient force in the horizontal.
-
-    Fully implicit with beta = 0.
-
-    Documented in Lin 97, Section 6.6 of FV3 documentation.
-
-    Fortran name is nh_p_grad.
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        grid_data: GridData,
-        grid_type,
-    ):
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-        )
-
-        grid_indexing = stencil_factory.grid_indexing
-        self.orig = grid_indexing.origin_compute()
-        domain_full_k = grid_indexing.domain_compute(add=(1, 1, 0))
-        u_domain = grid_indexing.domain_compute(add=(0, 1, 0))
-        v_domain = grid_indexing.domain_compute(add=(1, 0, 0))
-        self.nk = grid_indexing.domain[2]
-        self._rdx = grid_data.rdx
-        self._rdy = grid_data.rdy
-
-        self._tmp_wk = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        self._tmp_wk1 = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-
-        self.a2b_k1 = AGrid2BGridFourthOrder(
-            stencil_factory.restrict_vertical(k_start=1),
-            quantity_factory=quantity_factory,
-            grid_data=grid_data,
-            grid_type=grid_type,
-            z_dim=Z_INTERFACE_DIM,
-            replace=True,
-        )
-        self.a2b_kbuffer = AGrid2BGridFourthOrder(
-            stencil_factory,
-            quantity_factory=quantity_factory,
-            grid_data=grid_data,
-            grid_type=grid_type,
-            z_dim=Z_INTERFACE_DIM,
-            replace=True,
-        )
-        self.a2b_kstandard = AGrid2BGridFourthOrder(
-            stencil_factory,
-            quantity_factory=quantity_factory,
-            grid_data=grid_data,
-            grid_type=grid_type,
-            replace=False,
-        )
-
-        self._set_k0_and_calc_wk_stencil = stencil_factory.from_origin_domain(
-            set_k0_and_calc_wk,
-            origin=self.orig,
-            domain=domain_full_k,
-        )
-
-        self._calc_u_stencil = stencil_factory.from_origin_domain(
-            calc_u,
-            origin=self.orig,
-            domain=u_domain,
-        )
-
-        self._calc_v_stencil = stencil_factory.from_origin_domain(
-            calc_v,
-            origin=self.orig,
-            domain=v_domain,
-        )
-
-    def __call__(
-        self,
-        u: FloatField,
-        v: FloatField,
-        pp: FloatField,
-        gz: FloatField,
-        pk3: FloatField,
-        delp: FloatField,
-        dt: Float,
-        ptop: Float,
-        akap: Float,
-    ):
-        """
-        Updates the U and V winds due to pressure gradients,
-        accounting for both the hydrostatic and nonhydrostatic contributions.
-
-        Args:
-            u (inout): wind in x-direction
-            v (inout): wind in y-direction
-            pp (inout): pressure, gets updated to B-grid
-            gz (inout): height of the model grid cells, gets updated to B-grid
-            pk3 (inout): gets updated to B-grid
-            delp (in): vertical delta in pressure
-            dt (in): model atmospheric timestep
-            ptop (in): pressure at top of atmosphere
-            akap (in): Kappa
-        """
-        # Fortran names:
-        # u=u v=v pp=pkc gz=gz pk3=pk3 delp=delp dt=dt
-
-        ptk = ptop ** akap
-        top_value = ptk  # = peln1 if spec.namelist.use_logp else ptk
-
-        # TODO: make it clearer that each of these a2b outputs is updated
-        # instead of the output being put in tmp_wk1, possibly by removing
-        # the second argument and using a temporary instead?
-        self.a2b_k1(pp, self._tmp_wk1)
-        self.a2b_k1(pk3, self._tmp_wk1)
-
-        self.a2b_kbuffer(gz, self._tmp_wk1)
-        self.a2b_kstandard(delp, self._tmp_wk1)
-
-        self._set_k0_and_calc_wk_stencil(pp, pk3, self._tmp_wk, top_value)
-
-        self._calc_u_stencil(
-            u,
-            self._tmp_wk,
-            self._tmp_wk1,
-            gz,
-            pk3,
-            pp,
-            self._rdx,
-            dt,
-        )
-
-        self._calc_v_stencil(
-            v,
-            self._tmp_wk,
-            self._tmp_wk1,
-            gz,
-            pk3,
-            pp,
-            self._rdy,
-            dt,
-        )
diff --git a/pyFV3/pyFV3/stencils/pe_halo.py b/pyFV3/pyFV3/stencils/pe_halo.py
deleted file mode 100644
index 48a5bb85..00000000
--- a/pyFV3/pyFV3/stencils/pe_halo.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from gt4py.cartesian.gtscript import FORWARD, computation, horizontal, interval, region
-from ndsl.dsl.typing import Float, FloatField
-
-
-def edge_pe(pe: FloatField, delp: FloatField, ptop: Float):
-    """
-    This corresponds to the pe_halo routine in FV3core
-    Updading the interface pressure from the pressure differences
-
-    Args:
-        pe (out): The pressure on the interfaces of the cell
-        delp (in): The pressure difference between vertical grid cells
-        ptop (in): The pressure level at the top of the grid
-    """
-    from __externals__ import local_ie, local_is, local_je, local_js
-
-    with computation(FORWARD):
-        with interval(0, 1):
-            with horizontal(
-                region[local_is - 1, local_js : local_je + 1],
-                region[local_ie + 1, local_js : local_je + 1],
-                region[local_is - 1 : local_ie + 2, local_js - 1],
-                region[local_is - 1 : local_ie + 2, local_je + 1],
-            ):
-                pe[0, 0, 0] = ptop
-        with interval(1, None):
-            with horizontal(
-                region[local_is - 1, local_js : local_je + 1],
-                region[local_ie + 1, local_js : local_je + 1],
-                region[local_is - 1 : local_ie + 2, local_js - 1],
-                region[local_is - 1 : local_ie + 2, local_je + 1],
-            ):
-                pe[0, 0, 0] = pe[0, 0, -1] + delp[0, 0, -1]
diff --git a/pyFV3/pyFV3/stencils/pk3_halo.py b/pyFV3/pyFV3/stencils/pk3_halo.py
deleted file mode 100644
index 2e0e1432..00000000
--- a/pyFV3/pyFV3/stencils/pk3_halo.py
+++ /dev/null
@@ -1,72 +0,0 @@
-from gt4py.cartesian.gtscript import FORWARD, computation, horizontal, interval, region
-from ndsl.constants import X_DIM, Y_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-from ndsl.initialization.allocator import QuantityFactory
-
-
-# TODO merge with pe_halo? reuse partials?
-# NOTE: This is different from pyFV3.stencils.pe_halo.edge_pe
-def edge_pe_update(
-    pe: FloatFieldIJ, delp: FloatField, pk3: FloatField, ptop: Float, akap: Float
-):
-    from __externals__ import local_ie, local_is, local_je, local_js
-
-    with computation(FORWARD):
-        with interval(0, 1):
-            with horizontal(
-                region[local_is - 2 : local_is, local_js : local_je + 1],
-                region[local_ie + 1 : local_ie + 3, local_js : local_je + 1],
-                region[local_is - 2 : local_ie + 3, local_js - 2 : local_js],
-                region[local_is - 2 : local_ie + 3, local_je + 1 : local_je + 3],
-            ):
-                pe = ptop
-        with interval(1, None):
-            with horizontal(
-                region[local_is - 2 : local_is, local_js : local_je + 1],
-                region[local_ie + 1 : local_ie + 3, local_js : local_je + 1],
-                region[local_is - 2 : local_ie + 3, local_js - 2 : local_js],
-                region[local_is - 2 : local_ie + 3, local_je + 1 : local_je + 3],
-            ):
-                pe = pe + delp[0, 0, -1]
-                pk3 = pe ** akap
-
-
-class PK3Halo:
-    """
-    Fortran name is pk3_halo
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-    ):
-        grid_indexing = stencil_factory.grid_indexing
-        origin = grid_indexing.origin_full()
-        domain = grid_indexing.domain_full(add=(0, 0, 1))
-        ax_offsets = grid_indexing.axis_offsets(origin, domain)
-        self._edge_pe_update = stencil_factory.from_origin_domain(
-            func=edge_pe_update,
-            externals={
-                **ax_offsets,
-            },
-            origin=origin,
-            domain=domain,
-        )
-        self._pe_tmp = quantity_factory.zeros(
-            [X_DIM, Y_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-
-    def __call__(self, pk3: FloatField, delp: FloatField, ptop: Float, akap: Float):
-        """Update pressure raised to the kappa (pk3) in halo region.
-
-        Args:
-            pk3: 3D interface pressure raised to power of kappa using constant kappa
-            delp: Vertical delta in pressure
-            ptop: The pressure level at the top of atmosphere
-            akap: Poisson constant (KAPPA)
-        """
-        self._edge_pe_update(self._pe_tmp, delp, pk3, ptop, akap)
diff --git a/pyFV3/pyFV3/stencils/ppm.py b/pyFV3/pyFV3/stencils/ppm.py
deleted file mode 100644
index c6d0a2c0..00000000
--- a/pyFV3/pyFV3/stencils/ppm.py
+++ /dev/null
@@ -1,58 +0,0 @@
-from gt4py.cartesian import gtscript
-from ndsl.dsl.typing import FloatField
-
-
-# volume-conserving cubic with 2nd drv=0 at end point:
-# non-monotonic
-c1 = -2.0 / 14.0
-c2 = 11.0 / 14.0
-c3 = 5.0 / 14.0
-
-# PPM volume mean form
-p1 = 7.0 / 12.0
-p2 = -1.0 / 12.0
-
-s11 = 11.0 / 14.0
-s14 = 4.0 / 7.0
-s15 = 3.0 / 14.0
-
-
-@gtscript.function
-def pert_ppm_standard_constraint_fcn(a0: FloatField, al: FloatField, ar: FloatField):
-    if al * ar < 0.0:
-        da1 = al - ar
-        da2 = da1 ** 2
-        a6da = 3.0 * (al + ar) * da1
-        if a6da < -da2:
-            ar = -2.0 * al
-        elif a6da > da2:
-            al = -2.0 * ar
-    else:
-        # effect of dm=0 included here
-        al = 0.0
-        ar = 0.0
-    return al, ar
-
-
-@gtscript.function
-def pert_ppm_positive_definite_constraint_fcn(
-    a0: FloatField, al: FloatField, ar: FloatField
-):
-    if a0 <= 0.0:
-        al = 0.0
-        ar = 0.0
-    else:
-        a4 = -3.0 * (ar + al)
-        da1 = ar - al
-        if abs(da1) < -a4:
-            fmin = a0 + 0.25 / a4 * da1 ** 2 + a4 * (1.0 / 12.0)
-            if fmin < 0.0:
-                if ar > 0.0 and al > 0.0:
-                    ar = 0.0
-                    al = 0.0
-                elif da1 > 0.0:
-                    ar = -2.0 * al
-            else:
-                al = -2.0 * ar
-
-    return al, ar
diff --git a/pyFV3/pyFV3/stencils/ray_fast.py b/pyFV3/pyFV3/stencils/ray_fast.py
deleted file mode 100644
index 6f857d37..00000000
--- a/pyFV3/pyFV3/stencils/ray_fast.py
+++ /dev/null
@@ -1,205 +0,0 @@
-import gt4py.cartesian.gtscript as gtscript
-import ndsl.constants as constants
-from gt4py.cartesian.gtscript import (
-    __INLINED,
-    BACKWARD,
-    FORWARD,
-    PARALLEL,
-    computation,
-    horizontal,
-    interval,
-    log,
-    region,
-    sin,
-)
-from ndsl.constants import X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM
-from ndsl.dsl.dace.orchestration import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldK
-
-
-SDAY = 86400.0
-
-
-# NOTE: The fortran version of this computes rf in the first timestep only. Then
-# rf_initialized let's you know you can skip it. Here we calculate it every
-# time.
-@gtscript.function
-def compute_rf_vals(pfull, bdt, rf_cutoff, tau0, ptop):
-    return (
-        bdt
-        / tau0
-        * sin(0.5 * constants.PI * log(rf_cutoff / pfull) / log(rf_cutoff / ptop)) ** 2
-    )
-
-
-@gtscript.function
-def compute_rff_vals(pfull, dt, rf_cutoff, tau0, ptop):
-    rffvals = compute_rf_vals(pfull, dt, rf_cutoff, tau0, ptop)
-    rffvals = 1.0 / (1.0 + rffvals)
-    return rffvals
-
-
-@gtscript.function
-def dm_layer(rf, dp, wind):
-    return (1.0 - rf) * dp * wind
-
-
-def ray_fast_wind_compute(
-    u: FloatField,
-    v: FloatField,
-    w: FloatField,
-    delta_p_ref: FloatFieldK,  # reference delta pressure
-    pfull: FloatFieldK,  # input layer pressure reference?
-    dt: Float,
-    ptop: Float,
-    rf_cutoff_nudge: Float,
-):
-    """
-    Args:
-        u (inout):
-        v (inout):
-        w (inout):
-        delta_p_ref (in):
-        pfull (in):
-        dt (in):
-        ptop (in):
-        rf_cutoff_nudge (in):
-        ks (in):
-    """
-    from __externals__ import hydrostatic, local_ie, local_je, rf_cutoff, tau
-
-    # dm_stencil
-    with computation(PARALLEL), interval(...):
-        # TODO -- in the fortran model rf is only computed once, repeating
-        # the computation every time ray_fast is run is inefficient
-        if pfull < rf_cutoff:
-            # rf is rayleigh damping increment, fraction of vertical velocity
-            # left after doing rayleigh damping (w -> w * rf)
-            rf = compute_rff_vals(pfull, dt, rf_cutoff, tau * SDAY, ptop)
-    with computation(FORWARD):
-        with interval(0, 1):
-            if pfull < rf_cutoff_nudge:
-                p_ref = delta_p_ref
-        with interval(1, None):
-            p_ref = p_ref[0, 0, -1]
-            if pfull < rf_cutoff_nudge:
-                p_ref += delta_p_ref
-    with computation(BACKWARD), interval(0, -1):
-        if pfull < rf_cutoff_nudge:
-            p_ref = p_ref[0, 0, 1]
-    # ray_fast_wind(u)
-    with computation(FORWARD):
-        with interval(0, 1):
-            with horizontal(region[: local_ie + 1, :]):
-                if pfull < rf_cutoff:
-                    # dmdir = (1.0 - rf) * dp * wind
-                    dmdir = dm_layer(rf, delta_p_ref, u)
-                    u *= rf
-                else:
-                    p_ref = 0
-        with interval(1, None):
-            with horizontal(region[: local_ie + 1, :]):
-                dmdir = dmdir[0, 0, -1]
-                if pfull < rf_cutoff:
-                    dmdir += dm_layer(rf, delta_p_ref, u)
-                    u *= rf
-    with computation(BACKWARD), interval(0, -1):
-        if pfull < rf_cutoff:
-            dmdir = dmdir[0, 0, 1]
-    with computation(PARALLEL), interval(...):
-        with horizontal(region[: local_ie + 1, :]):
-            if pfull < rf_cutoff_nudge:
-                u += dmdir / p_ref
-    # ray_fast_wind(v)
-    with computation(FORWARD):
-        with interval(0, 1):
-            with horizontal(region[:, : local_je + 1]):
-                if pfull < rf_cutoff:
-                    dmdir = dm_layer(rf, delta_p_ref, v)
-                    v *= rf
-                else:
-                    p_ref = 0
-        with interval(1, None):
-            with horizontal(region[:, : local_je + 1]):
-                dmdir = dmdir[0, 0, -1]
-                if pfull < rf_cutoff:
-                    dmdir += dm_layer(rf, delta_p_ref, v)
-                    v *= rf
-    with computation(BACKWARD), interval(0, -1):
-        if pfull < rf_cutoff:
-            dmdir = dmdir[0, 0, 1]
-    with computation(PARALLEL), interval(...):
-        with horizontal(region[:, : local_je + 1]):
-            if pfull < rf_cutoff_nudge:
-                v += dmdir / p_ref
-    # ray_fast_w
-    with computation(PARALLEL), interval(...):
-        with horizontal(region[: local_ie + 1, : local_je + 1]):
-            if __INLINED(not hydrostatic):
-                if pfull < rf_cutoff:
-                    w *= rf
-
-
-class RayleighDamping:
-    """
-    Apply Rayleigh damping (for tau > 0).
-
-    Namelist:
-        - tau [Float]: time scale (in days) for Rayleigh friction applied to horizontal
-                       and vertical winds; lost kinetic energy is converted to heat,
-                       except on nested grids.
-        - rf_cutoff [Float]: pressure below which no Rayleigh damping is applied
-                             if tau > 0.
-
-    Fortran name: ray_fast.
-    """
-
-    def __init__(self, stencil_factory: StencilFactory, rf_cutoff, tau, hydrostatic):
-        orchestrate(obj=self, config=stencil_factory.config.dace_config)
-        grid_indexing = stencil_factory.grid_indexing
-        self._rf_cutoff = rf_cutoff
-        origin, domain = grid_indexing.get_origin_domain(
-            [X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM]
-        )
-
-        ax_offsets = grid_indexing.axis_offsets(origin, domain)
-        local_axis_offsets = {}
-        for axis_offset_name, axis_offset_value in ax_offsets.items():
-            if "local" in axis_offset_name:
-                local_axis_offsets[axis_offset_name] = axis_offset_value
-
-        self._ray_fast_wind_compute = stencil_factory.from_origin_domain(
-            ray_fast_wind_compute,
-            origin=origin,
-            domain=domain,
-            externals={
-                "hydrostatic": hydrostatic,
-                "rf_cutoff": rf_cutoff,
-                "tau": tau,
-                **local_axis_offsets,
-            },
-        )
-
-    def __call__(
-        self,
-        u: FloatField,
-        v: FloatField,
-        w: FloatField,
-        dp: FloatFieldK,
-        pfull: FloatFieldK,
-        dt: Float,
-        ptop: Float,
-    ):
-        rf_cutoff_nudge = self._rf_cutoff + min(100.0, 10.0 * ptop)
-
-        self._ray_fast_wind_compute(
-            u,
-            v,
-            w,
-            dp,
-            pfull,
-            dt,
-            ptop,
-            rf_cutoff_nudge,
-        )
diff --git a/pyFV3/pyFV3/stencils/remap_profile.py b/pyFV3/pyFV3/stencils/remap_profile.py
deleted file mode 100644
index ea60f775..00000000
--- a/pyFV3/pyFV3/stencils/remap_profile.py
+++ /dev/null
@@ -1,696 +0,0 @@
-from typing import Sequence
-
-import gt4py.cartesian.gtscript as gtscript
-from gt4py.cartesian.gtscript import (
-    __INLINED,
-    BACKWARD,
-    FORWARD,
-    PARALLEL,
-    computation,
-    interval,
-)
-from ndsl.constants import X_DIM, Y_DIM, Z_DIM, Z_INTERFACE_DIM
-from ndsl.dsl.dace.orchestration import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import BoolField, Float, FloatField, FloatFieldIJ
-from ndsl.initialization.allocator import QuantityFactory
-
-
-@gtscript.function
-def limit_minmax(q, a4):
-    tmp = a4[0, 0, -1] if a4[0, 0, -1] > a4 else a4
-    ret = q if q < tmp else tmp
-    return ret
-
-
-@gtscript.function
-def limit_maxmin(q, a4):
-    tmp2 = a4[0, 0, -1] if a4[0, 0, -1] < a4 else a4
-    ret = q if q > tmp2 else tmp2
-    return ret
-
-
-@gtscript.function
-def limit_both(q, a4):
-    ret = limit_minmax(q, a4)
-    ret = limit_maxmin(ret, a4)
-    return ret
-
-
-@gtscript.function
-def constrain_interior(q, gam, a4):
-    return (
-        limit_both(q, a4)
-        if (gam[0, 0, -1] * gam[0, 0, 1] > 0.0)
-        else limit_maxmin(q, a4)
-        if (gam[0, 0, -1] > 0.0)
-        else limit_minmax(q, a4)
-    )
-
-
-@gtscript.function
-def posdef_constraint_iv0(
-    a4_1: FloatField,
-    a4_2: FloatField,
-    a4_3: FloatField,
-    a4_4: FloatField,
-):
-    """
-    Args:
-        a4_1 (inout): First cubic interpolation coefficient
-        a4_2 (inout): Second cubic interpolation coefficient
-        a4_3 (inout): Third cubic interpolation coefficient
-        a4_4 (inout): Fourth cubic interpolation coefficient
-    """
-    if a4_1 <= 0.0:
-        a4_2 = a4_1
-        a4_3 = a4_1
-        a4_4 = 0.0
-    else:
-        if (
-            abs(a4_3 - a4_2) < -a4_4
-            and (a4_1 + 0.25 * (a4_3 - a4_2) ** 2 / a4_4 + a4_4 * (1.0 / 12.0)) < 0.0
-        ):
-            if (a4_1 < a4_3) and (a4_1 < a4_2):
-                a4_3 = a4_1
-                a4_2 = a4_1
-                a4_4 = 0.0
-            elif a4_3 > a4_2:
-                a4_4 = 3.0 * (a4_2 - a4_1)
-                a4_3 = a4_2 - a4_4
-            else:
-                a4_4 = 3.0 * (a4_3 - a4_1)
-                a4_2 = a4_3 - a4_4
-    return a4_1, a4_2, a4_3, a4_4
-
-
-@gtscript.function
-def posdef_constraint_iv1(
-    a4_1: FloatField,
-    a4_2: FloatField,
-    a4_3: FloatField,
-    a4_4: FloatField,
-):
-    """
-    Args:
-        a4_1 (inout): First cubic interpolation coefficient
-        a4_2 (inout): Second cubic interpolation coefficient
-        a4_3 (inout): Third cubic interpolation coefficient
-        a4_4 (inout): Fourth cubic interpolation coefficient
-    """
-    da1 = a4_3 - a4_2
-    da2 = da1 * da1
-    a6da = a4_4 * da1
-    if ((a4_1 - a4_2) * (a4_1 - a4_3)) >= 0.0:
-        a4_2 = a4_1
-        a4_3 = a4_1
-        a4_4 = 0.0
-    elif a6da < -1.0 * da2:
-        a4_4 = 3.0 * (a4_2 - a4_1)
-        a4_3 = a4_2 - a4_4
-    elif a6da > da2:
-        a4_4 = 3.0 * (a4_3 - a4_1)
-        a4_2 = a4_3 - a4_4
-    return a4_1, a4_2, a4_3, a4_4
-
-
-@gtscript.function
-def remap_constraint(
-    a4_1: FloatField,
-    a4_2: FloatField,
-    a4_3: FloatField,
-    a4_4: FloatField,
-    extm: BoolField,
-):
-    """
-    Args:
-        a4_1 (inout): First cubic interpolation coefficient
-        a4_2 (inout): Second cubic interpolation coefficient
-        a4_3 (inout): Third cubic interpolation coefficient
-        a4_4 (inout): Fourth cubic interpolation coefficient
-        extm (in): If true sets a4_2 and a4_3 as a4_1 and a4_4 to 0
-    """
-    da1 = a4_3 - a4_2
-    da2 = da1 * da1
-    a6da = a4_4 * da1
-    if extm:
-        a4_2 = a4_1
-        a4_3 = a4_1
-        a4_4 = 0.0
-    elif a6da < -da2:
-        a4_4 = 3.0 * (a4_2 - a4_1)
-        a4_3 = a4_2 - a4_4
-    elif a6da > da2:
-        a4_4 = 3.0 * (a4_3 - a4_1)
-        a4_2 = a4_3 - a4_4
-    return a4_1, a4_2, a4_3, a4_4
-
-
-def set_initial_vals(
-    gam: FloatField,
-    q: FloatField,
-    delp: FloatField,
-    a4_1: FloatField,
-    a4_2: FloatField,
-    a4_3: FloatField,
-    a4_4: FloatField,
-    q_bot: FloatField,
-    qs: FloatFieldIJ,
-):
-    """
-    Args:
-        gam (out):
-        q (out):
-        delp (in):
-        a4_1 (in):
-        a4_2 (out):
-        a4_3 (out):
-        a4_4 (out):
-        q_bot (out):
-        qs (in):
-    """
-    from __externals__ import iv, kord
-
-    with computation(FORWARD):
-        with interval(0, 1):
-            # set top
-            if __INLINED(iv == -2):
-                # gam = 0.5
-                q = 1.5 * a4_1
-            else:
-                grid_ratio = delp[0, 0, 1] / delp
-                bet = grid_ratio * (grid_ratio + 0.5)
-                q = (
-                    (grid_ratio + grid_ratio) * (grid_ratio + 1.0) * a4_1
-                    + a4_1[0, 0, 1]
-                ) / bet
-                gam = (1.0 + grid_ratio * (grid_ratio + 1.5)) / bet
-        with interval(1, 2):
-            if __INLINED(iv == -2):
-                gam = 0.5
-                grid_ratio = delp[0, 0, -1] / delp
-                bet = 2.0 + grid_ratio + grid_ratio - gam
-                q = (3.0 * (a4_1[0, 0, -1] + a4_1) - q[0, 0, -1]) / bet
-    with computation(FORWARD), interval(1, -1):
-        if __INLINED(iv != -2):
-            # set middle
-            d4 = delp[0, 0, -1] / delp
-            bet = 2.0 + d4 + d4 - gam[0, 0, -1]
-            q = (3.0 * (a4_1[0, 0, -1] + d4 * a4_1) - q[0, 0, -1]) / bet
-            gam = d4 / bet
-    with computation(FORWARD):
-        with interval(2, -1):
-            if __INLINED(iv == -2):
-                old_grid_ratio = delp[0, 0, -2] / delp[0, 0, -1]
-                old_bet = 2.0 + old_grid_ratio + old_grid_ratio - gam[0, 0, -1]
-                gam = old_grid_ratio / old_bet
-                grid_ratio = delp[0, 0, -1] / delp
-    with computation(FORWARD):
-        with interval(2, -2):
-            if __INLINED(iv == -2):
-                # set middle
-                bet = 2.0 + grid_ratio + grid_ratio - gam
-                q = (3.0 * (a4_1[0, 0, -1] + a4_1) - q[0, 0, -1]) / bet
-                # gam[0, 0, 1] = grid_ratio / bet
-        with interval(-2, -1):
-            if __INLINED(iv == -2):
-                # set bottom
-                q = (3.0 * (a4_1[0, 0, -1] + a4_1) - grid_ratio * qs - q[0, 0, -1]) / (
-                    2.0 + grid_ratio + grid_ratio - gam
-                )
-                q_bot = qs
-        with interval(-1, None):
-            if __INLINED(iv == -2):
-                q_bot = qs
-                q = qs
-            else:
-                # set bottom
-                d4 = delp[0, 0, -2] / delp[0, 0, -1]
-                a_bot = 1.0 + d4 * (d4 + 1.5)
-                q = (
-                    2.0 * d4 * (d4 + 1.0) * a4_1[0, 0, -1]
-                    + a4_1[0, 0, -2]
-                    - a_bot * q[0, 0, -1]
-                ) / (d4 * (d4 + 0.5) - a_bot * gam[0, 0, -1])
-    with computation(BACKWARD), interval(0, -1):
-        if __INLINED(iv != -2):
-            q = q - gam * q[0, 0, 1]
-    with computation(BACKWARD), interval(0, -2):
-        if __INLINED(iv == -2):
-            q = q - gam[0, 0, 1] * q[0, 0, 1]
-    # set_avals
-    with computation(PARALLEL), interval(...):
-        if __INLINED(kord > 16):
-            a4_2 = q
-            a4_3 = q[0, 0, 1]
-            a4_4 = 3.0 * (2.0 * a4_1 - (a4_2 + a4_3))
-    with computation(PARALLEL), interval(-1, None):
-        if __INLINED(kord > 16):
-            a4_3 = q_bot
-
-
-def apply_constraints(
-    q: FloatField,
-    gam: FloatField,
-    a4_1: FloatField,
-    a4_2: FloatField,
-    a4_3: FloatField,
-    a4_4: FloatField,
-    ext5: BoolField,
-    ext6: BoolField,
-    extm: BoolField,
-):
-    """
-    Args:
-        q (inout):
-        gam (out):
-        a4_1 (in):
-        a4_2 (out):
-        a4_3 (out):
-        a4_4 (out):
-        ext5 (out):
-        ext6 (out):
-        extm (out):
-    """
-    # TODO: q is not consumed in remap_profile after this stencil.
-    # Can we remove it or set it to be purely an input here?
-    from __externals__ import iv, kord
-
-    # apply constraints
-    with computation(PARALLEL), interval(1, None):
-        a4_1_0 = a4_1[0, 0, -1]
-        tmp = a4_1_0 if a4_1_0 > a4_1 else a4_1
-        tmp2 = a4_1_0 if a4_1_0 < a4_1 else a4_1
-        gam = a4_1 - a4_1_0
-    with computation(PARALLEL), interval(1, 2):
-        # do top
-        if q >= tmp:
-            q = tmp
-        if q <= tmp2:
-            q = tmp2
-    with computation(FORWARD):
-        with interval(2, -1):
-            # do middle
-            if (gam[0, 0, -1] * gam[0, 0, 1]) > 0:
-                if q >= tmp:
-                    q = tmp
-                if q <= tmp2:
-                    q = tmp2
-            elif gam[0, 0, -1] > 0:
-                # there's a local maximum
-                if q <= tmp2:
-                    q = tmp2
-            else:
-                # there's a local minimum
-                if q >= tmp:
-                    q = tmp
-                if __INLINED(iv == 0):
-                    if q < 0.0:
-                        q = 0.0
-            # q = constrain_interior(q, gam, a4_1)
-        with interval(-1, None):
-            # do bottom
-            if q >= tmp:
-                q = tmp
-            if q <= tmp2:
-                q = tmp2
-    with computation(PARALLEL), interval(...):
-        # re-set a4_2 and a4_3
-        a4_2 = q
-        a4_3 = q[0, 0, 1]
-    # set_extm
-    with computation(PARALLEL):
-        with interval(0, 1):
-            extm = (a4_2 - a4_1) * (a4_3 - a4_1) > 0.0
-        with interval(1, -1):
-            extm = gam * gam[0, 0, 1] < 0.0
-        with interval(-1, None):
-            extm = (a4_2 - a4_1) * (a4_3 - a4_1) > 0.0
-    # set_exts
-    with computation(PARALLEL), interval(...):
-        if __INLINED(kord > 9):
-            x0 = 2.0 * a4_1 - (a4_2 + a4_3)
-            x1 = abs(a4_2 - a4_3)
-            a4_4 = 3.0 * x0
-            ext5 = abs(x0) > x1
-            ext6 = abs(a4_4) > x1
-
-
-def set_interpolation_coefficients(
-    gam: FloatField,
-    a4_1: FloatField,
-    a4_2: FloatField,
-    a4_3: FloatField,
-    a4_4: FloatField,
-    ext5: BoolField,
-    ext6: BoolField,
-    extm: BoolField,
-    qmin: Float,
-):
-    """
-    Args:
-        gam (in):
-        a4_1 (inout):
-        a4_2 (inout):
-        a4_3 (inout):
-        a4_4 (inout):
-        ext5 (in):
-        ext6 (in):
-        extm (in):
-        qmin (in):
-    """
-    from __externals__ import iv, kord
-
-    # set_top_as_iv0
-    with computation(PARALLEL), interval(0, 1):
-        if __INLINED(iv == 0):
-            if a4_2 < 0.0:
-                a4_2 = 0.0
-    with computation(PARALLEL), interval(0, 2):
-        if __INLINED(iv == 0):
-            a4_4 = 3.0 * (2.0 * a4_1 - (a4_2 + a4_3))
-    # set_top_as_iv1
-    with computation(PARALLEL), interval(0, 1):
-        if __INLINED(iv == -1):
-            if a4_2 * a4_1 <= 0.0:
-                a4_2 = 0.0
-    with computation(PARALLEL), interval(0, 2):
-        if __INLINED(iv == -1):
-            a4_4 = 3.0 * (2.0 * a4_1 - (a4_2 + a4_3))
-    # set_top_as_iv2
-    with computation(PARALLEL):
-        with interval(0, 1):
-            if __INLINED(iv == 2):
-                a4_2 = a4_1
-                a4_3 = a4_1
-                a4_4 = 0.0
-        with interval(1, 2):
-            if __INLINED(iv == 2):
-                a4_4 = 3.0 * (2.0 * a4_1 - (a4_2 + a4_3))
-    # set_top_as_else
-    with computation(PARALLEL), interval(0, 2):
-        if __INLINED(iv < -1 or iv == 1 or iv > 2):
-            a4_4 = 3.0 * (2.0 * a4_1 - (a4_2 + a4_3))
-    with computation(PARALLEL):
-        with interval(0, 1):
-            if __INLINED(iv != 2):
-                a4_1, a4_2, a4_3, a4_4 = posdef_constraint_iv1(a4_1, a4_2, a4_3, a4_4)
-        with interval(1, 2):
-            a4_1, a4_2, a4_3, a4_4 = remap_constraint(a4_1, a4_2, a4_3, a4_4, extm)
-
-    with computation(PARALLEL), interval(2, -2):
-        # set_inner_as_kordsmall
-        if __INLINED(kord < 9):
-            # left edges?
-            pmp_1 = a4_1 - gam[0, 0, 1]
-            lac_1 = pmp_1 + 1.5 * gam[0, 0, 2]
-            tmp_min = (
-                a4_1
-                if (a4_1 < pmp_1) and (a4_1 < lac_1)
-                else pmp_1
-                if pmp_1 < lac_1
-                else lac_1
-            )
-            tmp_max0 = a4_2 if a4_2 > tmp_min else tmp_min
-            tmp_max = (
-                a4_1
-                if (a4_1 > pmp_1) and (a4_1 > lac_1)
-                else pmp_1
-                if pmp_1 > lac_1
-                else lac_1
-            )
-            a4_2 = tmp_max0 if tmp_max0 < tmp_max else tmp_max
-            # right edges?
-            pmp_2 = a4_1 + 2.0 * gam[0, 0, 1]
-            lac_2 = pmp_2 - 1.5 * gam[0, 0, -1]
-            tmp_min = (
-                a4_1
-                if (a4_1 < pmp_2) and (a4_1 < lac_2)
-                else pmp_2
-                if pmp_2 < lac_2
-                else lac_2
-            )
-            tmp_max0 = a4_3 if a4_3 > tmp_min else tmp_min
-            tmp_max = (
-                a4_1
-                if (a4_1 > pmp_2) and (a4_1 > lac_2)
-                else pmp_2
-                if pmp_2 > lac_2
-                else lac_2
-            )
-            a4_3 = tmp_max0 if tmp_max0 < tmp_max else tmp_max
-            a4_4 = 3.0 * (2.0 * a4_1 - (a4_2 + a4_3))
-        # set_inner_as_kord9
-        if __INLINED(kord == 9):
-            pmp_1 = a4_1 - 2.0 * gam[0, 0, 1]
-            lac_1 = pmp_1 + 1.5 * gam[0, 0, 2]
-            pmp_2 = a4_1 + 2.0 * gam
-            lac_2 = pmp_2 - 1.5 * gam[0, 0, -1]
-            tmp_min = a4_1
-            tmp_max = a4_2
-            tmp_max0 = a4_1
-            if (
-                (extm and extm[0, 0, -1])
-                or (extm and extm[0, 0, 1])
-                or (extm and (qmin > 0.0 and a4_1 < qmin))
-            ):
-                a4_2 = a4_1
-                a4_3 = a4_1
-                a4_4 = 0.0
-            else:
-                a4_4 = 6.0 * a4_1 - 3.0 * (a4_2 + a4_3)
-                if abs(a4_4) > abs(a4_2 - a4_3):
-                    tmp_min = (
-                        a4_1
-                        if (a4_1 < pmp_1) and (a4_1 < lac_1)
-                        else pmp_1
-                        if pmp_1 < lac_1
-                        else lac_1
-                    )
-                    tmp_max0 = a4_2 if a4_2 > tmp_min else tmp_min
-                    tmp_max = (
-                        a4_1
-                        if (a4_1 > pmp_1) and (a4_1 > lac_1)
-                        else pmp_1
-                        if pmp_1 > lac_1
-                        else lac_1
-                    )
-                    a4_2 = tmp_max0 if tmp_max0 < tmp_max else tmp_max
-                    tmp_min = (
-                        a4_1
-                        if (a4_1 < pmp_2) and (a4_1 < lac_2)
-                        else pmp_2
-                        if pmp_2 < lac_2
-                        else lac_2
-                    )
-                    tmp_max0 = a4_3 if a4_3 > tmp_min else tmp_min
-                    tmp_max = (
-                        a4_1
-                        if (a4_1 > pmp_2) and (a4_1 > lac_2)
-                        else pmp_2
-                        if pmp_2 > lac_2
-                        else lac_2
-                    )
-                    a4_3 = tmp_max0 if tmp_max0 < tmp_max else tmp_max
-                    a4_4 = 6.0 * a4_1 - 3.0 * (a4_2 + a4_3)
-                else:
-                    a4_2 = a4_2
-        # set_inner_as_kord10
-        if __INLINED(kord == 10):
-            pmp_1 = a4_1 - 2.0 * gam[0, 0, 1]
-            lac_1 = pmp_1 + 1.5 * gam[0, 0, 2]
-            pmp_2 = a4_1 + 2.0 * gam
-            lac_2 = pmp_2 - 1.5 * gam[0, 0, -1]
-            tmp_min2 = (
-                a4_1
-                if (a4_1 < pmp_1) and (a4_1 < lac_1)
-                else pmp_1
-                if pmp_1 < lac_1
-                else lac_1
-            )
-            tmp_max2 = (
-                a4_1
-                if (a4_1 > pmp_1) and (a4_1 > lac_1)
-                else pmp_1
-                if pmp_1 > lac_1
-                else lac_1
-            )
-            tmp2 = a4_2 if a4_2 > tmp_min2 else tmp_min2
-            tmp_min3 = a4_1 if a4_1 < pmp_2 else pmp_2
-            tmp_min3 = lac_2 if lac_2 < tmp_min3 else tmp_min3
-            tmp_max3 = a4_1 if a4_1 > pmp_2 else pmp_2
-            tmp_max3 = lac_2 if lac_2 > tmp_max3 else tmp_max3
-            tmp3 = a4_3 if a4_3 > tmp_min3 else tmp_min3
-            if ext5:
-                if ext5[0, 0, -1] or ext5[0, 0, 1]:
-                    a4_2 = a4_1
-                    a4_3 = a4_1
-                elif ext6[0, 0, -1] or ext6[0, 0, 1]:
-                    a4_2 = tmp2 if tmp2 < tmp_max2 else tmp_max2
-                    a4_3 = tmp3 if tmp3 < tmp_max3 else tmp_max3
-                else:
-                    a4_2 = a4_2
-            elif ext6:
-                if ext5[0, 0, -1] or ext5[0, 0, 1]:
-                    a4_2 = tmp2 if tmp2 < tmp_max2 else tmp_max2
-                    a4_3 = tmp3 if tmp3 < tmp_max3 else tmp_max3
-                else:
-                    a4_2 = a4_2
-            else:
-                a4_2 = a4_2
-            a4_4 = 3.0 * (2.0 * a4_1 - (a4_2 + a4_3))
-        # remap_constraint
-        if __INLINED(iv == 0):
-            a4_1, a4_2, a4_3, a4_4 = posdef_constraint_iv0(a4_1, a4_2, a4_3, a4_4)
-    # set_bottom_as_iv0, set_bottom_as_iv1
-    # TODO(rheag) temporary workaround to gt:gpu bug
-    # this computation can get out of order with the one that follows
-    with computation(FORWARD), interval(-1, None):
-        if __INLINED(iv == 0):
-            if a4_3 < 0.0:
-                a4_3 = 0.0
-        if __INLINED(iv == -1):
-            if a4_3 * a4_1 <= 0.0:
-                a4_3 = 0.0
-    with computation(PARALLEL), interval(-2, None):
-        # set_bottom_as_iv0, set_bottom_as_iv1, set_bottom_as_else
-        a4_4 = 3.0 * (2.0 * a4_1 - (a4_2 + a4_3))
-    with computation(FORWARD):
-        with interval(-2, -1):
-            a4_1, a4_2, a4_3, a4_4 = remap_constraint(a4_1, a4_2, a4_3, a4_4, extm)
-        with interval(-1, None):
-            a4_1, a4_2, a4_3, a4_4 = posdef_constraint_iv1(a4_1, a4_2, a4_3, a4_4)
-
-
-class RemapProfile:
-    """
-    This corresponds to the cs_profile routine in FV3
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        kord: int,
-        iv: int,
-        dims: Sequence[str],
-    ):
-        """
-        The constraints on the spline are set by kord and iv.
-
-        Args:
-            stencil_factory: creates stencils
-            quantity_factory: creates quantities
-            kord: ???
-            iv: ???
-            dims: dimensions on which to operate on inputs
-        """
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-        )
-
-        if kord > 10:
-            raise NotImplementedError(
-                f"Remap Profile: kord {kord} not implemented. kord <= 10 available."
-            )
-
-        self._kord = kord
-
-        self._gam = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        self._q = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        self._q_bot = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        self._extm = quantity_factory.zeros([X_DIM, Y_DIM, Z_DIM], units="", dtype=bool)
-        self._ext5 = quantity_factory.zeros([X_DIM, Y_DIM, Z_DIM], units="", dtype=bool)
-        self._ext6 = quantity_factory.zeros([X_DIM, Y_DIM, Z_DIM], units="", dtype=bool)
-
-        self._set_initial_values = stencil_factory.from_dims_halo(
-            func=set_initial_vals,
-            compute_dims=list(dims[:2]) + [Z_INTERFACE_DIM],
-            externals={"iv": iv, "kord": abs(kord)},
-        )
-
-        self._apply_constraints = stencil_factory.from_dims_halo(
-            func=apply_constraints,
-            compute_dims=dims,
-            externals={"iv": iv, "kord": abs(kord)},
-        )
-
-        self._set_interpolation_coefficients = stencil_factory.from_dims_halo(
-            func=set_interpolation_coefficients,
-            compute_dims=dims,
-            externals={"iv": iv, "kord": abs(kord)},
-        )
-
-    def __call__(
-        self,
-        qs: FloatFieldIJ,
-        a4_1: FloatField,
-        a4_2: FloatField,
-        a4_3: FloatField,
-        a4_4: FloatField,
-        delp: FloatField,
-        qmin: Float = 0.0,
-    ):
-        """
-        Calculates the interpolation coefficients for a cubic-spline which models the
-        distribution of the remapped field within each deformed grid cell.
-
-        Args:
-            qs (in): Bottom boundary condition
-            a4_1 (out): The first interpolation coefficient
-            a4_2 (out): The second interpolation coefficient
-            a4_3 (out): The third interpolation coefficient
-            a4_4 (out): The fourth interpolation coefficient
-            delp (in): The pressure difference between grid levels
-            qmin (in): The minimum value the field can take in a cell
-        """
-        self._set_initial_values(
-            self._gam,
-            self._q,
-            delp,
-            a4_1,
-            a4_2,
-            a4_3,
-            a4_4,
-            self._q_bot,
-            qs,
-        )
-
-        if abs(self._kord) <= 16:
-            # TODO: These stencils could be combined once the backend can handle it
-            self._apply_constraints(
-                self._q,
-                self._gam,
-                a4_1,
-                a4_2,
-                a4_3,
-                a4_4,
-                self._ext5,
-                self._ext6,
-                self._extm,
-            )
-
-            self._set_interpolation_coefficients(
-                self._gam,
-                a4_1,
-                a4_2,
-                a4_3,
-                a4_4,
-                self._ext5,
-                self._ext6,
-                self._extm,
-                qmin,
-            )
diff --git a/pyFV3/pyFV3/stencils/remapping.py b/pyFV3/pyFV3/stencils/remapping.py
deleted file mode 100644
index cccd5b65..00000000
--- a/pyFV3/pyFV3/stencils/remapping.py
+++ /dev/null
@@ -1,731 +0,0 @@
-from typing import Dict, Optional
-
-from gt4py.cartesian.gtscript import (
-    __INLINED,
-    BACKWARD,
-    FORWARD,
-    PARALLEL,
-    computation,
-    exp,
-    horizontal,
-    interval,
-    log,
-    region,
-)
-from ndsl.checkpointer import Checkpointer
-from ndsl.constants import (
-    X_DIM,
-    X_INTERFACE_DIM,
-    Y_DIM,
-    Y_INTERFACE_DIM,
-    Z_DIM,
-    Z_INTERFACE_DIM,
-)
-from ndsl.dsl.dace.orchestration import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ, FloatFieldK
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.quantity import Quantity
-
-import pyFV3.stencils.moist_cv as moist_cv
-from pyFV3._config import RemappingConfig
-from pyFV3.stencils.basic_operations import adjust_divide_stencil
-from pyFV3.stencils.map_single import MapSingle
-from pyFV3.stencils.mapn_tracer import MapNTracer
-from pyFV3.stencils.moist_cv import moist_pt_func, moist_pt_last_step
-from pyFV3.stencils.saturation_adjustment import SatAdjust3d
-
-
-# TODO: Should this be set here or in global_constants?
-CONSV_MIN = 0.001
-
-
-def init_pe(pe: FloatField, pe1: FloatField, pe2: FloatField, ptop: Float):
-    """
-    Args:
-        pe (in):
-        pe1 (out):
-        pe2 (out):
-        ptop (in):
-    """
-    with computation(PARALLEL):
-        with interval(0, 1):
-            pe2 = ptop
-        with interval(-1, None):
-            pe2 = pe
-    with computation(PARALLEL), interval(...):
-        pe1 = pe
-
-
-def undo_delz_adjust_and_copy_peln(
-    delp: FloatField,
-    delz: FloatField,
-    peln: FloatField,
-    pe0: FloatField,
-    pn2: FloatField,
-):
-    """
-    Args:
-        delp (in):
-        delz (inout):
-        peln (inout):
-        pe0 (out):
-        pn2 (in):
-    """
-    # TODO: We can assign pe0 and peln outside of a stencil to save the data copying
-    # dace parsing may not allow this, however
-    with computation(PARALLEL), interval(0, -1):
-        delz = -delz * delp
-    with computation(PARALLEL), interval(...):
-        pe0 = peln
-        peln = pn2
-
-
-# TODO: some of the intermediate values here are not really output
-# values, and can be refactored into stencil temporaries (e.g. cvm)
-def moist_cv_pt_pressure(
-    qvapor: FloatField,
-    qliquid: FloatField,
-    qrain: FloatField,
-    qsnow: FloatField,
-    qice: FloatField,
-    qgraupel: FloatField,
-    q_con: FloatField,
-    pt: FloatField,
-    cappa: FloatField,
-    delp: FloatField,
-    delz: FloatField,
-    pe: FloatField,
-    pe2: FloatField,
-    ak: FloatFieldK,
-    bk: FloatFieldK,
-    dp2: FloatField,
-    ps: FloatFieldIJ,
-    pn2: FloatField,
-    peln: FloatField,
-    r_vir: Float,
-):
-    """
-    Computes Eulerian reference pressures as targets for remapping.
-
-    Args:
-        qvapor (in):
-        qliquid (in):
-        qrain (in):
-        qsnow (in):
-        qice (in):
-        qgraupel (in):
-        q_con (out):
-        pt (inout):
-        cappa (out):
-        delp (inout):
-        delz (inout):
-        pe (in):
-        pe2 (inout):
-        ak (in):
-        bk (in):
-        dp2 (out):
-        ps (out):
-        pn2 (out):
-        peln (in):
-    """
-    from __externals__ import hydrostatic, kord_tm
-
-    # moist_cv.moist_pt
-    with computation(PARALLEL), interval(0, -1):
-        if __INLINED(kord_tm < 0):
-            cvm, gz, q_con, cappa, pt = moist_pt_func(
-                qvapor,
-                qliquid,
-                qrain,
-                qsnow,
-                qice,
-                qgraupel,
-                q_con,
-                pt,
-                cappa,
-                delp,
-                delz,
-                r_vir,
-            )
-        # delz_adjust
-        if __INLINED(not hydrostatic):
-            delz = -delz / delp
-    # pressure_updates
-    with computation(FORWARD):
-        with interval(-1, None):
-            ps = pe
-    with computation(PARALLEL):
-        with interval(0, 1):
-            pn2 = peln
-        # TODO: refactor the pe2 = ptop assignment from
-        # previous stencil into this one, and remove
-        # pe2 from the other stencil
-        with interval(1, -1):
-            pe2 = ak + bk * ps
-        with interval(-1, None):
-            pn2 = peln
-    with computation(BACKWARD), interval(0, -1):
-        dp2 = pe2[0, 0, 1] - pe2
-    # copy_stencil
-    with computation(PARALLEL), interval(0, -1):
-        delp = dp2
-
-
-def pn2_pk_delp(
-    dp2: FloatField,
-    delp: FloatField,
-    pe2: FloatField,
-    pn2: FloatField,
-    pk: FloatField,
-    akap: Float,
-):
-    """
-    Args:
-        dp2 (in):
-        delp (out):
-        pe2 (in):
-        pn2 (out):
-        pk (out):
-    """
-    with computation(PARALLEL), interval(...):
-        delp = dp2
-        pn2 = log(pe2)
-        pk = exp(akap * pn2)
-
-
-def pressures_mapu(
-    pe: FloatField,
-    pe1: FloatField,
-    ak: FloatFieldK,
-    bk: FloatFieldK,
-    pe0: FloatField,
-    pe3: FloatField,
-):
-    """
-    Args:
-        pe (in):
-        pe1 (in):
-        ak (in):
-        bk (in):
-        pe0 (out):
-        pe3 (out):
-    """
-    with computation(BACKWARD):
-        with interval(-1, None):
-            pe_bottom = pe
-            pe1_bottom = pe
-        with interval(0, -1):
-            pe_bottom = pe_bottom[0, 0, 1]
-            pe1_bottom = pe1_bottom[0, 0, 1]
-    with computation(FORWARD):
-        with interval(0, 1):
-            pe0 = pe
-        with interval(1, None):
-            pe0 = 0.5 * (pe[0, -1, 0] + pe1)
-    with computation(FORWARD), interval(...):
-        bkh = 0.5 * bk
-        pe3 = ak + bkh * (pe_bottom[0, -1, 0] + pe1_bottom)
-
-
-def pressures_mapv(
-    pe: FloatField, ak: FloatFieldK, bk: FloatFieldK, pe0: FloatField, pe3: FloatField
-):
-    """
-    Args:
-        pe (in):
-        ak (in):
-        bk (in):
-        pe0 (out):
-        pe3 (out):
-    """
-    # TODO: Combine pressures_mapu and pressures_mapv
-    with computation(BACKWARD):
-        with interval(-1, None):
-            pe_bottom = pe
-        with interval(0, -1):
-            pe_bottom = pe_bottom[0, 0, 1]
-    with computation(FORWARD):
-        with interval(0, 1):
-            pe3 = ak
-            pe0 = pe
-        with interval(1, None):
-            bkh = 0.5 * bk
-            pe0 = 0.5 * (pe[-1, 0, 0] + pe)
-            pe3 = ak + bkh * (pe_bottom[-1, 0, 0] + pe_bottom)
-
-
-def update_ua(pe2: FloatField, ua: FloatField):
-    """
-    Args:
-        pe2 (in):
-        ua (out):
-    """
-    from __externals__ import local_je
-
-    with computation(PARALLEL), interval(0, -1):
-        ua = pe2[0, 0, 1]
-
-    # pe2[:, je+1, 1:npz] should equal pe2[:, je, 1:npz] as in the Fortran model,
-    # but the extra j-elements are only used here, so we can just directly assign ua.
-    # Maybe we can eliminate this later?
-    with computation(PARALLEL), interval(0, -2):
-        with horizontal(region[:, local_je + 1]):
-            ua = pe2[0, -1, 1]
-
-
-def copy_from_below(a: FloatField, b: FloatField):
-    """
-    Args:
-        a (in):
-        b (out):
-    """
-    with computation(PARALLEL), interval(1, None):
-        b = a[0, 0, -1]
-
-
-class LagrangianToEulerian:
-    """
-    Fortran name is Lagrangian_to_Eulerian
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        config: RemappingConfig,
-        area_64,
-        nq,
-        pfull,
-        tracers: Dict[str, Quantity],
-        checkpointer: Optional[Checkpointer] = None,
-    ):
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            dace_compiletime_args=["tracers"],
-        )
-        self._checkpointer = checkpointer
-        # this is only computed in init because Dace does not yet support
-        # this operation
-        self._call_checkpointer = checkpointer is not None
-        grid_indexing = stencil_factory.grid_indexing
-        if config.kord_tm >= 0:
-            raise NotImplementedError("map ppm, untested mode where kord_tm >= 0")
-        hydrostatic = config.hydrostatic
-        if hydrostatic:
-            raise NotImplementedError("Hydrostatic is not implemented")
-
-        self._t_min = 184.0
-        self._nq = nq
-        # do_omega = hydrostatic and last_step # TODO pull into inputs
-        self._domain_jextra = (
-            grid_indexing.domain[0],
-            grid_indexing.domain[1] + 1,
-            grid_indexing.domain[2] + 1,
-        )
-
-        self._pe1 = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            units="Pa",
-            dtype=Float,
-        )
-        self._pe2 = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            units="Pa",
-            dtype=Float,
-        )
-        self._pe3 = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            units="Pa",
-            dtype=Float,
-        )
-        self._dp2 = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="Pa",
-            dtype=Float,
-        )
-        self._pn2 = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="Pa",
-            dtype=Float,
-        )
-        self._pe0 = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            units="Pa",
-            dtype=Float,
-        )
-        self._pe3 = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            units="Pa",
-            dtype=Float,
-        )
-
-        self._gz = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="m^2 s^-2",
-            dtype=Float,
-        )
-        self._cvm = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-
-        self._kord_tm = abs(config.kord_tm)
-        self._kord_wz = config.kord_wz
-        self._kord_mt = config.kord_mt
-
-        self._do_sat_adjust = config.do_sat_adj
-
-        self.kmp = grid_indexing.domain[2] - 1
-        for k in range(pfull.shape[0]):
-            if pfull.view[k] > 10.0e2:
-                self.kmp = k
-                break
-
-        self._init_pe = stencil_factory.from_origin_domain(
-            init_pe, origin=grid_indexing.origin_compute(), domain=self._domain_jextra
-        )
-
-        self._moist_cv_pt_pressure = stencil_factory.from_origin_domain(
-            moist_cv_pt_pressure,
-            externals={"kord_tm": config.kord_tm, "hydrostatic": hydrostatic},
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(add=(0, 0, 1)),
-        )
-
-        self._pn2_pk_delp = stencil_factory.from_origin_domain(
-            pn2_pk_delp,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(),
-        )
-
-        self._map_single_pt = MapSingle(
-            stencil_factory,
-            quantity_factory,
-            self._kord_tm,
-            1,
-            dims=[X_DIM, Y_DIM, Z_DIM],
-        )
-
-        self._mapn_tracer = MapNTracer(
-            stencil_factory,
-            quantity_factory,
-            abs(config.kord_tr),
-            nq,
-            fill=config.fill,
-            tracers=tracers,
-        )
-
-        self._map_single_w = MapSingle(
-            stencil_factory,
-            quantity_factory,
-            self._kord_wz,
-            -2,
-            dims=[X_DIM, Y_DIM, Z_DIM],
-        )
-
-        self._map_single_delz = MapSingle(
-            stencil_factory,
-            quantity_factory,
-            self._kord_wz,
-            1,
-            dims=[X_DIM, Y_DIM, Z_DIM],
-        )
-
-        self._undo_delz_adjust_and_copy_peln = stencil_factory.from_origin_domain(
-            undo_delz_adjust_and_copy_peln,
-            origin=grid_indexing.origin_compute(),
-            domain=(
-                grid_indexing.domain[0],
-                grid_indexing.domain[1],
-                grid_indexing.domain[2] + 1,
-            ),
-        )
-
-        self._moist_cv_pkz = stencil_factory.from_origin_domain(
-            moist_cv.moist_pkz,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(),
-        )
-
-        self._pressures_mapu = stencil_factory.from_origin_domain(
-            pressures_mapu,
-            origin=grid_indexing.origin_compute(),
-            domain=self._domain_jextra,
-        )
-
-        self._map_single_u = MapSingle(
-            stencil_factory,
-            quantity_factory,
-            self._kord_mt,
-            -1,
-            dims=[X_DIM, Y_INTERFACE_DIM, Z_DIM],
-        )
-
-        self._pressures_mapv = stencil_factory.from_origin_domain(
-            pressures_mapv,
-            origin=grid_indexing.origin_compute(),
-            domain=(
-                grid_indexing.domain[0] + 1,
-                grid_indexing.domain[1],
-                grid_indexing.domain[2] + 1,
-            ),
-        )
-
-        self._map_single_v = MapSingle(
-            stencil_factory,
-            quantity_factory,
-            self._kord_mt,
-            -1,
-            dims=[X_INTERFACE_DIM, Y_DIM, Z_DIM],
-        )
-
-        ax_offsets_jextra = grid_indexing.axis_offsets(
-            grid_indexing.origin_compute(),
-            self._domain_jextra,
-        )
-        self._update_ua = stencil_factory.from_origin_domain(
-            update_ua,
-            origin=grid_indexing.origin_compute(),
-            domain=self._domain_jextra,
-            externals={**ax_offsets_jextra},
-        )
-
-        self._copy_from_below_stencil = stencil_factory.from_origin_domain(
-            copy_from_below,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(),
-        )
-
-        self._saturation_adjustment = SatAdjust3d(
-            stencil_factory, config.sat_adjust, area_64, self.kmp
-        )
-
-        self._moist_cv_last_step_stencil = stencil_factory.from_origin_domain(
-            moist_pt_last_step,
-            origin=(grid_indexing.isc, grid_indexing.jsc, 0),
-            domain=(
-                grid_indexing.domain[0],
-                grid_indexing.domain[1],
-                grid_indexing.domain[2] + 1,
-            ),
-        )
-
-        self._basic_adjust_divide_stencil = stencil_factory.from_origin_domain(
-            adjust_divide_stencil,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(),
-        )
-
-    def __call__(
-        self,
-        tracers: Dict[str, Quantity],
-        pt: FloatField,
-        delp: FloatField,
-        delz: FloatField,
-        peln: FloatField,
-        u: FloatField,
-        v: FloatField,
-        w: FloatField,
-        cappa: FloatField,
-        q_con: FloatField,
-        q_cld: FloatField,
-        pkz: FloatField,
-        pk: FloatField,
-        pe: FloatField,
-        hs: FloatFieldIJ,
-        ps: FloatFieldIJ,
-        wsd: FloatFieldIJ,
-        ak: FloatFieldK,
-        bk: FloatFieldK,
-        dp1: FloatField,
-        ptop: Float,
-        akap: Float,
-        zvir: Float,
-        last_step: bool,
-        consv_te: Float,
-        mdt: Float,
-    ):
-        """
-        Remap the deformed Lagrangian surfaces onto the reference, or "Eulerian",
-        coordinate levels.
-
-        Args:
-            tracers (inout): Tracer species tracked across
-            pt (inout): D-grid potential temperature
-            delp (inout): Pressure Thickness
-            delz (in): Vertical thickness of atmosphere layers
-            peln (inout): Logarithm of interface pressure
-            u (inout): D-grid x-velocity
-            v (inout): D-grid y-velocity
-            w (inout): Vertical velocity
-            ua (inout): A-grid x-velocity
-            va (inout): A-grid y-velocity
-            cappa (inout): Power to raise pressure to
-            q_con (out): Total condensate mixing ratio
-            q_cld (out): Cloud fraction
-            pkz (in): Layer mean pressure raised to the power of Kappa
-            pk (out): Interface pressure raised to power of kappa, final acoustic value
-            pe (in): Pressure at layer edges
-            hs (in): Surface geopotential
-            te0_2d (unused): Atmosphere total energy in columns
-            ps (out): Surface pressure
-            wsd (in): Vertical velocity of the lowest level
-            omga (unused): Vertical pressure velocity
-            ak (in): Atmosphere hybrid a coordinate (Pa)
-            bk (in): Atmosphere hybrid b coordinate (dimensionless)
-            pfull (in): Pressure full levels
-            dp1 (out): Pressure thickness before dyn_core (only written
-                if do_sat_adjust=True)
-            ptop (in): The pressure level at the top of atmosphere
-            akap (in): Poisson constant (KAPPA)
-            zvir (in): Constant (Rv/Rd-1)
-            last_step (in): Flag for the last step of k-split remapping
-            consv_te (in): If True, conserve total energy
-            mdt (in) : Remap time step
-            bdt (in): Timestep
-        """
-        # TODO: remove unused arguments (and commented code that references them)
-        # TODO: can we trim ps or make it a temporary
-        # TODO: pe is copied into pe1 and pe2 for vectorization reasons in the Fortran,
-        # we should be able to refactor them away in this version
-        self._init_pe(pe, self._pe1, self._pe2, ptop)
-        # pe1 is initial lagrangian edge pressures
-        # pe2 is final Eulerian edge pressures
-
-        self._moist_cv_pt_pressure(
-            tracers["qvapor"],
-            tracers["qliquid"],
-            tracers["qrain"],
-            tracers["qsnow"],
-            tracers["qice"],
-            tracers["qgraupel"],
-            q_con,
-            pt,
-            cappa,
-            delp,
-            delz,
-            pe,
-            self._pe2,
-            ak,
-            bk,
-            self._dp2,
-            ps,
-            self._pn2,
-            peln,
-            zvir,
-        )
-
-        self._pn2_pk_delp(self._dp2, delp, self._pe2, self._pn2, pk, akap)
-
-        # now that we have the pressure profiles, we can start remapping
-        self._map_single_pt(pt, peln, self._pn2, qmin=self._t_min)
-
-        self._mapn_tracer(self._pe1, self._pe2, self._dp2, tracers)
-
-        self._map_single_w(w, self._pe1, self._pe2, qs=wsd)
-        self._map_single_delz(delz, self._pe1, self._pe2)
-
-        self._undo_delz_adjust_and_copy_peln(delp, delz, peln, self._pe0, self._pn2)
-        # if do_omega:  # NOTE untested
-        #    pe3 = copy(omga, origin=(grid_indexing.isc, grid_indexing.jsc, 1))
-
-        # TODO: can we move this to after the rest of the remapping calls, to make
-        # it clear the outputs are not needed until then?
-        # or, are its outputs actually used? can we delete this stencil call?
-        self._moist_cv_pkz(
-            tracers["qvapor"],
-            tracers["qliquid"],
-            tracers["qrain"],
-            tracers["qsnow"],
-            tracers["qice"],
-            tracers["qgraupel"],
-            q_con,
-            self._gz,
-            self._cvm,
-            pkz,
-            pt,
-            cappa,
-            delp,
-            delz,
-            zvir,
-        )
-
-        # if do_omega:
-        # dp2 update, if larger than pe0 and smaller than one level up, update omega
-        # and exit
-
-        self._pressures_mapu(pe, self._pe1, ak, bk, self._pe0, self._pe3)
-        self._map_single_u(u, self._pe0, self._pe3)
-
-        self._pressures_mapv(pe, ak, bk, self._pe0, self._pe3)
-        self._map_single_v(v, self._pe0, self._pe3)
-
-        self._update_ua(self._pe2, self._pe3)
-
-        self._copy_from_below_stencil(self._pe3, pe)
-        dtmp = 0.0
-        if last_step:
-            if consv_te > CONSV_MIN:
-                raise NotImplementedError(
-                    "We do not support consv_te > 0.001 "
-                    "because that would trigger an allReduce"
-                )
-            elif consv_te < -CONSV_MIN:
-                raise NotImplementedError(
-                    "Unimplemented/untested case consv("
-                    + str(consv_te)
-                    + ")  < -CONSV_MIN("
-                    + str(-CONSV_MIN)
-                    + ")"
-                )
-
-        if self._do_sat_adjust:
-            fast_mp_consv = consv_te > CONSV_MIN
-            self._saturation_adjustment(
-                dp1,
-                tracers["qvapor"],
-                tracers["qliquid"],
-                tracers["qice"],
-                tracers["qrain"],
-                tracers["qsnow"],
-                tracers["qgraupel"],
-                q_cld,
-                hs,
-                peln,
-                delp,
-                delz,
-                q_con,
-                pt,
-                pkz,
-                cappa,
-                zvir,
-                mdt,
-                fast_mp_consv,
-                last_step,
-                akap,
-                self.kmp,
-            )
-
-        if last_step:
-            # on the last step, we need the regular temperature to send
-            # to the physics, but if we're staying in dynamics we need
-            # to keep it as the virtual potential temperature
-            self._moist_cv_last_step_stencil(
-                tracers["qvapor"],
-                tracers["qliquid"],
-                tracers["qrain"],
-                tracers["qsnow"],
-                tracers["qice"],
-                tracers["qgraupel"],
-                self._gz,
-                pt,
-                pkz,
-                dtmp,
-                zvir,
-            )
-        else:
-            # converts virtual temperature back to virtual potential temperature
-            self._basic_adjust_divide_stencil(pkz, pt)
diff --git a/pyFV3/pyFV3/stencils/riem_solver3.py b/pyFV3/pyFV3/stencils/riem_solver3.py
deleted file mode 100644
index f5fc3798..00000000
--- a/pyFV3/pyFV3/stencils/riem_solver3.py
+++ /dev/null
@@ -1,339 +0,0 @@
-import math
-import typing
-
-import ndsl.constants as constants
-from gt4py.cartesian.gtscript import (
-    __INLINED,
-    BACKWARD,
-    FORWARD,
-    PARALLEL,
-    computation,
-    exp,
-    interval,
-    log,
-)
-from ndsl.constants import X_DIM, Y_DIM, Z_DIM, Z_INTERFACE_DIM
-from ndsl.dsl.dace import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-from ndsl.initialization.allocator import QuantityFactory
-
-from pyFV3._config import RiemannConfig
-from pyFV3.stencils.sim1_solver import Sim1Solver
-
-
-@typing.no_type_check
-def precompute(
-    delp: FloatField,
-    cappa: FloatField,
-    pe: FloatField,
-    pe_init: FloatField,
-    delta_mass: FloatField,
-    zh: FloatField,
-    q_con: FloatField,
-    p_interface: FloatField,
-    log_p_interface: FloatField,
-    pk3: FloatField,
-    gamma: FloatField,
-    dz: FloatField,
-    p_gas: FloatField,
-    ptop: Float,
-    peln1: Float,
-    ptk: Float,
-):
-    """
-    Args:
-        delp (in): pressure thickness of atmospheric layer (Pa)
-        cappa (in):
-        pe (in):
-        pe_init (out):
-        delta_mass (out): mass thickness of atmospheric layer
-        zh (in):
-        q_con (in):
-        p_interface (out): pressure defined on vertical interfaces (Pa)
-        log_p_interface (out): log(pressure) defined on vertical interfaces
-        pk3 (out):
-        gamma (out):
-        dz (out):
-        p_gas (out): pressure defined at vertical mid levels due to gas-phase
-            only, excluding condensates (Pa)
-    """
-    with computation(PARALLEL), interval(...):
-        delta_mass = delp
-        pe_init = pe
-    with computation(FORWARD):
-        with interval(0, 1):
-            p_interface = ptop
-            log_p_interface = peln1
-            pk3 = ptk
-            p_interface_gas = ptop
-            log_p_interface_gas = peln1
-        with interval(1, None):
-            # TODO consolidate with riem_solver_c, same functions, math functions
-            p_interface = p_interface[0, 0, -1] + delta_mass[0, 0, -1]
-            log_p_interface = log(p_interface)
-            # Excluding contribution from condensates
-            # peln used during remap; pk3 used only for p_grad
-            p_interface_gas = p_interface_gas[0, 0, -1] + delta_mass[0, 0, -1] * (
-                1.0 - q_con[0, 0, -1]
-            )
-            log_p_interface_gas = log(p_interface_gas)
-            # interface pk is using constant akap
-            pk3 = exp(constants.KAPPA * log_p_interface)
-    with computation(PARALLEL), interval(...):
-        gamma = 1.0 / (1.0 - cappa)  # gamma, cp/cv
-        delta_mass = delta_mass * constants.RGRAV
-    with computation(PARALLEL), interval(0, -1):
-        p_gas = (p_interface_gas[0, 0, 1] - p_interface_gas) / (
-            log_p_interface_gas[0, 0, 1] - log_p_interface_gas
-        )
-        dz = zh[0, 0, 1] - zh
-
-
-def finalize(
-    zs: FloatFieldIJ,
-    dz: FloatField,
-    zh: FloatField,
-    log_p_interface_internal: FloatField,
-    log_p_interface_out: FloatField,
-    pk3: FloatField,
-    pk: FloatField,
-    p_interface: FloatField,
-    pe: FloatField,
-    ppe: FloatField,
-    pe_init: FloatField,
-    last_call: bool,
-):
-    """
-    Updates auxilary pressure values
-
-    Args:
-        zs (in):
-        dz (in):
-        zh (out):
-        peln_run (in): log(pressure) defined on vertical interfaces, as used
-            for computation in this module
-        peln (out): log(pressure) defined on vertical interfaces, memory
-            to be returned to calling module
-        pk3 (in):
-        pk (out):
-        p_interface (in):
-        pe (inout):
-        ppe (out):
-        pe_init (in):
-        last_call (in):
-    """
-    from __externals__ import beta, use_logp
-
-    with computation(PARALLEL), interval(...):
-        if __INLINED(use_logp):
-            pk3 = log_p_interface_internal
-        if __INLINED(beta < -0.1):
-            ppe = pe + p_interface
-        else:
-            ppe = pe
-        if last_call:
-            log_p_interface_out = log_p_interface_internal
-            pk = pk3
-            pe = p_interface
-        else:
-            pe = pe_init
-    with computation(BACKWARD):
-        with interval(-1, None):
-            zh = zs
-        with interval(0, -1):
-            zh = zh[0, 0, 1] - dz
-
-
-class NonhydrostaticVerticalSolver:
-    """
-    Fortran subroutine Riem_Solver3
-
-    Like RiemannSolverC, but for the d-grid.
-
-    Difference is that this uses the advanced values for the d-grid full timestep,
-    while RiemannSolverC uses the half time stepped c-grid w, delp, and gz.
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        config: RiemannConfig,
-    ):
-        grid_indexing = stencil_factory.grid_indexing
-        self._sim1_solve = Sim1Solver(
-            stencil_factory,
-            config.p_fac,
-            n_halo=0,
-        )
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-        )
-
-        if config.a_imp <= 0.999:
-            raise NotImplementedError("a_imp <= 0.999 is not implemented")
-
-        self._delta_mass = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="kg",
-            dtype=Float,
-        )
-        self._tmp_pe_init = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            units="Pa",
-            dtype=Float,
-        )
-        self._p_gas = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="Pa",
-            dtype=Float,
-        )
-        self._p_interface = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            units="Pa",
-            dtype=Float,
-        )
-        self._log_p_interface = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            units="log(Pa)",
-            dtype=Float,
-        )
-
-        # gamma parameter is (cp/cv)
-        self._gamma = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="",
-            dtype=Float,
-        )
-
-        riemorigin = grid_indexing.origin_compute()
-        domain = grid_indexing.domain_compute(add=(0, 0, 1))
-        self._precompute_stencil = stencil_factory.from_origin_domain(
-            precompute,
-            origin=riemorigin,
-            domain=domain,
-        )
-        self._finalize_stencil = stencil_factory.from_origin_domain(
-            finalize,
-            externals={"use_logp": config.use_logp, "beta": config.beta},
-            origin=riemorigin,
-            domain=domain,
-        )
-
-    def __call__(
-        self,
-        last_call: bool,
-        dt: Float,
-        cappa: FloatField,
-        ptop: Float,
-        zs: FloatFieldIJ,
-        ws: FloatFieldIJ,
-        delz: FloatField,
-        q_con: FloatField,
-        delp: FloatField,
-        pt: FloatField,
-        zh: FloatField,
-        p: FloatField,
-        ppe: FloatField,
-        pk3: FloatField,
-        pk: FloatField,
-        log_p_interface: FloatField,
-        w: FloatFieldIJ,
-    ):
-        """
-        Solves for the nonhydrostatic terms for vertical velocity (w)
-        and non-hydrostatic pressure perturbation after D-grid winds advect
-        and heights are updated.
-        This accounts for vertically propagating sound waves. Currently
-        the only implemented option of a_imp > 0.999 calls a semi-implicit
-        method solver, and the exact Riemann solver best used for > 1km resolution
-        simulations is not yet implemented.
-
-        Args:
-            last_call (in): boolean, is last acoustic timestep
-            dt (in): acoustic timestep in seconds
-            cappa (in):
-            ptop (in): pressure at top of atmosphere
-            zs (in): surface geopotential height
-            ws (in): surface vertical wind (e.g. due to topography)
-            delz (inout): vertical delta of atmospheric layer in meters
-            q_con (in): total condensate mixing ratio
-            delp (in): vertical delta in pressure
-            pt (in): potential temperature
-            zh (inout): geopotential height
-            p (inout): full hydrostatic pressure
-            ppe (out): non-hydrostatic pressure perturbation
-            pk3 (inout): interface pressure raised to power of kappa
-                using constant kappa
-            pk (out): interface pressure raised to power of kappa, final acoustic value
-            log_p_interface (out): logarithm of interface pressure,
-                only written if last_call=True
-            w (inout): vertical velocity
-        """
-
-        # TODO: propagate variable renaming for these into stencils here and
-        # in Sim1Solver
-        # temporaries:
-        # cp2 is cappa copied into a 2d variable, copied for vectorization reasons
-        #     we should be able to remove this as gt4py optimizes automatically
-        # peln2 is peln copied into a 2d variable, copied for vectorization reasons
-        #     we should be able to remove this as gt4py optimizes automatically
-        # pk3 is p**kappa
-        # pm is layer-mean hydrostatic pressure due to gas phase
-        #       (with condensates removed)
-        # gm2 is gamma (cp/cv)
-        # dz2 is delz
-
-        peln1 = math.log(ptop)
-        # ptk = ptop ** kappa
-        ptk = math.exp(constants.KAPPA * peln1)
-
-        self._precompute_stencil(
-            delp,
-            cappa,
-            p,
-            self._tmp_pe_init,
-            self._delta_mass,
-            zh,
-            q_con,
-            self._p_interface,
-            self._log_p_interface,
-            pk3,
-            self._gamma,
-            delz,
-            self._p_gas,
-            ptop,
-            peln1,
-            ptk,
-        )
-
-        self._sim1_solve(
-            dt,
-            self._gamma,
-            cappa,
-            p,
-            self._delta_mass,
-            self._p_gas,
-            self._p_interface,
-            w,
-            delz,
-            pt,
-            ws,
-        )
-
-        self._finalize_stencil(
-            zs,
-            delz,
-            zh,
-            self._log_p_interface,
-            log_p_interface,
-            pk3,
-            pk,
-            self._p_interface,
-            p,
-            ppe,
-            self._tmp_pe_init,
-            last_call,
-        )
diff --git a/pyFV3/pyFV3/stencils/riem_solver_c.py b/pyFV3/pyFV3/stencils/riem_solver_c.py
deleted file mode 100644
index 94e12787..00000000
--- a/pyFV3/pyFV3/stencils/riem_solver_c.py
+++ /dev/null
@@ -1,278 +0,0 @@
-import typing
-
-import ndsl.constants as constants
-from gt4py.cartesian.gtscript import (
-    BACKWARD,
-    FORWARD,
-    PARALLEL,
-    computation,
-    interval,
-    log,
-)
-from ndsl.constants import X_DIM, Y_DIM, Z_DIM, Z_INTERFACE_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-from ndsl.initialization.allocator import QuantityFactory
-
-from pyFV3.stencils.sim1_solver import Sim1Solver
-
-
-@typing.no_type_check
-def precompute(
-    delpc: FloatField,
-    cappa: FloatField,
-    w3: FloatField,
-    w: FloatField,
-    gz: FloatField,
-    dm: FloatField,
-    q_con: FloatField,
-    pem: FloatField,
-    dz: FloatField,  # is actually delta of gz
-    gm: FloatField,
-    pm: FloatField,
-    ptop: Float,
-):
-    """
-    Args:
-        delpc (in):
-        cappa (in):
-        w3 (in):
-        w (out):
-        gz (in):
-        dm (out): delta mass, mass of gridcell per unit area
-        q_con (in):
-        pem (out): total hydrostatic pressure defined on interface
-            (including condensate)
-        dz (out):
-        gm (out): gamma parameter, Cp/Cv, used to compute pressure gradient force
-            using potential temperature and ideal gas law
-        pm (out): hydrostatic cell mean pressure, derivation in documentation
-            (Chapter 4? 7?)
-            TODO: identify chapter reference, will be sent by Lucas
-    """
-    with computation(PARALLEL), interval(...):
-        dm = delpc
-        w = w3
-    # peg is hydrostatic pressure defined on interface with condensate mass removed
-    # pem is total hydrostatic pressure defined on interface (including condensate)
-    with computation(FORWARD):
-        with interval(0, 1):
-            pem = ptop
-            peg = ptop
-        with interval(1, None):
-            pem = pem[0, 0, -1] + dm[0, 0, -1]
-            peg = peg[0, 0, -1] + dm[0, 0, -1] * (1.0 - q_con[0, 0, -1])
-    with computation(PARALLEL), interval(0, -1):
-        dz = gz[0, 0, 1] - gz
-    with computation(PARALLEL), interval(...):
-        gm = 1.0 / (1.0 - cappa)
-        dm /= constants.GRAV
-    with computation(PARALLEL), interval(0, -1):
-        # (1) From \partial p*/\partial z = -\rho g, we can separate and integrate
-        # over a layer to get
-        # \delta p* = -\bar\rho g \delta z = -\bar p* g\delta z / (R_d T_v)
-        # (using the ideal gas law)
-        # which we can solve for cell-mean pressure to get
-        # \bar p* = - \delta p* \frac{R_d T_v}{g \delta z}
-
-        # (2) From the hydrostatic balance, use the ideal gas law first to get
-        # \partial p* / \partial z = - \frac{p* g}{R_d T_v}. Separating and integrating
-        # yields
-        # \delta log p* = - \frac{g\delta z}{R_d T_v}
-
-        # The RHS of the final expression in (2) is the reciprocal of the fraction in
-        # (1), giving us
-
-        # \bar p* = \delta p* / \delta log p*
-        # note log(b) - log(a) = log(b/a)
-        pm = (peg[0, 0, 1] - peg) / (log(peg[0, 0, 1] / peg))
-
-
-def finalize(
-    pe2: FloatField,
-    pem: FloatField,
-    hs: FloatFieldIJ,
-    dz: FloatField,
-    pef: FloatField,
-    gz: FloatField,
-    ptop: Float,
-):
-    """
-    Enforce vertical boundary conditions.
-
-    The top of atmosphere pressure is constant.
-    At bottom of domain, the height should be equal to hs, the surface elevation.
-
-    Args:
-        pe2 (in): nonhydrostatic perturbation pressure defined on interfaces
-        pem (in): total hydrostatic pressure defined on interface (including condensate)
-        hs (in): surface elevation
-        dz (in):
-        pef (out):
-        gz (out):
-    """
-    with computation(PARALLEL):
-        with interval(0, 1):
-            pef = ptop
-        with interval(1, None):
-            pef = pe2 + pem
-    with computation(BACKWARD):
-        with interval(-1, None):
-            gz = hs
-        with interval(0, -1):
-            gz = gz[0, 0, 1] - dz * constants.GRAV
-
-
-class NonhydrostaticVerticalSolverCGrid:
-    """
-    Fortran subroutine Riem_Solver_C
-
-    Semi-implicit solver for pressure, vertical velocity, and dz (not a Riemann solver)
-
-    accounts for:
-    Vertically-propagating sound wave and straining terms
-    vertical non-hydrostatic pressure gradient force
-    change in layer interface heights due to straining/compression by sound waves
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        p_fac: Float,
-    ):
-        grid_indexing = stencil_factory.grid_indexing
-        origin = grid_indexing.origin_compute(add=(-1, -1, 0))
-        domain = grid_indexing.domain_compute(add=(2, 2, 1))
-
-        self._dm = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="kg",
-            dtype=Float,
-        )
-        self._w = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="m/s",
-            dtype=Float,
-        )
-        self._pem = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            units="Pa",
-            dtype=Float,
-        )
-        self._pe = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            units="Pa",
-            dtype=Float,
-        )
-        self._gm = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="",
-            dtype=Float,
-        )
-        self._dz = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="m",
-            dtype=Float,
-        )
-        self._pm = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="Pa",
-            dtype=Float,
-        )
-
-        self._precompute_stencil = stencil_factory.from_origin_domain(
-            precompute,
-            origin=origin,
-            domain=domain,
-        )
-        self._sim1_solve = Sim1Solver(
-            stencil_factory,
-            p_fac,
-            n_halo=1,
-        )
-        self._finalize_stencil = stencil_factory.from_origin_domain(
-            finalize,
-            origin=origin,
-            domain=domain,
-        )
-
-    def __call__(
-        self,
-        dt2: Float,
-        cappa: FloatField,
-        ptop: Float,
-        hs: FloatFieldIJ,
-        ws: FloatFieldIJ,
-        ptc: FloatField,
-        q_con: FloatField,
-        delpc: FloatField,
-        gz: FloatField,
-        pef: FloatField,
-        w3: FloatField,
-    ):
-        """
-        Solves for the nonhydrostatic terms for vertical velocity (w)
-        and non-hydrostatic pressure perturbation after C-grid winds advect
-        and heights are updated.
-
-        Args:
-           dt2 (in): acoustic timestep in seconds
-           cappa (in): ???
-           ptop (in): pressure at top of atmosphere
-           hs (in): surface height in m
-           ws (in): vertical velocity of the lowest level
-           ptc (in): potential temperature
-           q_con (in): total condensate mixing ratio
-           delpc (in): vertical delta in pressure
-           gz (inout): geopotential height
-           pef (out): full hydrostatic pressure
-           w3 (in): vertical velocity
-        """
-
-        # TODO: integrate these notes into comments/code, double-check:
-        """
-        pe:interface full hydrostatic pressure, pe=pem at last_call
-        pkc: (ppe, pe2 from SIM1_solver) interface non-hydrostatic
-            pressure perturbation
-        pem: interface full hydrostatic pressure, pem(i,k) = pem(i,k-1) + dm(i,k-1)
-        peln2=log(pem)
-        peg: as pem but without condensation,
-            peg(i,k) = peg(i,k-1) + dm(i,k-1)*(1.-q_con(i,j,k-1))
-        pm2: layer-mean full hydrostatic pressure without condensation
-        pk3: interface pk with constant akap (p**k),
-            pk3(i,j,k) = exp(akap*peln2(i,k))
-        pe2: calculated from SIM1_sol
-        """
-
-        # TODO: this class is extremely similar in structure to RiemannSolver3,
-        # can or should they be merged?
-        self._precompute_stencil(
-            delpc,
-            cappa,
-            w3,
-            self._w,
-            gz,
-            self._dm,
-            q_con,
-            self._pem,
-            self._dz,
-            self._gm,
-            self._pm,
-            ptop,
-        )
-        self._sim1_solve(
-            dt2,
-            self._gm,
-            cappa,
-            self._pe,
-            self._dm,
-            self._pm,
-            self._pem,
-            self._w,
-            self._dz,
-            ptc,
-            ws,
-        )
-        # pe is nonhydrostatic perturbation pressure defined on interfaces
-        self._finalize_stencil(self._pe, self._pem, hs, self._dz, pef, gz, ptop)
diff --git a/pyFV3/pyFV3/stencils/saturation_adjustment.py b/pyFV3/pyFV3/stencils/saturation_adjustment.py
deleted file mode 100644
index 9e53fd0d..00000000
--- a/pyFV3/pyFV3/stencils/saturation_adjustment.py
+++ /dev/null
@@ -1,1108 +0,0 @@
-import math
-
-import gt4py.cartesian.gtscript as gtscript
-import ndsl.constants as constants
-from gt4py.cartesian.gtscript import (
-    __INLINED,
-    PARALLEL,
-    computation,
-    exp,
-    floor,
-    interval,
-    log,
-)
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-
-from pyFV3._config import SatAdjustConfig
-from pyFV3.stencils.basic_operations import dim
-from pyFV3.stencils.moist_cv import compute_pkz_func
-
-
-# TODO: This code could be reduced greatly with abstraction, but first gt4py
-# needs to support gtscript function calls of arbitrary depth embedded in
-# conditionals.
-
-
-DELT = 0.1
-satmix = {"table": None, "table2": None, "tablew": None, "des2": None, "desw": None}
-
-
-# melting of cloud ice to cloud water and rain
-# TODO, when if blocks are possible,, only compute when 'melting'
-QS_LENGTH = 2621
-
-
-@gtscript.function
-def tem_lower(i):
-    return constants.T_SAT_MIN + DELT * i
-
-
-@gtscript.function
-def tem_upper(i):
-    return 253.16 + DELT * i
-
-
-@gtscript.function
-def q_table_oneline(delta_heat_capacity, latent_heat_coefficient, tem):
-    return constants.E00 * exp(
-        (
-            delta_heat_capacity * log(tem / constants.TICE)
-            + (tem - constants.TICE) / (tem * constants.TICE) * latent_heat_coefficient
-        )
-        / constants.RVGAS
-    )
-
-
-@gtscript.function
-def table_vapor_oneline(tem):
-    return q_table_oneline(constants.DC_VAP, constants.LV0, tem)
-
-
-@gtscript.function
-def table_ice_oneline(tem):
-    return q_table_oneline(constants.D2ICE, constants.LI2, tem)
-
-
-# TODO Math can be consolidated if we can call gtscript functions from
-# conditionals, fac0 and fac2 functions and others.
-@gtscript.function
-def qs_table_fn(i):
-    tem_l = tem_lower(i)
-    tem_u = tem_upper(i - 1400)
-    table = 0.0
-    if i < 1600:
-        table = table_ice_oneline(tem_l)
-    if i >= 1600 and i < (1400 + 1221):
-        table = table_vapor_oneline(tem_u)
-    if i >= 1400 and i < 1600:
-        esupc = table_vapor_oneline(tem_u)
-        wice = 0.05 * (constants.TICE - tem_u)
-        wh2o = 0.05 * (tem_u - 253.16)
-        table = wice * table + wh2o * esupc
-    return table
-
-
-# TODO Math can be consolidated if we can call gtscript functions from
-# conditionals, fac0 and fac2 functions and others.
-@gtscript.function
-def qs_table2_fn(i):
-    tem0 = tem_lower(i)
-    if i < 1600:
-        # compute es over ice between - 160 deg c and 0 deg c.
-        table2 = table_ice_oneline(tem0)
-    else:
-        # compute es over water between 0 deg c and 102 deg c.
-        table2 = table_vapor_oneline(tem0)
-    if i == 1599:
-        # table(i)
-        table = table_ice_oneline(tem0)
-        tem0 = tem_upper(i - 1400)
-        table = (0.05 * (constants.TICE - tem0)) * table + (
-            0.05 * (tem0 - 253.16)
-        ) * table_vapor_oneline(tem0)
-        # table2(i - 1)
-        tem0 = tem_lower(1598)
-        table2_m1 = table_ice_oneline(tem0)
-        # table2(i + 1)
-        tem0 = tem_lower(1600)
-        table2_p1 = table_vapor_oneline(tem0)
-        table2 = 0.25 * (table2_m1 + 2.0 * table + table2_p1)
-    if i == 1600:
-        # table(i)
-        tem0 = tem_upper(i - 1400)
-        table = table_vapor_oneline(tem0)
-        # table2(i - 1)
-        tem0 = tem_lower(1599)
-        table2_m1 = table_ice_oneline(tem0)
-        # table2(i + 1)
-        tem0 = tem_lower(1601)
-        table2_p1 = table_vapor_oneline(tem0)
-        table2 = 0.25 * (table2_m1 + 2.0 * table + table2_p1)
-    return table2
-
-
-@gtscript.function
-def qs_tablew_fn(i):
-    tem = tem_lower(i)
-    return table_vapor_oneline(tem)
-
-
-@gtscript.function
-def des_end(t, i, z, des2):
-    if i == QS_LENGTH - 1:
-        t_m1 = qs_table2_fn(i - 1)
-        diff = t - t_m1
-        des2 = max(z, diff)
-    return des2
-
-
-# TODO There might be a cleaner way to set des2[QS_LENGTH - 1] to des2[QS_LENGTH
-# - 2].
-@gtscript.function
-def des2_table(i):
-    t = qs_table2_fn(i)
-    diff = qs_table2_fn(i + 1) - t
-    z = 0.0
-    des2 = max(z, diff)
-    des2 = des_end(t, i, z, des2)
-    return des2
-
-
-# TODO There might be a cleaner way to set desw[QS_LENGTH - 1] to desw[QS_LENGTH
-# - 2].
-@gtscript.function
-def desw_table(i):
-    t = qs_tablew_fn(i)
-    diff = qs_tablew_fn(i + 1) - t
-    z = 0.0
-    desw = max(z, diff)
-    desw = des_end(t, i, z, desw)
-    return desw
-
-
-@gtscript.function
-def compute_cvm(mc_air, qv, c_vap, q_liq, q_sol):
-    return mc_air + qv * c_vap + q_liq * constants.C_LIQ + q_sol * constants.C_ICE
-
-
-@gtscript.function
-def add_src_pt1(pt1, src, lhl, cvm):
-    return pt1 + src * lhl / cvm
-
-
-@gtscript.function
-def subtract_sink_pt1(pt1, sink, lhl, cvm):
-    return pt1 - sink * lhl / cvm
-
-
-@gtscript.function
-def melt_cloud_ice(
-    qv, qi, ql, q_liq, q_sol, pt1, icp2, fac_imlt, mc_air, c_vap, lhi, cvm
-):
-    if (qi > 1.0e-8) and (pt1 > constants.TICE):
-        factmp = fac_imlt * (pt1 - constants.TICE) / icp2
-        sink = qi if qi < factmp else factmp
-        qi = qi - sink
-        ql = ql + sink
-        q_liq = q_liq + sink
-        q_sol = q_sol - sink
-        cvm = compute_cvm(mc_air, qv, c_vap, q_liq, q_sol)
-        sink = -sink
-        pt1 = add_src_pt1(pt1, sink, lhi, cvm)
-    return qi, ql, q_liq, q_sol, cvm, pt1
-
-
-@gtscript.function
-def minmax_tmp_h20(qa, qb):
-    tmpmax = max(qb, 0.0)
-    return min(-qa, tmpmax)
-
-
-@gtscript.function
-def fix_negative_snow(qs, qg):
-    if qs < 0.0:
-        qg = qg + qs
-        qs = 0.0
-    elif qg < 0.0:
-        tmp = minmax_tmp_h20(qg, qs)
-        qg = qg + tmp
-        qs = qs - tmp
-    return qs, qg
-
-
-# Fix negative cloud water with rain or rain with available cloud water
-@gtscript.function
-def fix_negative_cloud_water(ql, qr):
-    if ql < 0.0:
-        tmp = minmax_tmp_h20(ql, qr)
-        ql = ql + tmp
-        qr = qr - tmp
-    elif qr < 0.0:
-        tmp = minmax_tmp_h20(qr, ql)
-        ql = ql - tmp
-        qr = qr + tmp
-    return ql, qr
-
-
-# Enforce complete freezing of cloud water to cloud ice below - 48 c
-@gtscript.function
-def complete_freezing(qv, ql, qi, q_liq, q_sol, pt1, cvm, icp2, mc_air, lhi, c_vap):
-    dtmp = constants.TICE - 48.0 - pt1
-    if ql > 0.0 and dtmp > 0.0:
-        sink = min(ql, dtmp / icp2)
-        ql = ql - sink
-        qi = qi + sink
-        q_liq = q_liq - sink
-        q_sol = q_sol + sink
-        cvm = compute_cvm(mc_air, qv, c_vap, q_liq, q_sol)
-        pt1 = add_src_pt1(pt1, sink, lhi, cvm)
-    return ql, qi, q_liq, q_sol, cvm, pt1
-
-
-@gtscript.function
-def homogenous_freezing(qv, ql, qi, q_liq, q_sol, pt1, cvm, icp2, mc_air, lhi, c_vap):
-    dtmp = constants.T_WFR - pt1  # [ - 40, - 48]
-    if ql > 0.0 and dtmp > 0.0:
-        sink = min(ql, dtmp / icp2)
-        sink = min(sink, ql * dtmp * 0.125)
-        ql = ql - sink
-        qi = qi + sink
-        q_liq = q_liq - sink
-        q_sol = q_sol + sink
-        cvm = compute_cvm(mc_air, qv, c_vap, q_liq, q_sol)
-        pt1 = add_src_pt1(pt1, sink, lhi, cvm)
-    return ql, qi, q_liq, q_sol, cvm, pt1
-
-
-# Bigg mechanism for heterogeneous freezing
-@gtscript.function
-def heterogeneous_freezing(
-    exptc, pt1, cvm, ql, qi, q_liq, q_sol, den, icp2, dt_bigg, mc_air, lhi, qv, c_vap
-):
-    tc = constants.TICE0 - pt1
-    if ql > 0.0 and tc > 0.0:
-        sink = 3.3333e-10 * dt_bigg * (exptc - 1.0) * den * ql ** 2
-        sink = min(ql, sink)
-        sink = min(sink, tc / icp2)
-        ql = ql - sink
-        qi = qi + sink
-        q_liq = q_liq - sink
-        q_sol = q_sol + sink
-        cvm = compute_cvm(mc_air, qv, c_vap, q_liq, q_sol)
-        pt1 = add_src_pt1(pt1, sink, lhi, cvm)
-    return ql, qi, q_liq, q_sol, cvm, pt1
-
-
-@gtscript.function
-def make_graupel(pt1, cvm, fac_r2g, qr, qg, q_liq, q_sol, lhi, icp2, mc_air, qv, c_vap):
-    dtmp = (constants.TICE - 0.1) - pt1
-    if qr > 1e-7 and dtmp > 0.0:
-        rainfac = (dtmp * 0.025) ** 2
-        #  no limit on freezing below - 40 deg c
-        tmp = qr if 1.0 < rainfac else rainfac * qr
-        sink = min(tmp, fac_r2g * dtmp / icp2)
-        qr = qr - sink
-        qg = qg + sink
-        q_liq = q_liq - sink
-        q_sol = q_sol + sink
-        cvm = compute_cvm(mc_air, qv, c_vap, q_liq, q_sol)
-        pt1 = add_src_pt1(pt1, sink, lhi, cvm)
-    return qr, qg, q_liq, q_sol, cvm, pt1
-
-
-@gtscript.function
-def melt_snow(
-    pt1, cvm, fac_smlt, qs, ql, qr, q_liq, q_sol, lhi, icp2, mc_air, qv, c_vap, qs_mlt
-):
-    dtmp = pt1 - (constants.TICE + 0.1)
-    dimqs = dim(qs_mlt, ql)
-    if qs > 1e-7 and dtmp > 0.0:
-        snowfac = (dtmp * 0.1) ** 2
-        tmp = (
-            qs if 1.0 < snowfac else snowfac * qs
-        )  # no limiter on melting above 10 deg c
-        sink = min(tmp, fac_smlt * dtmp / icp2)
-        tmp = min(sink, dimqs)
-        qs = qs - sink
-        ql = ql + tmp
-        qr = qr + sink - tmp
-        q_liq = q_liq + sink
-        q_sol = q_sol - sink
-        cvm = compute_cvm(mc_air, qv, c_vap, q_liq, q_sol)
-        pt1 = subtract_sink_pt1(pt1, sink, lhi, cvm)
-    return qs, ql, qr, q_liq, q_sol, cvm, pt1
-
-
-@gtscript.function
-def autoconversion_cloud_to_rain(ql, qr, fac_l2r, ql0_max):
-    if ql > ql0_max:
-        sink = fac_l2r * (ql - ql0_max)
-        qr = qr + sink
-        ql = ql - sink
-    return ql, qr
-
-
-@gtscript.function
-def sublimation(
-    pt1,
-    cvm,
-    expsubl,
-    qv,
-    qi,
-    q_liq,
-    q_sol,
-    iqs2,
-    tcp2,
-    den,
-    dqsdt,
-    sdt,
-    adj_fac,
-    mc_air,
-    c_vap,
-    lhl,
-    lhi,
-    qi_gen,
-    qi_lim,
-):
-    from __externals__ import t_sub
-
-    src = 0.0
-    if pt1 < t_sub:
-        src = dim(qv, 1e-6)
-    elif pt1 < constants.TICE0:
-        dq = qv - iqs2
-        sink = adj_fac * dq / (1.0 + tcp2 * dqsdt)
-        if qi > 1.0e-8:
-            pidep = (
-                sdt
-                * dq
-                * 349138.78
-                * expsubl
-                / (
-                    iqs2
-                    * den
-                    * constants.LAT2
-                    / (0.0243 * constants.RVGAS * pt1 ** 2.0)
-                    + 4.42478e4
-                )
-            )
-        else:
-            pidep = 0.0
-        if dq > 0.0:
-            tmp = constants.TICE - pt1
-            qi_crt = (
-                qi_gen * qi_lim / den
-                if qi_lim < 0.1 * tmp
-                else qi_gen * 0.1 * tmp / den
-            )
-            maxtmp = qi_crt - qi if qi_crt - qi > pidep else pidep
-            src = sink if sink < maxtmp else maxtmp
-            src = src if src < tmp / tcp2 else tmp / tcp2
-        else:
-            dimtmp = dim(pt1, t_sub)
-            pidep = pidep if 1.0 < (dimtmp * 0.2) else pidep * dimtmp * 0.2
-            src = pidep if pidep > sink else sink
-            src = src if src > -qi else -qi
-    qv = qv - src
-    qi = qi + src
-    q_sol = q_sol + src
-    cvm = compute_cvm(mc_air, qv, c_vap, q_liq, q_sol)
-    lh = lhl + lhi
-    pt1 = add_src_pt1(pt1, src, lh, cvm)
-    return qv, qi, q_sol, cvm, pt1
-
-
-@gtscript.function
-def update_latent_heat_coefficient_i(pt1, cvm):
-    lhi = constants.LI00 + constants.DC_ICE * pt1
-    icp2 = lhi / cvm
-    return lhi, icp2
-
-
-@gtscript.function
-def update_latent_heat_coefficient_l(pt1, cvm, lv00, d0_vap):
-    lhl = lv00 + d0_vap * pt1
-    lcp2 = lhl / cvm
-    return lhl, lcp2
-
-
-@gtscript.function
-def update_latent_heat_coefficient(pt1, cvm, lv00, d0_vap):
-    lhl, lcp2 = update_latent_heat_coefficient_l(pt1, cvm, lv00, d0_vap)
-    lhi, icp2 = update_latent_heat_coefficient_i(pt1, cvm)
-    return lhl, lhi, lcp2, icp2
-
-
-@gtscript.function
-def compute_dq0(qv, wqsat, dq2dt, tcp3):
-    return (qv - wqsat) / (1.0 + tcp3 * dq2dt)
-
-
-@gtscript.function
-def get_factor(wqsat, qv, fac_l2v):
-    factor = -min(1, fac_l2v * 10.0 * (1.0 - qv / wqsat))
-    return factor
-
-
-@gtscript.function
-def get_src(ql, factor, dq0):
-    src = -min(ql, factor * dq0)
-    return src
-
-
-@gtscript.function
-def ql_evaporation(wqsat, qv, ql, dq0, fac_l2v):
-    factor = get_factor(wqsat, qv, fac_l2v)
-    src = get_src(ql, factor, dq0)
-    return factor, src
-
-
-@gtscript.function
-def wqsat_correct(src, pt1, lhl, qv, ql, q_liq, q_sol, mc_air, c_vap):
-    qv = qv - src
-    ql = ql + src
-    q_liq = q_liq + src
-    cvm = compute_cvm(mc_air, qv, c_vap, q_liq, q_sol)
-    pt1 = add_src_pt1(pt1, src, lhl, cvm)  # pt1 + src * lhl / cvm
-    return qv, ql, q_liq, cvm, pt1
-
-
-@gtscript.function
-def ap1_for_wqs2(ta):
-    ap1 = 10.0 * dim(ta, constants.T_SAT_MIN) + 1.0
-    return min(ap1, QS_LENGTH) - 1
-
-
-@gtscript.function
-def ap1_index(ap1):
-    return floor(ap1)
-
-
-@gtscript.function
-def ap1_indices(ap1):
-    it = ap1_index(ap1)
-    it2 = floor(ap1 - 0.5)
-    it2_p1 = it2 + 1
-    return it, it2, it2_p1
-
-
-@gtscript.function
-def ap1_and_indices(ta):
-    ap1 = ap1_for_wqs2(ta)
-    it, it2, it2_p1 = ap1_indices(ap1)
-    return ap1, it, it2, it2_p1
-
-
-@gtscript.function
-def ap1_and_index(ta):
-    ap1 = ap1_for_wqs2(ta)
-    it = ap1_index(ap1)
-    return it, ap1
-
-
-@gtscript.function
-def wqsat_and_dqdt(tablew, desw, desw2, desw_p1, ap1, it, it2, ta, den):
-    es = tablew + (ap1 - it) * desw
-    denom = constants.RVGAS * ta * den
-    wqsat = es / denom
-    dqdt = 10.0 * (desw2 + (ap1 - it2) * (desw_p1 - desw2))
-    dqdt = dqdt / denom
-    return wqsat, dqdt
-
-
-@gtscript.function
-def wqsat_wsq1(table, des, ap1, it, ta, den):
-    es = table + (ap1 - it) * des
-    return es / (constants.RVGAS * ta * den)
-
-
-@gtscript.function
-def wqs2_fn_2(ta, den):
-    ap1, it, it2, it2_p1 = ap1_and_indices(ta)
-    table2 = qs_table2_fn(it)
-    des2 = des2_table(it)
-    des22 = des2_table(it2)
-    des2_p1 = des2_table(it2_p1)
-    wqsat, dqdt = wqsat_and_dqdt(table2, des2, des22, des2_p1, ap1, it, it2, ta, den)
-    return wqsat, dqdt
-
-
-@gtscript.function
-def wqs2_fn_w(ta, den):
-    ap1, it, it2, it2_p1 = ap1_and_indices(ta)
-    tablew = qs_tablew_fn(it)
-    desw = desw_table(it)
-    desw2 = desw_table(it2)
-    desw_p1 = desw_table(it2_p1)
-    wqsat, dqdt = wqsat_and_dqdt(tablew, desw, desw2, desw_p1, ap1, it, it2, ta, den)
-    return wqsat, dqdt
-
-
-@gtscript.function
-def wqs1_fn_w(it, ap1, ta, den):
-    tablew = qs_tablew_fn(it)
-    desw = desw_table(it)
-    return wqsat_wsq1(tablew, desw, ap1, it, ta, den)
-
-
-@gtscript.function
-def wqs1_fn_2(it, ap1, ta, den):
-    table2 = qs_table2_fn(it)
-    des2 = des2_table(it)
-    return wqsat_wsq1(table2, des2, ap1, it, ta, den)
-
-
-def compute_q_tables(
-    index: FloatField,
-    tablew: FloatField,
-    table2: FloatField,
-    table: FloatField,
-    desw: FloatField,
-    des2: FloatField,
-):
-    """
-    Args:
-        index (in):
-        tablew (out):
-        table2 (out):
-        table (out):
-        desw (out):
-        des2 (out):
-    """
-    with computation(PARALLEL), interval(...):
-        tablew = qs_tablew_fn(index)
-        table2 = qs_table2_fn(index)
-        table = qs_table_fn(index)
-        desw = desw_table(index)
-        des2 = des2_table(index)
-
-
-def satadjust(
-    peln: FloatField,
-    qv: FloatField,
-    ql: FloatField,
-    qi: FloatField,
-    qr: FloatField,
-    qs: FloatField,
-    cappa: FloatField,
-    qg: FloatField,
-    pt: FloatField,
-    dp: FloatField,
-    delz: FloatField,
-    te0: FloatField,
-    q_con: FloatField,
-    qa: FloatField,
-    area: FloatFieldIJ,
-    hs: FloatFieldIJ,
-    pkz: FloatField,
-    sdt: Float,
-    zvir: Float,
-    fac_i2s: Float,
-    do_qa: bool,
-    consv_te: bool,
-    c_air: Float,
-    c_vap: Float,
-    mdt: Float,
-    fac_r2g: Float,
-    fac_smlt: Float,
-    fac_l2r: Float,
-    fac_imlt: Float,
-    d0_vap: Float,
-    lv00: Float,
-    fac_v2l: Float,
-    fac_l2v: Float,
-    last_step: bool,
-):
-    """
-    Documented in Zhou, Harris and Chen (2022)
-    https://repository.library.noaa.gov/view/noaa/44636.
-
-    Args:
-        peln (in):
-        qv (inout):
-        ql (inout):
-        qi (inout):
-        qr (inout):
-        qs (inout):
-        cappa (out):
-        qg (inout):
-        pt (inout):
-        dp (in):
-        delz (inout): If nonhydrostatic delz is only in, not out
-        te0 (out):
-        q_con (out):
-        qa (out):
-        area (in):
-        hs (in):
-        pkz (out):
-        sdt (in):
-        zvir (in): epsilon parameter in virtual temperature
-        fac_i2s (in):
-        do_qa (in): enables the cloud fraction scheme accounting for subgrid
-            variability in cloud fraction
-        consv_te (in):
-        c_air (in):
-        c_vap (in):
-        mdt (in):
-        fac_r2g (in):
-        fac_smlt (in):
-        fac_l2r (in):
-        fac_imlt (in):
-        d0_vap (in): Cvapor - Cliquid, used for Clausius-Clapeyron
-        lv00 (in): latent heating of vaporization, HLV - d0_vap * TICE
-        fac_v2l (in):
-        fac_l2v (in):
-        last_step (in):
-    """
-    from __externals__ import (
-        cld_min,
-        dw_land,
-        dw_ocean,
-        hydrostatic,
-        icloud_f,
-        qi0_max,
-        qi_gen,
-        qi_lim,
-        ql0_max,
-        ql_gen,
-        qs_mlt,
-        rad_graupel,
-        rad_rain,
-        rad_snow,
-        sat_adj0,
-        tintqs,
-    )
-
-    with computation(PARALLEL), interval(1, None):
-        if __INLINED(hydrostatic):
-            delz_0 = delz[0, 0, -1]
-            delz = delz_0
-    with computation(PARALLEL), interval(...):
-        q_liq = ql + qr
-        q_sol = qi + qs + qg
-        qpz = q_liq + q_sol
-        pt1 = pt / ((1.0 + zvir * qv) * (1.0 - qpz))
-        t0 = pt1  # true temperature
-        qpz = qpz + qv  # total_wat conserved in this routine
-        # define air density based on hydrostatical property
-        if __INLINED(hydrostatic):
-            den = dp / ((peln[0, 0, 1] - peln) * constants.RDGAS * pt)
-        else:
-            den = -dp / (constants.GRAV * delz)
-        # define heat capacity and latend heat coefficient
-        mc_air = (1.0 - qpz) * c_air
-        cvm = compute_cvm(mc_air, qv, c_vap, q_liq, q_sol)
-        lhi, icp2 = update_latent_heat_coefficient_i(pt1, cvm)
-        #  fix energy conservation
-        if consv_te:
-            if __INLINED(hydrostatic):
-                te0 = -c_air * t0
-            else:
-                te0 = -cvm * t0
-        # fix negative cloud ice with snow
-        if qi < 0.0:
-            qs = qs + qi
-            qi = 0.0
-
-        #  melting of cloud ice to cloud water and rain
-        qi, ql, q_liq, q_sol, cvm, pt1 = melt_cloud_ice(
-            qv, qi, ql, q_liq, q_sol, pt1, icp2, fac_imlt, mc_air, c_vap, lhi, cvm
-        )
-        # update latend heat coefficient
-        lhi, icp2 = update_latent_heat_coefficient_i(pt1, cvm)
-        # fix negative snow with graupel or graupel with available snow
-        qs, qg = fix_negative_snow(qs, qg)
-        # after this point cloud ice & snow are positive definite
-        # fix negative cloud water with rain or rain with available cloud water
-        ql, qr = fix_negative_cloud_water(ql, qr)
-        # enforce complete freezing of cloud water to cloud ice below - 48 c
-        ql, qi, q_liq, q_sol, cvm, pt1 = complete_freezing(
-            qv, ql, qi, q_liq, q_sol, pt1, cvm, icp2, mc_air, lhi, c_vap
-        )
-        wqsat, dq2dt = wqs2_fn_w(pt1, den)
-        # update latent heat coefficient
-        lhl, lhi, lcp2, icp2 = update_latent_heat_coefficient(pt1, cvm, lv00, d0_vap)
-        diff_ice = dim(constants.TICE, pt1) / 48.0
-        dimmin = min(1.0, diff_ice)
-        tcp3 = lcp2 + icp2 * dimmin
-
-        dq0 = compute_dq0(qv, wqsat, dq2dt, tcp3)
-        # TODO Might be able to get rid of these temporary allocations when not used?
-        if dq0 > 0:  # whole grid - box saturated
-            src = min(
-                sat_adj0 * dq0,
-                max(ql_gen - ql, fac_v2l * dq0),
-            )
-        else:
-            factor, src = ql_evaporation(wqsat, qv, ql, dq0, fac_l2v)
-
-        qv, ql, q_liq, cvm, pt1 = wqsat_correct(
-            src, pt1, lhl, qv, ql, q_liq, q_sol, mc_air, c_vap
-        )
-        # update latent heat coefficient
-        lhl, lhi, lcp2, icp2 = update_latent_heat_coefficient(pt1, cvm, lv00, d0_vap)
-        # TODO: Remove duplicate
-        diff_ice = dim(constants.TICE, pt1) / 48.0
-        dimmin = min(1.0, diff_ice)
-        tcp3 = lcp2 + icp2 * dimmin
-
-        if last_step:
-            wqsat, dq2dt = wqs2_fn_w(pt1, den)
-
-            dq0 = compute_dq0(qv, wqsat, dq2dt, tcp3)
-            if dq0 > 0:
-                src = dq0
-            else:
-                factor, src = ql_evaporation(wqsat, qv, ql, dq0, fac_l2v)
-
-            qv, ql, q_liq, cvm, pt1 = wqsat_correct(
-                src, pt1, lhl, qv, ql, q_liq, q_sol, mc_air, c_vap
-            )
-
-            lhl, lhi, lcp2, icp2 = update_latent_heat_coefficient(
-                pt1, cvm, lv00, d0_vap
-            )
-
-        # homogeneous freezing of cloud water to cloud ice
-        ql, qi, q_liq, q_sol, cvm, pt1 = homogenous_freezing(
-            qv, ql, qi, q_liq, q_sol, pt1, cvm, icp2, mc_air, lhi, c_vap
-        )
-        # update some of the latent heat coefficients
-        lhi, icp2 = update_latent_heat_coefficient_i(pt1, cvm)
-        exptc = exp(0.66 * (constants.TICE0 - pt1))
-        # bigg mechanism (heterogeneous freezing of cloud water to cloud ice)
-        ql, qi, q_liq, q_sol, cvm, pt1 = heterogeneous_freezing(
-            exptc,
-            pt1,
-            cvm,
-            ql,
-            qi,
-            q_liq,
-            q_sol,
-            den,
-            icp2,
-            mdt,
-            mc_air,
-            lhi,
-            qv,
-            c_vap,
-        )
-
-        lhi, icp2 = update_latent_heat_coefficient_i(pt1, cvm)
-        # freezing of rain to graupel
-        qr, qg, q_liq, q_sol, cvm, pt1 = make_graupel(
-            pt1, cvm, fac_r2g, qr, qg, q_liq, q_sol, lhi, icp2, mc_air, qv, c_vap
-        )
-        lhi, icp2 = update_latent_heat_coefficient_i(pt1, cvm)
-        # melting of snow to rain or cloud water
-        qs, ql, qr, q_liq, q_sol, cvm, pt1 = melt_snow(
-            pt1,
-            cvm,
-            fac_smlt,
-            qs,
-            ql,
-            qr,
-            q_liq,
-            q_sol,
-            lhi,
-            icp2,
-            mc_air,
-            qv,
-            c_vap,
-            qs_mlt,
-        )
-        #  autoconversion from cloud water to rain
-        ql, qr = autoconversion_cloud_to_rain(ql, qr, fac_l2r, ql0_max)
-        iqs2, dqsdt = wqs2_fn_2(pt1, den)
-        expsubl = exp(0.875 * log(qi * den))
-        lhl, lhi, lcp2, icp2 = update_latent_heat_coefficient(pt1, cvm, lv00, d0_vap)
-        tcp2 = lcp2 + icp2
-
-        if last_step:
-            adj_fac = 1.0
-        else:
-            adj_fac = sat_adj0
-
-        qv, qi, q_sol, cvm, pt1 = sublimation(
-            pt1,
-            cvm,
-            expsubl,
-            qv,
-            qi,
-            q_liq,
-            q_sol,
-            iqs2,
-            tcp2,
-            den,
-            dqsdt,
-            sdt,
-            adj_fac,
-            mc_air,
-            c_vap,
-            lhl,
-            lhi,
-            qi_gen,
-            qi_lim,
-        )
-        # virtual temp updated
-        q_con = q_liq + q_sol
-        tmp = 1.0 + zvir * qv
-        pt = pt1 * tmp * (1.0 - q_con)
-        tmp *= constants.RDGAS
-        cappa = tmp / (tmp + cvm)
-        #  fix negative graupel with available cloud ice
-        if qg < 0:
-            maxtmp = max(0.0, qi)
-            mintmp = min(-qg, maxtmp)
-            qg = qg + mintmp
-            qi = qi - mintmp
-        else:
-            qg = qg
-        #  autoconversion from cloud ice to snow
-        qim = qi0_max / den
-        if qi > qim:
-            sink = fac_i2s * (qi - qim)
-            qi = qi - sink
-            qs = qs + sink
-        # fix energy conservation
-        if consv_te:
-            if __INLINED(hydrostatic):
-                te0 = dp * (te0 + c_air * pt1)
-            else:
-                te0 = dp * (te0 + cvm * pt1)
-        # update latent heat coefficient
-        cvm = mc_air + (qv + q_liq + q_sol) * c_vap
-        lhl, lhi, lcp2, icp2 = update_latent_heat_coefficient(pt1, cvm, lv00, d0_vap)
-        # compute cloud fraction
-        if do_qa and last_step:
-            # combine water species
-            if rad_snow:
-                if rad_graupel:
-                    q_sol = qi + qs + qg
-                else:
-                    q_sol = qi + qs
-            else:
-                q_sol = qi
-            if rad_rain:
-                q_liq = ql + qr
-            else:
-                q_liq = ql
-            q_cond = q_sol + q_liq
-            # use the "liquid - frozen water temperature" (tin) to compute
-            # saturated specific humidity
-            if tintqs:
-                tin = pt1
-            else:
-                tin = pt1 - (lcp2 * q_cond + icp2 * q_sol)
-
-            # CK : Additions from satadjust_part3_laststep_qa
-            it, ap1 = ap1_and_index(tin)
-            wqs1 = wqs1_fn_w(it, ap1, tin, den)
-            iqs1 = wqs1_fn_2(it, ap1, tin, den)
-            # Determine saturated specific humidity
-            if tin < constants.T_WFR:
-                # ice phase
-                qstar = iqs1
-            elif tin >= constants.TICE:
-                qstar = wqs1
-            else:
-                # qsw = wqs1
-                if q_cond > 1e-6:
-                    rqi = q_sol / q_cond
-                else:
-                    rqi = (constants.TICE - tin) / (constants.TICE - constants.T_WFR)
-                qstar = rqi * iqs1 + (1.0 - rqi) * wqs1
-                # higher than 10 m is considered "land" and will have higher subgrid
-                # variability
-            mindw = min(1.0, abs(hs) / (10.0 * constants.GRAV))
-            dw = dw_ocean + (dw_land - dw_ocean) * mindw
-            # "scale - aware" subgrid variability: 100 - km as the base
-            dbl_sqrt_area = dw * (area ** 0.5 / 100.0e3) ** 0.5
-            maxtmp = max(0.01, dbl_sqrt_area)
-            hvar = min(0.2, maxtmp)
-            # partial cloudiness by pdf:
-            # assuming subgrid linear distribution in horizontal; this is
-            # effectively a smoother for the binary cloud scheme;
-            # qa = 0.5 if qstar == qpz
-            rh = qpz / qstar
-            # icloud_f = 0: bug - fixed
-            # icloud_f = 1: old fvgfs gfdl) mp implementation
-            # icloud_f = 2: binary cloud scheme (0 / 1)
-            if rh > 0.75 and qpz > constants.SAT_ADJUST_THRESHOLD:
-                dq = hvar * qpz
-                q_plus = qpz + dq
-                q_minus = qpz - dq
-                if icloud_f == 2:  # TODO untested
-                    if qpz > qstar:
-                        qa = 1.0
-                    elif (qstar < q_plus) and (q_cond > constants.SAT_ADJUST_THRESHOLD):
-                        qa = min(1.0, ((q_plus - qstar) / dq) ** 2)
-                    else:
-                        qa = 0.0
-                else:
-                    if qstar < q_minus:
-                        qa = 1.0
-                    else:
-                        if qstar < q_plus:
-                            if icloud_f == 0:
-                                qa = (q_plus - qstar) / (dq + dq)
-                            else:
-                                qa = (q_plus - qstar) / (2.0 * dq * (1.0 - q_cond))
-                        else:
-                            qa = 0.0
-                        # impose minimum cloudiness if substantial q_cond exist
-                        if q_cond > constants.SAT_ADJUST_THRESHOLD:
-                            qa = max(cld_min, qa)
-                        qa = min(1, qa)
-            else:
-                qa = 0.0
-
-        if __INLINED(not hydrostatic):
-            pkz = compute_pkz_func(dp, delz, pt, cappa)
-
-
-class SatAdjust3d:
-    def __init__(
-        self, stencil_factory: StencilFactory, config: SatAdjustConfig, area_64, kmp
-    ):
-        grid_indexing = stencil_factory.grid_indexing
-        self._config = config
-        self._area_64 = area_64
-
-        self._satadjust_stencil = stencil_factory.from_origin_domain(
-            func=satadjust,
-            externals={
-                "hydrostatic": self._config.hydrostatic,
-                "rad_snow": self._config.rad_snow,
-                "rad_rain": self._config.rad_rain,
-                "rad_graupel": self._config.rad_graupel,
-                "tintqs": self._config.tintqs,
-                "sat_adj0": self._config.sat_adj0,
-                "ql_gen": self._config.ql_gen,
-                "qs_mlt": self._config.qs_mlt,
-                "ql0_max": self._config.ql0_max,
-                "t_sub": self._config.t_sub,
-                "qi_gen": self._config.qi_gen,
-                "qi_lim": self._config.qi_lim,
-                "qi0_max": self._config.qi0_max,
-                "dw_ocean": self._config.dw_ocean,
-                "dw_land": self._config.dw_land,
-                "icloud_f": self._config.icloud_f,
-                "cld_min": self._config.cld_min,
-            },
-            origin=(grid_indexing.isc, grid_indexing.jsc, int(kmp)),
-            domain=(
-                grid_indexing.domain[0],
-                grid_indexing.domain[1],
-                int(grid_indexing.domain[2] - kmp),
-            ),
-        )
-
-    def __call__(
-        self,
-        te: FloatField,
-        qvapor: FloatField,
-        qliquid: FloatField,
-        qice: FloatField,
-        qrain: FloatField,
-        qsnow: FloatField,
-        qgraupel: FloatField,
-        qcld: FloatField,
-        hs: FloatFieldIJ,
-        peln: FloatField,
-        delp: FloatField,
-        delz: FloatField,
-        q_con: FloatField,
-        pt: FloatField,
-        pkz: FloatField,
-        cappa: FloatField,
-        r_vir: Float,
-        mdt: Float,
-        fast_mp_consv: bool,
-        last_step: bool,
-        akap: Float,
-        kmp: int,
-    ):
-        """
-        Fast phase change as part of GFDL microphysics.
-
-        Grid-scale condensation.
-
-        Args:
-            te (out):
-            qvapor (inout):
-            qliquid (inout):
-            qice (inout):
-            qrain (inout):
-            qsnow (inout):
-            qgraupel (inout):
-            qcld (out):
-            hs (in):
-            peln (in): only read if hydrostatic, otherwise unused
-            delp (in):
-            delz (inout): If nonhydrostatic delz is only in, not out
-            q_con (out):
-            pt (inout):
-            pkz (out):
-            cappa (out):
-            r_vir (in):
-            mdt (in):
-            fast_mp_consv (in):
-            last_step (in):
-            akap (unused):
-            kmp (unused):
-        """
-        # TODO: akap and kmp are not used and should be removed from the call
-        # TODO: Maybe remove hydrostatic code
-        sdt = 0.5 * mdt  # half remapping time step
-        # define conversion scalar / factor
-        # ice to snow
-        fac_ice_to_snow = 1.0 - math.exp(-mdt / self._config.tau_i2s)
-        # vapor to liquid
-        fac_vapor_to_liquid = 1.0 - math.exp(-sdt / self._config.tau_v2l)
-        # rain to graupel
-        fac_rain_to_graupel = 1.0 - math.exp(-mdt / self._config.tau_r2g)
-        # liquid to rain
-        fac_liquid_to_rain = 1.0 - math.exp(-mdt / self._config.tau_l2r)
-
-        # liquid to vapor
-        fac_liquid_to_vapor = 1.0 - math.exp(-sdt / self._config.tau_l2v)
-        fac_liquid_to_vapor = min(self._config.sat_adj0, fac_liquid_to_vapor)
-
-        # time scale for ice melting (i2r)
-        fac_ice_to_rain = 1.0 - math.exp(-sdt / self._config.tau_imlt)
-        # snow melting (s2r)
-        fac_snow_to_rain = 1.0 - math.exp(-mdt / self._config.tau_smlt)
-
-        # define heat capacity of dry air and water vapor based on hydrostatical
-        # property
-
-        if self._config.hydrostatic:
-            c_air = constants.CP_AIR
-            c_vap = constants.CP_VAP
-        else:
-            c_air = constants.CV_AIR
-            c_vap = constants.CV_VAP
-
-        d0_vap = c_vap - constants.C_LIQ
-        lv00 = constants.HLV - d0_vap * constants.TICE
-
-        do_qa = True
-
-        self._satadjust_stencil(
-            peln,
-            qvapor,
-            qliquid,
-            qice,
-            qrain,
-            qsnow,
-            cappa,
-            qgraupel,
-            pt,
-            delp,
-            delz,
-            te,
-            q_con,
-            qcld,
-            self._area_64,
-            hs,
-            pkz,
-            sdt,
-            r_vir,
-            fac_ice_to_snow,
-            do_qa,
-            fast_mp_consv,
-            c_air,
-            c_vap,
-            mdt,
-            fac_rain_to_graupel,
-            fac_snow_to_rain,
-            fac_liquid_to_rain,
-            fac_ice_to_rain,
-            d0_vap,
-            lv00,
-            fac_vapor_to_liquid,
-            fac_liquid_to_vapor,
-            last_step,
-        )
diff --git a/pyFV3/pyFV3/stencils/sim1_solver.py b/pyFV3/pyFV3/stencils/sim1_solver.py
deleted file mode 100644
index d183d6e9..00000000
--- a/pyFV3/pyFV3/stencils/sim1_solver.py
+++ /dev/null
@@ -1,218 +0,0 @@
-import typing
-
-import ndsl.constants as constants
-from gt4py.cartesian.gtscript import (
-    BACKWARD,
-    FORWARD,
-    PARALLEL,
-    computation,
-    exp,
-    interval,
-    log,
-)
-from ndsl.constants import X_DIM, Y_DIM, Z_INTERFACE_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-
-
-@typing.no_type_check
-def sim1_solver(
-    w: FloatField,
-    delta_mass: FloatField,
-    gamma: FloatField,
-    dz: FloatField,
-    potential_temperature: FloatField,
-    pm: FloatField,
-    pe: FloatField,
-    pem: FloatField,
-    ws: FloatFieldIJ,
-    cp3: FloatField,
-    dt: Float,
-    t1g: Float,
-    rdt: Float,
-    p_fac: Float,
-):
-    """
-    Tridiagonal solve for w and dz, handles pressure gradient force and sound waves
-    in the vertical.
-
-    Documented in Chapter 7.1 of the FV3 dynamical core documentation.
-
-    Args:
-        w (inout):
-        delta_mass (in):
-        gamma (in):
-        dz (inout):
-        ptr (in):
-        pm (in):
-        pe (out): nonhydrostatic perturbation pressure defined on interfaces
-        pem (in):
-        ws (in): surface vertical wind (e.g. due to topography)
-        cp3 (in):
-    """
-    with computation(PARALLEL), interval(0, -1):
-        pe = (
-            exp(gamma * log(-delta_mass / dz * constants.RDGAS * potential_temperature))
-            - pm
-        )
-        w1 = w
-    with computation(FORWARD):
-        with interval(0, -2):
-            g_rat = delta_mass / delta_mass[0, 0, 1]
-            bb = 2.0 * (1.0 + g_rat)
-            dd = 3.0 * (pe + g_rat * pe[0, 0, 1])
-        with interval(-2, -1):
-            bb = 2.0
-            dd = 3.0 * pe
-    # bet[i,j,k] = bb[i,j,0]
-    with computation(FORWARD):
-        with interval(0, 1):
-            bet = bb
-        with interval(1, -1):
-            bet = bet[0, 0, -1]
-
-    # stencils: w_solver
-    # {
-    with computation(PARALLEL):
-        with interval(0, 1):
-            pp = 0.0
-        with interval(1, 2):
-            pp = dd[0, 0, -1] / bet
-    with computation(FORWARD), interval(1, -1):
-        gam = g_rat[0, 0, -1] / bet[0, 0, -1]
-        bet = bb - gam
-    with computation(FORWARD), interval(2, None):
-        pp = (dd[0, 0, -1] - pp[0, 0, -1]) / bet[0, 0, -1]
-    with computation(BACKWARD), interval(1, -1):
-        pp = pp - gam * pp[0, 0, 1]
-        # w solver
-        aa = t1g * 0.5 * (gamma[0, 0, -1] + gamma) / (dz[0, 0, -1] + dz) * (pem + pp)
-    # }
-    # updates on bet:
-    with computation(FORWARD):
-        with interval(0, 1):
-            bet = delta_mass[0, 0, 0] - aa[0, 0, 1]
-        with interval(1, None):
-            bet = bet[0, 0, -1]
-    # w_pe_dz_compute
-    # {
-    with computation(FORWARD):
-        with interval(0, 1):
-            w = (delta_mass * w1 + dt * pp[0, 0, 1]) / bet
-        with interval(1, -2):
-            gam = aa / bet[0, 0, -1]
-            bet = delta_mass - (aa + aa[0, 0, 1] + aa * gam)
-            w = (delta_mass * w1 + dt * (pp[0, 0, 1] - pp) - aa * w[0, 0, -1]) / bet
-        with interval(-2, -1):
-            p1 = t1g * gamma / dz * (pem[0, 0, 1] + pp[0, 0, 1])
-            gam = aa / bet[0, 0, -1]
-            bet = delta_mass - (aa + p1 + aa * gam)
-            w = (
-                delta_mass * w1
-                + dt * (pp[0, 0, 1] - pp)
-                - p1 * ws[0, 0]
-                - aa * w[0, 0, -1]
-            ) / bet
-    with computation(BACKWARD), interval(0, -2):
-        w = w - gam[0, 0, 1] * w[0, 0, 1]
-    with computation(FORWARD):
-        with interval(0, 1):
-            pe = 0.0
-        with interval(1, None):
-            pe = (
-                pe[0, 0, -1] + delta_mass[0, 0, -1] * (w[0, 0, -1] - w1[0, 0, -1]) * rdt
-            )
-    with computation(BACKWARD):
-        with interval(-2, -1):
-            p1 = (pe + 2.0 * pe[0, 0, 1]) * 1.0 / 3.0
-        with interval(0, -2):
-            p1 = (pe + bb * pe[0, 0, 1] + g_rat * pe[0, 0, 2]) * 1.0 / 3.0 - g_rat * p1[
-                0, 0, 1
-            ]
-    with computation(PARALLEL), interval(0, -1):
-        maxp = p_fac * pm if p_fac * delta_mass > p1 + pm else p1 + pm
-        dz = (
-            -delta_mass
-            * constants.RDGAS
-            * potential_temperature
-            * exp((cp3 - 1.0) * log(maxp))
-        )
-    # }
-
-
-class Sim1Solver:
-    """
-    Fortran name is sim1_solver
-
-    Namelist:
-        p_fac: Safety factor for minimum nonhydrostatic pressures.
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        p_fac: Float,
-        n_halo: int,
-    ):
-        self._pfac = p_fac
-        self._compute_sim1_solve = stencil_factory.from_dims_halo(
-            func=sim1_solver,
-            compute_dims=[X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            compute_halos=(n_halo, n_halo, 0),
-        )
-
-    def __call__(
-        self,
-        dt: Float,
-        gamma: FloatField,
-        cp3: FloatField,
-        pe: FloatField,
-        delta_mass: FloatField,
-        pm: FloatField,
-        pem: FloatField,
-        w: FloatField,
-        dz: FloatField,
-        potential_temperature: FloatField,
-        ws: FloatFieldIJ,
-    ):
-        """
-        Semi-Implicit Method solver -- solves a vertically tridiagonal
-        system for sound waves to compute nonhydrostatic terms for
-        vertical velocity and pressure perturbations.
-
-        Chapter 7 of the FV3 documentation
-
-        Args:
-          dt (in): timstep in seconds of solver
-          gm (in): ?? 1 / (1 - cappa)
-          cp3 (in): cappa
-          pe (out): full hydrostatic pressure
-          delta_mass (in): mass thickness of atmospheric layer (kg)
-          pm (in): ?? ratio of change in layer pressure without condensates
-          pem (in): recomputed pressure using ptop and delp
-          w (inout): vertical velocity
-          dz (inout): vertical delta of atmospheric layer in meters
-          potential_temperature (in): potential temperature
-          ws (in): surface vertical wind (e.g. due to topography)
-        """
-
-        # TODO: email Lucas about any remaining variable naming here
-
-        t1g = 2.0 * dt * dt
-        rdt = 1.0 / dt
-        self._compute_sim1_solve(
-            w,
-            delta_mass,
-            gamma,
-            dz,
-            potential_temperature,
-            pm,
-            pe,
-            pem,
-            ws,
-            cp3,
-            dt,
-            t1g,
-            rdt,
-            self._pfac,
-        )
diff --git a/pyFV3/pyFV3/stencils/temperature_adjust.py b/pyFV3/pyFV3/stencils/temperature_adjust.py
deleted file mode 100644
index bf6e9f2c..00000000
--- a/pyFV3/pyFV3/stencils/temperature_adjust.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import ndsl.constants as constants
-from gt4py.cartesian.gtscript import PARALLEL, computation, exp, interval, log
-from ndsl.dsl.typing import Float, FloatField
-
-from pyFV3.stencils.basic_operations import sign
-
-
-def apply_diffusive_heating(
-    delp: FloatField,
-    delz: FloatField,
-    cappa: FloatField,
-    heat_source: FloatField,
-    pt: FloatField,
-    delt_time_factor: Float,
-):
-    """
-    Adjust air temperature from heating due to vorticity damping.
-    Heating is limited by deltmax times the length of a timestep, with the
-    highest levels limited further.
-
-    Args:
-        delp (in): Pressure thickness of atmosphere layers
-        delz (in): Vertical thickness of atmosphere layers
-        cappa (in): R/Cp
-        heat_source (in): heat source from vorticity damping implied by
-            energy conservation
-        pt (inout): Air potential temperature
-        delta_time_factor (in): scaled time step
-    """
-    with computation(PARALLEL), interval(...):
-        pkz = exp(cappa / (1.0 - cappa) * log(constants.RDG * delp / delz * pt))
-        dtmp = heat_source / (constants.CV_AIR * delp)
-    with computation(PARALLEL):
-        with interval(0, 1):
-            deltmin = sign(min(delt_time_factor * 0.1, abs(dtmp)), dtmp)
-            pt = pt + deltmin / pkz
-        with interval(1, 2):
-            deltmin = sign(min(delt_time_factor * 0.5, abs(dtmp)), dtmp)
-            pt = pt + deltmin / pkz
-        with interval(2, None):
-            deltmin = sign(min(delt_time_factor, abs(dtmp)), dtmp)
-            pt = pt + deltmin / pkz
diff --git a/pyFV3/pyFV3/stencils/tracer_2d_1l.py b/pyFV3/pyFV3/stencils/tracer_2d_1l.py
deleted file mode 100644
index f9d13d07..00000000
--- a/pyFV3/pyFV3/stencils/tracer_2d_1l.py
+++ /dev/null
@@ -1,417 +0,0 @@
-import math
-from typing import Dict
-
-import gt4py.cartesian.gtscript as gtscript
-from gt4py.cartesian.gtscript import PARALLEL, computation, horizontal, interval, region
-from ndsl.comm.communicator import Communicator
-from ndsl.constants import (
-    N_HALO_DEFAULT,
-    X_DIM,
-    X_INTERFACE_DIM,
-    Y_DIM,
-    Y_INTERFACE_DIM,
-    Z_DIM,
-)
-from ndsl.dsl.dace.orchestration import orchestrate
-from ndsl.dsl.dace.wrapped_halo_exchange import WrappedHaloUpdater
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.quantity import Quantity
-
-from pyFV3.stencils.fvtp2d import FiniteVolumeTransport
-
-
-@gtscript.function
-def flux_x(cx, dxa, dy, sin_sg3, sin_sg1, xfx):
-    from __externals__ import local_ie, local_is, local_je, local_js
-
-    with horizontal(region[local_is : local_ie + 2, local_js - 3 : local_je + 4]):
-        xfx = (
-            cx * dxa[-1, 0] * dy * sin_sg3[-1, 0] if cx > 0 else cx * dxa * dy * sin_sg1
-        )
-    return xfx
-
-
-@gtscript.function
-def flux_y(cy, dya, dx, sin_sg4, sin_sg2, yfx):
-    from __externals__ import local_ie, local_is, local_je, local_js
-
-    with horizontal(region[local_is - 3 : local_ie + 4, local_js : local_je + 2]):
-        yfx = (
-            cy * dya[0, -1] * dx * sin_sg4[0, -1] if cy > 0 else cy * dya * dx * sin_sg2
-        )
-    return yfx
-
-
-def flux_compute(
-    cx: FloatField,
-    cy: FloatField,
-    dxa: FloatFieldIJ,
-    dya: FloatFieldIJ,
-    dx: FloatFieldIJ,
-    dy: FloatFieldIJ,
-    sin_sg1: FloatFieldIJ,
-    sin_sg2: FloatFieldIJ,
-    sin_sg3: FloatFieldIJ,
-    sin_sg4: FloatFieldIJ,
-    xfx: FloatField,
-    yfx: FloatField,
-):
-    """
-    Args:
-        cx (in):
-        cy (in):
-        dxa (in):
-        dya (in):
-        dx (in):
-        dy (in):
-        sin_sg1 (in):
-        sin_sg2 (in):
-        sin_sg3 (in):
-        sin_sg4 (in):
-        xfx (out): x-direction area flux
-        yfx (out): y-direction area flux
-    """
-    with computation(PARALLEL), interval(...):
-        xfx = flux_x(cx, dxa, dy, sin_sg3, sin_sg1, xfx)
-        yfx = flux_y(cy, dya, dx, sin_sg4, sin_sg2, yfx)
-
-
-def divide_fluxes_by_n_substeps(
-    cxd: FloatField,
-    xfx: FloatField,
-    mfxd: FloatField,
-    cyd: FloatField,
-    yfx: FloatField,
-    mfyd: FloatField,
-    n_split: int,
-):
-    """
-    Divide all inputs in-place by the number of substeps n_split.
-
-    Args:
-        cxd (inout):
-        xfx (inout):
-        mfxd (inout):
-        cyd (inout):
-        yfx (inout):
-        mfyd (inout):
-    """
-    with computation(PARALLEL), interval(...):
-        frac = 1.0 / n_split
-        cxd = cxd * frac
-        xfx = xfx * frac
-        mfxd = mfxd * frac
-        cyd = cyd * frac
-        yfx = yfx * frac
-        mfyd = mfyd * frac
-
-
-def cmax_stencil1(cx: FloatField, cy: FloatField, cmax: FloatField):
-    with computation(PARALLEL), interval(...):
-        cmax = max(abs(cx), abs(cy))
-
-
-def cmax_stencil2(
-    cx: FloatField, cy: FloatField, sin_sg5: FloatField, cmax: FloatField
-):
-    with computation(PARALLEL), interval(...):
-        cmax = max(abs(cx), abs(cy)) + 1.0 - sin_sg5
-
-
-def apply_mass_flux(
-    dp1: FloatField,
-    x_mass_flux: FloatField,
-    y_mass_flux: FloatField,
-    rarea: FloatFieldIJ,
-    dp2: FloatField,
-):
-    """
-    Args:
-        dp1 (in): initial pressure thickness
-        mfx (in): flux of (area * mass * g) in x-direction
-        mfy (in): flux of (area * mass * g) in y-direction
-        rarea (in): 1 / area
-        dp2 (out): final pressure thickness
-    """
-    with computation(PARALLEL), interval(...):
-        dp2 = (
-            dp1
-            + (x_mass_flux - x_mass_flux[1, 0, 0] + y_mass_flux - y_mass_flux[0, 1, 0])
-            * rarea
-        )
-
-
-def apply_tracer_flux(
-    q: FloatField,
-    dp1: FloatField,
-    fx: FloatField,
-    fy: FloatField,
-    rarea: FloatFieldIJ,
-    dp2: FloatField,
-):
-    """
-    Args:
-        q (inout):
-        dp1 (in):
-        fx (in):
-        fy (in):
-        rarea (in):
-        dp2 (in):
-    """
-    with computation(PARALLEL), interval(...):
-        q = (q * dp1 + (fx - fx[1, 0, 0] + fy - fy[0, 1, 0]) * rarea) / dp2
-
-
-# Simple stencil replacing:
-#   self._tmp_dp2[:] = dp1
-#   dp1[:] = dp2
-#   dp2[:] = self._tmp_dp2
-# Because dpX can be a quantity or an array
-def swap_dp(dp1: FloatField, dp2: FloatField):
-    with computation(PARALLEL), interval(...):
-        tmp = dp1
-        dp1 = dp2
-        dp2 = tmp
-
-
-class TracerAdvection:
-    """
-    Performs horizontal advection on tracers.
-
-    Corresponds to tracer_2D_1L in the Fortran code.
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        transport: FiniteVolumeTransport,
-        grid_data,
-        comm: Communicator,
-        tracers: Dict[str, Quantity],
-    ):
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            dace_compiletime_args=["tracers"],
-        )
-        grid_indexing = stencil_factory.grid_indexing
-        self.grid_indexing = grid_indexing  # needed for selective validation
-        self._tracer_count = len(tracers)
-        self.grid_data = grid_data
-
-        self._x_area_flux = quantity_factory.zeros(
-            [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        self._y_area_flux = quantity_factory.zeros(
-            [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        self._x_flux = quantity_factory.zeros(
-            [X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        self._y_flux = quantity_factory.zeros(
-            [X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM],
-            units="unknown",
-            dtype=Float,
-        )
-        self._tmp_dp = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="Pa",
-            dtype=Float,
-        )
-        self._tmp_dp2 = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="Pa",
-            dtype=Float,
-        )
-
-        ax_offsets = grid_indexing.axis_offsets(
-            grid_indexing.origin_full(), grid_indexing.domain_full()
-        )
-        local_axis_offsets = {}
-        for axis_offset_name, axis_offset_value in ax_offsets.items():
-            if "local" in axis_offset_name:
-                local_axis_offsets[axis_offset_name] = axis_offset_value
-
-        self._swap_dp = stencil_factory.from_origin_domain(
-            swap_dp,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(),
-            externals=local_axis_offsets,
-        )
-
-        self._flux_compute = stencil_factory.from_origin_domain(
-            flux_compute,
-            origin=grid_indexing.origin_full(),
-            domain=grid_indexing.domain_full(add=(1, 1, 0)),
-            externals=local_axis_offsets,
-        )
-        self._divide_fluxes_by_n_substeps = stencil_factory.from_origin_domain(
-            divide_fluxes_by_n_substeps,
-            origin=grid_indexing.origin_full(),
-            domain=grid_indexing.domain_full(add=(1, 1, 0)),
-            externals=local_axis_offsets,
-        )
-        self._apply_mass_flux = stencil_factory.from_origin_domain(
-            apply_mass_flux,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(),
-            externals=local_axis_offsets,
-        )
-        self._apply_tracer_flux = stencil_factory.from_origin_domain(
-            apply_tracer_flux,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(),
-            externals=local_axis_offsets,
-        )
-        self.finite_volume_transport: FiniteVolumeTransport = transport
-
-        # Setup halo updater for tracers
-        tracer_halo_spec = quantity_factory.get_quantity_halo_spec(
-            dims=[X_DIM, Y_DIM, Z_DIM],
-            n_halo=N_HALO_DEFAULT,
-            dtype=Float,
-        )
-        self._tracers_halo_updater = WrappedHaloUpdater(
-            comm.get_scalar_halo_updater([tracer_halo_spec] * self._tracer_count),
-            tracers,
-            [t for t in tracers.keys()],
-        )
-
-    def __call__(
-        self,
-        tracers: Dict[str, Quantity],
-        dp1,
-        x_mass_flux,
-        y_mass_flux,
-        x_courant,
-        y_courant,
-    ):
-        """
-        Apply advection to tracers based on the given courant numbers and mass fluxes.
-
-        Note only output values for tracers are used, all other inouts are only such
-        because they are modified for intermediate computation.
-
-        Args:
-            tracers (inout): tracers to advect according to fluxes during
-                acoustic substeps
-            dp1 (in): pressure thickness of atmospheric layers before acoustic substeps
-            x_mass_flux (inout): total mass flux in x-direction over acoustic substeps
-            y_mass_flux (inout): total mass flux in y-direction over acoustic substeps
-            x_courant (inout): accumulated courant number in x-direction
-            y_courant (inout): accumulated courant number in y-direction
-        """
-        # DaCe parsing issue
-        # if len(tracers) != self._tracer_count:
-        #     raise ValueError(
-        #         f"incorrect number of tracers, {self._tracer_count} was "
-        #         f"specified on init but {len(tracers)} were passed"
-        #     )
-        # start HALO update on q (in dyn_core in fortran -- just has started when
-        # this function is called...)
-        self._flux_compute(
-            x_courant,
-            y_courant,
-            self.grid_data.dxa,
-            self.grid_data.dya,
-            self.grid_data.dx,
-            self.grid_data.dy,
-            self.grid_data.sin_sg1,
-            self.grid_data.sin_sg2,
-            self.grid_data.sin_sg3,
-            self.grid_data.sin_sg4,
-            # TODO: rename xfx/yfx to "area flux"
-            self._x_area_flux,
-            self._y_area_flux,
-        )
-
-        # # TODO for if we end up using the Allreduce and compute cmax globally
-        # (or locally). For now, hardcoded.
-        # split = int(grid_indexing.domain[2] / 6)
-        # self._cmax_1(
-        #     cxd, cyd, self._tmp_cmax, origin=grid_indexing.origin_compute(),
-        #     domain=(grid_indexing.domain[0], self.grid_indexing.domain[1], split)
-        # )
-        # self._cmax_2(
-        #     cxd,
-        #     cyd,
-        #     self.grid.sin_sg5,
-        #     self._tmp_cmax,
-        #     origin=(grid_indexing.isc, self.grid_indexing.jsc, split),
-        #     domain=(
-        #         grid_indexing.domain[0],
-        #         self.grid_indexing.domain[1],
-        #         grid_indexing.domain[2] - split + 1
-        #     ),
-        # )
-        # cmax_flat = np.amax(self._tmp_cmax, axis=(0, 1))
-        # # cmax_flat is a gt4py storage still, but of dimension [npz+1]...
-
-        # cmax_max_all_ranks = cmax_flat.data
-        # # TODO mpi allreduce...
-        # # comm.Allreduce(cmax_flat, cmax_max_all_ranks, op=MPI.MAX)
-
-        cmax_max_all_ranks = 2.0
-        n_split = math.floor(1.0 + cmax_max_all_ranks)
-        # NOTE: cmax is not usually a single value, it varies with k, if return to
-        # that, make n_split a column as well
-
-        if n_split > 1.0:
-            self._divide_fluxes_by_n_substeps(
-                x_courant,
-                self._x_area_flux,
-                x_mass_flux,
-                y_courant,
-                self._y_area_flux,
-                y_mass_flux,
-                n_split,
-            )
-
-        self._tracers_halo_updater.update()
-
-        dp2 = self._tmp_dp
-
-        for it in range(n_split):
-            last_call = it == n_split - 1
-            # tracer substep
-            self._apply_mass_flux(
-                dp1,
-                x_mass_flux,
-                y_mass_flux,
-                self.grid_data.rarea,
-                dp2,
-            )
-            for q in tracers.values():
-                self.finite_volume_transport(
-                    q,
-                    x_courant,
-                    y_courant,
-                    self._x_area_flux,
-                    self._y_area_flux,
-                    self._x_flux,
-                    self._y_flux,
-                    x_mass_flux=x_mass_flux,
-                    y_mass_flux=y_mass_flux,
-                )
-                self._apply_tracer_flux(
-                    q,
-                    dp1,
-                    self._x_flux,
-                    self._y_flux,
-                    self.grid_data.rarea,
-                    dp2,
-                )
-            if not last_call:
-                self._tracers_halo_updater.update()
-                # we can't use variable assignment to avoid a data copy
-                # because of current dace limitations
-                self._swap_dp(dp1, dp2)
diff --git a/pyFV3/pyFV3/stencils/updatedzc.py b/pyFV3/pyFV3/stencils/updatedzc.py
deleted file mode 100644
index ad610c0a..00000000
--- a/pyFV3/pyFV3/stencils/updatedzc.py
+++ /dev/null
@@ -1,225 +0,0 @@
-import gt4py.cartesian.gtscript as gtscript
-import ndsl.constants as constants
-from gt4py.cartesian.gtscript import BACKWARD, FORWARD, PARALLEL, computation, interval
-from ndsl.constants import X_DIM, Y_DIM, Z_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ, FloatFieldK
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.quantity import Quantity
-from ndsl.stencils import corners
-
-
-DZ_MIN = constants.DZ_MIN
-
-
-@gtscript.function
-def p_weighted_average_top(vel, dp0):
-    # TODO: ratio is a constant, where should this be placed?
-    ratio = dp0 / (dp0 + dp0[1])
-    return vel + (vel - vel[0, 0, 1]) * ratio
-
-
-@gtscript.function
-def p_weighted_average_bottom(vel, dp0):
-    ratio = dp0[-1] / (dp0[-2] + dp0[-1])
-    return vel[0, 0, -1] + (vel[0, 0, -1] - vel[0, 0, -2]) * ratio
-
-
-@gtscript.function
-def p_weighted_average_domain(vel, dp0):
-    int_ratio = 1.0 / (dp0[-1] + dp0)
-    return (dp0 * vel[0, 0, -1] + dp0[-1] * vel) * int_ratio
-
-
-@gtscript.function
-def xy_flux(gz_x, gz_y, xfx, yfx):
-    """
-    Compute first-order upwind fluxes of gz in x and y directions.
-
-    Args:
-        gz_x: gz with corners copied to perform derivatives in x-direction
-        gz_y: gz with corners copied to perform derivatives in y-direction
-        xfx (out): contravariant c-grid u-wind interpolated to layer interfaces,
-            including metric terms to make it a "volume flux"
-        yfx (out): contravariant c-grid v-wind interpolated to layer interfaces
-
-    Returns:
-        fx: first-order upwind x-flux of gz
-        fy: first-order upwind y-flux of gz
-    """
-    fx = xfx * (gz_x[-1, 0, 0] if xfx > 0.0 else gz_x)
-    fy = yfx * (gz_y[0, -1, 0] if yfx > 0.0 else gz_y)
-    return fx, fy
-
-
-def double_copy(q_in: FloatField, copy_1: FloatField, copy_2: FloatField):
-    with computation(PARALLEL), interval(...):
-        copy_1 = q_in
-        copy_2 = q_in
-
-
-def update_dz_c(
-    dp_ref: FloatFieldK,
-    zs: FloatFieldIJ,
-    area: FloatFieldIJ,
-    ut: FloatField,
-    vt: FloatField,
-    gz: FloatField,
-    gz_x: FloatField,
-    gz_y: FloatField,
-    ws: FloatFieldIJ,
-    *,
-    dt: Float,
-):
-    """
-    Step dz forward on c-grid
-    Eusures gz is monotonically increasing in z at the end
-    Args:
-        dp_ref:
-        zs:
-        area:
-        ut:
-        vt:
-        gz:
-        gz_x: gz with corners copied to perform derivatives in x-direction
-        gz_y: gz with corners copied to perform derivatives in y-direction
-        ws: lagrangian (parcel-following) surface vertical wind implied by
-            lowest-level gz change note that a parcel moving horizontally
-            across terrain will be moving in the vertical (eqn 5.5 in documentation)
-        dt:
-    """
-
-    # there's some complexity due to gz being defined on interfaces
-    # have to interpolate winds to layer interfaces first, using higher-order
-    # cubic spline interpolation
-    with computation(PARALLEL):
-        with interval(0, 1):
-            # TODO: inline some or all of these functions
-            xfx = p_weighted_average_top(ut, dp_ref)
-            yfx = p_weighted_average_top(vt, dp_ref)
-        with interval(1, -1):
-            xfx = p_weighted_average_domain(ut, dp_ref)
-            yfx = p_weighted_average_domain(vt, dp_ref)
-        with interval(-1, None):
-            xfx = p_weighted_average_bottom(ut, dp_ref)
-            yfx = p_weighted_average_bottom(vt, dp_ref)
-    # xfx/yfx are now ut/vt interpolated to layer interfaces
-    with computation(PARALLEL), interval(...):
-        fx, fy = xy_flux(gz_x, gz_y, xfx, yfx)
-        gz = (gz * area + fx - fx[1, 0, 0] + fy - fy[0, 1, 0]) / (
-            area + xfx - xfx[1, 0, 0] + yfx - yfx[0, 1, 0]
-        )
-    with computation(FORWARD), interval(-1, None):
-        rdt = 1.0 / dt
-        ws = (zs - gz) * rdt
-    with computation(BACKWARD), interval(0, -1):
-        gz_kp1 = gz[0, 0, 1] + DZ_MIN
-        gz = gz if gz > gz_kp1 else gz_kp1
-
-
-class UpdateGeopotentialHeightOnCGrid:
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        area: Quantity,
-        dp_ref: Quantity,
-        grid_type,
-    ):
-        grid_indexing = stencil_factory.grid_indexing
-        self._area = area
-        self._grid_type = grid_type
-        # TODO: this is needed because GridData.dp_ref does not have access
-        # to a QuantityFactory, we should add a way to perform operations on
-        # Quantity and persist the QuantityFactory choices
-        # e.g. by adding a quantity.factory
-        # attribute, or by implementing basic math like slicing, addition, etc.
-        # here it's needed to ensure we have a buffer point after the compute domain
-        self._dp_ref = quantity_factory.zeros(
-            dp_ref.dims,
-            units=dp_ref.units,
-            dtype=Float,
-        )
-        self._dp_ref.view[:] = dp_ref.view[:]
-        self._gz_x = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="m**2/s**2",
-            dtype=Float,
-        )
-        self._gz_y = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_DIM],
-            units="m**2/s**2",
-            dtype=Float,
-        )
-        full_origin = grid_indexing.origin_full()
-        full_domain = grid_indexing.domain_full(add=(0, 0, 1))
-        self._double_copy_stencil = stencil_factory.from_origin_domain(
-            double_copy,
-            origin=full_origin,
-            domain=full_domain,
-        )
-
-        ax_offsets = grid_indexing.axis_offsets(full_origin, full_domain)
-
-        if self._grid_type < 3:
-            self._fill_corners_x_stencil = stencil_factory.from_origin_domain(
-                corners.fill_corners_2cells_x_stencil,
-                externals=ax_offsets,
-                origin=full_origin,
-                domain=full_domain,
-            )
-            self._fill_corners_y_stencil = stencil_factory.from_origin_domain(
-                corners.fill_corners_2cells_y_stencil,
-                externals=ax_offsets,
-                origin=full_origin,
-                domain=full_domain,
-            )
-
-        self._update_dz_c = stencil_factory.from_origin_domain(
-            update_dz_c,
-            origin=grid_indexing.origin_compute(add=(-1, -1, 0)),
-            domain=grid_indexing.domain_compute(add=(2, 2, 1)),
-        )
-
-    def __call__(
-        self,
-        zs: FloatFieldIJ,
-        ut: FloatField,
-        vt: FloatField,
-        gz: FloatField,
-        ws: FloatFieldIJ,
-        dt: Float,
-    ):
-        """
-        Args:
-            dp_ref: layer thickness in Pa
-            zs: surface height in m
-            ut: horizontal wind (TODO: covariant or contravariant?)
-            vt: horizontal wind (TODO: covariant or contravariant?)
-            gz: geopotential height on model interfaces
-            ws: surface vertical wind implied by horizontal motion over topography
-            dt: timestep over which to evolve the geopotential height, in seconds
-        """
-
-        # TODO: is this advecting gz, and if so can we name it that?
-        # Can we reduce duplication of advection logic with other stencils?
-
-        self._double_copy_stencil(gz, self._gz_x, self._gz_y)
-
-        # TODO(eddied): We pass the same fields 2x to avoid GTC validation errors
-        if self._grid_type < 3:
-            self._fill_corners_x_stencil(self._gz_x, self._gz_x)
-            self._fill_corners_y_stencil(self._gz_y, self._gz_y)
-
-        self._update_dz_c(
-            self._dp_ref,
-            zs,
-            self._area,
-            ut,
-            vt,
-            gz,
-            self._gz_x,
-            self._gz_y,
-            ws,
-            dt=dt,
-        )
diff --git a/pyFV3/pyFV3/stencils/updatedzd.py b/pyFV3/pyFV3/stencils/updatedzd.py
deleted file mode 100644
index acbb29a2..00000000
--- a/pyFV3/pyFV3/stencils/updatedzd.py
+++ /dev/null
@@ -1,389 +0,0 @@
-from typing import Tuple
-
-import gt4py.cartesian.gtscript as gtscript
-import ndsl.constants as constants
-from gt4py.cartesian.gtscript import BACKWARD, FORWARD, PARALLEL, computation, interval
-from ndsl.constants import (
-    X_DIM,
-    X_INTERFACE_DIM,
-    Y_DIM,
-    Y_INTERFACE_DIM,
-    Z_DIM,
-    Z_INTERFACE_DIM,
-)
-from ndsl.dsl.dace.orchestration import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ, FloatFieldK
-from ndsl.grid import DampingCoefficients, GridData
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.quantity import Quantity
-
-from pyFV3.stencils.delnflux import DelnFluxNoSG
-from pyFV3.stencils.fvtp2d import FiniteVolumeTransport
-
-
-DZ_MIN = constants.DZ_MIN
-
-
-@gtscript.function
-def _apply_height_advective_flux(
-    height: FloatField,
-    area: FloatFieldIJ,
-    x_height_flux: FloatField,
-    y_height_flux: FloatField,
-    x_area_flux: FloatField,
-    y_area_flux: FloatField,
-):
-    """
-    Apply the computed fluxes of height and gridcell area to the height profile.
-
-    A positive flux of area corresponds to convergence, which expands
-    the layer thickness.
-
-    Args:
-        height: initial height
-        area: gridcell area in m^2
-        x_height_flux: area-weighted flux of height in x-direction,
-            in units of g * m^3
-        y_height_flux: area-weighted flux of height in y-direction,
-            in units of g * m^3
-        x_area_flux: flux of area in x-direction, in units of m^2
-        y_area_flux: flux of area in y-direction, in units of m^2
-    """
-    # described in Putman and Lin 2007 equation 7
-    # updated area is used because of implicit-in-time evaluation
-    area_after_flux = (
-        (area + x_area_flux - x_area_flux[1, 0, 0])
-        + (area + y_area_flux - y_area_flux[0, 1, 0])
-        - area
-    )
-    # final height is the original volume plus the fluxed volumes,
-    # divided by the final area
-    return (
-        height * area
-        + x_height_flux
-        - x_height_flux[1, 0, 0]
-        + y_height_flux
-        - y_height_flux[0, 1, 0]
-    ) / area_after_flux
-
-
-def apply_height_fluxes(
-    area: FloatFieldIJ,
-    height: FloatField,
-    fx: FloatField,
-    fy: FloatField,
-    x_area_flux: FloatField,
-    y_area_flux: FloatField,
-    gz_x_diffusive_flux: FloatField,
-    gz_y_diffusive_flux: FloatField,
-    surface_height: FloatFieldIJ,
-    ws: FloatFieldIJ,
-    dt: Float,
-):
-    """
-    Apply all computed fluxes to height profile.
-
-    All vertically-resolved arguments are defined on the same grid
-    (normally interface levels).
-
-    Args:
-        area (in): gridcell area in m^2
-        height (inout): height profile on which to apply fluxes
-        fx (in): area-weighted flux of height in x-direction,
-            in units of g * m^3
-        fy (in): area-weighted flux of height in y-direction,
-            in units of g * m^3
-        x_area_flux (in): flux of area in x-direction, in units of m^2
-        y_area_flux (in): flux of area in y-direction, in units of m^2
-        gz_x_diffusive_flux (in): diffusive flux of area-weighted height
-            in x-direction
-        gz_y_diffusive_flux (in): diffusive flux of area-weighted height
-            in y-direction
-        surface_height (in): surface height
-        ws (out): vertical velocity of the lowest level (to keep it at the surface)
-        dt (in): acoustic timestep (seconds)
-    Grid variable inputs:
-        area
-    """
-    with computation(PARALLEL), interval(...):
-        height = (
-            _apply_height_advective_flux(height, area, fx, fy, x_area_flux, y_area_flux)
-            + (
-                gz_x_diffusive_flux
-                - gz_x_diffusive_flux[1, 0, 0]
-                + gz_y_diffusive_flux
-                - gz_y_diffusive_flux[0, 1, 0]
-            )
-            / area
-        )
-
-    with computation(BACKWARD):
-        with interval(-1, None):
-            ws = (surface_height - height) / dt
-        with interval(0, -1):
-            # ensure layer thickness exceeds minimum
-            other = height[0, 0, 1] + DZ_MIN
-            height = height if height > other else other
-
-
-def cubic_spline_interpolation_constants(
-    dp0: Quantity, quantity_factory: QuantityFactory
-) -> Tuple[Quantity, Quantity, Quantity]:
-    """
-    Computes constants used in cubic spline interpolation
-    from cell center to interface levels.
-
-    Args:
-        dp0: reference pressure thickness on mid levels (in)
-
-    Returns:
-        gk: interpolation constant on mid levels
-        beta: interpolation constant on mid levels
-        gamma: interpolation constant on mid levels
-    """
-    gk = quantity_factory.zeros(
-        [Z_DIM],
-        units="",
-        dtype=Float,
-    )
-    beta = quantity_factory.zeros(
-        [Z_DIM],
-        units="",
-        dtype=Float,
-    )
-    gamma = quantity_factory.zeros(
-        [Z_DIM],
-        units="",
-        dtype=Float,
-    )
-    gk.view[0] = dp0.view[1] / dp0.view[0]
-    beta.view[0] = gk.view[0] * (gk.view[0] + 0.5)
-    gamma.view[0] = (1.0 + gk.view[0] * (gk.view[0] + 1.5)) / beta.view[0]
-    gk.view[1:] = dp0.view[:-1] / dp0.view[1:]
-    for i in range(1, beta.view[:].shape[0]):
-        beta.view[i] = 2.0 + 2.0 * gk.view[i] - gamma.view[i - 1]
-        gamma.view[i] = gk.view[i] / beta.view[i]
-    return gk, beta, gamma
-
-
-def cubic_spline_interpolation_from_layer_center_to_interfaces(
-    q_center: FloatField,
-    q_interface: FloatField,
-    gk: FloatFieldK,
-    beta: FloatFieldK,
-    gamma: FloatFieldK,
-) -> FloatField:
-    """
-    Interpolate a field from layer (vertical) centers to interfaces.
-
-    Corresponds to edge_profile in nh_utils.F90 in the original Fortran code.
-
-    Args:
-        q_center (in): value on layer centers
-        q_interface (out): value on layer interfaces
-        gk (in): cubic spline interpolation constant
-        beta (in): cubic spline interpolation constant
-        gamma (in): cubic spline interpolation constant
-    """
-    # NOTE: We have not ported the uniform_grid True option as it is never called
-    # that way in this model. We have also ignored limiter != 0 for the same reason.
-    with computation(FORWARD):
-        with interval(0, 1):
-            xt1 = 2.0 * gk * (gk + 1.0)
-            q_interface = (xt1 * q_center + q_center[0, 0, 1]) / beta
-        with interval(1, -1):
-            q_interface = (
-                3.0 * (q_center[0, 0, -1] + gk * q_center) - q_interface[0, 0, -1]
-            ) / beta
-        with interval(-1, None):
-            a_bot = 1.0 + gk[-1] * (gk[-1] + 1.5)
-            xt1 = 2.0 * gk[-1] * (gk[-1] + 1.0)
-            xt2 = gk[-1] * (gk[-1] + 0.5) - a_bot * gamma[-1]
-            q_interface = (
-                xt1 * q_center[0, 0, -1]
-                + q_center[0, 0, -2]
-                - a_bot * q_interface[0, 0, -1]
-            ) / xt2
-    with computation(BACKWARD), interval(0, -1):
-        q_interface -= gamma * q_interface[0, 0, 1]
-
-
-class UpdateHeightOnDGrid:
-    """
-    Fortran name is updatedzd.
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-        damping_coefficients: DampingCoefficients,
-        grid_data: GridData,
-        grid_type: int,
-        hord_tm: int,
-        column_namelist,
-    ):
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-        )
-        grid_indexing = stencil_factory.grid_indexing
-        self.grid_indexing = grid_indexing
-        self._area = grid_data.area
-        self._column_namelist = column_namelist
-        if any(column_namelist["damp_vt"].view[:] <= 1e-5):
-            raise NotImplementedError("damp <= 1e-5 in column_namelist is untested")
-        self._dp_ref = grid_data.dp_ref
-        self._allocate_temporary_storages(quantity_factory)
-        self._gk, self._beta, self._gamma = cubic_spline_interpolation_constants(
-            dp0=grid_data.dp_ref, quantity_factory=quantity_factory
-        )
-
-        self._interpolate_to_layer_interface = stencil_factory.from_origin_domain(
-            cubic_spline_interpolation_from_layer_center_to_interfaces,
-            origin=grid_indexing.origin_full(),
-            domain=grid_indexing.domain_full(add=(0, 0, 1)),
-        )
-        self.finite_volume_transport = FiniteVolumeTransport(
-            stencil_factory=stencil_factory,
-            quantity_factory=quantity_factory,
-            grid_data=grid_data,
-            damping_coefficients=damping_coefficients,
-            grid_type=grid_type,
-            hord=hord_tm,
-        )
-        self.delnflux = DelnFluxNoSG(
-            stencil_factory,
-            damping_coefficients,
-            grid_data.rarea,
-            self._column_namelist["nord_v"],
-            nk=grid_indexing.domain[2] + 1,
-        )
-        self._apply_height_fluxes = stencil_factory.from_origin_domain(
-            apply_height_fluxes,
-            origin=grid_indexing.origin_compute(),
-            domain=grid_indexing.domain_compute(add=(0, 0, 1)),
-        )
-
-    def _allocate_temporary_storages(self, quantity_factory: QuantityFactory):
-        self._crx_interface = quantity_factory.zeros(
-            [X_INTERFACE_DIM, Y_DIM, Z_INTERFACE_DIM],
-            "",
-            dtype=Float,
-        )
-        self._cry_interface = quantity_factory.zeros(
-            [X_DIM, Y_INTERFACE_DIM, Z_INTERFACE_DIM],
-            "",
-            dtype=Float,
-        )
-        self._x_area_flux_interface = quantity_factory.zeros(
-            [X_INTERFACE_DIM, Y_DIM, Z_INTERFACE_DIM],
-            "m^2",
-            dtype=Float,
-        )
-        self._y_area_flux_interface = quantity_factory.zeros(
-            [X_DIM, Y_INTERFACE_DIM, Z_INTERFACE_DIM],
-            "m^2",
-            dtype=Float,
-        )
-        self._wk = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            "unknown",
-            dtype=Float,
-        )
-        self._height_x_diffusive_flux = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            "unknown",
-            dtype=Float,
-        )
-        self._height_y_diffusive_flux = quantity_factory.zeros(
-            [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            "unknown",
-            dtype=Float,
-        )
-        self._fx = quantity_factory.zeros(
-            [X_INTERFACE_DIM, Y_DIM, Z_INTERFACE_DIM],
-            "unknown",
-            dtype=Float,
-        )
-        self._fy = quantity_factory.zeros(
-            [X_DIM, Y_INTERFACE_DIM, Z_INTERFACE_DIM],
-            "unknown",
-            dtype=Float,
-        )
-
-    def __call__(
-        self,
-        surface_height: FloatFieldIJ,
-        height: FloatField,
-        courant_number_x: FloatField,
-        courant_number_y: FloatField,
-        x_area_flux: FloatField,
-        y_area_flux: FloatField,
-        ws: FloatFieldIJ,
-        dt: Float,
-    ):
-        """
-        Advect height on D-grid.
-
-        Height can be in any units, including geopotential units.
-
-        Args:
-            surface_height (in): height of surface
-            height (inout): height defined on layer interfaces
-            courant_number_x (in): Courant number in x-direction defined on cell centers
-            courant_number_y (in): Courant number in y-direction defined on cell centers
-            x_area_flux (in): Area flux in x-direction defined on cell centers
-            y_area_flux (in): Area flux in y-direction defined on cell centers
-            ws (out): lowest layer vertical velocity implied by horizontal motion
-                over topography, in units of [height units] / second
-            dt (in): timestep over which input fluxes have been computed, in seconds
-        """
-        self._interpolate_to_layer_interface(
-            courant_number_x, self._crx_interface, self._gk, self._beta, self._gamma
-        )
-        self._interpolate_to_layer_interface(
-            x_area_flux, self._x_area_flux_interface, self._gk, self._beta, self._gamma
-        )
-        self._interpolate_to_layer_interface(
-            courant_number_y, self._cry_interface, self._gk, self._beta, self._gamma
-        )
-        self._interpolate_to_layer_interface(
-            y_area_flux, self._y_area_flux_interface, self._gk, self._beta, self._gamma
-        )
-
-        # compute fluxes
-        self.finite_volume_transport(
-            height,
-            self._crx_interface,
-            self._cry_interface,
-            self._x_area_flux_interface,
-            self._y_area_flux_interface,
-            self._fx,
-            self._fy,
-        )
-
-        # TODO: in theory, we should check if damp_vt > 1e-5 for each k-level and
-        # only compute for k-levels where this is true
-        # compute diffusive component of fluxes
-        self.delnflux(
-            height,
-            self._height_x_diffusive_flux,
-            self._height_y_diffusive_flux,
-            self._column_namelist["damp_vt"],
-            self._wk,
-        )
-        self._apply_height_fluxes(
-            self._area,
-            height,
-            self._fx,
-            self._fy,
-            self._x_area_flux_interface,
-            self._y_area_flux_interface,
-            self._height_x_diffusive_flux,
-            self._height_y_diffusive_flux,
-            surface_height,
-            ws,
-            dt,
-        )
diff --git a/pyFV3/pyFV3/stencils/xppm.py b/pyFV3/pyFV3/stencils/xppm.py
deleted file mode 100644
index 3ae0317e..00000000
--- a/pyFV3/pyFV3/stencils/xppm.py
+++ /dev/null
@@ -1,366 +0,0 @@
-from gt4py.cartesian import gtscript
-from gt4py.cartesian.gtscript import (
-    __INLINED,
-    PARALLEL,
-    compile_assert,
-    computation,
-    horizontal,
-    interval,
-    region,
-)
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import FloatField, FloatFieldIJ, Index3D
-
-from pyFV3.stencils import ppm
-from pyFV3.stencils.basic_operations import sign
-
-
-@gtscript.function
-def apply_flux(courant, q, fx1, mask):
-    """
-    Args:
-        courant: any value whose sign is the same as the sign of
-            the x-wind on cell corners
-        q: scalar being transported, on x-centers
-        fx1: flux of q in units of q, on x-interfaces
-        mask: fx1 is multiplied by this before being applied
-    """
-    return q[-1, 0, 0] + fx1 * mask if courant > 0.0 else q + fx1 * mask
-
-
-@gtscript.function
-def fx1_fn(courant, br, b0, bl):
-    """
-    Args:
-        courant: courant number, u * dt / dx (unitless)
-        br: ???
-        b0: br + bl
-        bl: ???
-    """
-    if courant > 0.0:
-        ret = (1.0 - courant) * (br[-1, 0, 0] - courant * b0[-1, 0, 0])
-    else:
-        ret = (1.0 + courant) * (bl + courant * b0)
-    return ret
-
-
-@gtscript.function
-def get_advection_mask(bl, b0, br):
-    from __externals__ import mord
-
-    if __INLINED(mord == 5):
-        smt5 = bl * br < 0
-    else:
-        smt5 = (3.0 * abs(b0)) < abs(bl - br)
-
-    if smt5[-1, 0, 0] or smt5[0, 0, 0]:
-        advection_mask = 1.0
-    else:
-        advection_mask = 0.0
-
-    return advection_mask
-
-
-@gtscript.function
-def get_flux(q: FloatField, courant: FloatField, al: FloatField):
-    bl = al[0, 0, 0] - q[0, 0, 0]
-    br = al[1, 0, 0] - q[0, 0, 0]
-    b0 = bl + br
-
-    advection_mask = get_advection_mask(bl, b0, br)
-    fx1 = fx1_fn(courant, br, b0, bl)
-    return apply_flux(courant, q, fx1, advection_mask)  # noqa
-
-
-@gtscript.function
-def get_flux_ord8plus(
-    q: FloatField, courant: FloatField, bl: FloatField, br: FloatField
-):
-    b0 = bl + br
-    fx1 = fx1_fn(courant, br, b0, bl)
-    return apply_flux(courant, q, fx1, 1.0)
-
-
-@gtscript.function
-def dm_iord8plus(q: FloatField):
-    xt = 0.25 * (q[1, 0, 0] - q[-1, 0, 0])
-    dqr = max(max(q, q[-1, 0, 0]), q[1, 0, 0]) - q
-    dql = q - min(min(q, q[-1, 0, 0]), q[1, 0, 0])
-    return sign(min(min(abs(xt), dqr), dql), xt)
-
-
-@gtscript.function
-def al_iord8plus(q: FloatField, dm: FloatField):
-    return 0.5 * (q[-1, 0, 0] + q) + 1.0 / 3.0 * (dm[-1, 0, 0] - dm)
-
-
-@gtscript.function
-def blbr_iord8(q: FloatField, al: FloatField, dm: FloatField):
-    xt = 2.0 * dm
-    bl = -1.0 * sign(min(abs(xt), abs(al - q)), xt)
-    br = sign(min(abs(xt), abs(al[1, 0, 0] - q)), xt)
-    return bl, br
-
-
-@gtscript.function
-def xt_dxa_edge_0_base(q, dxa):
-    return 0.5 * (
-        ((2.0 * dxa + dxa[-1, 0]) * q - dxa * q[-1, 0, 0]) / (dxa[-1, 0] + dxa)
-        + ((2.0 * dxa[1, 0] + dxa[2, 0]) * q[1, 0, 0] - dxa[1, 0] * q[2, 0, 0])
-        / (dxa[1, 0] + dxa[2, 0])
-    )
-
-
-@gtscript.function
-def xt_dxa_edge_1_base(q, dxa):
-    return 0.5 * (
-        ((2.0 * dxa[-1, 0] + dxa[-2, 0]) * q[-1, 0, 0] - dxa[-1, 0] * q[-2, 0, 0])
-        / (dxa[-2, 0] + dxa[-1, 0])
-        + ((2.0 * dxa + dxa[1, 0]) * q - dxa * q[1, 0, 0]) / (dxa + dxa[1, 0])
-    )
-
-
-@gtscript.function
-def xt_dxa_edge_0(q, dxa):
-    from __externals__ import xt_minmax
-
-    xt = xt_dxa_edge_0_base(q, dxa)
-    if __INLINED(xt_minmax):
-        minq = min(min(min(q[-1, 0, 0], q), q[1, 0, 0]), q[2, 0, 0])
-        maxq = max(max(max(q[-1, 0, 0], q), q[1, 0, 0]), q[2, 0, 0])
-        xt = min(max(xt, minq), maxq)
-    return xt
-
-
-@gtscript.function
-def xt_dxa_edge_1(q, dxa):
-    from __externals__ import xt_minmax
-
-    xt = xt_dxa_edge_1_base(q, dxa)
-    if __INLINED(xt_minmax):
-        minq = min(min(min(q[-2, 0, 0], q[-1, 0, 0]), q), q[1, 0, 0])
-        maxq = max(max(max(q[-2, 0, 0], q[-1, 0, 0]), q), q[1, 0, 0])
-        xt = min(max(xt, minq), maxq)
-    return xt
-
-
-@gtscript.function
-def compute_al(q: FloatField, dxa: FloatFieldIJ):
-    """
-    Interpolate q at interface.
-
-    Inputs:
-        q: transported scalar centered along the x-direction
-        dxa: dx on A-grid (?)
-
-    Returns:
-        q interpolated to x-interfaces
-    """
-    from __externals__ import grid_type, i_end, i_start, iord
-
-    compile_assert(iord < 8)
-
-    al = ppm.p1 * (q[-1, 0, 0] + q) + ppm.p2 * (q[-2, 0, 0] + q[1, 0, 0])
-
-    if __INLINED(iord < 0):
-        compile_assert(False)
-        al = max(al, 0.0)
-
-    if __INLINED(grid_type < 3):
-        with horizontal(region[i_start - 1, :], region[i_end, :]):
-            al = ppm.c1 * q[-2, 0, 0] + ppm.c2 * q[-1, 0, 0] + ppm.c3 * q
-        with horizontal(region[i_start, :], region[i_end + 1, :]):
-            al = 0.5 * (
-                (
-                    (2.0 * dxa[-1, 0] + dxa[-2, 0]) * q[-1, 0, 0]
-                    - dxa[-1, 0] * q[-2, 0, 0]
-                )
-                / (dxa[-2, 0] + dxa[-1, 0])
-                + ((2.0 * dxa[0, 0] + dxa[1, 0]) * q[0, 0, 0] - dxa[0, 0] * q[1, 0, 0])
-                / (dxa[0, 0] + dxa[1, 0])
-            )
-        with horizontal(region[i_start + 1, :], region[i_end + 2, :]):
-            al = ppm.c3 * q[-1, 0, 0] + ppm.c2 * q[0, 0, 0] + ppm.c1 * q[1, 0, 0]
-
-    return al
-
-
-@gtscript.function
-def bl_br_edges(bl, br, q, dxa, al, dm):
-    from __externals__ import i_end, i_start
-
-    # TODO(eddied): This temporary prevents race conditions in regions
-    al_ip1 = al[1, 0, 0]
-
-    with horizontal(region[i_start - 1, :]):
-        # TODO(rheag) when possible
-        # dm_left = dm_iord8plus(q[-1, 0, 0])
-        xt = 0.25 * (q - q[-2, 0, 0])
-        dqr = max(max(q[-1, 0, 0], q[-2, 0, 0]), q) - q[-1, 0, 0]
-        dql = q[-1, 0, 0] - min(min(q[-1, 0, 0], q[-2, 0, 0]), q)
-        dm_left = sign(min(min(abs(xt), dqr), dql), xt)
-        xt_bl = ppm.s14 * dm_left + ppm.s11 * (q[-1, 0, 0] - q) + q
-        xt_br = xt_dxa_edge_0(q, dxa)
-
-    with horizontal(region[i_start, :]):
-        # TODO(rheag) when possible
-        # dm_right = dm_iord8plus(q[1, 0, 0])
-        xt = 0.25 * (q[2, 0, 0] - q)
-        dqr = max(max(q[1, 0, 0], q), q[2, 0, 0]) - q[1, 0, 0]
-        dql = q[1, 0, 0] - min(min(q[1, 0, 0], q), q[2, 0, 0])
-        dm_right = sign(min(min(abs(xt), dqr), dql), xt)
-        xt_bl = ppm.s14 * dm_left + ppm.s11 * (q[-1, 0, 0] - q) + q
-        xt_bl = xt_dxa_edge_1(q, dxa)
-        xt_br = ppm.s15 * q + ppm.s11 * q[1, 0, 0] - ppm.s14 * dm_right
-
-    with horizontal(region[i_start + 1, :]):
-        xt_bl = ppm.s15 * q[-1, 0, 0] + ppm.s11 * q - ppm.s14 * dm
-        xt_br = al_ip1
-
-    with horizontal(region[i_end - 1, :]):
-        xt_bl = al
-        xt_br = ppm.s15 * q[1, 0, 0] + ppm.s11 * q + ppm.s14 * dm
-
-    with horizontal(region[i_end, :]):
-        # TODO(rheag) when possible
-        # dm_left_end = dm_iord8plus(q[-1, 0, 0])
-        xt = 0.25 * (q - q[-2, 0, 0])
-        dqr = max(max(q[-1, 0, 0], q[-2, 0, 0]), q) - q[-1, 0, 0]
-        dql = q[-1, 0, 0] - min(min(q[-1, 0, 0], q[-2, 0, 0]), q)
-        dm_left_end = sign(min(min(abs(xt), dqr), dql), xt)
-        xt_bl = ppm.s15 * q + ppm.s11 * q[-1, 0, 0] + ppm.s14 * dm_left_end
-        xt_br = xt_dxa_edge_0(q, dxa)
-
-    with horizontal(region[i_end + 1, :]):
-        # TODO(rheag) when possible
-        # dm_right_end = dm_iord8plus(q[1, 0, 0])
-        xt = 0.25 * (q[2, 0, 0] - q)
-        dqr = max(max(q[1, 0, 0], q), q[2, 0, 0]) - q[1, 0, 0]
-        dql = q[1, 0, 0] - min(min(q[1, 0, 0], q), q[2, 0, 0])
-        dm_right_end = sign(min(min(abs(xt), dqr), dql), xt)
-        xt_bl = xt_dxa_edge_1(q, dxa)
-        xt_br = ppm.s11 * (q[1, 0, 0] - q) - ppm.s14 * dm_right_end + q
-
-    with horizontal(
-        region[i_start - 1 : i_start + 2, :], region[i_end - 1 : i_end + 2, :]
-    ):
-        bl = xt_bl - q
-        br = xt_br - q
-
-    return bl, br
-
-
-@gtscript.function
-def compute_blbr_ord8plus(q: FloatField, dxa: FloatFieldIJ):
-    from __externals__ import grid_type, i_end, i_start, iord
-
-    dm = dm_iord8plus(q)
-    al = al_iord8plus(q, dm)
-
-    compile_assert(iord == 8)
-
-    bl, br = blbr_iord8(q, al, dm)
-
-    if __INLINED(grid_type < 3):
-        bl, br = bl_br_edges(bl, br, q, dxa, al, dm)
-
-        with horizontal(
-            region[i_start - 1 : i_start + 2, :], region[i_end - 1 : i_end + 2, :]
-        ):
-            bl, br = ppm.pert_ppm_standard_constraint_fcn(q, bl, br)
-
-    return bl, br
-
-
-def compute_x_flux(
-    q: FloatField, courant: FloatField, dxa: FloatFieldIJ, xflux: FloatField
-):
-    """
-    Args:
-        q (in):
-        courant (in):
-        dxa (in):
-        xflux (out):
-    """
-    from __externals__ import mord
-
-    with computation(PARALLEL), interval(...):
-        if __INLINED(mord < 8):
-            al = compute_al(q, dxa)
-            xflux = get_flux(q, courant, al)
-        else:
-            bl, br = compute_blbr_ord8plus(q, dxa)
-            xflux = get_flux_ord8plus(q, courant, bl, br)
-
-
-class XPiecewiseParabolic:
-    """
-    Fortran name is xppm
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        dxa,
-        grid_type: int,
-        iord,
-        origin: Index3D,
-        domain: Index3D,
-    ):
-        # Arguments come from:
-        # namelist.grid_type
-        # grid.dxa
-        if grid_type == 3 or grid_type > 4:
-            raise NotImplementedError(
-                "X Piecewise Parabolic (xppm): "
-                f" grid type {grid_type} not implemented. <3 or 4 available."
-            )
-        self._dxa = dxa
-        ax_offsets = stencil_factory.grid_indexing.axis_offsets(origin, domain)
-        self._compute_flux_stencil = stencil_factory.from_origin_domain(
-            func=compute_x_flux,
-            externals={
-                "iord": iord,
-                "mord": abs(iord),
-                "xt_minmax": True,
-                "i_start": ax_offsets["i_start"],
-                "i_end": ax_offsets["i_end"],
-                "grid_type": grid_type,
-            },
-            origin=origin,
-            domain=domain,
-        )
-
-    def __call__(
-        self,
-        q_in: FloatField,
-        c: FloatField,
-        q_mean_advected_through_x_interface: FloatField,
-    ):
-        """
-        Determine the mean value per area of q_in to be advected along x-interfaces.
-
-        This is done by integrating a piecewise-parabolic subgrid reconstruction
-        of q_in along the x-direction over the segment of gridcell which
-        will be advected.
-
-        Multiplying this mean value by the area to be advected through the interface
-        would give the flux of q through that interface.
-
-        Args:
-            q_in (in): scalar to be integrated
-            c (in): Courant number (u*dt/dx) in x-direction defined on x-interfaces,
-                indicates the fraction of the adjacent grid cell which will be
-                advected through the interface in one timestep
-            q_mean_advected_through_x_interface (out): defined on x-interfaces.
-                mean value of scalar within the segment of gridcell to be advected
-                through that interface in one timestep, in units of q_in
-        """
-        # in the Fortran version of this code, "x_advection" routines
-        # were called "get_flux", while the routine which got the flux was called
-        # fx1_fn. The final value was called xflux instead of q_out.
-        self._compute_flux_stencil(
-            q_in, c, self._dxa, q_mean_advected_through_x_interface
-        )
-        # bl and br are "edge perturbation values" as in equation 4.1
-        # of the FV3 documentation
diff --git a/pyFV3/pyFV3/stencils/xtp_u.py b/pyFV3/pyFV3/stencils/xtp_u.py
deleted file mode 100644
index a6c4185f..00000000
--- a/pyFV3/pyFV3/stencils/xtp_u.py
+++ /dev/null
@@ -1,95 +0,0 @@
-from gt4py.cartesian import gtscript
-from gt4py.cartesian.gtscript import __INLINED, compile_assert, horizontal, region
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-
-from pyFV3.stencils import ppm, xppm
-
-
-@gtscript.function
-def get_bl_br(u, dx, dxa):
-    """
-    Args:
-        u: covariant x-wind on D-grid
-        dx: gridcell spacing in x-direction
-        dxa: gridcell spacing in x-direction on A-grid
-
-    Returns:
-        bl: ???
-        br: ???
-    """
-    from __externals__ import grid_type, i_end, i_start, iord, j_end, j_start
-
-    if __INLINED(iord < 8):
-        u_on_cell_corners = xppm.compute_al(u, dx)
-
-        bl = u_on_cell_corners[0, 0, 0] - u[0, 0, 0]
-        br = u_on_cell_corners[1, 0, 0] - u[0, 0, 0]
-
-    else:
-        dm = xppm.dm_iord8plus(u)
-        u_on_cell_corners = xppm.al_iord8plus(u, dm)
-
-        compile_assert(iord == 8)
-
-        bl, br = xppm.blbr_iord8(u, u_on_cell_corners, dm)
-
-        if __INLINED(grid_type < 3):
-            bl, br = xppm.bl_br_edges(bl, br, u, dxa, u_on_cell_corners, dm)
-
-            with horizontal(region[i_start + 1, :], region[i_end - 1, :]):
-                bl, br = ppm.pert_ppm_standard_constraint_fcn(u, bl, br)
-
-    if __INLINED(grid_type < 3):
-        # Zero corners
-        with horizontal(
-            region[i_start - 1 : i_start + 1, j_start],
-            region[i_start - 1 : i_start + 1, j_end + 1],
-            region[i_end : i_end + 2, j_start],
-            region[i_end : i_end + 2, j_end + 1],
-        ):
-            bl = 0.0
-            br = 0.0
-
-    return bl, br
-
-
-@gtscript.function
-def advect_u_along_x(
-    u: FloatField,
-    ub_contra: FloatField,
-    rdx: FloatFieldIJ,
-    dx: FloatFieldIJ,
-    dxa: FloatFieldIJ,
-    dt: Float,
-):
-    """
-    Advect covariant x-wind on D-grid using contravariant x-wind on cell corners.
-
-    Named xtp_u in the original Fortran code. In the Fortran, dt is folded
-    in to ub_contra and called "courant".
-
-    Args:
-        u: covariant x-wind on D-grid
-        ub_contra: contravariant x-wind on cell corners
-        rdx: 1 / dx
-        dx: gridcell spacing in x-direction
-        dxa: a-grid gridcell spacing in x-direction
-        dt: timestep in seconds
-
-    Returns:
-        updated_u: u having been advected by u_on_cell_corners
-    """
-    # Could try merging this with xppm version.
-
-    from __externals__ import iord
-
-    bl, br = get_bl_br(u, dx, dxa)
-    b0 = bl + br
-    cfl = ub_contra * dt * rdx[-1, 0] if ub_contra > 0 else ub_contra * dt * rdx
-    fx0 = xppm.fx1_fn(cfl, br, b0, bl)
-
-    if __INLINED(iord < 8):
-        advection_mask = xppm.get_advection_mask(bl, b0, br)
-    else:
-        advection_mask = 1.0
-    return xppm.apply_flux(ub_contra, u, fx0, advection_mask)
diff --git a/pyFV3/pyFV3/stencils/yppm.py b/pyFV3/pyFV3/stencils/yppm.py
deleted file mode 100644
index 6caeee0b..00000000
--- a/pyFV3/pyFV3/stencils/yppm.py
+++ /dev/null
@@ -1,368 +0,0 @@
-from gt4py.cartesian import gtscript
-from gt4py.cartesian.gtscript import (
-    __INLINED,
-    PARALLEL,
-    compile_assert,
-    computation,
-    horizontal,
-    interval,
-    region,
-)
-from ndsl.dsl.dace.orchestration import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import FloatField, FloatFieldIJ, Index3D
-
-from pyFV3.stencils import ppm
-from pyFV3.stencils.basic_operations import sign
-
-
-@gtscript.function
-def apply_flux(courant, q, fx1, mask):
-    """
-    Args:
-        courant: any value whose sign is the same as the sign of
-            the y-wind on cell corners
-        q: scalar being transported, on y-centers
-        fx1: flux of q in units of q, on y-interfaces
-        mask: fx1 is multiplied by this before being applied
-    """
-    return q[0, -1, 0] + fx1 * mask if courant > 0.0 else q + fx1 * mask
-
-
-@gtscript.function
-def fx1_fn(courant, br, b0, bl):
-    """
-    Args:
-        courant: courant number, v * dt / dy (unitless)
-        br: ???
-        b0: br + bl
-        bl: ???
-    """
-    if courant > 0.0:
-        ret = (1.0 - courant) * (br[0, -1, 0] - courant * b0[0, -1, 0])
-    else:
-        ret = (1.0 + courant) * (bl + courant * b0)
-    return ret
-
-
-@gtscript.function
-def get_advection_mask(bl, b0, br):
-    from __externals__ import mord
-
-    if __INLINED(mord == 5):
-        smt5 = bl * br < 0
-    else:
-        smt5 = (3.0 * abs(b0)) < abs(bl - br)
-
-    if smt5[0, -1, 0] or smt5[0, 0, 0]:
-        advection_mask = 1.0
-    else:
-        advection_mask = 0.0
-
-    return advection_mask
-
-
-@gtscript.function
-def get_flux(q: FloatField, courant: FloatField, al: FloatField):
-    bl = al[0, 0, 0] - q[0, 0, 0]
-    br = al[0, 1, 0] - q[0, 0, 0]
-    b0 = bl + br
-
-    advection_mask = get_advection_mask(bl, b0, br)
-    fx1 = fx1_fn(courant, br, b0, bl)
-    return apply_flux(courant, q, fx1, advection_mask)  # noqa
-
-
-@gtscript.function
-def get_flux_ord8plus(
-    q: FloatField, courant: FloatField, bl: FloatField, br: FloatField
-):
-    b0 = bl + br
-    fx1 = fx1_fn(courant, br, b0, bl)
-    return apply_flux(courant, q, fx1, 1.0)
-
-
-@gtscript.function
-def dm_jord8plus(q: FloatField):
-    yt = 0.25 * (q[0, 1, 0] - q[0, -1, 0])
-    dqr = max(max(q, q[0, -1, 0]), q[0, 1, 0]) - q
-    dql = q - min(min(q, q[0, -1, 0]), q[0, 1, 0])
-    return sign(min(min(abs(yt), dqr), dql), yt)
-
-
-@gtscript.function
-def al_jord8plus(q: FloatField, dm: FloatField):
-    return 0.5 * (q[0, -1, 0] + q) + 1.0 / 3.0 * (dm[0, -1, 0] - dm)
-
-
-@gtscript.function
-def blbr_jord8(q: FloatField, al: FloatField, dm: FloatField):
-    yt = 2.0 * dm
-    bl = -1.0 * sign(min(abs(yt), abs(al - q)), yt)
-    br = sign(min(abs(yt), abs(al[0, 1, 0] - q)), yt)
-    return bl, br
-
-
-@gtscript.function
-def yt_dya_edge_0_base(q, dya):
-    return 0.5 * (
-        ((2.0 * dya + dya[0, -1]) * q - dya * q[0, -1, 0]) / (dya[0, -1] + dya)
-        + ((2.0 * dya[0, 1] + dya[0, 2]) * q[0, 1, 0] - dya[0, 1] * q[0, 2, 0])
-        / (dya[0, 1] + dya[0, 2])
-    )
-
-
-@gtscript.function
-def yt_dya_edge_1_base(q, dya):
-    return 0.5 * (
-        ((2.0 * dya[0, -1] + dya[0, -2]) * q[0, -1, 0] - dya[0, -1] * q[0, -2, 0])
-        / (dya[0, -2] + dya[0, -1])
-        + ((2.0 * dya + dya[0, 1]) * q - dya * q[0, 1, 0]) / (dya + dya[0, 1])
-    )
-
-
-@gtscript.function
-def yt_dya_edge_0(q, dya):
-    from __externals__ import yt_minmax
-
-    yt = yt_dya_edge_0_base(q, dya)
-    if __INLINED(yt_minmax):
-        minq = min(min(min(q[0, -1, 0], q), q[0, 1, 0]), q[0, 2, 0])
-        maxq = max(max(max(q[0, -1, 0], q), q[0, 1, 0]), q[0, 2, 0])
-        yt = min(max(yt, minq), maxq)
-    return yt
-
-
-@gtscript.function
-def yt_dya_edge_1(q, dya):
-    from __externals__ import yt_minmax
-
-    yt = yt_dya_edge_1_base(q, dya)
-    if __INLINED(yt_minmax):
-        minq = min(min(min(q[0, -2, 0], q[0, -1, 0]), q), q[0, 1, 0])
-        maxq = max(max(max(q[0, -2, 0], q[0, -1, 0]), q), q[0, 1, 0])
-        yt = min(max(yt, minq), maxq)
-    return yt
-
-
-@gtscript.function
-def compute_al(q: FloatField, dya: FloatFieldIJ):
-    """
-    Interpolate q at interface.
-
-    Inputs:
-        q: transported scalar centered along the y-direction
-        dya: dy on A-grid (?)
-
-    Returns:
-        q interpolated to y-interfaces
-    """
-    from __externals__ import grid_type, j_end, j_start, jord
-
-    compile_assert(jord < 8)
-
-    al = ppm.p1 * (q[0, -1, 0] + q) + ppm.p2 * (q[0, -2, 0] + q[0, 1, 0])
-
-    if __INLINED(jord < 0):
-        compile_assert(False)
-        al = max(al, 0.0)
-
-    if __INLINED(grid_type < 3):
-        with horizontal(region[:, j_start - 1], region[:, j_end]):
-            al = ppm.c1 * q[0, -2, 0] + ppm.c2 * q[0, -1, 0] + ppm.c3 * q
-        with horizontal(region[:, j_start], region[:, j_end + 1]):
-            al = 0.5 * (
-                (
-                    (2.0 * dya[0, -1] + dya[0, -2]) * q[0, -1, 0]
-                    - dya[0, -1] * q[0, -2, 0]
-                )
-                / (dya[0, -2] + dya[0, -1])
-                + ((2.0 * dya[0, 0] + dya[0, 1]) * q[0, 0, 0] - dya[0, 0] * q[0, 1, 0])
-                / (dya[0, 0] + dya[0, 1])
-            )
-        with horizontal(region[:, j_start + 1], region[:, j_end + 2]):
-            al = ppm.c3 * q[0, -1, 0] + ppm.c2 * q[0, 0, 0] + ppm.c1 * q[0, 1, 0]
-
-    return al
-
-
-@gtscript.function
-def bl_br_edges(bl, br, q, dya, al, dm):
-    from __externals__ import j_end, j_start
-
-    # TODO(eddied): This temporary prevents race conditions in regions
-    al_ip1 = al[0, 1, 0]
-
-    with horizontal(region[:, j_start - 1]):
-        # TODO(rheag) when possible
-        # dm_left = dm_jord8plus(q[0, -1, 0])
-        yt = 0.25 * (q - q[0, -2, 0])
-        dqr = max(max(q[0, -1, 0], q[0, -2, 0]), q) - q[0, -1, 0]
-        dql = q[0, -1, 0] - min(min(q[0, -1, 0], q[0, -2, 0]), q)
-        dm_left = sign(min(min(abs(yt), dqr), dql), yt)
-        yt_bl = ppm.s14 * dm_left + ppm.s11 * (q[0, -1, 0] - q) + q
-        yt_br = yt_dya_edge_0(q, dya)
-
-    with horizontal(region[:, j_start]):
-        # TODO(rheag) when possible
-        # dm_right = dm_jord8plus(q[0, 1, 0])
-        yt = 0.25 * (q[0, 2, 0] - q)
-        dqr = max(max(q[0, 1, 0], q), q[0, 2, 0]) - q[0, 1, 0]
-        dql = q[0, 1, 0] - min(min(q[0, 1, 0], q), q[0, 2, 0])
-        dm_right = sign(min(min(abs(yt), dqr), dql), yt)
-        yt_bl = ppm.s14 * dm_left + ppm.s11 * (q[0, -1, 0] - q) + q
-        yt_bl = yt_dya_edge_1(q, dya)
-        yt_br = ppm.s15 * q + ppm.s11 * q[0, 1, 0] - ppm.s14 * dm_right
-
-    with horizontal(region[:, j_start + 1]):
-        yt_bl = ppm.s15 * q[0, -1, 0] + ppm.s11 * q - ppm.s14 * dm
-        yt_br = al_ip1
-
-    with horizontal(region[:, j_end - 1]):
-        yt_bl = al
-        yt_br = ppm.s15 * q[0, 1, 0] + ppm.s11 * q + ppm.s14 * dm
-
-    with horizontal(region[:, j_end]):
-        # TODO(rheag) when possible
-        # dm_left_end = dm_jord8plus(q[0, -1, 0])
-        yt = 0.25 * (q - q[0, -2, 0])
-        dqr = max(max(q[0, -1, 0], q[0, -2, 0]), q) - q[0, -1, 0]
-        dql = q[0, -1, 0] - min(min(q[0, -1, 0], q[0, -2, 0]), q)
-        dm_left_end = sign(min(min(abs(yt), dqr), dql), yt)
-        yt_bl = ppm.s15 * q + ppm.s11 * q[0, -1, 0] + ppm.s14 * dm_left_end
-        yt_br = yt_dya_edge_0(q, dya)
-
-    with horizontal(region[:, j_end + 1]):
-        # TODO(rheag) when possible
-        # dm_right_end = dm_jord8plus(q[0, 1, 0])
-        yt = 0.25 * (q[0, 2, 0] - q)
-        dqr = max(max(q[0, 1, 0], q), q[0, 2, 0]) - q[0, 1, 0]
-        dql = q[0, 1, 0] - min(min(q[0, 1, 0], q), q[0, 2, 0])
-        dm_right_end = sign(min(min(abs(yt), dqr), dql), yt)
-        yt_bl = yt_dya_edge_1(q, dya)
-        yt_br = ppm.s11 * (q[0, 1, 0] - q) - ppm.s14 * dm_right_end + q
-
-    with horizontal(
-        region[:, j_start - 1 : j_start + 2], region[:, j_end - 1 : j_end + 2]
-    ):
-        bl = yt_bl - q
-        br = yt_br - q
-
-    return bl, br
-
-
-@gtscript.function
-def compute_blbr_ord8plus(q: FloatField, dya: FloatFieldIJ):
-    from __externals__ import grid_type, j_end, j_start, jord
-
-    dm = dm_jord8plus(q)
-    al = al_jord8plus(q, dm)
-
-    compile_assert(jord == 8)
-
-    bl, br = blbr_jord8(q, al, dm)
-
-    if __INLINED(grid_type < 3):
-        bl, br = bl_br_edges(bl, br, q, dya, al, dm)
-
-        with horizontal(
-            region[:, j_start - 1 : j_start + 2], region[:, j_end - 1 : j_end + 2]
-        ):
-            bl, br = ppm.pert_ppm_standard_constraint_fcn(q, bl, br)
-
-    return bl, br
-
-
-def compute_y_flux(
-    q: FloatField, courant: FloatField, dya: FloatFieldIJ, yflux: FloatField
-):
-    """
-    Args:
-        q (in):
-        courant (in):
-        dya (in):
-        yflux (out):
-    """
-    from __externals__ import mord
-
-    with computation(PARALLEL), interval(...):
-        if __INLINED(mord < 8):
-            al = compute_al(q, dya)
-            yflux = get_flux(q, courant, al)
-        else:
-            bl, br = compute_blbr_ord8plus(q, dya)
-            yflux = get_flux_ord8plus(q, courant, bl, br)
-
-
-class YPiecewiseParabolic:
-    """
-    Fortran name is yppm
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        dya,
-        grid_type: int,
-        jord,
-        origin: Index3D,
-        domain: Index3D,
-    ):
-        orchestrate(obj=self, config=stencil_factory.config.dace_config)
-        # Arguments come from:
-        # namelist.grid_type
-        # grid.dya
-        if grid_type == 3 or grid_type > 4:
-            raise NotImplementedError(
-                "Y Piecewise Parabolic (xppm): "
-                f" grid type {grid_type} not implemented. <3 or 4 available."
-            )
-        self._dya = dya
-        ax_offsets = stencil_factory.grid_indexing.axis_offsets(origin, domain)
-        self._compute_flux_stencil = stencil_factory.from_origin_domain(
-            func=compute_y_flux,
-            externals={
-                "jord": jord,
-                "mord": abs(jord),
-                "yt_minmax": True,
-                "j_start": ax_offsets["j_start"],
-                "j_end": ax_offsets["j_end"],
-                "grid_type": grid_type,
-            },
-            origin=origin,
-            domain=domain,
-        )
-
-    def __call__(
-        self,
-        q_in: FloatField,
-        c: FloatField,
-        q_mean_advected_through_y_interface: FloatField,
-    ):
-        """
-        Determine the mean value of q_in to be advected along y-interfaces.
-
-        This is done by integrating a piecewise-parabolic svbgrid reconstruction
-        of q_in along the y-direction over the segment of gridcell which
-        will be advected.
-
-        Multiplying this mean value by the area to be advected through the interface
-        would give the flux of q through that interface.
-
-        Args:
-            q_in (in): scalar to be integrated
-            c (in): Courant number (v*dt/dy) in y-direction defined on y-interfaces,
-                indicates the fraction of the adjacent grid cell which will be
-                advected through the interface in one timestep
-            q_mean_advected_through_y_interface (out): defined on y-interfaces.
-                mean value of scalar within the segment of gridcell to be advected
-                through that interface in one timestep, in units of q_in
-        """
-        # in the Fortran version of this code, "x_advection" routines
-        # were called "get_flux", while the routine which got the flux was called
-        # fx1_fn. The final value was called yflux instead of q_out.
-        self._compute_flux_stencil(
-            q_in, c, self._dya, q_mean_advected_through_y_interface
-        )
-        # bl and br are "edge perturbation values" as in equation 4.1
-        # of the FV3 documentation
diff --git a/pyFV3/pyFV3/stencils/ytp_v.py b/pyFV3/pyFV3/stencils/ytp_v.py
deleted file mode 100644
index 305ef8c9..00000000
--- a/pyFV3/pyFV3/stencils/ytp_v.py
+++ /dev/null
@@ -1,94 +0,0 @@
-from gt4py.cartesian import gtscript
-from gt4py.cartesian.gtscript import __INLINED, compile_assert, horizontal, region
-from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
-
-from pyFV3.stencils import ppm, yppm
-
-
-@gtscript.function
-def get_bl_br(v, dy, dya):
-    """
-    Args:
-        v: covariant y-wind on D-grid
-        dy: gridcell spacing in y-direction
-        dya: gridcell spacing in y-direction on A-grid
-
-    Returns:
-        bl: ???
-        br: ???
-    """
-    from __externals__ import grid_type, i_end, i_start, j_end, j_start, jord
-
-    if __INLINED(jord < 8):
-        v_on_cell_corners = yppm.compute_al(v, dy)
-
-        bl = v_on_cell_corners[0, 0, 0] - v[0, 0, 0]
-        br = v_on_cell_corners[0, 1, 0] - v[0, 0, 0]
-
-    else:
-        dm = yppm.dm_jord8plus(v)
-        v_on_cell_corners = yppm.al_jord8plus(v, dm)
-
-        compile_assert(jord == 8)
-
-        bl, br = yppm.blbr_jord8(v, v_on_cell_corners, dm)
-        if __INLINED(grid_type < 3):
-            bl, br = yppm.bl_br_edges(bl, br, v, dya, v_on_cell_corners, dm)
-
-            with horizontal(region[:, j_start + 1], region[:, j_end - 1]):
-                bl, br = ppm.pert_ppm_standard_constraint_fcn(v, bl, br)
-
-    if __INLINED(grid_type < 3):
-        # Zero corners
-        with horizontal(
-            region[i_start, j_start - 1 : j_start + 1],
-            region[i_end + 1, j_start - 1 : j_start + 1],
-            region[i_start, j_end : j_end + 2],
-            region[i_end + 1, j_end : j_end + 2],
-        ):
-            bl = 0.0
-            br = 0.0
-
-    return bl, br
-
-
-@gtscript.function
-def advect_v_along_y(
-    v: FloatField,
-    vb_contra: FloatField,
-    rdy: FloatFieldIJ,
-    dy: FloatFieldIJ,
-    dya: FloatFieldIJ,
-    dt: Float,
-):
-    """
-    Advect covariant y-wind on D-grid using contravariant y-wind on cell corners.
-
-    Named ytp_v in the original Fortran code. In the Fortran, dt is folded
-    in to vb_contra and called "courant".
-
-    Args:
-        v: covariant y-wind on D-grid
-        vb_contra: contravariant y-wind on cell corners
-        rdy: 1 / dy
-        dy: gridcell spacing in y-direction
-        dya: a-grid gridcell spacing in y-direction
-        dt: timestep in seconds
-
-    Returns:
-        updated_v: v having been advected by v_on_cell_corners
-    """
-    # Could try merging this with yppm version.
-
-    from __externals__ import jord
-
-    bl, br = get_bl_br(v, dy, dya)
-    b0 = bl + br
-    cfl = vb_contra * dt * rdy[0, -1] if vb_contra > 0 else vb_contra * dt * rdy
-    fx0 = yppm.fx1_fn(cfl, br, b0, bl)
-
-    if __INLINED(jord < 8):
-        advection_mask = yppm.get_advection_mask(bl, b0, br)
-    else:
-        advection_mask = 1.0
-    return yppm.apply_flux(vb_contra, v, fx0, advection_mask)
diff --git a/pyFV3/pyFV3/testing/__init__.py b/pyFV3/pyFV3/testing/__init__.py
deleted file mode 100644
index 31625660..00000000
--- a/pyFV3/pyFV3/testing/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# flake8: noqa: F401
-from .map_single import MapSingleFactory
-from .translate_dyncore import TranslateDynCore
-from .translate_fvdynamics import TranslateDycoreFortranData2Py, TranslateFVDynamics
-from .validation import enable_selective_validation
diff --git a/pyFV3/pyFV3/testing/map_single.py b/pyFV3/pyFV3/testing/map_single.py
deleted file mode 100644
index 4ae609a7..00000000
--- a/pyFV3/pyFV3/testing/map_single.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from typing import Dict, Tuple
-
-from ndsl.constants import X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.initialization.allocator import QuantityFactory
-
-from pyFV3.stencils.map_single import MapSingle
-
-
-class MapSingleFactory:
-    _object_pool: Dict[Tuple[int, int, Tuple[str, ...]], MapSingle] = {}
-    """Pool of MapSingle objects."""
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        quantity_factory: QuantityFactory,
-    ):
-        self.stencil_factory = stencil_factory
-        self.quantity_factory = quantity_factory
-
-    def __call__(
-        self,
-        kord: int,
-        mode: int,
-        *args,
-        **kwargs,
-    ):
-        key_tuple = (kord, mode, (X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM))
-        if key_tuple not in self._object_pool:
-            self._object_pool[key_tuple] = MapSingle(
-                self.stencil_factory, self.quantity_factory, *key_tuple
-            )
-        return self._object_pool[key_tuple](*args, **kwargs)
diff --git a/pyFV3/pyFV3/testing/translate_dyncore.py b/pyFV3/pyFV3/testing/translate_dyncore.py
deleted file mode 100644
index a06f1c6f..00000000
--- a/pyFV3/pyFV3/testing/translate_dyncore.py
+++ /dev/null
@@ -1,190 +0,0 @@
-import ndsl.dsl.gt4py_utils as utils
-from ndsl.constants import X_DIM, X_INTERFACE_DIM, Y_DIM, Y_INTERFACE_DIM, Z_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-from ndsl.quantity import Quantity
-from ndsl.stencils.testing import ParallelTranslate2PyState
-
-import pyFV3.stencils.dyn_core as dyn_core
-from pyFV3 import DycoreState, DynamicalCoreConfig
-
-
-class TranslateDynCore(ParallelTranslate2PyState):
-    inputs = {
-        "q_con": {
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "default",
-        },
-        "cappa": {
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "default",
-        },
-        "delp": {
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "default",
-        },
-        "pt": {
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "K",
-        },
-        "u": {
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "v": {
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "uc": {
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "vc": {
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "w": {
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-    }
-
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self._base.in_vars["data_vars"] = {
-            "cappa": {},
-            "u": grid.y3d_domain_dict(),
-            "v": grid.x3d_domain_dict(),
-            "w": {},
-            "delz": {},
-            "delp": {},
-            "pt": {},
-            "pe": {
-                "istart": grid.is_ - 1,
-                "iend": grid.ie + 1,
-                "jstart": grid.js - 1,
-                "jend": grid.je + 1,
-                "kend": grid.npz + 1,
-                "kaxis": 1,
-            },
-            "pk": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.je,
-                "kend": grid.npz + 1,
-            },
-            "phis": {"kstart": 0, "kend": 0},
-            "wsd": grid.compute_dict(),
-            "omga": {},
-            "ua": {},
-            "va": {},
-            "uc": grid.x3d_domain_dict(),
-            "vc": grid.y3d_domain_dict(),
-            "mfxd": grid.x3d_compute_dict(),
-            "mfyd": grid.y3d_compute_dict(),
-            "cxd": grid.x3d_compute_domain_y_dict(),
-            "cyd": grid.y3d_compute_domain_x_dict(),
-            "pkz": grid.compute_dict(),
-            "peln": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.je,
-                "kend": grid.npz + 1,
-                "kaxis": 1,
-            },
-            "q_con": {},
-            "ak": {},
-            "bk": {},
-            "diss_estd": {},
-        }
-        self._base.in_vars["data_vars"]["wsd"]["kstart"] = grid.npz
-        self._base.in_vars["data_vars"]["wsd"]["kend"] = None
-
-        self._base.in_vars["parameters"] = ["mdt", "akap", "ptop", "n_map"]
-
-        self._base.out_vars = {}
-        for v, d in self._base.in_vars["data_vars"].items():
-            self._base.out_vars[v] = d
-
-        del self._base.out_vars["ak"]
-        del self._base.out_vars["bk"]
-        del self._base.out_vars["phis"]
-        del self._base.out_vars["pkz"]
-
-        # TODO: Fix edge_interpolate4 in d2a2c_vect to match closer and the
-        # variables here should as well.
-        self.max_error = 2e-6
-        self.ignore_near_zero_errors["wsd"] = 1e-18
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist
-
-    def compute_parallel(self, inputs, communicator):
-        # ak, bk, and phis are numpy arrays at this point and
-        #   must be converted into gt4py storages
-        for name in ("ak", "bk", "phis"):
-            inputs[name] = utils.make_storage_data(
-                inputs[name],
-                inputs[name].shape,
-                len(inputs[name].shape) * (0,),
-                backend=self.stencil_factory.backend,
-            )
-
-        grid_data = self.grid.grid_data
-        if grid_data.ak is None or grid_data.bk is None:
-            grid_data.ak = inputs["ak"]
-            grid_data.bk = inputs["bk"]
-            grid_data.ptop = inputs["ptop"]
-        self._base.make_storage_data_input_vars(inputs)
-        state = DycoreState.init_zeros(quantity_factory=self.grid.quantity_factory)
-        wsd: Quantity = self.grid.quantity_factory.zeros(
-            dims=[X_DIM, Y_DIM],
-            units="unknown",
-        )
-        for name, value in inputs.items():
-            if hasattr(state, name) and isinstance(state[name], Quantity):
-                # the ndarray can have buffer points at the end, so value.shape
-                # is often not equal to state[name].shape
-                selection = tuple(slice(0, end) for end in value.shape)
-                state[name].data[selection] = value
-            else:
-                setattr(state, name, value)
-        phis: Quantity = self.grid.quantity_factory.zeros(
-            dims=[X_DIM, Y_DIM],
-            units="m",
-        )
-        phis.data[:] = phis.np.asarray(inputs["phis"])
-        acoustic_dynamics = dyn_core.AcousticDynamics(
-            comm=communicator,
-            stencil_factory=self.stencil_factory,
-            quantity_factory=self.grid.quantity_factory,
-            grid_data=grid_data,
-            damping_coefficients=self.grid.damping_coefficients,
-            grid_type=self.grid.grid_type,
-            nested=self.grid.nested,
-            stretched_grid=self.grid.stretched_grid,
-            config=DynamicalCoreConfig.from_namelist(self.namelist).acoustic_dynamics,
-            phis=phis,
-            wsd=wsd.data,
-            state=state,
-        )
-        acoustic_dynamics.cappa.data[:] = inputs["cappa"][:]
-
-        acoustic_dynamics(state, timestep=inputs["mdt"], n_map=state.n_map)
-        # the "inputs" dict is not used to return, we construct a new dict based
-        # on variables attached to `state`
-        storages_only = {}
-        for name, value in vars(state).items():
-            if isinstance(value, Quantity):
-                storages_only[name] = value.data
-            else:
-                storages_only[name] = value
-        storages_only["wsd"] = wsd.data
-        storages_only["cappa"] = acoustic_dynamics.cappa.data
-        return self._base.slice_output(storages_only)
diff --git a/pyFV3/pyFV3/testing/translate_fvdynamics.py b/pyFV3/pyFV3/testing/translate_fvdynamics.py
deleted file mode 100644
index 1d71e8b3..00000000
--- a/pyFV3/pyFV3/testing/translate_fvdynamics.py
+++ /dev/null
@@ -1,371 +0,0 @@
-from dataclasses import fields
-from datetime import timedelta
-from typing import Any, Dict, Optional, Tuple
-
-import ndsl.dsl.gt4py_utils as utils
-import pytest
-from ndsl.constants import (
-    X_DIM,
-    X_INTERFACE_DIM,
-    Y_DIM,
-    Y_INTERFACE_DIM,
-    Z_DIM,
-    Z_INTERFACE_DIM,
-)
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.grid import GridData
-from ndsl.namelist import Namelist
-from ndsl.performance.timer import NullTimer
-from ndsl.quantity import Quantity
-from ndsl.stencils.testing import ParallelTranslateBaseSlicing
-from ndsl.stencils.testing.translate import TranslateFortranData2Py
-
-import pyFV3.stencils.fv_dynamics as fv_dynamics
-from pyFV3._config import DynamicalCoreConfig
-from pyFV3.dycore_state import DycoreState
-
-
-class TranslateDycoreFortranData2Py(TranslateFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, stencil_factory)
-        self.namelist = DynamicalCoreConfig.from_namelist(namelist)
-
-
-class TranslateFVDynamics(ParallelTranslateBaseSlicing):
-    compute_grid_option = True
-    inputs: Dict[str, Any] = {
-        "q_con": {
-            "name": "total_condensate_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        },
-        "delp": {
-            "name": "pressure_thickness_of_atmospheric_layer",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "Pa",
-        },
-        "delz": {
-            "name": "vertical_thickness_of_atmospheric_layer",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m",
-        },
-        "ps": {
-            "name": "surface_pressure",
-            "dims": [X_DIM, Y_DIM],
-            "units": "Pa",
-        },
-        "pe": {
-            "name": "interface_pressure",
-            "dims": [X_DIM, Z_INTERFACE_DIM, Y_DIM],
-            "units": "Pa",
-            "n_halo": 1,
-        },
-        "ak": {
-            "name": "atmosphere_hybrid_a_coordinate",
-            "dims": [Z_INTERFACE_DIM],
-            "units": "Pa",
-        },
-        "bk": {
-            "name": "atmosphere_hybrid_b_coordinate",
-            "dims": [Z_INTERFACE_DIM],
-            "units": "",
-        },
-        "pk": {
-            "name": "interface_pressure_raised_to_power_of_kappa",
-            "units": "unknown",
-            "dims": [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            "n_halo": 0,
-        },
-        "pkz": {
-            "name": "layer_mean_pressure_raised_to_power_of_kappa",
-            "units": "unknown",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "n_halo": 0,
-        },
-        "peln": {
-            "name": "logarithm_of_interface_pressure",
-            "units": "ln(Pa)",
-            "dims": [X_DIM, Z_INTERFACE_DIM, Y_DIM],
-            "n_halo": 0,
-        },
-        "mfxd": {
-            "name": "accumulated_x_mass_flux",
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "unknown",
-            "n_halo": 0,
-        },
-        "mfyd": {
-            "name": "accumulated_y_mass_flux",
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "unknown",
-            "n_halo": 0,
-        },
-        "cxd": {
-            "name": "accumulated_x_courant_number",
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "",
-            "n_halo": (0, 3),
-        },
-        "cyd": {
-            "name": "accumulated_y_courant_number",
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "",
-            "n_halo": (3, 0),
-        },
-        "diss_estd": {
-            "name": "dissipation_estimate_from_heat_source",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "unknown",
-        },
-        "pt": {
-            "name": "air_temperature",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "degK",
-        },
-        "u": {
-            "name": "x_wind",
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "v": {
-            "name": "y_wind",
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "ua": {
-            "name": "eastward_wind",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "va": {
-            "name": "northward_wind",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "uc": {
-            "name": "x_wind_on_c_grid",
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "vc": {
-            "name": "y_wind_on_c_grid",
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "w": {
-            "name": "vertical_wind",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "phis": {
-            "name": "surface_geopotential",
-            "units": "m^2 s^-2",
-            "dims": [X_DIM, Y_DIM],
-        },
-        "qvapor": {
-            "name": "specific_humidity",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        },
-        "qliquid": {
-            "name": "cloud_water_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        },
-        "qice": {
-            "name": "cloud_ice_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        },
-        "qrain": {
-            "name": "rain_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        },
-        "qsnow": {
-            "name": "snow_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        },
-        "qgraupel": {
-            "name": "graupel_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        },
-        "qo3mr": {
-            "name": "ozone_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        },
-        "qsgs_tke": {
-            "name": "turbulent_kinetic_energy",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m**2/s**2",
-        },
-        "qcld": {
-            "name": "cloud_fraction",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "",
-        },
-        "omga": {
-            "name": "vertical_pressure_velocity",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "Pa/s",
-        },
-        "bdt": {"dims": []},
-        "ptop": {"dims": []},
-    }
-
-    outputs = inputs.copy()
-
-    for name in ("bdt", "ak", "bk", "ptop", "ua"):
-        outputs.pop(name)
-
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-        *args,
-        **kwargs,
-    ):
-        super().__init__(grid, namelist, stencil_factory, *args, **kwargs)
-        fv_dynamics_vars = {
-            "u": grid.y3d_domain_dict(),
-            "v": grid.x3d_domain_dict(),
-            "w": {},
-            "delz": {},
-            "qvapor": grid.compute_dict(),
-            "qliquid": grid.compute_dict(),
-            "qice": grid.compute_dict(),
-            "qrain": grid.compute_dict(),
-            "qsnow": grid.compute_dict(),
-            "qgraupel": grid.compute_dict(),
-            "qo3mr": grid.compute_dict(),
-            "qsgs_tke": grid.compute_dict(),
-            "qcld": {},
-            "ps": {},
-            "pe": {
-                "istart": grid.is_ - 1,
-                "iend": grid.ie + 1,
-                "jstart": grid.js - 1,
-                "jend": grid.je + 1,
-                "kend": grid.npz + 1,
-                "kaxis": 1,
-            },
-            "pk": grid.compute_buffer_k_dict(),
-            "peln": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.je,
-                "kend": grid.npz,
-                "kaxis": 1,
-            },
-            "pkz": grid.compute_dict(),
-            "phis": {},
-            "q_con": {},
-            "delp": {},
-            "pt": {},
-            "omga": {},
-            "ua": {},
-            "va": {},
-            "uc": grid.x3d_domain_dict(),
-            "vc": grid.y3d_domain_dict(),
-            "mfxd": grid.x3d_compute_dict(),
-            "mfyd": grid.y3d_compute_dict(),
-            "cxd": grid.x3d_compute_domain_y_dict(),
-            "cyd": grid.y3d_compute_domain_x_dict(),
-            "diss_estd": {},
-        }
-        self._base.in_vars["data_vars"].update(fv_dynamics_vars)
-
-        self._base.out_vars.update(fv_dynamics_vars)
-        self._base.out_vars["ps"] = {"kstart": grid.npz - 1, "kend": grid.npz - 1}
-        self._base.out_vars["phis"] = {"kstart": grid.npz - 1, "kend": grid.npz - 1}
-        self._base.out_vars.pop("ua")
-
-        self.max_error = 1e-5
-
-        self.ignore_near_zero_errors = {}
-        for qvar in utils.tracer_variables:
-            self.ignore_near_zero_errors[qvar] = True
-        self.ignore_near_zero_errors["q_con"] = True
-        self.dycore: Optional[fv_dynamics.DynamicalCore] = None
-        self.stencil_factory = stencil_factory
-        self.namelist: DynamicalCoreConfig = DynamicalCoreConfig.from_namelist(namelist)
-
-    def state_from_inputs(self, inputs):
-        input_storages = super().state_from_inputs(inputs)
-        # making sure we init DycoreState with the exact set of variables
-        accepted_keys = [_field.name for _field in fields(DycoreState)]
-        todelete = []
-        for name in input_storages.keys():
-            if name not in accepted_keys:
-                todelete.append(name)
-        for name in todelete:
-            del input_storages[name]
-
-        state = DycoreState.init_from_storages(input_storages, sizer=self.grid.sizer)
-        return state
-
-    def prepare_data(self, inputs) -> Tuple[DycoreState, GridData]:
-        for name in ("ak", "bk"):
-            inputs[name] = utils.make_storage_data(
-                inputs[name],
-                inputs[name].shape,
-                len(inputs[name].shape) * (0,),
-                backend=self.stencil_factory.backend,
-            )
-        grid_data = self.grid.grid_data
-        # These aren't in the Grid-Info savepoint, but are in the generated grid
-        if grid_data.ak is None or grid_data.bk is None:
-            grid_data.ak = inputs["ak"]
-            grid_data.bk = inputs["bk"]
-            grid_data.ptop = inputs["ptop"]
-
-        state = self.state_from_inputs(inputs)
-        return state, grid_data
-
-    def compute_parallel(self, inputs, communicator):
-        state, grid_data = self.prepare_data(inputs)
-        self.dycore = fv_dynamics.DynamicalCore(
-            comm=communicator,
-            grid_data=grid_data,
-            stencil_factory=self.stencil_factory,
-            quantity_factory=self.grid.quantity_factory,
-            damping_coefficients=self.grid.damping_coefficients,
-            config=DynamicalCoreConfig.from_namelist(self.namelist),
-            phis=state.phis,
-            state=state,
-            timestep=timedelta(seconds=inputs["bdt"]),
-        )
-        self.dycore.step_dynamics(state, NullTimer())
-        outputs = self.outputs_from_state(state)
-        return outputs
-
-    def outputs_from_state(self, state: dict):
-        if len(self.outputs) == 0:
-            return {}
-        outputs = {}
-        storages = {}
-        for name, properties in self.outputs.items():
-            if isinstance(state[name], Quantity):
-                storages[name] = state[name].data
-            elif len(self.outputs[name]["dims"]) > 0:
-                storages[name] = state[name]  # assume it's a storage
-            else:
-                outputs[name] = state[name]  # scalar
-        outputs.update(self._base.slice_output(storages))
-        return outputs
-
-    def compute_sequential(self, *args, **kwargs):
-        pytest.skip(
-            f"{self.__class__} only has a mpirun implementation, "
-            "not running in mock-parallel"
-        )
diff --git a/pyFV3/pyFV3/testing/validation.py b/pyFV3/pyFV3/testing/validation.py
deleted file mode 100644
index eeed0d94..00000000
--- a/pyFV3/pyFV3/testing/validation.py
+++ /dev/null
@@ -1,196 +0,0 @@
-import inspect
-from typing import Callable, Mapping, Tuple
-
-import numpy as np
-from ndsl.constants import X_DIM, X_INTERFACE_DIM, Y_DIM, Y_INTERFACE_DIM, Z_DIM
-from ndsl.quantity import Quantity
-
-import pyFV3.stencils.divergence_damping
-import pyFV3.stencils.updatedzd
-
-
-def get_selective_class(
-    cls: type,
-    name_to_origin_domain_function: Mapping[
-        str, Callable[..., Tuple[Tuple[int, ...], Tuple[int, ...]]]
-    ],
-):
-    """
-    Convert a model class into one that sets nans on non-validated outputs,
-    and gives a helper function to retrieve the output subset we want to validate.
-
-    Using this ensures that if these non-validated values are ever used, a test
-    will fail because an output will have NaN.
-    """
-
-    class SelectivelyValidated:
-        """
-        Wrapper class that sets non-validated outputs to nan, and gives a helper
-        function to retrieve the output subset to be validated.
-        """
-
-        def __init__(self, *args, **kwargs):
-            self.wrapped = cls(*args, **kwargs)
-            self._validation_slice = {}
-
-            for arg_name, func in name_to_origin_domain_function.items():
-                variable_origin, variable_domain = func(self.wrapped)
-
-                self._validation_slice[arg_name] = tuple(
-                    slice(start, start + n)
-                    for start, n in zip(variable_origin, variable_domain)
-                )
-            try:
-                self._all_argument_names = tuple(
-                    inspect.getfullargspec(self.wrapped).args[1:]
-                )
-                assert "self" not in self._all_argument_names
-            except TypeError:  # wrapped object is not callable
-                self._all_argument_names = None
-
-        def __call__(self, *args, **kwargs):
-            kwargs.update(self._args_to_kwargs(args))
-            self.wrapped(**kwargs)
-            self._set_nans(kwargs)
-
-        def _args_to_kwargs(self, args):
-            return dict(zip(self._all_argument_names, args))
-
-        @property
-        def selective_names(self):
-            return tuple(self._validation_slice.keys())
-
-        def subset_output(self, varname: str, output: np.ndarray) -> np.ndarray:
-            """
-            Given an output array, return the slice of the array which we'd
-            like to validate against reference data
-            """
-            if varname in self._validation_slice.keys():
-                output = output[self._validation_slice[varname]]
-            return output
-
-        def _set_nans(self, kwargs):
-            for name, validation_slice in self._validation_slice.items():
-                if name in kwargs.keys():
-                    array = kwargs[name]
-                    try:
-                        validation_data = np.copy(array[validation_slice])
-                        array[:] = np.nan
-                        array[validation_slice] = validation_data
-                    except TypeError:
-                        validation_data = np.copy(array.data[validation_slice])
-                        array.data[:] = np.nan
-                        array.data[validation_slice] = validation_data
-
-        def __getattr__(self, name):
-            # if SelectivelyValidated doesn't have an attribute, this is called
-            # which gets the attribute from the wrapped instance/class
-            return getattr(self.wrapped, name)
-
-    return SelectivelyValidated
-
-
-def get_selective_tracer_advection(
-    cls: type,
-    origin_domain_func: Callable[..., Tuple[Tuple[int, ...], Tuple[int, ...]]],
-):
-    class SelectivelyValidatedTracerAdvection:
-        """
-        We have to treat tracers separately because they are a dictionary,
-        not a storage.
-        """
-
-        def __init__(self, *args, **kwargs):
-            self.wrapped = cls(*args, **kwargs)
-            origin, domain = origin_domain_func(self.wrapped)
-            self._validation_slice = tuple(
-                slice(start, start + n) for start, n in zip(origin, domain)
-            )
-            self._all_argument_names = tuple(
-                inspect.getfullargspec(self.wrapped).args[1:]
-            )
-            assert "self" not in self._all_argument_names
-
-        def __call__(self, *args, **kwargs):
-            if self._all_argument_names is not None:
-                kwargs.update(self._args_to_kwargs(args))
-            self.wrapped(**kwargs)
-            self._set_nans(kwargs["tracers"])
-
-        def _args_to_kwargs(self, args):
-            return dict(zip(self._all_argument_names, args))
-
-        def subset_output(self, varname: str, output: np.ndarray) -> np.ndarray:
-            """
-            Given an output array, return the slice of the array which we'd
-            like to validate against reference data
-            """
-            if varname == "tracers":
-                # tracers are still an array for this routine
-                output = output[self._validation_slice]
-            return output
-
-        def _set_nans(self, tracers: Mapping[str, Quantity]):
-            # tracers is a dict of Quantity for this routine
-            for quantity in tracers.values():
-                validation_data = np.copy(quantity.data[self._validation_slice])
-                quantity.data[:] = np.nan
-                quantity.data[self._validation_slice] = validation_data
-
-    return SelectivelyValidatedTracerAdvection
-
-
-def get_compute_domain_k_interfaces(
-    instance,
-) -> Tuple[Tuple[int, ...], Tuple[int, ...]]:
-    try:
-        origin = instance.grid_indexing.origin_compute()
-        domain = instance.grid_indexing.domain_compute(add=(0, 0, 1))
-    except AttributeError:
-        origin = instance.grid.compute_origin()
-        domain = instance.grid.domain_shape_compute(add=(0, 0, 1))
-    return origin, domain
-
-
-def get_domain_func(dims):
-    def domain_func(instance):
-        return instance.grid_indexing.get_origin_domain(dims)
-
-    return domain_func
-
-
-def enable_selective_validation():
-    """
-    Replaces certain function-classes with wrapped versions that set data we aren't
-    validating to NaN, and have an attribute function `subset_output` that
-    takes in a string variable name and an output array and returns the
-    subset of that array which should be validated.
-
-    This wrapping removes any attributes of the wrapped module.
-    """
-    # to enable selective validation for a new class, add a new monkeypatch
-    # this should require only a new function for (origin, domain)
-    # note we have not implemented disabling selective validation once enabled
-
-    pyFV3.stencils.divergence_damping.DivergenceDamping = get_selective_class(
-        pyFV3.stencils.divergence_damping.DivergenceDamping,
-        {
-            "v_contra_dxc": get_domain_func([X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM]),
-            "vort": get_domain_func([X_INTERFACE_DIM, Y_INTERFACE_DIM, Z_DIM]),
-        },  # must include both function argument and savepoint names
-    )
-    cell_center_func = get_domain_func([X_DIM, Y_DIM, Z_DIM])
-    pyFV3.stencils.fv_dynamics.DynamicalCore = get_selective_class(
-        pyFV3.stencils.fv_dynamics.DynamicalCore,
-        {
-            "qsnow": cell_center_func,
-            "va": cell_center_func,
-            "qcld": cell_center_func,
-            "qice": cell_center_func,
-            "v": get_domain_func([X_INTERFACE_DIM, Y_DIM, Z_DIM]),
-            "qliquid": cell_center_func,
-            "ua": cell_center_func,
-            "q_con": cell_center_func,
-            "u": get_domain_func([X_DIM, Y_INTERFACE_DIM, Z_DIM]),
-        },
-    )
diff --git a/pyFV3/pyFV3/utils/__init__.py b/pyFV3/pyFV3/utils/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/pyFV3/pyFV3/utils/functional_validation.py b/pyFV3/pyFV3/utils/functional_validation.py
deleted file mode 100644
index cfbe1782..00000000
--- a/pyFV3/pyFV3/utils/functional_validation.py
+++ /dev/null
@@ -1,61 +0,0 @@
-import copy
-from typing import Callable, Sequence, Tuple
-
-import numpy as np
-from ndsl.dsl.stencil import GridIndexing
-
-
-def get_subset_func(
-    grid_indexing: GridIndexing,
-    dims: Sequence[str],
-    n_halo: Tuple[Tuple[int, int], Tuple[int, int]] = ((0, 0), (0, 0)),
-) -> Callable[[np.ndarray], np.ndarray]:
-    """
-    Args:
-        grid_indexing: configuration for domain and halo indexing
-        dims: dimensions
-        n_halo: number of halo points to retain
-
-    Returns:
-        subset: a subset function
-    """
-    origin, domain = grid_indexing.get_origin_domain(dims)
-    i_start = origin[0] - n_halo[0][0]
-    i_end = origin[0] + domain[0] + n_halo[0][1]
-    j_start = origin[1] - n_halo[1][0]
-    j_end = origin[1] + domain[1] + n_halo[1][1]
-
-    def subset(data):
-        if len(dims) == 3:
-            return data[i_start:i_end, j_start:j_end, :]
-        elif len(dims) == 2:
-            return data[i_start:i_end, j_start:j_end]
-        else:
-            raise NotImplementedError(
-                "Only 2D and 3D subsets are supported, got dims: {}".format(dims)
-            )
-
-    return subset
-
-
-def get_set_nan_func(
-    grid_indexing: GridIndexing,
-    dims: Sequence[str],
-    n_halo: Tuple[Tuple[int, int], Tuple[int, int]] = ((0, 0), (0, 0)),
-) -> Callable[[np.ndarray], np.ndarray]:
-    subset = get_subset_func(grid_indexing=grid_indexing, dims=dims, n_halo=n_halo)
-
-    def set_nans(data):
-        try:
-            safe = copy.deepcopy(data)
-            data[:] = np.nan
-            # data_subset is a view of data, so modifying data_subset modifies data
-            data_subset = subset(data)
-            data_subset[:] = subset(safe)
-        except TypeError:
-            safe = copy.deepcopy(data.data)
-            data.data[:] = np.nan
-            data_subset = subset(data.data)
-            data_subset[:] = subset(safe)
-
-    return set_nans
diff --git a/pyFV3/pyFV3/wrappers/geos_wrapper.py b/pyFV3/pyFV3/wrappers/geos_wrapper.py
deleted file mode 100644
index f8429974..00000000
--- a/pyFV3/pyFV3/wrappers/geos_wrapper.py
+++ /dev/null
@@ -1,602 +0,0 @@
-import enum
-import logging
-import os
-from datetime import timedelta
-from typing import Dict, List, Tuple
-
-import f90nml
-import numpy as np
-from gt4py.cartesian.config import build_settings as gt_build_settings
-from mpi4py import MPI
-from ndsl.comm.comm_abc import Comm
-from ndsl.comm.communicator import CubedSphereCommunicator
-from ndsl.comm.null_comm import NullComm
-from ndsl.comm.partitioner import CubedSpherePartitioner, TilePartitioner
-from ndsl.dsl.dace import orchestrate
-from ndsl.dsl.dace.build import set_distributed_caches
-from ndsl.dsl.dace.dace_config import DaceConfig, DaCeOrchestration
-from ndsl.dsl.gt4py_utils import is_gpu_backend
-from ndsl.dsl.stencil import GridIndexing, StencilFactory
-from ndsl.dsl.stencil_config import CompilationConfig, StencilConfig
-from ndsl.dsl.typing import floating_point_precision
-from ndsl.grid import GridData
-from ndsl.grid.generation import MetricTerms
-from ndsl.grid.helper import DampingCoefficients
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.initialization.sizer import SubtileGridSizer
-from ndsl.logging import ndsl_log
-from ndsl.optional_imports import cupy as cp
-from ndsl.performance.collector import PerformanceCollector
-from ndsl.utils import safe_assign_array
-
-import pyFV3
-
-
-class StencilBackendCompilerOverride:
-    """Override the Pace global stencil JIT to allow for 9-rank build
-    on any setup.
-
-    This is a workaround that requires to know _exactly_ when build is happening.
-    Using this as a context manager, we leverage the DaCe build system to override
-    the name and build the 9 codepaths required- while every other rank wait.
-
-    This should be removed when we refactor the GT JIT to distribute building
-    much more efficiently
-    """
-
-    def __init__(self, comm: MPI.Intracomm, config: DaceConfig):
-        self.comm = comm
-        self.config = config
-
-        # Orchestration or mono-node is not concerned
-        self.no_op = self.config.is_dace_orchestrated() or self.comm.Get_size() == 1
-
-        # We abuse the DaCe build system
-        if not self.no_op:
-            config._orchestrate = DaCeOrchestration.Build
-            set_distributed_caches(config)
-            config._orchestrate = DaCeOrchestration.Python
-
-        # We remove warnings from the stencils compiling when in critical and/or
-        # error
-        if ndsl_log.level > logging.WARNING:
-            gt_build_settings["extra_compile_args"]["cxx"].append("-w")
-            gt_build_settings["extra_compile_args"]["cuda"].append("-w")
-
-    def __enter__(self):
-        if self.no_op:
-            return
-        if self.config.do_compile:
-            ndsl_log.info(f"Stencil backend compiles on {self.comm.Get_rank()}")
-        else:
-            ndsl_log.info(f"Stencil backend waits on {self.comm.Get_rank()}")
-            self.comm.Barrier()
-
-    def __exit__(self, type, value, traceback):
-        if self.no_op:
-            return
-        if not self.config.do_compile:
-            ndsl_log.info(f"Stencil backend read cache on {self.comm.Get_rank()}")
-        else:
-            ndsl_log.info(f"Stencil backend compiled on {self.comm.Get_rank()}")
-            self.comm.Barrier()
-
-
-@enum.unique
-class MemorySpace(enum.Enum):
-    HOST = 0
-    DEVICE = 1
-
-
-class GeosDycoreWrapper:
-    """
-    Provides an interface for the Geos model to access the Pace dycore.
-    Takes numpy arrays as inputs, returns a dictionary of numpy arrays as outputs
-    """
-
-    def __init__(
-        self,
-        namelist: f90nml.Namelist,
-        bdt: int,
-        comm: Comm,
-        backend: str,
-        fortran_mem_space: MemorySpace = MemorySpace.HOST,
-    ):
-        # Look for an override to run on a single node
-        gtfv3_single_rank_override = int(os.getenv("GTFV3_SINGLE_RANK_OVERRIDE", -1))
-        if gtfv3_single_rank_override >= 0:
-            comm = NullComm(gtfv3_single_rank_override, 6, 42)
-
-        # Make a custom performance collector for the GEOS wrapper
-        self.perf_collector = PerformanceCollector("GEOS wrapper", comm)
-
-        self.backend = backend
-        self.namelist = namelist
-        self.dycore_config = pyFV3.DynamicalCoreConfig.from_f90nml(self.namelist)
-        self.dycore_config.dt_atmos = bdt
-        assert self.dycore_config.dt_atmos != 0
-
-        self.layout = self.dycore_config.layout
-        partitioner = CubedSpherePartitioner(TilePartitioner(self.layout))
-        self.communicator = CubedSphereCommunicator(
-            comm,
-            partitioner,
-            timer=self.perf_collector.timestep_timer,
-        )
-
-        sizer = SubtileGridSizer.from_namelist(
-            self.namelist, partitioner.tile, self.communicator.tile.rank
-        )
-        quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend)
-
-        # set up the metric terms and grid data
-        metric_terms = MetricTerms(
-            quantity_factory=quantity_factory,
-            communicator=self.communicator,
-            eta_file=namelist["grid_config"]["config"]["eta_file"],
-        )
-        grid_data = GridData.new_from_metric_terms(metric_terms)
-
-        stencil_config = StencilConfig(
-            compilation_config=CompilationConfig(
-                backend=backend, rebuild=False, validate_args=False
-            ),
-        )
-
-        # Build a DaCeConfig for orchestration.
-        # This and all orchestration code are transparent when outside
-        # configuration deactivate orchestration
-        stencil_config.dace_config = DaceConfig(
-            communicator=self.communicator,
-            backend=stencil_config.backend,
-            tile_nx=self.dycore_config.npx,
-            tile_nz=self.dycore_config.npz,
-        )
-        self._is_orchestrated = stencil_config.dace_config.is_dace_orchestrated()
-
-        # Orchestrate all code called from this function
-        orchestrate(
-            obj=self,
-            config=stencil_config.dace_config,
-            method_to_orchestrate="_critical_path",
-        )
-
-        self._grid_indexing = GridIndexing.from_sizer_and_communicator(
-            sizer=sizer, comm=self.communicator
-        )
-        stencil_factory = StencilFactory(
-            config=stencil_config, grid_indexing=self._grid_indexing
-        )
-
-        self.dycore_state = pyFV3.DycoreState.init_zeros(
-            quantity_factory=quantity_factory
-        )
-        self.dycore_state.bdt = self.dycore_config.dt_atmos
-
-        damping_coefficients = DampingCoefficients.new_from_metric_terms(metric_terms)
-
-        with StencilBackendCompilerOverride(MPI.COMM_WORLD, stencil_config.dace_config):
-            self.dynamical_core = pyFV3.DynamicalCore(
-                comm=self.communicator,
-                grid_data=grid_data,
-                stencil_factory=stencil_factory,
-                quantity_factory=quantity_factory,
-                damping_coefficients=damping_coefficients,
-                config=self.dycore_config,
-                timestep=timedelta(seconds=self.dycore_state.bdt),
-                phis=self.dycore_state.phis,
-                state=self.dycore_state,
-            )
-
-        self._fortran_mem_space = fortran_mem_space
-        self._pace_mem_space = (
-            MemorySpace.DEVICE if is_gpu_backend(backend) else MemorySpace.HOST
-        )
-
-        self.output_dict: Dict[str, np.ndarray] = {}
-        self._allocate_output_dir()
-
-        # Feedback information
-        device_ordinal_info = (
-            f"  Device PCI bus id: {cp.cuda.Device(0).pci_bus_id}\n"
-            if is_gpu_backend(backend)
-            else "N/A"
-        )
-        MPS_pipe_directory = os.getenv("CUDA_MPS_PIPE_DIRECTORY", None)
-        MPS_is_on = (
-            MPS_pipe_directory is not None
-            and is_gpu_backend(backend)
-            and os.path.exists(f"{MPS_pipe_directory}/log")
-        )
-        ndsl_log.info(
-            "Pace GEOS wrapper initialized: \n"
-            f"             dt : {self.dycore_state.bdt}\n"
-            f"         bridge : {self._fortran_mem_space} > {self._pace_mem_space}\n"
-            f"        backend : {backend}\n"
-            f"          float : {floating_point_precision()}bit"
-            f"  orchestration : {self._is_orchestrated}\n"
-            f"          sizer : {sizer.nx}x{sizer.ny}x{sizer.nz}"
-            f"(halo: {sizer.n_halo})\n"
-            f"     Device ord : {device_ordinal_info}\n"
-            f"     Nvidia MPS : {MPS_is_on}"
-        )
-
-    def _critical_path(self):
-        """Top-level orchestration function"""
-        with self.perf_collector.timestep_timer.clock("step_dynamics"):
-            self.dynamical_core.step_dynamics(
-                state=self.dycore_state,
-                timer=self.perf_collector.timestep_timer,
-            )
-
-    def __call__(
-        self,
-        timings: Dict[str, List[float]],
-        u: np.ndarray,
-        v: np.ndarray,
-        w: np.ndarray,
-        delz: np.ndarray,
-        pt: np.ndarray,
-        delp: np.ndarray,
-        q: np.ndarray,
-        ps: np.ndarray,
-        pe: np.ndarray,
-        pk: np.ndarray,
-        peln: np.ndarray,
-        pkz: np.ndarray,
-        phis: np.ndarray,
-        q_con: np.ndarray,
-        omga: np.ndarray,
-        ua: np.ndarray,
-        va: np.ndarray,
-        uc: np.ndarray,
-        vc: np.ndarray,
-        mfxd: np.ndarray,
-        mfyd: np.ndarray,
-        cxd: np.ndarray,
-        cyd: np.ndarray,
-        diss_estd: np.ndarray,
-    ) -> Tuple[Dict[str, np.ndarray], Dict[str, List[float]]]:
-        with self.perf_collector.timestep_timer.clock("numpy-to-dycore"):
-            self.dycore_state = self._put_fortran_data_in_dycore(
-                u,
-                v,
-                w,
-                delz,
-                pt,
-                delp,
-                q,
-                ps,
-                pe,
-                pk,
-                peln,
-                pkz,
-                phis,
-                q_con,
-                omga,
-                ua,
-                va,
-                uc,
-                vc,
-                mfxd,
-                mfyd,
-                cxd,
-                cyd,
-                diss_estd,
-            )
-
-        # Enter orchestrated code - if applicable
-        self._critical_path()
-
-        with self.perf_collector.timestep_timer.clock("dycore-to-numpy"):
-            self.output_dict = self._prep_outputs_for_geos()
-
-        # Collect performance of the timestep and write a json file for rank 0
-        self.perf_collector.collect_performance()
-        for k, v in self.perf_collector.times_per_step[0].items():
-            if k not in timings.keys():
-                timings[k] = [v]
-            else:
-                timings[k].append(v)
-        self.perf_collector.clear()
-
-        return self.output_dict, timings
-
-    def _put_fortran_data_in_dycore(
-        self,
-        u: np.ndarray,
-        v: np.ndarray,
-        w: np.ndarray,
-        delz: np.ndarray,
-        pt: np.ndarray,
-        delp: np.ndarray,
-        q: np.ndarray,
-        ps: np.ndarray,
-        pe: np.ndarray,
-        pk: np.ndarray,
-        peln: np.ndarray,
-        pkz: np.ndarray,
-        phis: np.ndarray,
-        q_con: np.ndarray,
-        omga: np.ndarray,
-        ua: np.ndarray,
-        va: np.ndarray,
-        uc: np.ndarray,
-        vc: np.ndarray,
-        mfxd: np.ndarray,
-        mfyd: np.ndarray,
-        cxd: np.ndarray,
-        cyd: np.ndarray,
-        diss_estd: np.ndarray,
-    ) -> pyFV3.DycoreState:
-        isc = self._grid_indexing.isc
-        jsc = self._grid_indexing.jsc
-        iec = self._grid_indexing.iec + 1
-        jec = self._grid_indexing.jec + 1
-
-        state = self.dycore_state
-
-        # Assign compute domain:
-        safe_assign_array(state.u.view[:], u[isc:iec, jsc : jec + 1, :])
-        safe_assign_array(state.v.view[:], v[isc : iec + 1, jsc:jec, :])
-        safe_assign_array(state.w.view[:], w[isc:iec, jsc:jec, :])
-        safe_assign_array(state.ua.view[:], ua[isc:iec, jsc:jec, :])
-        safe_assign_array(state.va.view[:], va[isc:iec, jsc:jec, :])
-        safe_assign_array(state.uc.view[:], uc[isc : iec + 1, jsc:jec, :])
-        safe_assign_array(state.vc.view[:], vc[isc:iec, jsc : jec + 1, :])
-
-        safe_assign_array(state.delz.view[:], delz[isc:iec, jsc:jec, :])
-        safe_assign_array(state.pt.view[:], pt[isc:iec, jsc:jec, :])
-        safe_assign_array(state.delp.view[:], delp[isc:iec, jsc:jec, :])
-
-        safe_assign_array(state.mfxd.view[:], mfxd)
-        safe_assign_array(state.mfyd.view[:], mfyd)
-        safe_assign_array(state.cxd.view[:], cxd[:, jsc:jec, :])
-        safe_assign_array(state.cyd.view[:], cyd[isc:iec, :, :])
-
-        safe_assign_array(state.ps.view[:], ps[isc:iec, jsc:jec])
-        safe_assign_array(state.pe.data[isc - 1 : iec + 1, jsc - 1 : jec + 1, :], pe)
-        safe_assign_array(state.pk.view[:], pk)
-        safe_assign_array(state.peln.view[:], peln)
-        safe_assign_array(state.pkz.view[:], pkz)
-        safe_assign_array(state.phis.view[:], phis[isc:iec, jsc:jec])
-        safe_assign_array(state.q_con.view[:], q_con[isc:iec, jsc:jec, :])
-        safe_assign_array(state.omga.view[:], omga[isc:iec, jsc:jec, :])
-        safe_assign_array(state.diss_estd.view[:], diss_estd[isc:iec, jsc:jec, :])
-
-        # tracer quantities should be a 4d array in order:
-        # vapor, liquid, ice, rain, snow, graupel, cloud
-        safe_assign_array(state.qvapor.view[:], q[isc:iec, jsc:jec, :, 0])
-        safe_assign_array(state.qliquid.view[:], q[isc:iec, jsc:jec, :, 1])
-        safe_assign_array(state.qice.view[:], q[isc:iec, jsc:jec, :, 2])
-        safe_assign_array(state.qrain.view[:], q[isc:iec, jsc:jec, :, 3])
-        safe_assign_array(state.qsnow.view[:], q[isc:iec, jsc:jec, :, 4])
-        safe_assign_array(state.qgraupel.view[:], q[isc:iec, jsc:jec, :, 5])
-        safe_assign_array(state.qcld.view[:], q[isc:iec, jsc:jec, :, 6])
-
-        return state
-
-    def _prep_outputs_for_geos(self) -> Dict[str, np.ndarray]:
-        output_dict = self.output_dict
-        isc = self._grid_indexing.isc
-        jsc = self._grid_indexing.jsc
-        iec = self._grid_indexing.iec + 1
-        jec = self._grid_indexing.jec + 1
-
-        if self._fortran_mem_space != self._pace_mem_space:
-            safe_assign_array(output_dict["u"], self.dycore_state.u.data[:-1, :, :-1])
-            safe_assign_array(output_dict["v"], self.dycore_state.v.data[:, :-1, :-1])
-            safe_assign_array(output_dict["w"], self.dycore_state.w.data[:-1, :-1, :-1])
-            safe_assign_array(
-                output_dict["ua"], self.dycore_state.ua.data[:-1, :-1, :-1]
-            )
-            safe_assign_array(
-                output_dict["va"], self.dycore_state.va.data[:-1, :-1, :-1]
-            )
-            safe_assign_array(output_dict["uc"], self.dycore_state.uc.data[:, :-1, :-1])
-            safe_assign_array(output_dict["vc"], self.dycore_state.vc.data[:-1, :, :-1])
-
-            safe_assign_array(
-                output_dict["delz"], self.dycore_state.delz.data[:-1, :-1, :-1]
-            )
-            safe_assign_array(
-                output_dict["pt"], self.dycore_state.pt.data[:-1, :-1, :-1]
-            )
-            safe_assign_array(
-                output_dict["delp"], self.dycore_state.delp.data[:-1, :-1, :-1]
-            )
-
-            safe_assign_array(
-                output_dict["mfxd"],
-                self.dycore_state.mfxd.data[isc : iec + 1, jsc:jec, :-1],
-            )
-            safe_assign_array(
-                output_dict["mfyd"],
-                self.dycore_state.mfyd.data[isc:iec, jsc : jec + 1, :-1],
-            )
-            safe_assign_array(
-                output_dict["cxd"], self.dycore_state.cxd.data[isc : iec + 1, :-1, :-1]
-            )
-            safe_assign_array(
-                output_dict["cyd"], self.dycore_state.cyd.data[:-1, jsc : jec + 1, :-1]
-            )
-
-            safe_assign_array(output_dict["ps"], self.dycore_state.ps.data[:-1, :-1])
-            safe_assign_array(
-                output_dict["pe"],
-                self.dycore_state.pe.data[isc - 1 : iec + 1, jsc - 1 : jec + 1, :],
-            )
-            safe_assign_array(
-                output_dict["pk"], self.dycore_state.pk.data[isc:iec, jsc:jec, :]
-            )
-            safe_assign_array(
-                output_dict["peln"], self.dycore_state.peln.data[isc:iec, jsc:jec, :]
-            )
-            safe_assign_array(
-                output_dict["pkz"], self.dycore_state.pkz.data[isc:iec, jsc:jec, :-1]
-            )
-            safe_assign_array(
-                output_dict["phis"], self.dycore_state.phis.data[:-1, :-1]
-            )
-            safe_assign_array(
-                output_dict["q_con"], self.dycore_state.q_con.data[:-1, :-1, :-1]
-            )
-            safe_assign_array(
-                output_dict["omga"], self.dycore_state.omga.data[:-1, :-1, :-1]
-            )
-            safe_assign_array(
-                output_dict["diss_estd"],
-                self.dycore_state.diss_estd.data[:-1, :-1, :-1],
-            )
-
-            safe_assign_array(
-                output_dict["qvapor"], self.dycore_state.qvapor.data[:-1, :-1, :-1]
-            )
-            safe_assign_array(
-                output_dict["qliquid"], self.dycore_state.qliquid.data[:-1, :-1, :-1]
-            )
-            safe_assign_array(
-                output_dict["qice"], self.dycore_state.qice.data[:-1, :-1, :-1]
-            )
-            safe_assign_array(
-                output_dict["qrain"], self.dycore_state.qrain.data[:-1, :-1, :-1]
-            )
-            safe_assign_array(
-                output_dict["qsnow"], self.dycore_state.qsnow.data[:-1, :-1, :-1]
-            )
-            safe_assign_array(
-                output_dict["qgraupel"], self.dycore_state.qgraupel.data[:-1, :-1, :-1]
-            )
-            safe_assign_array(
-                output_dict["qcld"], self.dycore_state.qcld.data[:-1, :-1, :-1]
-            )
-        else:
-            output_dict["u"] = self.dycore_state.u.data[:-1, :, :-1]
-            output_dict["v"] = self.dycore_state.v.data[:, :-1, :-1]
-            output_dict["w"] = self.dycore_state.w.data[:-1, :-1, :-1]
-            output_dict["ua"] = self.dycore_state.ua.data[:-1, :-1, :-1]
-            output_dict["va"] = self.dycore_state.va.data[:-1, :-1, :-1]
-            output_dict["uc"] = self.dycore_state.uc.data[:, :-1, :-1]
-            output_dict["vc"] = self.dycore_state.vc.data[:-1, :, :-1]
-            output_dict["delz"] = self.dycore_state.delz.data[:-1, :-1, :-1]
-            output_dict["pt"] = self.dycore_state.pt.data[:-1, :-1, :-1]
-            output_dict["delp"] = self.dycore_state.delp.data[:-1, :-1, :-1]
-            output_dict["mfxd"] = self.dycore_state.mfxd.data[
-                isc : iec + 1, jsc:jec, :-1
-            ]
-            output_dict["mfyd"] = self.dycore_state.mfyd.data[
-                isc:iec, jsc : jec + 1, :-1
-            ]
-            output_dict["cxd"] = self.dycore_state.cxd.data[isc : iec + 1, :-1, :-1]
-            output_dict["cyd"] = self.dycore_state.cyd.data[:-1, jsc : jec + 1, :-1]
-            output_dict["ps"] = self.dycore_state.ps.data[:-1, :-1]
-            output_dict["pe"] = self.dycore_state.pe.data[
-                isc - 1 : iec + 1, jsc - 1 : jec + 1, :
-            ]
-            output_dict["pk"] = self.dycore_state.pk.data[isc:iec, jsc:jec, :]
-            output_dict["peln"] = self.dycore_state.peln.data[isc:iec, jsc:jec, :]
-            output_dict["pkz"] = self.dycore_state.pkz.data[isc:iec, jsc:jec, :-1]
-            output_dict["phis"] = self.dycore_state.phis.data[:-1, :-1]
-            output_dict["q_con"] = self.dycore_state.q_con.data[:-1, :-1, :-1]
-            output_dict["omga"] = self.dycore_state.omga.data[:-1, :-1, :-1]
-            output_dict["diss_estd"] = self.dycore_state.diss_estd.data[:-1, :-1, :-1]
-            output_dict["qvapor"] = self.dycore_state.qvapor.data[:-1, :-1, :-1]
-            output_dict["qliquid"] = self.dycore_state.qliquid.data[:-1, :-1, :-1]
-            output_dict["qice"] = self.dycore_state.qice.data[:-1, :-1, :-1]
-            output_dict["qrain"] = self.dycore_state.qrain.data[:-1, :-1, :-1]
-            output_dict["qsnow"] = self.dycore_state.qsnow.data[:-1, :-1, :-1]
-            output_dict["qgraupel"] = self.dycore_state.qgraupel.data[:-1, :-1, :-1]
-            output_dict["qcld"] = self.dycore_state.qcld.data[:-1, :-1, :-1]
-
-        return output_dict
-
-    def _allocate_output_dir(self):
-        if self._fortran_mem_space != self._pace_mem_space:
-            nhalo = self._grid_indexing.n_halo
-            shape_centered = self._grid_indexing.domain_full(add=(0, 0, 0))
-            shape_x_interface = self._grid_indexing.domain_full(add=(1, 0, 0))
-            shape_y_interface = self._grid_indexing.domain_full(add=(0, 1, 0))
-            shape_z_interface = self._grid_indexing.domain_full(add=(0, 0, 1))
-            shape_2d = shape_centered[:-1]
-
-            self.output_dict["u"] = np.empty((shape_y_interface))
-            self.output_dict["v"] = np.empty((shape_x_interface))
-            self.output_dict["w"] = np.empty((shape_centered))
-            self.output_dict["ua"] = np.empty((shape_centered))
-            self.output_dict["va"] = np.empty((shape_centered))
-            self.output_dict["uc"] = np.empty((shape_x_interface))
-            self.output_dict["vc"] = np.empty((shape_y_interface))
-
-            self.output_dict["delz"] = np.empty((shape_centered))
-            self.output_dict["pt"] = np.empty((shape_centered))
-            self.output_dict["delp"] = np.empty((shape_centered))
-
-            self.output_dict["mfxd"] = np.empty(
-                (self._grid_indexing.domain_full(add=(1 - 2 * nhalo, -2 * nhalo, 0)))
-            )
-            self.output_dict["mfyd"] = np.empty(
-                (self._grid_indexing.domain_full(add=(-2 * nhalo, 1 - 2 * nhalo, 0)))
-            )
-            self.output_dict["cxd"] = np.empty(
-                (self._grid_indexing.domain_full(add=(1 - 2 * nhalo, 0, 0)))
-            )
-            self.output_dict["cyd"] = np.empty(
-                (self._grid_indexing.domain_full(add=(0, 1 - 2 * nhalo, 0)))
-            )
-
-            self.output_dict["ps"] = np.empty((shape_2d))
-            self.output_dict["pe"] = np.empty(
-                (self._grid_indexing.domain_full(add=(2 - 2 * nhalo, 2 - 2 * nhalo, 1)))
-            )
-            self.output_dict["pk"] = np.empty(
-                (self._grid_indexing.domain_full(add=(-2 * nhalo, -2 * nhalo, 1)))
-            )
-            self.output_dict["peln"] = np.empty(
-                (self._grid_indexing.domain_full(add=(-2 * nhalo, -2 * nhalo, 1)))
-            )
-            self.output_dict["pkz"] = np.empty(
-                (self._grid_indexing.domain_full(add=(-2 * nhalo, -2 * nhalo, 0)))
-            )
-            self.output_dict["phis"] = np.empty((shape_2d))
-            self.output_dict["q_con"] = np.empty((shape_centered))
-            self.output_dict["omga"] = np.empty((shape_centered))
-            self.output_dict["diss_estd"] = np.empty((shape_centered))
-
-            self.output_dict["qvapor"] = np.empty((shape_centered))
-            self.output_dict["qliquid"] = np.empty((shape_centered))
-            self.output_dict["qice"] = np.empty((shape_centered))
-            self.output_dict["qrain"] = np.empty((shape_centered))
-            self.output_dict["qsnow"] = np.empty((shape_centered))
-            self.output_dict["qgraupel"] = np.empty((shape_centered))
-            self.output_dict["qcld"] = np.empty((shape_centered))
-        else:
-            self.output_dict["u"] = None
-            self.output_dict["v"] = None
-            self.output_dict["w"] = None
-            self.output_dict["ua"] = None
-            self.output_dict["va"] = None
-            self.output_dict["uc"] = None
-            self.output_dict["vc"] = None
-            self.output_dict["delz"] = None
-            self.output_dict["pt"] = None
-            self.output_dict["delp"] = None
-            self.output_dict["mfxd"] = None
-            self.output_dict["mfyd"] = None
-            self.output_dict["cxd"] = None
-            self.output_dict["cyd"] = None
-            self.output_dict["ps"] = None
-            self.output_dict["pe"] = None
-            self.output_dict["pk"] = None
-            self.output_dict["peln"] = None
-            self.output_dict["pkz"] = None
-            self.output_dict["phis"] = None
-            self.output_dict["q_con"] = None
-            self.output_dict["omga"] = None
-            self.output_dict["diss_estd"] = None
-            self.output_dict["qvapor"] = None
-            self.output_dict["qliquid"] = None
-            self.output_dict["qice"] = None
-            self.output_dict["qrain"] = None
-            self.output_dict["qsnow"] = None
-            self.output_dict["qgraupel"] = None
-            self.output_dict["qcld"] = None
diff --git a/pyFV3/setup.py b/pyFV3/setup.py
deleted file mode 100644
index 17326970..00000000
--- a/pyFV3/setup.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-"""The setup script."""
-
-from setuptools import find_namespace_packages, setup
-
-
-with open("README.md", encoding="utf-8") as readme_file:
-    readme = readme_file.read()
-
-requirements = [
-    "f90nml>=1.1.0",
-    "numpy",
-    "ndsl",
-    "xarray",
-]
-
-test_requirements = ["pytest==5.2.2", "pytest-subtests>=0.3.0", "serialbox"]
-
-setup(
-    author="The Allen Institute for Artificial Intelligence",
-    author_email="jeremym@allenai.org",
-    python_requires=">=3.8",
-    classifiers=[
-        "Development Status :: 2 - Pre-Alpha",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: BSD License",
-        "Natural Language :: English",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-    ],
-    description="pyFV3 is a NDSL-based FV3 dynamical core for atmospheric models",
-    install_requires=requirements,
-    extras_require={},
-    license="BSD license",
-    long_description=readme,
-    include_package_data=True,
-    name="pyFV3",
-    packages=find_namespace_packages(include=["pyFV3.*"]),
-    setup_requires=[],
-    test_suite="tests",
-    tests_require=test_requirements,
-    url="https://github.com/NOAA-GFDL/pyFV3",
-    version="0.2.0",
-    zip_safe=False,
-)
diff --git a/pyFV3/tests/conftest.py b/pyFV3/tests/conftest.py
deleted file mode 100644
index f7e506a6..00000000
--- a/pyFV3/tests/conftest.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import pytest
-
-
-@pytest.fixture()
-def backend(pytestconfig):
-    backend = pytestconfig.getoption("backend")
-    return backend
-
-
-def pytest_addoption(parser):
-    parser.addoption("--backend", action="store", default="numpy")
-    parser.addoption("--which_modules", action="store")
-    parser.addoption("--which_rank", action="store")
-    parser.addoption("--skip_modules", action="store")
-    parser.addoption("--print_failures", action="store_true")
-    parser.addoption("--failure_stride", action="store", default=1)
-    parser.addoption("--data_path", action="store", default="./")
-    parser.addoption("--threshold_overrides_file", action="store", default=None)
-    parser.addoption("--compute_grid", action="store_true")
-    parser.addoption("--dperiodic", action="store_true")
-
-
-def pytest_configure(config):
-    # register an additional marker
-    config.addinivalue_line(
-        "markers", "sequential(name): mark test as running sequentially on ranks"
-    )
-    config.addinivalue_line(
-        "markers", "parallel(name): mark test as running in parallel across ranks"
-    )
-    config.addinivalue_line(
-        "markers",
-        "mock_parallel(name): mark test as running in mock parallel across ranks",
-    )
diff --git a/pyFV3/tests/mpi/test_doubly_periodic.py b/pyFV3/tests/mpi/test_doubly_periodic.py
deleted file mode 100644
index 9c454cef..00000000
--- a/pyFV3/tests/mpi/test_doubly_periodic.py
+++ /dev/null
@@ -1,145 +0,0 @@
-from datetime import timedelta
-from typing import Any, List, Tuple, cast
-
-import ndsl.dsl.stencil
-import ndsl.stencils.testing
-from ndsl.comm.communicator import CubedSphereCommunicator, TileCommunicator
-from ndsl.comm.mpi import MPIComm
-from ndsl.comm.partitioner import TilePartitioner
-from ndsl.dsl.stencil import GridIndexing
-from ndsl.grid import DampingCoefficients, GridData, MetricTerms
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.initialization.sizer import SubtileGridSizer
-
-import pyFV3
-import pyFV3._config
-import pyFV3.initialization.baroclinic as baroclinic_init
-
-
-def setup_dycore() -> Tuple[pyFV3.DynamicalCore, List[Any]]:
-    backend = "numpy"
-    layout = (3, 3)
-    config = pyFV3.DynamicalCoreConfig(
-        layout=layout,
-        npx=13,
-        npy=13,
-        npz=79,
-        ntiles=6,
-        nwat=6,
-        dt_atmos=225,
-        a_imp=1.0,
-        beta=0.0,
-        consv_te=False,  # not implemented, needs allreduce
-        d2_bg=0.0,
-        d2_bg_k1=0.2,
-        d2_bg_k2=0.1,
-        d4_bg=0.15,
-        d_con=1.0,
-        d_ext=0.0,
-        dddmp=0.5,
-        delt_max=0.002,
-        do_sat_adj=True,
-        do_vort_damp=True,
-        fill=True,
-        hord_dp=6,
-        hord_mt=6,
-        hord_tm=6,
-        hord_tr=8,
-        hord_vt=6,
-        hydrostatic=False,
-        k_split=1,
-        ke_bg=0.0,
-        kord_mt=9,
-        kord_tm=-9,
-        kord_tr=9,
-        kord_wz=9,
-        n_split=1,
-        nord=3,
-        p_fac=0.05,
-        rf_fast=True,
-        rf_cutoff=3000.0,
-        tau=10.0,
-        vtdm4=0.06,
-        z_tracer=True,
-        do_qa=True,
-    )
-    mpi_comm = MPIComm()
-    partitioner = TilePartitioner(config.layout)
-    # TODO: cleanup typing of tile vs cubed sphere communicators,
-    # currently both have a .tile attribute that reference a TileCommunicator
-    # instead both should have the methods specific to a TileCommunicator
-    # (to be put on the Communicator abstract base class) and
-    # the CubedSphere implementation should defer to the tile.
-    communicator = cast(
-        CubedSphereCommunicator,
-        TileCommunicator(mpi_comm, partitioner),
-    )
-    stencil_config = ndsl.dsl.stencil.StencilConfig(
-        compilation_config=ndsl.dsl.stencil.CompilationConfig(
-            communicator=communicator,
-            backend=backend,
-            rebuild=False,
-            validate_args=True,
-        )
-    )
-    sizer = SubtileGridSizer.from_tile_params(
-        nx_tile=config.npx - 1,
-        ny_tile=config.npy - 1,
-        nz=config.npz,
-        n_halo=3,
-        extra_dim_lengths={},
-        layout=config.layout,
-        tile_partitioner=partitioner,
-        tile_rank=communicator.rank,
-    )
-    grid_indexing = GridIndexing.from_sizer_and_communicator(
-        sizer=sizer, comm=communicator
-    )
-    quantity_factory = QuantityFactory.from_backend(sizer=sizer, backend=backend)
-    metric_terms = MetricTerms(
-        quantity_factory=quantity_factory,
-        communicator=communicator,
-    )
-    grid_data = GridData.new_from_metric_terms(metric_terms)
-
-    # create an initial state from the Jablonowski & Williamson Baroclinic
-    # test case perturbation. JRMS2006
-    state = baroclinic_init.init_baroclinic_state(
-        grid_data=grid_data,
-        quantity_factory=quantity_factory,
-        adiabatic=config.adiabatic,
-        hydrostatic=config.hydrostatic,
-        moist_phys=config.moist_phys,
-        comm=communicator,
-    )
-    stencil_factory = ndsl.dsl.stencil.StencilFactory(
-        config=stencil_config,
-        grid_indexing=grid_indexing,
-    )
-
-    dycore = pyFV3.DynamicalCore(
-        comm=communicator,
-        grid_data=grid_data,
-        stencil_factory=stencil_factory,
-        quantity_factory=quantity_factory,
-        damping_coefficients=DampingCoefficients.new_from_metric_terms(metric_terms),
-        config=config,
-        phis=state.phis,
-        state=state,
-        timestep=timedelta(seconds=255),
-    )
-    # TODO compute from namelist
-    bdt = config.dt_atmos
-
-    args = [
-        state,
-        config.consv_te,
-        bdt,
-        config.n_split,
-    ]
-    return dycore, args
-
-
-def test_dycore_runs_one_step():
-    dycore, args = setup_dycore()
-    dycore.step_dynamics(*args)
diff --git a/pyFV3/tests/pytest.ini b/pyFV3/tests/pytest.ini
deleted file mode 100644
index 7c0c4bf0..00000000
--- a/pyFV3/tests/pytest.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[pytest]
-filterwarnings =
-    ignore:invalid value encountered in true_divide
diff --git a/pyFV3/tests/savepoint/__init__.py b/pyFV3/tests/savepoint/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/pyFV3/tests/savepoint/conftest.py b/pyFV3/tests/savepoint/conftest.py
deleted file mode 100644
index f8367c9d..00000000
--- a/pyFV3/tests/savepoint/conftest.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# flake8: noqa
-
-# This magical series of imports is to de-duplicate the conftest.py file
-# between the dycore and physics tests. We can avoid this if we refactor the tests
-# to all run from one directory
-
-import pyFV3.testing
-
-
-# this must happen before any classes from pyFV3 are instantiated
-pyFV3.testing.enable_selective_validation()
-
-import ndsl.stencils.testing.conftest
-from ndsl.stencils.testing.conftest import *  # noqa: F403,F401
-
-from . import translate
-
-
-ndsl.stencils.testing.conftest.translate = translate  # type: ignore
diff --git a/pyFV3/tests/savepoint/output/.gitkeep b/pyFV3/tests/savepoint/output/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/pyFV3/tests/savepoint/test_translate.py b/pyFV3/tests/savepoint/test_translate.py
deleted file mode 100644
index 8dadf15a..00000000
--- a/pyFV3/tests/savepoint/test_translate.py
+++ /dev/null
@@ -1 +0,0 @@
-from ndsl.stencils.testing.test_translate import *  # noqa: F403,F401
diff --git a/pyFV3/tests/savepoint/translate/__init__.py b/pyFV3/tests/savepoint/translate/__init__.py
deleted file mode 100644
index 651b2551..00000000
--- a/pyFV3/tests/savepoint/translate/__init__.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# flake8: noqa: F401
-from pyFV3.testing import TranslateDynCore, TranslateFVDynamics
-
-from .translate_a2b_ord4 import TranslateA2B_Ord4
-from .translate_c_sw import (
-    TranslateC_SW,
-    TranslateCirculation_Cgrid,
-    TranslateDivergenceCorner,
-    TranslateVorticityTransport_Cgrid,
-)
-from .translate_corners import (
-    TranslateCopyCorners,
-    TranslateFill4Corners,
-    TranslateFillCorners,
-    TranslateFillCornersVector,
-)
-from .translate_cubedtolatlon import TranslateCubedToLatLon
-from .translate_d2a2c_vect import TranslateD2A2C_Vect
-from .translate_d_sw import (
-    TranslateD_SW,
-    TranslateFluxCapacitor,
-    TranslateHeatDiss,
-    TranslateUbKE,
-    TranslateVbKE,
-    TranslateWdivergence,
-)
-from .translate_del2cubed import TranslateDel2Cubed
-from .translate_del6vtflux import TranslateDel6VtFlux
-from .translate_delnflux import TranslateDelnFlux, TranslateDelnFlux_2
-from .translate_divergencedamping import TranslateDivergenceDamping
-from .translate_fillz import TranslateFillz
-from .translate_fvsubgridz import TranslateFVSubgridZ
-from .translate_fvtp2d import TranslateFvTp2d, TranslateFvTp2d_2
-from .translate_fxadv import TranslateFxAdv
-from .translate_grid import (
-    TranslateAGrid,
-    TranslateDerivedTrig,
-    TranslateDivgDel6,
-    TranslateDxDy,
-    TranslateEdgeFactors,
-    TranslateGnomonicGrids,
-    TranslateGridAreas,
-    TranslateGridGrid,
-    TranslateInitCubedtoLatLon,
-    TranslateInitGrid,
-    TranslateInitGridUtils,
-    TranslateMirrorGrid,
-    TranslateSetEta,
-    TranslateTrigSg,
-    TranslateUtilVectors,
-)
-from .translate_haloupdate import (
-    TranslateHaloUpdate,
-    TranslateHaloUpdate_2,
-    TranslateHaloVectorUpdate,
-    TranslateMPPBoundaryAdjust,
-    TranslateMPPUpdateDomains,
-)
-from .translate_init_case import (
-    TranslateInitCase,
-    TranslateInitPreJab,
-    TranslateJablonowskiBaroclinic,
-    TranslatePVarAuxiliaryPressureVars,
-)
-from .translate_last_step import TranslateLastStep
-from .translate_moistcvpluspkz_2d import TranslateMoistCVPlusPkz_2d
-from .translate_moistcvpluspt_2d import TranslateMoistCVPlusPt_2d
-from .translate_neg_adj3 import TranslateNeg_Adj3
-from .translate_nh_p_grad import TranslateNH_P_Grad
-from .translate_pe_halo import TranslatePE_Halo
-from .translate_pk3_halo import TranslatePK3_Halo
-from .translate_pressureadjustedtemperature_nonhydrostatic import (
-    TranslatePressureAdjustedTemperature_NonHydrostatic,
-)
-from .translate_qsinit import TranslateQSInit
-from .translate_ray_fast import TranslateRay_Fast
-from .translate_remapping import TranslateRemapping
-from .translate_riem_solver3 import TranslateRiem_Solver3
-from .translate_riem_solver_c import TranslateRiem_Solver_C
-from .translate_satadjust3d import TranslateSatAdjust3d
-from .translate_tracer2d1l import TranslateTracer2D1L
-from .translate_updatedzc import TranslateUpdateDzC
-from .translate_updatedzd import TranslateUpdateDzD
-from .translate_xppm import TranslateXPPM, TranslateXPPM_2
-from .translate_xtp_u import TranslateXTP_U
-from .translate_yppm import TranslateYPPM, TranslateYPPM_2
-from .translate_ytp_v import TranslateYTP_V
diff --git a/pyFV3/tests/savepoint/translate/overrides/README.md b/pyFV3/tests/savepoint/translate/overrides/README.md
deleted file mode 100644
index 4d087b05..00000000
--- a/pyFV3/tests/savepoint/translate/overrides/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Threshold overrides
-
-`--threshold_overrides_file` takes in a yaml file with error thresholds specified for specific backend and platform configuration. Currently, two types of error overrides are allowed: maximum error and near zero.
-
-For maximum error, a blanket `max_error` is specified to override the parent classes relative error threshold.
-
-For near zero override, `ignore_near_zero_errors` is specified to allow some fields to pass with higher relative error if the absolute error is very small. Additionally, it is also possible to define a global near zero value for all remaining fields not specified in `ignore_near_zero_errors`. This is done by specifying `all_other_near_zero=<value>`.
-
-Override yaml file should have one of the following formats:
-
-## One near zero value for all variables
-
-```Stencil_name:
- - backend: <backend>
-   max_error: <value>
-   near_zero: <value>
-   ignore_near_zero_errors:
-    - <var1>
-    - <var2>
-    - ...
-```
-## Variable specific near zero value
-
-```Stencil_name:
- - backend: <backend>
-   max_error: <value>
-   ignore_near_zero_errors:
-    <var1>:<value1>
-    <var2>:<value2>
-    ...
-```
-
-## [optional] Global near zero value for remaining fields
-
-```Stencil_name:
- - backend: <backend>
-   max_error: <value>
-   ignore_near_zero_errors:
-    <var1>:<value1>
-    <var2>:<value2>
-   all_other_near_zero:<global_value>
-    ...
-```
-
-where fields other than `var1` and `var2` will use `global_value`.
diff --git a/pyFV3/tests/savepoint/translate/overrides/baroclinic.yaml b/pyFV3/tests/savepoint/translate/overrides/baroclinic.yaml
deleted file mode 100644
index 2b288372..00000000
--- a/pyFV3/tests/savepoint/translate/overrides/baroclinic.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
-C_SW:
-  - max_error: 5e-2
-
-FVDynamics:
-  - ignore_near_zero_errors:
-      uc: 1e-13
-      vc: 1e-13
-      mfxd: 1e-3
-      mfyd: 1e-3
-      cxd: 1e-3
-      cyd: 1e-3
-
-DynCore:
-  - ignore_near_zero_errors:
-      uc: 1e-13
-      vc: 1e-13
-      mfxd: 1e-3
-      mfyd: 1e-3
-      cxd: 1e-3
-      cyd: 1e-3
-
-D_SW:
-  - ignore_near_zero_errors:
-      divgdd: 1e-20
-      ucd: 1e-20
-      vcd: 1e-20
-      delpcd: 1e-15
-
-DivergenceDamping:
-  - ignore_near_zero_errors:
-      vort: 6e-8
-      delpc: 1e-15
-
-DivgDel6:
- - max_error: 3e-12 # 48_6ranks
-
-DxDy:
- - max_error: 6e-13 # 48_6ranks
-
-EdgeFactors:
- - max_error: 3e-11 # 48_6ranks
-
-DerivedTrig:
- - max_error: 2e-9 # 192_6ranks
-
-GridGrid:
- - max_error: 2e-11 # 192_6ranks
-
-InitGridUtils:
- - max_error: 5e-6 # 48_6ranks
-   near_zero: 5e-8
-   ignore_near_zero_errors:
-      - l2c_v
-      - l2c_u
-      - ee1
-      - ee2
-      - ew1
-      - ew2
-      - es1
-      - es2
-      - cos_sg1
-      - cos_sg2
-      - cos_sg3
-      - cos_sg4
-      - cos_sg5
-      - cos_sg6
-      - cos_sg7
-      - cos_sg8
-      - cos_sg9
-      - cosa
-      - cosa_u
-      - cosa_v
-
-TrigSg:
-  - max_error: 2e-6 # 48_6ranks
-    near_zero: 1e-7
-    ignore_near_zero_errors:
-      - cos_sg1
-      - cos_sg2
-      - cos_sg3
-      - cos_sg4
-      - cos_sg6
-      - cos_sg7
-      - cos_sg8
-      - cos_sg9
-
-UtilVectors:
-  - max_error: 2e-8 # 192_6ranks
-
-JablonowskiBaroclinic:
-  - ignore_near_zero_errors:
-      u: 4e-12
-      v: 4e-12
-    max_error: 3e-12
-
-InitCase:
-  - max_error: 7e-12
-    ignore_near_zero_errors:
-      u: 7e-12
-      v: 7e-12
diff --git a/pyFV3/tests/savepoint/translate/overrides/standard.yaml b/pyFV3/tests/savepoint/translate/overrides/standard.yaml
deleted file mode 100644
index fb489ae5..00000000
--- a/pyFV3/tests/savepoint/translate/overrides/standard.yaml
+++ /dev/null
@@ -1,230 +0,0 @@
-CS_Profile_2d:
-  - backend: gt:gpu
-    max_error: 2.5e-9
-    near_zero: 1.5e-14
-  - backend: cuda
-    max_error: 2.5e-9
-    near_zero: 1.5e-14
-  - backend: dace:gpu
-    max_error: 2.5e-9
-    near_zero: 1.5e-14
-
-CS_Profile_2d-2:
-  - backend: gt:gpu
-    max_error: 3e-8
-    near_zero: 1.5e-14
-  - backend: dace:gpu
-    max_error: 3e-8
-    near_zero: 1.5e-14
-  - backend: cuda
-    max_error: 3e-8
-    near_zero: 1.5e-14
-
-Fillz:
-  - backend: gt:gpu
-    max_error: 5e-6
-  - backend: dace:gpu
-    max_error: 5e-6
-
-MapN_Tracer_2d:
-  - backend: gtcuda
-    max_error: 2e-7
-    near_zero: 1e-17
-    ignore_near_zero_errors:
-      - qtracers
-  - backend: dace:gpu
-    max_error: 2e-7
-    near_zero: 1e-17
-    ignore_near_zero_errors:
-      - qtracers
-  - backend: numpy
-    max_error: 9e-9 # 48_6ranks
-
-NH_P_Grad:
-  - backend: gtcuda
-    max_error: 2e-9
-  - backend: dace:cpu
-    max_error: 6e-11
-
-Riem_Solver3:
-  - backend: gt:gpu
-    max_error: 5e-6
-  - backend: gt:cpu_ifirst
-    max_error: 5e-6
-  - backend: cuda
-    max_error: 5e-6
-  - backend: numpy
-    max_error: 5e-6
-  - backend: dace:gpu
-    max_error: 5e-6
-  - backend: dace:cpu
-    max_error: 5e-6
-
-Remapping:
-  - backend: gt:gpu
-    max_error: 1e-9
-    near_zero: 5e-6
-    ignore_near_zero_errors:
-      - q_con
-      - tracers
-  - backend: dace:gpu
-    max_error: 1e-9
-    near_zero: 5e-6
-    ignore_near_zero_errors:
-      - q_con
-      - tracers
-
-UpdateDzC:
-  - backend: gt:gpu
-    max_error: 5e-10
-    near_zero: 4.5e-15
-    ignore_near_zero_errors:
-      - ws
-  - backend: cuda
-    max_error: 5e-10
-    near_zero: 4.5e-15
-    ignore_near_zero_errors:
-      - ws
-  - backend: dace:gpu
-    max_error: 5e-10
-    near_zero: 4.5e-15
-    ignore_near_zero_errors:
-      - ws
-  - backend: dace:cpu
-    max_error: 3e-13
-
-UpdateDzD:
-  - backend: gt:gpu
-    max_error: 5e-10
-    ignore_near_zero_errors:
-      - wsd
-  - backend: cuda
-    max_error: 5e-10
-    ignore_near_zero_errors:
-      - wsd
-  - backend: dace:gpu
-    max_error: 5e-10
-    ignore_near_zero_errors:
-      - wsd
-  - backend: dace:cpu
-    max_error: 5e-10
-    ignore_near_zero_errors:
-      - wsd
-
-FVSubgridZ:
-  - backend: gt:gpu
-    max_error: 1e-8
-  - backend: dace:gpu
-    max_error: 1e-8
-    skip_test: true # Register overflow lead to CUDA 401
-  - backend: cuda
-    max_error: 1e-8
-
-DynCore:
- - backend: gt:gpu
-   ignore_near_zero_errors:
-     - wsd
- - backend: cuda
-   ignore_near_zero_errors:
-     - wsd
- - backend: dace:cpu
-   ignore_near_zero_errors:
-     - wsd
- - backend: dace:gpu
-   ignore_near_zero_errors:
-     - wsd
-
-Tracer2D1L:
- - backend: gt:gpu
-   max_error: 1e-9
- - backend: cuda
-   max_error: 1e-9
- - backend: dace:cpu
-   ignore_near_zero_errors:
-     tracers: 1e-9
- - backend: dace:gpu
-   ignore_near_zero_errors:
-     tracers: 1e-9
- - backend: gt:cpu_ifirst
-   ignore_near_zero_errors:
-     tracers: 1e-15
-
-DivgDel6:
- - max_error: 3e-13 # 48_6ranks
-
-DxDy:
- - max_error: 2e-13 # 48_6ranks
-
-EdgeFactors:
- - max_error: 2e-12 # 48_6ranks
-
-DerivedTrig:
- - max_error: 2e-11 # 48_6ranks
-
-GridAreas:
- - max_error: 9e-12 # 48_6ranks
-
-GridGrid:
- - max_error: 6e-13 # 48_6ranks
-
-InitGrid:
- - max_error: 7e-12 # 48_6ranks
-
-InitGridUtils:
- - max_error: 2e-7 # 48_6ranks
-   near_zero: 2e-13
-
-InitCubedtoLatLon:
- - max_error: 9e-13 # 48_6ranks
-   platform: metal
-
-TrigSg:
-  - max_error: 2e-7 # 48_6ranks
-    near_zero: 1e-12
-    ignore_near_zero_errors:
-      - cos_sg6
-      - cos_sg7
-      - cos_sg8
-      - cos_sg9
-
-UtilVectors:
-  - max_error: 2e-10 # 48_6ranks
-
-FVDynamics:
-  - max_error: 5e-5 # 48_6ranks using metric terms
-
-DivergenceDamping:
-  - backend: dace:cpu
-    max_error: 1e-9
-  - backend: dace:gpu
-    max_error: 1e-9
-
-DelnFlux:
-  - backend: dace:cpu
-    max_error: 2e-13
-  - backend: dace:gpu
-    max_error: 7e-13
-
-Del2Cubed:
-  - backend: dace:cpu
-    max_error: 8e-12
-
-FvTp2d:
-  - backend: dace:cpu
-    max_error: 2e-13
-
-FxAdv:
-  - backend: dace:cpu
-    max_error: 5e-12
-
-XPPM:
-  - backend: dace:cpu
-    max_error: 2e-12
-
-YPPM:
-  - backend: dace:cpu
-    max_error: 2e-13
-
-A2B_Ord4:
-  - backend: dace:cpu
-    max_error: 1e-13
diff --git a/pyFV3/tests/savepoint/translate/translate_a2b_ord4.py b/pyFV3/tests/savepoint/translate/translate_a2b_ord4.py
deleted file mode 100644
index 08891bdf..00000000
--- a/pyFV3/tests/savepoint/translate/translate_a2b_ord4.py
+++ /dev/null
@@ -1,85 +0,0 @@
-from typing import Any, Dict
-
-from ndsl.constants import Z_DIM
-from ndsl.dsl.dace.orchestration import orchestrate
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-from pyFV3.stencils.divergence_damping import DivergenceDamping
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class A2B_Ord4Compute:
-    def __init__(self, stencil_factory: StencilFactory) -> None:
-        orchestrate(
-            obj=self,
-            config=stencil_factory.config.dace_config,
-            dace_compiletime_args=["divdamp"],
-        )
-
-    def __call__(
-        self,
-        divdamp,
-        wk,
-        vort,
-        delpc,
-        dt,
-        grid_type: int,  # TODO: swap grid_type type hint when refactor into an enum
-    ):
-        # this function is kept because it has a translate test, if its
-        # structure is changed significantly from __call__ of DivergenceDamping
-        # consider deleting this method and the translate test, or altering the
-        # savepoint to be more closely wrapped around a newly defined
-        # gtscript function
-        if divdamp._dddmp < 1e-5:
-            divdamp._set_value(vort, 0.0)
-        else:
-            # TODO: what is wk/vort here?
-            if grid_type < 3:
-                divdamp.a2b_ord4(wk, vort)
-                divdamp._smagorinksy_diffusion_approx_stencil(
-                    delpc,
-                    vort,
-                    abs(dt),
-                )
-            else:
-                pass
-
-
-class TranslateA2B_Ord4(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        assert namelist.grid_type < 3
-        self.in_vars["data_vars"] = {"wk": {}, "vort": {}, "delpc": {}, "nord_col": {}}
-        self.in_vars["parameters"] = ["dt"]
-        self.out_vars: Dict[str, Any] = {"wk": {}, "vort": {}}
-        self.namelist = namelist  # type: ignore
-        self.stencil_factory = stencil_factory
-        self.compute_obj = A2B_Ord4Compute(stencil_factory)
-
-    def compute_from_storage(self, inputs):
-        nord_col = self.grid.quantity_factory.zeros(dims=[Z_DIM], units="unknown")
-        nord_col.data[:] = nord_col.np.asarray(inputs.pop("nord_col"))
-        divdamp = DivergenceDamping(
-            self.stencil_factory,
-            self.grid.quantity_factory,
-            self.grid.grid_data,
-            self.grid.damping_coefficients,
-            self.grid.nested,
-            self.grid.stretched_grid,
-            self.namelist.dddmp,
-            self.namelist.d4_bg,
-            self.namelist.nord,
-            self.namelist.grid_type,
-            nord_col,
-            nord_col,
-        )
-        # TODO: use proper grid_type values when refactor into an enum
-        inputs["grid_type"] = 0
-        self.compute_obj(divdamp, **inputs)
-        return inputs
diff --git a/pyFV3/tests/savepoint/translate/translate_c_sw.py b/pyFV3/tests/savepoint/translate/translate_c_sw.py
deleted file mode 100644
index 7baf0269..00000000
--- a/pyFV3/tests/savepoint/translate/translate_c_sw.py
+++ /dev/null
@@ -1,256 +0,0 @@
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.namelist import Namelist
-
-from pyFV3.stencils.c_sw import CGridShallowWaterDynamics
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-def get_c_sw_instance(
-    grid,
-    namelist: Namelist,
-    stencil_factory: StencilFactory,
-    quantity_factory: QuantityFactory,
-):
-    return CGridShallowWaterDynamics(
-        stencil_factory,
-        quantity_factory=quantity_factory,
-        grid_data=grid.grid_data,
-        nested=grid.nested,
-        grid_type=namelist.grid_type,
-        nord=namelist.nord,
-    )
-
-
-def compute_vorticitytransport_cgrid(
-    c_sw: CGridShallowWaterDynamics,
-    uc,
-    vc,
-    vort_c,
-    ke_c,
-    v,
-    u,
-    dt2: float,
-):
-    """Update the C-Grid x and y velocity fields.
-
-    Args:
-        uc: x-velocity on C-grid (input, output)
-        vc: y-velocity on C-grid (input, output)
-        vort_c: Vorticity on C-grid (input)
-        ke_c: kinetic energy on C-grid (input)
-        v: y-velocity on D-grid (input)
-        u: x-velocity on D-grid (input)
-        dt2: timestep (input)
-    """
-    # TODO: this function is kept because it has a translate test,
-    # if the structure of call changes significantly from this
-    # consider deleting this function and the translate test
-    # or restructuring the savepoint
-    c_sw._update_y_velocity(
-        vort_c,
-        ke_c,
-        u,
-        vc,
-        c_sw.grid_data.cosa_v,
-        c_sw.grid_data.sina_v,
-        c_sw.grid_data.rdyc,
-        dt2,
-    )
-    c_sw._update_x_velocity(
-        vort_c,
-        ke_c,
-        v,
-        uc,
-        c_sw.grid_data.cosa_u,
-        c_sw.grid_data.sina_u,
-        c_sw.grid_data.rdxc,
-        dt2,
-    )
-
-
-class TranslateC_SW(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        cgrid_shallow_water_lagrangian_dynamics = get_c_sw_instance(
-            grid, namelist, stencil_factory, self.grid.quantity_factory
-        )
-        self.compute_func = cgrid_shallow_water_lagrangian_dynamics  # type: ignore
-        self.in_vars["data_vars"] = {
-            "delp": {},
-            "pt": {},
-            "u": {"jend": grid.jed + 1},
-            "v": {"iend": grid.ied + 1},
-            "w": {},
-            "uc": {"iend": grid.ied + 1},
-            "vc": {"jend": grid.jed + 1},
-            "ua": {},
-            "va": {},
-            "ut": {},
-            "vt": {},
-            "omga": {"serialname": "omgad"},
-            "divgd": {"iend": grid.ied + 1, "jend": grid.jed + 1},
-        }
-        self.in_vars["parameters"] = ["dt2"]
-        for name, info in self.in_vars["data_vars"].items():
-            info["serialname"] = name + "d"
-        self.out_vars = {}
-        for v, d in self.in_vars["data_vars"].items():
-            self.out_vars[v] = d
-        for servar in ["delpcd", "ptcd"]:
-            self.out_vars[servar] = {}
-        # TODO: Fix edge_interpolate4 in d2a2c_vect to match closer and the
-        # variables here should as well.
-        self.max_error = 2e-10
-        self.stencil_factory = stencil_factory
-
-    def compute(self, inputs):
-        self.make_storage_data_input_vars(inputs)
-        delpc, ptc = self.compute_func(**inputs)
-        return self.slice_output(inputs, {"delpcd": delpc, "ptcd": ptc})
-
-
-class TranslateDivergenceCorner(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.max_error = 9e-10
-        self.cgrid_sw_lagrangian_dynamics = get_c_sw_instance(
-            grid, namelist, stencil_factory, self.grid.quantity_factory
-        )
-        self.in_vars["data_vars"] = {
-            "u": {
-                "istart": grid.isd,
-                "iend": grid.ied,
-                "jstart": grid.jsd,
-                "jend": grid.jed + 1,
-            },
-            "v": {
-                "istart": grid.isd,
-                "iend": grid.ied + 1,
-                "jstart": grid.jsd,
-                "jend": grid.jed,
-            },
-            "ua": {},
-            "va": {},
-            "divg_d": {},
-        }
-        self.out_vars = {
-            "divg_d": {
-                "istart": grid.isd,
-                "iend": grid.ied + 1,
-                "jstart": grid.jsd,
-                "jend": grid.jed + 1,
-            }
-        }
-        self.stencil_factory = stencil_factory
-
-    def compute(self, inputs):
-        self.make_storage_data_input_vars(inputs)
-        self.cgrid_sw_lagrangian_dynamics._divergence_corner(
-            **inputs,
-            dxc=self.grid.dxc,
-            dyc=self.grid.dyc,
-            sin_sg1=self.grid.sin_sg1,
-            sin_sg2=self.grid.sin_sg2,
-            sin_sg3=self.grid.sin_sg3,
-            sin_sg4=self.grid.sin_sg4,
-            cos_sg1=self.grid.cos_sg1,
-            cos_sg2=self.grid.cos_sg2,
-            cos_sg3=self.grid.cos_sg3,
-            cos_sg4=self.grid.cos_sg4,
-            rarea_c=self.grid.rarea_c,
-        )
-        return self.slice_output({"divg_d": inputs["divg_d"]})
-
-
-class TranslateCirculation_Cgrid(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.max_error = 5e-9
-        self.cgrid_sw_lagrangian_dynamics = get_c_sw_instance(
-            grid, namelist, stencil_factory, self.grid.quantity_factory
-        )
-        self.in_vars["data_vars"] = {
-            "uc": {},
-            "vc": {},
-            "vort_c": {
-                "istart": grid.is_ - 1,
-                "iend": grid.ie + 1,
-                "jstart": grid.js - 1,
-                "jend": grid.je + 1,
-            },
-        }
-        self.out_vars = {
-            "vort_c": {
-                "istart": grid.is_ - 1,
-                "iend": grid.ie + 1,
-                "jstart": grid.js - 1,
-                "jend": grid.je + 1,
-            }
-        }
-        self.stencil_factory = stencil_factory
-
-    def compute(self, inputs):
-        self.make_storage_data_input_vars(inputs)
-        self.cgrid_sw_lagrangian_dynamics._circulation_cgrid(
-            **inputs,
-            dxc=self.grid.dxc,
-            dyc=self.grid.dyc,
-        )
-        return self.slice_output({"vort_c": inputs["vort_c"]})
-
-
-class TranslateVorticityTransport_Cgrid(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        cgrid_sw_lagrangian_dynamics = get_c_sw_instance(
-            grid, namelist, stencil_factory, self.grid.quantity_factory
-        )
-
-        def compute_func(*args, **kwargs):
-            return compute_vorticitytransport_cgrid(
-                cgrid_sw_lagrangian_dynamics, *args, **kwargs
-            )
-
-        self.compute_func = compute_func  # type: ignore
-        self.in_vars["data_vars"] = {
-            "uc": {},
-            "vc": {},
-            "vort_c": {
-                "istart": grid.is_ - 1,
-                "iend": grid.ie + 1,
-                "jstart": grid.js - 1,
-                "jend": grid.je + 1,
-            },
-            "ke_c": {
-                "istart": grid.is_ - 1,
-                "iend": grid.ie + 1,
-                "jstart": grid.js - 1,
-                "jend": grid.je + 1,
-            },
-            "u": {},
-            "v": {},
-        }
-        self.in_vars["parameters"] = ["dt2"]
-        self.out_vars = {"uc": grid.x3d_domain_dict(), "vc": grid.y3d_domain_dict()}
-        self.stencil_factory = stencil_factory
diff --git a/pyFV3/tests/savepoint/translate/translate_corners.py b/pyFV3/tests/savepoint/translate/translate_corners.py
deleted file mode 100644
index fca15720..00000000
--- a/pyFV3/tests/savepoint/translate/translate_corners.py
+++ /dev/null
@@ -1,171 +0,0 @@
-from typing import Any, Dict
-
-import ndsl.dsl.gt4py_utils as utils
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-from ndsl.stencils import corners
-
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateFill4Corners(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {"q4c": {}}
-        self.in_vars["parameters"] = ["dir"]
-        self.out_vars: Dict[str, Any] = {"q4c": {}}
-        self.stencil_factory = stencil_factory
-
-    def compute(self, inputs):
-        self.make_storage_data_input_vars(inputs)
-        origin = self.grid.full_origin()
-        domain = self.grid.domain_shape_full()
-        axes_offsets = self.stencil_factory.grid_indexing.axis_offsets(origin, domain)
-        if inputs["dir"] == 1:
-            stencil = self.stencil_factory.from_origin_domain(
-                corners.fill_corners_2cells_x_stencil,
-                externals=axes_offsets,
-                origin=origin,
-                domain=domain,
-            )
-        elif inputs["dir"] == 2:
-            stencil = self.stencil_factory.from_origin_domain(
-                corners.fill_corners_2cells_y_stencil,
-                externals=axes_offsets,
-                origin=origin,
-                domain=domain,
-            )
-        stencil(inputs["q4c"], inputs["q4c"])
-        return self.slice_output(inputs, {"q4c": inputs["q4c"]})
-
-
-class TranslateFillCorners(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {"divg_d": {}, "nord_col": {}}
-        self.in_vars["parameters"] = ["dir"]
-        self.out_vars = {"divg_d": {"iend": grid.ied + 1, "jend": grid.jed + 1}}
-        self.stencil_factory = stencil_factory
-
-    def compute_from_storage(self, inputs):
-        nord_column = inputs["nord_col"][:]
-        utils.device_sync(backend=self.stencil_factory.backend)
-        for nord in utils.unique(nord_column):
-            if nord != 0:
-                ki = [i for i in range(self.grid.npz) if nord_column[i] == nord]
-                origin = (self.grid.isd, self.grid.jsd, ki[0])
-                domain = (self.grid.nid + 1, self.grid.njd + 1, len(ki))
-                if inputs["dir"] == 1:
-                    fill_corners = corners.FillCornersBGrid(
-                        "x",
-                        origin=origin,
-                        domain=domain,
-                        stencil_factory=self.stencil_factory,
-                    )
-
-                    fill_corners(
-                        inputs["divg_d"],
-                    )
-                elif inputs["dir"] == 2:
-                    fill_corners = corners.FillCornersBGrid(
-                        "y",
-                        origin=origin,
-                        domain=domain,
-                        stencil_factory=self.stencil_factory,
-                    )
-                    fill_corners(
-                        inputs["divg_d"],
-                    )
-                else:
-                    raise ValueError("Invalid input")
-        return inputs
-
-
-class TranslateCopyCorners(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {"q": {}}
-        self.in_vars["parameters"] = ["dir"]
-        self.out_vars: Dict[str, Any] = {"q": {}}
-        self._copy_corners_x = corners.CopyCorners("x", stencil_factory=stencil_factory)
-        self._copy_corners_y = corners.CopyCorners("y", stencil_factory=stencil_factory)
-        self.stencil_factory = stencil_factory
-
-    def compute_from_storage(self, inputs):
-        if inputs["dir"] == 1:
-            self._copy_corners_x(inputs["q"])
-        elif inputs["dir"] == 2:
-            self._copy_corners_y(inputs["q"])
-        else:
-            raise ValueError("Invalid input")
-        return inputs
-
-
-class FillCornersVector_Wrapper:
-    def __init__(self, stencil_factory, axes_offsets, origin, domain):
-        self.stencil = stencil_factory.from_origin_domain(
-            corners.fill_corners_dgrid_defn,
-            externals=axes_offsets,
-            origin=origin,
-            domain=domain,
-        )
-
-    def __call__(
-        self,
-        x_in,
-        x_out,
-        y_in,
-        y_out,
-        mysign,
-    ):
-        self.stencil(x_in, x_out, y_in, y_out, mysign)
-
-
-class TranslateFillCornersVector(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {"vc": {}, "uc": {}, "nord_col": {}}
-        self.out_vars: Dict[str, Any] = {
-            "vc": grid.y3d_domain_dict(),
-            "uc": grid.x3d_domain_dict(),
-        }
-        self.stencil_factory = stencil_factory
-
-    def compute(self, inputs):
-        nord_column = inputs["nord_col"][:]
-        self.make_storage_data_input_vars(inputs)
-        for nord in utils.unique(nord_column):
-            if nord != 0:
-                ki = [k for k in range(self.grid.npz) if nord_column[0, 0, k] == nord]
-                origin = (self.grid.isd, self.grid.jsd, ki[0])
-                domain = (self.grid.nid + 1, self.grid.njd + 1, len(ki))
-                axes_offsets = self.stencil_factory.grid_indexing.axis_offsets(
-                    origin, domain
-                )
-                vector_corner_fill = FillCornersVector_Wrapper(
-                    self.stencil_factory, axes_offsets, origin, domain
-                )
-                vector_corner_fill(
-                    inputs["vc"], inputs["vc"], inputs["uc"], inputs["uc"], -1.0
-                )
-        return self.slice_output(inputs)
diff --git a/pyFV3/tests/savepoint/translate/translate_cubedtolatlon.py b/pyFV3/tests/savepoint/translate/translate_cubedtolatlon.py
deleted file mode 100644
index 54ed2f1e..00000000
--- a/pyFV3/tests/savepoint/translate/translate_cubedtolatlon.py
+++ /dev/null
@@ -1,73 +0,0 @@
-from ndsl.constants import X_DIM, X_INTERFACE_DIM, Y_DIM, Y_INTERFACE_DIM, Z_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-from ndsl.quantity import Quantity
-from ndsl.stencils.c2l_ord import CubedToLatLon
-from ndsl.stencils.testing import ParallelTranslate2Py
-
-
-class TranslateCubedToLatLon(ParallelTranslate2Py):
-    inputs = {
-        "u": {
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "v": {
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-    }
-
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self._base.in_vars["data_vars"] = {"u": {}, "v": {}, "ua": {}, "va": {}}
-        self._base.out_vars = {
-            "ua": {},
-            "va": {},
-            "u": self.grid.y3d_domain_dict(),
-            "v": self.grid.x3d_domain_dict(),
-        }
-        self.stencil_factory = stencil_factory
-        self.grid_type = namelist.grid_type
-
-    def compute_parallel(self, inputs, communicator):
-        self._base.make_storage_data_input_vars(inputs)
-        u_quantity = _quantity_wrap(
-            inputs["u"],
-            self.inputs["u"]["dims"],
-            self.grid.grid_indexing,
-        )
-        v_quantity = _quantity_wrap(
-            inputs["v"],
-            self.inputs["v"]["dims"],
-            self.grid.grid_indexing,
-        )
-        state_dict = {"u": u_quantity, "v": v_quantity}
-
-        self._cubed_to_latlon = CubedToLatLon(
-            state=state_dict,
-            stencil_factory=self.stencil_factory,
-            quantity_factory=self.grid.quantity_factory,
-            grid_data=self.grid.grid_data,
-            order=self.namelist.c2l_ord,
-            comm=communicator,
-            grid_type=self.grid_type,
-        )
-        self._cubed_to_latlon(**inputs)
-        return self._base.slice_output(inputs)
-
-
-def _quantity_wrap(storage, dims, grid_indexing):
-    origin, extent = grid_indexing.get_origin_domain(dims)
-    return Quantity(
-        storage,
-        dims=dims,
-        units="unknown",
-        origin=origin,
-        extent=extent,
-    )
diff --git a/pyFV3/tests/savepoint/translate/translate_d2a2c_vect.py b/pyFV3/tests/savepoint/translate/translate_d2a2c_vect.py
deleted file mode 100644
index 8b8d5ea9..00000000
--- a/pyFV3/tests/savepoint/translate/translate_d2a2c_vect.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-from pyFV3.stencils.d2a2c_vect import DGrid2AGrid2CGridVectors
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateD2A2C_Vect(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        dord4 = True
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist  # type: ignore
-        self.compute_func = DGrid2AGrid2CGridVectors(  # type: ignore
-            self.stencil_factory,
-            self.grid.quantity_factory,
-            self.grid.grid_data,
-            self.grid.nested,
-            self.namelist.grid_type,
-            dord4,
-        )
-        self.in_vars["data_vars"] = {
-            "uc": {},
-            "vc": {},
-            "u": {},
-            "v": {},
-            "ua": {},
-            "va": {},
-            "utc": {},
-            "vtc": {},
-        }
-        self.out_vars = {
-            "uc": grid.x3d_domain_dict(),
-            "vc": grid.y3d_domain_dict(),
-            "ua": {},
-            "va": {},
-            "utc": {},
-            "vtc": {},
-        }
-        # TODO: This seems to be needed primarily for the edge_interpolate_4
-        # methods, can we rejigger the order of operations to make it match to
-        # more precision?
-        self.max_error = 2e-10
diff --git a/pyFV3/tests/savepoint/translate/translate_d_sw.py b/pyFV3/tests/savepoint/translate/translate_d_sw.py
deleted file mode 100644
index 55900608..00000000
--- a/pyFV3/tests/savepoint/translate/translate_d_sw.py
+++ /dev/null
@@ -1,260 +0,0 @@
-from gt4py.cartesian.gtscript import PARALLEL, computation, interval
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import FloatField, FloatFieldIJ
-from ndsl.namelist import Namelist
-
-import pyFV3
-import pyFV3.stencils.d_sw as d_sw
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateD_SW(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.max_error = 3.2e-10
-        self.stencil_factory = stencil_factory
-        dycore_config = pyFV3.DynamicalCoreConfig.from_namelist(namelist)
-        column_namelist = d_sw.get_column_namelist(
-            config=dycore_config.acoustic_dynamics.d_grid_shallow_water,
-            quantity_factory=self.grid.quantity_factory,
-        )
-        self.compute_func = d_sw.DGridShallowWaterLagrangianDynamics(  # type: ignore
-            stencil_factory=self.stencil_factory,
-            quantity_factory=self.grid.quantity_factory,
-            grid_data=self.grid.grid_data,
-            damping_coefficients=self.grid.damping_coefficients,
-            column_namelist=column_namelist,
-            nested=self.grid.nested,
-            stretched_grid=self.grid.stretched_grid,
-            config=dycore_config.d_grid_shallow_water,
-        )
-        self.in_vars["data_vars"] = {
-            "uc": grid.x3d_domain_dict(),
-            "vc": grid.y3d_domain_dict(),
-            "w": {},
-            "delpc": {},
-            "delp": {},
-            "u": grid.y3d_domain_dict(),
-            "v": grid.x3d_domain_dict(),
-            "xfx": grid.x3d_compute_domain_y_dict(),
-            "crx": grid.x3d_compute_domain_y_dict(),
-            "yfx": grid.y3d_compute_domain_x_dict(),
-            "cry": grid.y3d_compute_domain_x_dict(),
-            "mfx": grid.x3d_compute_dict(),
-            "mfy": grid.y3d_compute_dict(),
-            "cx": grid.x3d_compute_domain_y_dict(),
-            "cy": grid.y3d_compute_domain_x_dict(),
-            "heat_source": {},
-            "diss_est": {},
-            "q_con": {},
-            "pt": {},
-            "ua": {},
-            "va": {},
-            "zh": {},
-            "divgd": grid.default_dict_buffer_2d(),
-        }
-        for name, info in self.in_vars["data_vars"].items():
-            info["serialname"] = name + "d"
-        self.in_vars["parameters"] = ["dt"]
-        self.out_vars = self.in_vars["data_vars"].copy()
-        del self.out_vars["zh"]
-
-
-def ubke(
-    uc: FloatField,
-    vc: FloatField,
-    cosa: FloatFieldIJ,
-    rsina: FloatFieldIJ,
-    ut: FloatField,
-    ub: FloatField,
-    dt4: float,
-    dt5: float,
-):
-    with computation(PARALLEL), interval(...):
-        dt = 2.0 * dt5
-        ub, _ = d_sw.interpolate_uc_vc_to_cell_corners(uc, vc, cosa, rsina, ut, ut)
-        ub = ub * dt
-
-
-class TranslateUbKE(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "uc": {},
-            "vc": {},
-            "ut": {},
-            "ub": grid.compute_dict_buffer_2d(),
-        }
-        self.in_vars["parameters"] = ["dt5", "dt4"]
-        self.out_vars = {"ub": grid.compute_dict_buffer_2d()}
-        origin = self.grid.compute_origin()
-        domain = self.grid.domain_shape_compute(add=(1, 1, 0))
-        self.stencil_factory = stencil_factory
-        ax_offsets = self.stencil_factory.grid_indexing.axis_offsets(origin, domain)
-        self.compute_func = self.stencil_factory.from_origin_domain(  # type: ignore
-            ubke, externals=ax_offsets, origin=origin, domain=domain
-        )
-
-    def compute_from_storage(self, inputs):
-        inputs["cosa"] = self.grid.cosa
-        inputs["rsina"] = self.grid.rsina
-        self.compute_func(**inputs)
-        return inputs
-
-
-def vbke(
-    vc: FloatField,
-    uc: FloatField,
-    cosa: FloatFieldIJ,
-    rsina: FloatFieldIJ,
-    vt: FloatField,
-    vb: FloatField,
-    dt4: float,
-    dt5: float,
-):
-    with computation(PARALLEL), interval(...):
-        dt = 2.0 * dt5
-        _, vb = d_sw.interpolate_uc_vc_to_cell_corners(uc, vc, cosa, rsina, vt, vt)
-        vb = vb * dt
-
-
-class TranslateVbKE(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "vc": {},
-            "uc": {},
-            "vt": {},
-            "vb": grid.compute_dict_buffer_2d(),
-        }
-        self.in_vars["parameters"] = ["dt5", "dt4"]
-        self.out_vars = {"vb": grid.compute_dict_buffer_2d()}
-        origin = self.grid.compute_origin()
-        domain = self.grid.domain_shape_compute(add=(1, 1, 0))
-        self.stencil_factory = stencil_factory
-        ax_offsets = self.stencil_factory.grid_indexing.axis_offsets(origin, domain)
-        self.compute_func = self.stencil_factory.from_origin_domain(  # type: ignore
-            vbke, externals=ax_offsets, origin=origin, domain=domain
-        )
-
-    def compute_from_storage(self, inputs):
-        inputs["cosa"] = self.grid.cosa
-        inputs["rsina"] = self.grid.rsina
-        self.compute_func(**inputs)
-        return inputs
-
-
-class TranslateFluxCapacitor(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "cx": grid.x3d_compute_domain_y_dict(),
-            "cy": grid.y3d_compute_domain_x_dict(),
-            "xflux": grid.x3d_compute_dict(),
-            "yflux": grid.y3d_compute_dict(),
-            "crx_adv": grid.x3d_compute_domain_y_dict(),
-            "cry_adv": grid.y3d_compute_domain_x_dict(),
-            "fx": grid.x3d_compute_dict(),
-            "fy": grid.y3d_compute_dict(),
-        }
-        self.out_vars = {}
-        for outvar in ["cx", "cy", "xflux", "yflux"]:
-            self.out_vars[outvar] = self.in_vars["data_vars"][outvar]
-        self.stencil_factory = stencil_factory
-        self.compute_func = self.stencil_factory.from_origin_domain(  # type: ignore
-            d_sw.flux_capacitor,
-            origin=grid.full_origin(),
-            domain=grid.domain_shape_full(),
-        )
-
-
-class TranslateHeatDiss(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "fx2": {},
-            "fy2": {},
-            "w": {},
-            "dw": {},
-            "heat_source": {},
-            "diss_est": {},
-        }
-        self.out_vars = {
-            "heat_source": grid.compute_dict(),
-            "diss_est": grid.compute_dict(),
-            "dw": grid.compute_dict(),
-        }
-        self.namelist = namelist  # type: ignore
-        self.stencil_factory = stencil_factory
-
-    def compute_from_storage(self, inputs):
-        column_namelist = d_sw.get_column_namelist(
-            config=self.namelist, quantity_factory=self.grid.quantity_factory
-        )
-        # TODO add these to the serialized data or remove the test
-        inputs["damp_w"] = column_namelist["damp_w"]
-        inputs["ke_bg"] = column_namelist["ke_bg"]
-        inputs["dt"] = (
-            self.namelist.dt_atmos / self.namelist.k_split / self.namelist.n_split
-        )
-        inputs["rarea"] = self.grid.rarea
-        heat_diss_stencil = self.stencil_factory.from_origin_domain(
-            d_sw.heat_diss,
-            origin=self.grid.compute_origin(),
-            domain=self.grid.domain_shape_compute(),
-        )
-        heat_diss_stencil(**inputs)
-        return inputs
-
-
-class TranslateWdivergence(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "q": {"serialname": "w"},
-            "delp": {},
-            "gx": {},
-            "gy": {},
-        }
-        self.out_vars = {"q": {"serialname": "w"}}
-        self.stencil_factory = stencil_factory
-        self.compute_func = self.stencil_factory.from_origin_domain(  # type: ignore
-            d_sw.apply_fluxes,
-            origin=self.grid.compute_origin(),
-            domain=self.grid.domain_shape_compute(),
-        )
-
-    def compute_from_storage(self, inputs):
-        inputs["rarea"] = self.grid.rarea
-        self.compute_func(**inputs)
-        return inputs
diff --git a/pyFV3/tests/savepoint/translate/translate_del2cubed.py b/pyFV3/tests/savepoint/translate/translate_del2cubed.py
deleted file mode 100644
index 2da31253..00000000
--- a/pyFV3/tests/savepoint/translate/translate_del2cubed.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from typing import Any, Dict
-
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-from pyFV3.stencils.del2cubed import HyperdiffusionDamping
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateDel2Cubed(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {"qdel": {}}
-        self.in_vars["parameters"] = ["nmax", "cd"]
-        self.out_vars: Dict[str, Any] = {"qdel": {}}
-        self.stencil_factory = stencil_factory
-
-    def compute_from_storage(self, inputs):
-        hyperdiffusion = HyperdiffusionDamping(
-            self.stencil_factory,
-            quantity_factory=self.grid.quantity_factory,
-            damping_coefficients=self.grid.damping_coefficients,
-            rarea=self.grid.rarea,
-            nmax=inputs.pop("nmax"),
-        )
-        hyperdiffusion(**inputs)
-        return inputs
diff --git a/pyFV3/tests/savepoint/translate/translate_del6vtflux.py b/pyFV3/tests/savepoint/translate/translate_del6vtflux.py
deleted file mode 100644
index 96f2da38..00000000
--- a/pyFV3/tests/savepoint/translate/translate_del6vtflux.py
+++ /dev/null
@@ -1,50 +0,0 @@
-from ndsl.constants import Z_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-import pyFV3.stencils.delnflux as delnflux
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateDel6VtFlux(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        fxstat = grid.x3d_domain_dict()
-        fxstat.update({"serialname": "fx2"})
-        fystat = grid.y3d_domain_dict()
-        fystat.update({"serialname": "fy2"})
-        self.in_vars["data_vars"] = {
-            "q": {"serialname": "wq"},
-            "d2": {"serialname": "wd2"},
-            "fx2": grid.x3d_domain_dict(),
-            "fy2": grid.y3d_domain_dict(),
-            "damp_c": {"serialname": "damp4"},
-            "nord_w": {},
-        }
-        self.in_vars["parameters"] = []
-        self.out_vars = {
-            "fx2": grid.x3d_domain_dict(),
-            "fy2": grid.y3d_domain_dict(),
-            "d2": {"serialname": "wd2"},
-            "q": {"serialname": "wq"},
-        }
-        self.stencil_factory = stencil_factory
-
-    # use_sg -- 'dx', 'dy', 'rdxc', 'rdyc', 'sin_sg needed
-    def compute(self, inputs):
-        self.make_storage_data_input_vars(inputs)
-        nord_col = self.grid.quantity_factory.zeros(dims=[Z_DIM], units="unknown")
-        nord_col.data[:] = nord_col.np.asarray(inputs.pop("nord_w"))
-        self.compute_func = delnflux.DelnFluxNoSG(  # type: ignore
-            self.stencil_factory,
-            self.grid.damping_coefficients,
-            self.grid.rarea,
-            nord_col,
-        )
-        self.compute_func(**inputs)
-        return self.slice_output(inputs)
diff --git a/pyFV3/tests/savepoint/translate/translate_delnflux.py b/pyFV3/tests/savepoint/translate/translate_delnflux.py
deleted file mode 100644
index 231dbf33..00000000
--- a/pyFV3/tests/savepoint/translate/translate_delnflux.py
+++ /dev/null
@@ -1,58 +0,0 @@
-from ndsl.constants import Z_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-import pyFV3.stencils.delnflux as delnflux
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateDelnFlux(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "q": {},
-            "fx": grid.x3d_compute_dict(),
-            "fy": grid.y3d_compute_dict(),
-            "damp_c": {},
-            "nord_column": {},
-            "mass": {},
-        }
-        self.in_vars["parameters"] = []
-        self.out_vars = {"fx": grid.x3d_compute_dict(), "fy": grid.y3d_compute_dict()}
-        self.stencil_factory = stencil_factory
-
-    # If use_sg is defined -- 'dx', 'dy', 'rdxc', 'rdyc', 'sin_sg needed
-    def compute(self, inputs):
-        if "mass" not in inputs:
-            inputs["mass"] = None
-        self.make_storage_data_input_vars(inputs)
-        nord_col = self.grid.quantity_factory.zeros(dims=[Z_DIM], units="unknown")
-        nord_col.data[:] = nord_col.np.asarray(inputs.pop("nord_column"))
-        damp_c = self.grid.quantity_factory.zeros(dims=[Z_DIM], units="unknown")
-        damp_c.data[:] = damp_c.np.asarray(inputs.pop("damp_c"))
-        self.compute_func = delnflux.DelnFlux(  # type: ignore
-            self.stencil_factory,
-            quantity_factory=self.grid.quantity_factory,
-            damping_coefficients=self.grid.damping_coefficients,
-            rarea=self.grid.rarea,
-            nord_col=nord_col,
-            damp_c=damp_c,
-        )
-        self.compute_func(**inputs)
-        return self.slice_output(inputs)
-
-
-class TranslateDelnFlux_2(TranslateDelnFlux):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        del self.in_vars["data_vars"]["mass"]
diff --git a/pyFV3/tests/savepoint/translate/translate_divergencedamping.py b/pyFV3/tests/savepoint/translate/translate_divergencedamping.py
deleted file mode 100644
index c71beff4..00000000
--- a/pyFV3/tests/savepoint/translate/translate_divergencedamping.py
+++ /dev/null
@@ -1,74 +0,0 @@
-from typing import Optional
-
-from ndsl.constants import Z_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-from pyFV3.stencils.divergence_damping import DivergenceDamping
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateDivergenceDamping(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "u": {},
-            "v": {},
-            "va": {},
-            "damped_rel_vort_bgrid": {"serialname": "vort"},
-            "ua": {},
-            "divg_d": {},
-            "vc": {},
-            "uc": {},
-            "delpc": {},
-            "ke": {},
-            "rel_vort_agrid": {"serialname": "wk"},
-            "nord_col": {},
-            "d2_bg": {},
-        }
-        self.in_vars["parameters"] = ["dt"]
-        self.out_vars = {
-            "ke": {"iend": grid.ied + 1, "jend": grid.jed + 1},
-            "delpc": {},
-        }
-        self.max_error = 1.4e-10
-        self.divdamp: Optional[DivergenceDamping] = None
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist  # type: ignore
-
-    def compute_from_storage(self, inputs):
-        nord_col = self.grid.quantity_factory.zeros(dims=[Z_DIM], units="unknown")
-        nord_col.data[:] = nord_col.np.asarray(inputs.pop("nord_col"))
-        d2_bg = self.grid.quantity_factory.zeros(dims=[Z_DIM], units="unknown")
-        d2_bg.data[:] = d2_bg.np.asarray(inputs.pop("d2_bg"))
-        self.divdamp = DivergenceDamping(
-            self.stencil_factory,
-            self.grid.quantity_factory,
-            self.grid.grid_data,
-            self.grid.damping_coefficients,
-            self.grid.nested,
-            self.grid.stretched_grid,
-            self.namelist.dddmp,
-            self.namelist.d4_bg,
-            self.namelist.nord,
-            self.namelist.grid_type,
-            nord_col,
-            d2_bg,
-        )
-        self.divdamp(**inputs)
-        return inputs
-
-    def subset_output(self, varname: str, output):
-        """
-        Given an output array, return the slice of the array which we'd
-        like to validate against reference data
-        """
-        if self.divdamp is None:
-            raise RuntimeError("must call compute_from_storage before subset_output")
-        else:
-            return self.divdamp.subset_output(varname, output)  # type: ignore
diff --git a/pyFV3/tests/savepoint/translate/translate_fillz.py b/pyFV3/tests/savepoint/translate/translate_fillz.py
deleted file mode 100644
index 6a7a9db4..00000000
--- a/pyFV3/tests/savepoint/translate/translate_fillz.py
+++ /dev/null
@@ -1,88 +0,0 @@
-import ndsl.dsl.gt4py_utils as utils
-import numpy as np
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-from ndsl.stencils.testing import pad_field_in_j
-from ndsl.utils import safe_assign_array
-
-import pyFV3.stencils.fillz as fillz
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateFillz(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "dp2": {"istart": grid.is_, "iend": grid.ie, "axis": 1},
-            "q2tracers": {"istart": grid.is_, "iend": grid.ie, "axis": 1},
-        }
-        self.in_vars["parameters"] = ["nq"]
-        self.out_vars = {
-            "q2tracers": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.js,
-                "axis": 1,
-            }
-        }
-        self.max_error = 1e-13
-        self.ignore_near_zero_errors = {"q2tracers": True}
-        self.stencil_factory = stencil_factory
-
-    def make_storage_data_input_vars(self, inputs, storage_vars=None):
-        if storage_vars is None:
-            storage_vars = self.storage_vars()
-        info = storage_vars["dp2"]
-        inputs["dp2"] = self.make_storage_data(
-            np.squeeze(inputs["dp2"]), istart=info["istart"], axis=info["axis"]
-        )
-        inputs["tracers"] = {}
-        info = storage_vars["q2tracers"]
-        for i in range(int(inputs["nq"])):
-            inputs["tracers"][utils.tracer_variables[i]] = self.make_storage_data(
-                np.squeeze(inputs["q2tracers"][:, :, i]),
-                istart=info["istart"],
-                axis=info["axis"],
-            )
-        del inputs["q2tracers"]
-
-    def compute(self, inputs):
-        self.make_storage_data_input_vars(inputs)
-        for name, value in tuple(inputs.items()):
-            if hasattr(value, "shape") and len(value.shape) > 1 and value.shape[1] == 1:
-                inputs[name] = self.make_storage_data(
-                    pad_field_in_j(
-                        value, self.grid.njd, backend=self.stencil_factory.backend
-                    )
-                )
-        for name, value in tuple(inputs["tracers"].items()):
-            if hasattr(value, "shape") and len(value.shape) > 1 and value.shape[1] == 1:
-                inputs["tracers"][name] = self.make_storage_data(
-                    pad_field_in_j(
-                        value, self.grid.njd, backend=self.stencil_factory.backend
-                    )
-                )
-        run_fillz = fillz.FillNegativeTracerValues(
-            self.stencil_factory,
-            self.grid.quantity_factory,
-            inputs.pop("nq"),
-            inputs["tracers"],
-        )
-        run_fillz(**inputs)
-        ds = self.grid.default_domain_dict()
-        ds.update(self.out_vars["q2tracers"])
-        tracers = np.zeros((self.grid.nic, self.grid.npz, len(inputs["tracers"])))
-        for varname, data in inputs["tracers"].items():
-            index = utils.tracer_variables.index(varname)
-            data[self.grid.slice_dict(ds)]
-            safe_assign_array(
-                tracers[:, :, index], np.squeeze(data[self.grid.slice_dict(ds)])
-            )
-        out = {"q2tracers": tracers}
-        return out
diff --git a/pyFV3/tests/savepoint/translate/translate_fvsubgridz.py b/pyFV3/tests/savepoint/translate/translate_fvsubgridz.py
deleted file mode 100644
index 15da852a..00000000
--- a/pyFV3/tests/savepoint/translate/translate_fvsubgridz.py
+++ /dev/null
@@ -1,220 +0,0 @@
-from types import SimpleNamespace
-
-import ndsl.dsl.gt4py_utils as utils
-from ndsl.constants import X_DIM, Y_DIM, Z_DIM, Z_INTERFACE_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-from ndsl.stencils.testing import ParallelTranslateBaseSlicing
-
-import pyFV3.stencils.fv_subgridz as fv_subgridz
-
-
-# NOTE, does no halo updates, does not need to be a Parallel test,
-# but doing so here to make the interface match fv_dynamics.
-# Could add support to the TranslateDycoreFortranData2Py class
-class TranslateFVSubgridZ(ParallelTranslateBaseSlicing):
-    inputs = {
-        "delp": {
-            "name": "pressure_thickness_of_atmospheric_layer",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "Pa",
-        },
-        "delz": {
-            "name": "vertical_thickness_of_atmospheric_layer",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m",
-        },
-        "pe": {
-            "name": "interface_pressure",
-            "dims": [X_DIM, Z_INTERFACE_DIM, Y_DIM],
-            "units": "Pa",
-            "n_halo": 1,
-        },
-        "pkz": {
-            "name": "layer_mean_pressure_raised_to_power_of_kappa",
-            "units": "unknown",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "n_halo": 0,
-        },
-        "peln": {
-            "name": "logarithm_of_interface_pressure",
-            "units": "ln(Pa)",
-            "dims": [X_DIM, Z_INTERFACE_DIM, Y_DIM],
-            "n_halo": 0,
-        },
-        "pt": {
-            "name": "air_temperature",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "degK",
-        },
-        "ua": {
-            "name": "eastward_wind",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "va": {
-            "name": "northward_wind",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "w": {
-            "name": "vertical_wind",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "qvapor": {
-            "name": "specific_humidity",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        },
-        "qliquid": {
-            "name": "cloud_water_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        },
-        "qice": {
-            "name": "cloud_ice_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        },
-        "qrain": {
-            "name": "rain_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        },
-        "qsnow": {
-            "name": "snow_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        },
-        "qgraupel": {
-            "name": "graupel_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        },
-        "qo3mr": {
-            "name": "ozone_mixing_ratio",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/kg",
-        },
-        "qsgs_tke": {
-            "name": "turbulent_kinetic_energy",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m**2/s**2",
-        },
-        "qcld": {
-            "name": "cloud_fraction",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "",
-        },
-        "u_dt": {
-            "name": "eastward_wind_tendency_due_to_physics",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m/s**2",
-        },
-        "v_dt": {
-            "name": "northward_wind_tendency_due_to_physics",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m/s**2",
-        },
-        "dt": {"dims": []},
-    }
-    outputs = inputs.copy()
-
-    for name in ("dt", "pe", "peln", "delp", "delz", "pkz"):
-        outputs.pop(name)
-
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-        *args,
-        **kwargs,
-    ):
-        super().__init__(grid, namelist, stencil_factory, *args, **kwargs)
-        self._base.in_vars["data_vars"] = {
-            "pe": {
-                "istart": grid.is_ - 1,
-                "iend": grid.ie + 1,
-                "jstart": grid.js - 1,
-                "jend": grid.je + 1,
-                "kend": grid.npz + 1,
-                "kaxis": 1,
-            },
-            "peln": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.je,
-                "kend": grid.npz,
-                "kaxis": 1,
-            },
-            "delp": {},
-            "delz": {},
-            "pkz": grid.compute_dict(),
-            "ua": {},
-            "va": {},
-            "w": {},
-            "pt": {},
-            "qvapor": {},
-            "qliquid": {},
-            "qice": {},
-            "qrain": {},
-            "qsnow": {},
-            "qgraupel": {},
-            "qo3mr": {},
-            "qsgs_tke": {},
-            "qcld": {},
-            "u_dt": {},
-            "v_dt": {},
-        }
-
-        self._base.out_vars = self._base.in_vars["data_vars"].copy()
-        for var in ["pe", "peln", "delp", "delz", "pkz"]:
-            self._base.out_vars.pop(var)
-
-        self.ignore_near_zero_errors = {}
-        for qvar in utils.tracer_variables:
-            self.ignore_near_zero_errors[qvar] = True
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist
-
-    def compute_parallel(self, inputs, communicator):
-        state = self.state_from_inputs(inputs)
-        fvsubgridz = fv_subgridz.DryConvectiveAdjustment(
-            self.stencil_factory,
-            self.grid.quantity_factory,
-            self.namelist.nwat,
-            self.namelist.fv_sg_adj,
-            self.namelist.n_sponge,
-            self.namelist.hydrostatic,
-        )
-        state_namespace = SimpleNamespace(**state)
-        fvsubgridz(
-            state_namespace,
-            state_namespace.u_dt,
-            state_namespace.v_dt,
-            state_namespace.dt,
-        )
-        return self.outputs_from_state(state)
-
-    def compute_sequential(self, inputs_list, communicator_list):
-        state_list = self.state_list_from_inputs_list(inputs_list)
-        for state in state_list:
-            fvsubgridz = fv_subgridz.DryConvectiveAdjustment(
-                self.stencil_factory,
-                self.grid.quantity_factory,
-                self.namelist.nwat,
-                self.namelist.fv_sg_adj,
-                self.namelist.n_sponge,
-                self.namelist.hydrostatic,
-            )
-            state_namespace = SimpleNamespace(**state)
-            fvsubgridz(
-                state_namespace,
-                state_namespace.u_dt,
-                state_namespace.v_dt,
-                state_namespace.dt,
-            )
-        return self.outputs_list_from_state_list(state_list)
diff --git a/pyFV3/tests/savepoint/translate/translate_fvtp2d.py b/pyFV3/tests/savepoint/translate/translate_fvtp2d.py
deleted file mode 100644
index 6552d8f6..00000000
--- a/pyFV3/tests/savepoint/translate/translate_fvtp2d.py
+++ /dev/null
@@ -1,91 +0,0 @@
-import ndsl.dsl.gt4py_utils as utils
-from ndsl.constants import Z_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float
-from ndsl.namelist import Namelist
-
-from pyFV3.stencils.fvtp2d import FiniteVolumeTransport
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateFvTp2d(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "q": {},
-            "mass": {},
-            "damp_c": {},
-            "nord": {"serialname": "nord_column"},
-            "crx": {"istart": grid.is_},
-            "cry": {"jstart": grid.js},
-            "x_area_flux": {"istart": grid.is_, "serialname": "xfx"},
-            "y_area_flux": {"jstart": grid.js, "serialname": "yfx"},
-            "x_mass_flux": grid.x3d_compute_dict(),
-            "y_mass_flux": grid.y3d_compute_dict(),
-        }
-        self.in_vars["data_vars"]["x_mass_flux"]["serialname"] = "mfx"
-        self.in_vars["data_vars"]["y_mass_flux"]["serialname"] = "mfy"
-        # 'fx': grid.x3d_compute_dict(),'fy': grid.y3d_compute_dict(),
-        self.in_vars["parameters"] = ["hord"]
-        self.out_vars = {
-            "q": {},
-            "q_x_flux": grid.x3d_compute_dict(),
-            "q_y_flux": grid.y3d_compute_dict(),
-        }
-        self.out_vars["q_x_flux"]["serialname"] = "fx"
-        self.out_vars["q_y_flux"]["serialname"] = "fy"
-        self.stencil_factory = stencil_factory
-
-    # use_sg -- 'dx', 'dy', 'rdxc', 'rdyc', 'sin_sg needed
-    def compute_from_storage(self, inputs):
-        inputs["q_x_flux"] = utils.make_storage_from_shape(
-            self.maxshape,
-            self.grid.full_origin(),
-            backend=self.stencil_factory.backend,
-        )
-        inputs["q_y_flux"] = utils.make_storage_from_shape(
-            self.maxshape,
-            self.grid.full_origin(),
-            backend=self.stencil_factory.backend,
-        )
-        nord_col = self.grid.quantity_factory.zeros(
-            dims=[Z_DIM], units="unknown", dtype=Float
-        )
-        nord_col.data[:] = nord_col.np.asarray(inputs.pop("nord"))
-        damp_c = self.grid.quantity_factory.zeros(
-            dims=[Z_DIM], units="unknown", dtype=Float
-        )
-        damp_c.data[:] = damp_c.np.asarray(inputs.pop("damp_c"))
-        for optional_arg in ["mass"]:
-            if optional_arg not in inputs:
-                inputs[optional_arg] = None
-        self.compute_func = FiniteVolumeTransport(  # type: ignore
-            stencil_factory=self.stencil_factory,
-            quantity_factory=self.grid.quantity_factory,
-            grid_data=self.grid.grid_data,
-            damping_coefficients=self.grid.damping_coefficients,
-            grid_type=self.grid.grid_type,
-            hord=int(inputs.pop("hord")),
-            nord=nord_col,
-            damp_c=damp_c,
-        )
-        self.compute_func(**inputs)
-        return inputs
-
-
-class TranslateFvTp2d_2(TranslateFvTp2d):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        del self.in_vars["data_vars"]["mass"]
-        del self.in_vars["data_vars"]["x_mass_flux"]
-        del self.in_vars["data_vars"]["y_mass_flux"]
diff --git a/pyFV3/tests/savepoint/translate/translate_fxadv.py b/pyFV3/tests/savepoint/translate/translate_fxadv.py
deleted file mode 100644
index b55243cd..00000000
--- a/pyFV3/tests/savepoint/translate/translate_fxadv.py
+++ /dev/null
@@ -1,74 +0,0 @@
-import numpy as np
-from ndsl.constants import X_DIM, Y_DIM, Z_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-from pyFV3.stencils.fxadv import FiniteVolumeFluxPrep
-from pyFV3.testing import TranslateDycoreFortranData2Py
-from pyFV3.utils.functional_validation import get_subset_func
-
-
-class TranslateFxAdv(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        utinfo = grid.x3d_domain_dict()
-        utinfo["serialname"] = "ut"
-        vtinfo = grid.y3d_domain_dict()
-        vtinfo["serialname"] = "vt"
-        self.stencil_factory = stencil_factory
-        self.compute_func = FiniteVolumeFluxPrep(  # type: ignore
-            self.stencil_factory,
-            self.grid.grid_data,
-            namelist.grid_type,
-        )
-        self.in_vars["data_vars"] = {
-            "uc": {},
-            "vc": {},
-            "uc_contra": utinfo,
-            "vc_contra": vtinfo,
-            "x_area_flux": {
-                **{"serialname": "xfx_adv"},
-                **grid.x3d_compute_domain_y_dict(),
-            },
-            "crx": {**{"serialname": "crx_adv"}, **grid.x3d_compute_domain_y_dict()},
-            "y_area_flux": {
-                **{"serialname": "yfx_adv"},
-                **grid.y3d_compute_domain_x_dict(),
-            },
-            "cry": {**{"serialname": "cry_adv"}, **grid.y3d_compute_domain_x_dict()},
-        }
-        self.in_vars["parameters"] = ["dt"]
-        self.out_vars = {
-            "uc_contra": utinfo,
-            "vc_contra": vtinfo,
-        }
-        for var in ["x_area_flux", "crx", "y_area_flux", "cry"]:
-            self.out_vars[var] = self.in_vars["data_vars"][var]
-
-        self._subset = get_subset_func(
-            self.grid.grid_indexing,
-            dims=[X_DIM, Y_DIM, Z_DIM],
-            n_halo=((2, 2), (2, 2)),
-        )
-
-    def subset_output(self, varname: str, output: np.ndarray) -> np.ndarray:
-        """
-        Given an output array, return the slice of the array which we'd
-        like to validate against reference data
-        """
-        if varname in ["uc_contra", "vc_contra", "ut", "vt"]:
-            return self._subset(output)
-        else:
-            return output
-
-    def compute_from_storage(self, inputs):
-        self.compute_func(**inputs)
-        for name in ["uc_contra", "vc_contra"]:
-            inputs[name] = self.subset_output(name, inputs[name])
-
-        return inputs
diff --git a/pyFV3/tests/savepoint/translate/translate_grid.py b/pyFV3/tests/savepoint/translate/translate_grid.py
deleted file mode 100644
index a4f56811..00000000
--- a/pyFV3/tests/savepoint/translate/translate_grid.py
+++ /dev/null
@@ -1,2335 +0,0 @@
-from typing import Any, Dict
-
-import ndsl.dsl.gt4py_utils as utils
-import numpy as np
-import pytest
-from ndsl.constants import (
-    X_DIM,
-    X_INTERFACE_DIM,
-    Y_DIM,
-    Y_INTERFACE_DIM,
-    Z_INTERFACE_DIM,
-)
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.grid import MetricTerms, set_hybrid_pressure_coefficients
-from ndsl.grid.global_setup import global_mirror_grid, gnomonic_grid
-from ndsl.namelist import Namelist
-from ndsl.stencils.testing.parallel_translate import ParallelTranslateGrid
-
-
-class TranslateGnomonicGrids(ParallelTranslateGrid):
-    max_error = 2e-14
-
-    inputs = {
-        "lon": {
-            "name": "longitude_on_cell_corners",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "radians",
-            "n_halo": 0,
-        },
-        "lat": {
-            "name": "latitude_on_cell_corners",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "radians",
-            "n_halo": 0,
-        },
-    }
-    outputs = {
-        "lon": {
-            "name": "longitude_on_cell_corners",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "radians",
-            "n_halo": 0,
-        },
-        "lat": {
-            "name": "latitude_on_cell_corners",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "radians",
-            "n_halo": 0,
-        },
-    }
-
-    def compute_parallel(self, inputs, communicator):
-        pytest.skip(f"{self.__class__} not running in parallel")
-
-    def compute_sequential(self, inputs_list, communicator_list):
-        outputs = []
-        self.max_error = 2e-14
-        for inputs in inputs_list:
-            outputs.append(self.compute(inputs))
-        return outputs
-
-    def compute(self, inputs):
-        gnomonic_grid(
-            self.grid.grid_type,
-            inputs["lon"],
-            inputs["lat"],
-            np,
-        )
-        return inputs
-
-
-class TranslateMirrorGrid(ParallelTranslateGrid):
-    inputs = {
-        "master_grid_global": {
-            "name": "grid_global",
-            "dims": [
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-                MetricTerms.LON_OR_LAT_DIM,
-                MetricTerms.TILE_DIM,
-            ],
-            "units": "radians",
-            "n_halo": 3,
-        },
-        "master_ng": {"name": "n_ghost", "dims": []},
-        "master_npx": {"name": "npx", "dims": []},
-        "master_npy": {"name": "npy", "dims": []},
-    }
-    outputs = {
-        "master_grid_global": {
-            "name": "grid_global",
-            "dims": [
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-                MetricTerms.LON_OR_LAT_DIM,
-                MetricTerms.TILE_DIM,
-            ],
-            "units": "radians",
-            "n_halo": 3,
-        },
-    }
-
-    def compute_parallel(self, inputs, communicator):
-        pytest.skip(f"{self.__class__} not running in parallel")
-
-    def compute_sequential(self, inputs_list, communicator_list):
-        outputs = []
-        outputs.append(self.compute(inputs_list[0]))
-        for inputs in inputs_list[1:]:
-            outputs.append(inputs)
-        return outputs
-
-    def compute(self, inputs):
-        global_mirror_grid(
-            inputs["master_grid_global"],
-            self.inputs["master_grid_global"]["n_halo"],
-            inputs["master_npx"],
-            inputs["master_npy"],
-            np,
-            MetricTerms.RIGHT_HAND_GRID,
-        )
-        return inputs
-
-
-class TranslateGridAreas(ParallelTranslateGrid):
-    def __init__(
-        self,
-        rank_grids,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(rank_grids, namelist, stencil_factory)
-        self.max_error = 1e-10
-        self.near_zero = 3e-14
-        self.ignore_near_zero_errors = {"agrid": True, "dxc": True, "dyc": True}
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist
-
-    inputs = {
-        "grid": {
-            "name": "grid",
-            "dims": [
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-                MetricTerms.LON_OR_LAT_DIM,
-            ],
-            "units": "radians",
-        },
-        "agrid": {
-            "name": "agrid",
-            "dims": [X_DIM, Y_DIM, MetricTerms.LON_OR_LAT_DIM],
-            "units": "radians",
-        },
-        "area": {
-            "name": "area",
-            "dims": [X_DIM, Y_DIM],
-            "units": "m^2",
-        },
-        "area_c": {
-            "name": "area_cgrid",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "m^2",
-        },
-        "dxa": {
-            "name": "dx_agrid",
-            "dims": [X_DIM, Y_DIM],
-            "units": "m",
-        },
-        "dya": {
-            "name": "dy_agrid",
-            "dims": [X_DIM, Y_DIM],
-            "units": "m",
-        },
-        "dxc": {
-            "name": "dx_cgrid",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "m",
-        },
-        "dyc": {
-            "name": "dy_cgrid",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "m",
-        },
-    }
-    outputs = {
-        "area": {
-            "name": "area",
-            "dims": [X_DIM, Y_DIM],
-            "units": "m^2",
-        },
-        "area_c": {
-            "name": "area_cgrid",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "m^2",
-        },
-        "dxa": {
-            "name": "dx_agrid",
-            "dims": [X_DIM, Y_DIM],
-            "units": "m",
-        },
-        "dya": {
-            "name": "dy_agrid",
-            "dims": [X_DIM, Y_DIM],
-            "units": "m",
-        },
-        "dxc": {
-            "name": "dx_cgrid",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "m",
-        },
-        "dyc": {
-            "name": "dy_cgrid",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "m",
-        },
-    }
-
-    def compute_parallel(self, inputs, communicator):
-        namelist = self.namelist
-        grid_generator = MetricTerms.from_tile_sizing(
-            npx=namelist.npx,
-            npy=namelist.npy,
-            npz=1,
-            communicator=communicator,
-            backend=self.stencil_factory.backend,
-        )
-
-        in_state = self.state_from_inputs(inputs)
-        grid_generator._grid.data[:] = in_state["grid"].data[:]
-        grid_generator._agrid.data[:] = in_state["agrid"].data[:]
-        state = {}
-        for metric_term, metadata in self.outputs.items():
-            state[metadata["name"]] = getattr(grid_generator, metric_term)
-        return self.outputs_from_state(state)
-
-
-class TranslateGridGrid(ParallelTranslateGrid):
-    max_error = 1e-14
-    inputs: Dict[str, Any] = {
-        "grid_global": {
-            "name": "grid",
-            "dims": [
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-                MetricTerms.LON_OR_LAT_DIM,
-                MetricTerms.TILE_DIM,
-            ],
-            "units": "radians",
-        }
-    }
-    outputs = {
-        "grid": {
-            "name": "grid",
-            "dims": [
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-                MetricTerms.LON_OR_LAT_DIM,
-            ],
-            "units": "radians",
-        },
-    }
-
-    def __init__(
-        self,
-        grids,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grids, namelist, stencil_factory)
-        self.max_error = 1.0e-13
-        self.near_zero = 1e-14
-        self.ignore_near_zero_errors = {"grid": True}
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist
-
-    def compute_parallel(self, inputs, communicator):
-        namelist = self.namelist
-        grid_generator = MetricTerms.from_tile_sizing(
-            npx=namelist.npx,
-            npy=namelist.npy,
-            npz=1,
-            communicator=communicator,
-            backend=self.stencil_factory.backend,
-        )
-
-        state = {}
-        for metric_term, metadata in self.outputs.items():
-            state[metadata["name"]] = getattr(grid_generator, metric_term)
-        return self.outputs_from_state(state)
-
-
-class TranslateDxDy(ParallelTranslateGrid):
-    def __init__(
-        self,
-        rank_grids,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(rank_grids, namelist, stencil_factory)
-        self.max_error = 3e-14
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist
-
-    inputs = {
-        "grid": {
-            "name": "grid",
-            "dims": [
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-                MetricTerms.LON_OR_LAT_DIM,
-            ],
-            "units": "radians",
-        },
-    }
-    outputs = {
-        "dx": {
-            "name": "dx",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "m",
-        },
-        "dy": {
-            "name": "dy",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "m",
-        },
-    }
-
-    def compute_parallel(self, inputs, communicator):
-        namelist = self.namelist
-        grid_generator = MetricTerms.from_tile_sizing(
-            npx=namelist.npx,
-            npy=namelist.npy,
-            npz=1,
-            communicator=communicator,
-            backend=self.stencil_factory.backend,
-        )
-
-        in_state = self.state_from_inputs(inputs)
-        grid_generator._grid.data[:] = in_state["grid"].data[:]
-        state = {}
-        for metric_term, metadata in self.outputs.items():
-            state[metadata["name"]] = getattr(grid_generator, metric_term)
-        return self.outputs_from_state(state)
-
-
-class TranslateAGrid(ParallelTranslateGrid):
-    def __init__(
-        self,
-        rank_grids,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(rank_grids, namelist, stencil_factory)
-        self.max_error = 1e-13
-        self.namelist = namelist
-        self.stencil_factory = stencil_factory
-
-    inputs = {
-        "agrid": {
-            "name": "agrid",
-            "dims": [X_DIM, Y_DIM, MetricTerms.LON_OR_LAT_DIM],
-            "units": "radians",
-        },
-        "grid": {
-            "name": "grid",
-            "dims": [
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-                MetricTerms.LON_OR_LAT_DIM,
-            ],
-            "units": "radians",
-        },
-    }
-    outputs = {
-        "agrid": {
-            "name": "agrid",
-            "dims": [X_DIM, Y_DIM, MetricTerms.LON_OR_LAT_DIM],
-            "units": "radians",
-        },
-        "grid": {
-            "name": "grid",
-            "dims": [
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-                MetricTerms.LON_OR_LAT_DIM,
-            ],
-            "units": "radians",
-        },
-    }
-
-    def compute_parallel(self, inputs, communicator):
-        namelist = self.namelist
-        grid_generator = MetricTerms.from_tile_sizing(
-            npx=namelist.npx,
-            npy=namelist.npy,
-            npz=1,
-            communicator=communicator,
-            backend=self.stencil_factory.backend,
-        )
-
-        in_state = self.state_from_inputs(inputs)
-        grid_generator._grid.data[:] = in_state["grid"].data[:]
-        grid_generator._init_agrid()
-        state = {}
-        for metric_term, metadata in self.outputs.items():
-            state[metadata["name"]] = getattr(grid_generator, metric_term)
-        return self.outputs_from_state(state)
-
-
-class TranslateInitGrid(ParallelTranslateGrid):
-    inputs = {
-        "ndims": {"name": "ndims", "dims": []},
-        "nregions": {
-            "name": "nregions",
-            "dims": [],
-        },
-        "grid_name": {
-            "name": "grid_name",
-            "dims": [],
-        },
-        "sw_corner": {
-            "name": "sw_corner",
-            "dims": [],
-        },
-        "se_corner": {
-            "name": "se_corner",
-            "dims": [],
-        },
-        "nw_corner": {
-            "name": "nw_corner",
-            "dims": [],
-        },
-        "ne_corner": {
-            "name": "ne_corner",
-            "dims": [],
-        },
-    }
-    outputs: Dict[str, Any] = {
-        "gridvar": {
-            "name": "grid",
-            "dims": [
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-                MetricTerms.LON_OR_LAT_DIM,
-            ],
-            "units": "radians",
-        },
-        "agrid": {
-            "name": "agrid",
-            "dims": [X_DIM, Y_DIM, MetricTerms.LON_OR_LAT_DIM],
-            "units": "radians",
-        },
-        "area": {
-            "name": "area",
-            "dims": [X_DIM, Y_DIM],
-            "units": "m^2",
-        },
-        "area_c": {
-            "name": "area_cgrid",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "m^2",
-        },
-        "dx": {
-            "name": "dx",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "m",
-        },
-        "dy": {
-            "name": "dy",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "m",
-        },
-        "dxc": {
-            "name": "dx_cgrid",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "m",
-        },
-        "dyc": {
-            "name": "dy_cgrid",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "m",
-        },
-        "dxa": {
-            "name": "dx_agrid",
-            "dims": [X_DIM, Y_DIM],
-            "units": "m",
-        },
-        "dya": {
-            "name": "dy_agrid",
-            "dims": [X_DIM, Y_DIM],
-            "units": "m",
-        },
-    }
-
-    def __init__(
-        self,
-        grids,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grids, namelist, stencil_factory)
-        self.max_error = 3e-12
-        self.near_zero = 3e-14
-        self.ignore_near_zero_errors = {"gridvar": True, "agrid": True}
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist
-
-    def compute_parallel(self, inputs, communicator):
-        namelist = self.namelist
-        grid_generator = MetricTerms.from_tile_sizing(
-            npx=namelist.npx,
-            npy=namelist.npy,
-            npz=1,
-            communicator=communicator,
-            backend=self.stencil_factory.backend,
-            grid_type=namelist.grid_type,
-            dx_const=namelist.dx_const,
-            dy_const=namelist.dy_const,
-            deglat=namelist.deglat,
-        )
-        state = {}
-        for metric_term, metadata in self.outputs.items():
-            state[metadata["name"]] = getattr(grid_generator, metric_term)
-        return self.outputs_from_state(state)
-
-
-class TranslateSetEta(ParallelTranslateGrid):
-    inputs: Dict[str, Any] = {
-        "npz": {
-            "name": "npz",
-            "dims": [],
-            "units": "",
-        },
-        "ptop": {
-            "name": "ptop",
-            "dims": [],
-            "units": "mb",
-        },
-        "ak": {
-            "name": "ak",
-            "dims": [Z_INTERFACE_DIM],
-            "units": "mb",
-        },
-        "bk": {
-            "name": "bk",
-            "dims": [Z_INTERFACE_DIM],
-            "units": "",
-        },
-    }
-    outputs: Dict[str, Any] = {
-        "ptop": {
-            "name": "ptop",
-            "dims": [],
-            "units": "mb",
-        },
-        "ak": {
-            "name": "ak",
-            "dims": [Z_INTERFACE_DIM],
-            "units": "mb",
-        },
-        "bk": {
-            "name": "bk",
-            "dims": [Z_INTERFACE_DIM],
-            "units": "",
-        },
-    }
-
-    def compute_parallel(self, inputs, communicator):
-        pytest.skip(f"{self.__class__} not running in parallel")
-
-    def compute_sequential(self, inputs_list, communicator_list):
-        state_list = []
-        for inputs in inputs_list:
-            state_list.append(self._compute_local(inputs))
-        return self.outputs_list_from_state_list(state_list)
-
-    def _compute_local(self, inputs):
-        state = self.state_from_inputs(inputs)
-        pressure_coefficients = set_hybrid_pressure_coefficients(state["npz"])
-        state["ptop"] = pressure_coefficients.ptop
-        array_type = type(state["ak"].data[:])
-        state["ak"].data[:] = utils.asarray(
-            pressure_coefficients.ak, to_type=array_type
-        )
-        state["bk"].data[:] = utils.asarray(
-            pressure_coefficients.bk, to_type=array_type
-        )
-        return state
-
-
-class TranslateUtilVectors(ParallelTranslateGrid):
-    def __init__(
-        self,
-        grids,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grids, namelist, stencil_factory)
-        self.max_error = 3e-12
-        self.near_zero = 1e-13
-        self.ignore_near_zero_errors = {
-            "ew1": True,
-            "ew2": True,
-            "es1": True,
-            "es2": True,
-            "ec1": True,
-            "ec2": True,
-        }
-        self._base.in_vars["data_vars"] = {
-            "ec1": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "ec2": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "ew1": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "ew2": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "es1": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "es2": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-        }
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist
-
-    inputs: Dict[str, Any] = {
-        "grid": {
-            "name": "grid",
-            "dims": [
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-                MetricTerms.LON_OR_LAT_DIM,
-            ],
-            "units": "radians",
-        },
-        "agrid": {
-            "name": "agrid",
-            "dims": [X_DIM, Y_DIM, MetricTerms.LON_OR_LAT_DIM],
-            "units": "radians",
-        },
-        "ec1": {
-            "name": "ec1",
-            "dims": [MetricTerms.CARTESIAN_DIM, X_DIM, Y_DIM],
-            "units": "",
-        },
-        "ec2": {
-            "name": "ec2",
-            "dims": [MetricTerms.CARTESIAN_DIM, X_DIM, Y_DIM],
-            "units": "",
-        },
-        "ew1": {
-            "name": "ew1",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_INTERFACE_DIM,
-                Y_DIM,
-            ],
-            "units": "",
-        },
-        "ew2": {
-            "name": "ew2",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_INTERFACE_DIM,
-                Y_DIM,
-            ],
-            "units": "",
-        },
-        "es1": {
-            "name": "es1",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_DIM,
-                Y_INTERFACE_DIM,
-            ],
-            "units": "",
-        },
-        "es2": {
-            "name": "es2",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_DIM,
-                Y_INTERFACE_DIM,
-            ],
-            "units": "",
-        },
-    }
-    outputs: Dict[str, Any] = {
-        "ec1": {
-            "name": "ec1",
-            "dims": [MetricTerms.CARTESIAN_DIM, X_DIM, Y_DIM],
-            "units": "",
-        },
-        "ec2": {
-            "name": "ec2",
-            "dims": [MetricTerms.CARTESIAN_DIM, X_DIM, Y_DIM],
-            "units": "",
-        },
-        "ew1": {
-            "name": "ew1",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_INTERFACE_DIM,
-                Y_DIM,
-            ],
-            "units": "",
-        },
-        "ew2": {
-            "name": "ew2",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_INTERFACE_DIM,
-                Y_DIM,
-            ],
-            "units": "",
-        },
-        "es1": {
-            "name": "es1",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_DIM,
-                Y_INTERFACE_DIM,
-            ],
-            "units": "",
-        },
-        "es2": {
-            "name": "es2",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_DIM,
-                Y_INTERFACE_DIM,
-            ],
-            "units": "",
-        },
-    }
-
-    def compute_parallel(self, inputs, communicator):
-        namelist = self.namelist
-        grid_generator = MetricTerms.from_tile_sizing(
-            npx=namelist.npx,
-            npy=namelist.npy,
-            npz=1,
-            communicator=communicator,
-            backend=self.stencil_factory.backend,
-        )
-
-        in_state = self.state_from_inputs(inputs)
-        grid_generator._grid.data[:] = in_state["grid"].data[:]
-        grid_generator._agrid.data[:] = in_state["agrid"].data[:]
-        state = {}
-        for metric_term, metadata in self.outputs.items():
-            state[metadata["name"]] = getattr(grid_generator, metric_term)
-        return self.outputs_from_state(state)
-
-
-class TranslateTrigSg(ParallelTranslateGrid):
-    def __init__(
-        self,
-        grids,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grids, namelist, stencil_factory)
-        self.max_error = 2.5e-10
-        self.near_zero = 1e-14
-        self.ignore_near_zero_errors = {
-            "cos_sg5": True,
-            "cos_sg6": True,
-            "cos_sg7": True,
-            "cos_sg8": True,
-            "cos_sg9": True,
-        }
-        self._base.in_vars["data_vars"] = {
-            "ec1": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "ec2": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "ee1": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "ee2": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-        }
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist
-
-    inputs: Dict[str, Any] = {
-        "grid": {
-            "name": "grid",
-            "dims": [
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-                MetricTerms.LON_OR_LAT_DIM,
-            ],
-            "units": "",
-        },
-        "agrid": {
-            "name": "agrid",
-            "dims": [X_DIM, Y_DIM, MetricTerms.LON_OR_LAT_DIM],
-            "units": "radians",
-        },
-        "cos_sg1": {
-            "name": "cos_sg1",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg1": {
-            "name": "sin_sg1",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg2": {
-            "name": "cos_sg2",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg2": {
-            "name": "sin_sg2",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg3": {
-            "name": "cos_sg3",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg3": {
-            "name": "sin_sg3",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg4": {
-            "name": "cos_sg4",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg4": {
-            "name": "sin_sg4",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg5": {
-            "name": "cos_sg5",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg5": {
-            "name": "sin_sg5",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg6": {
-            "name": "cos_sg6",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg6": {
-            "name": "sin_sg6",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg7": {
-            "name": "cos_sg7",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg7": {
-            "name": "sin_sg7",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg8": {
-            "name": "cos_sg8",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg8": {
-            "name": "sin_sg8",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg9": {
-            "name": "cos_sg9",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg9": {
-            "name": "sin_sg9",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "ec1": {
-            "name": "ec1",
-            "dims": [MetricTerms.CARTESIAN_DIM, X_DIM, Y_DIM],
-            "units": "",
-        },
-        "ec2": {
-            "name": "ec2",
-            "dims": [MetricTerms.CARTESIAN_DIM, X_DIM, Y_DIM],
-            "units": "",
-        },
-    }
-    outputs: Dict[str, Any] = {
-        "cos_sg1": {
-            "name": "cos_sg1",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg1": {
-            "name": "sin_sg1",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg2": {
-            "name": "cos_sg2",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg2": {
-            "name": "sin_sg2",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg3": {
-            "name": "cos_sg3",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg3": {
-            "name": "sin_sg3",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg4": {
-            "name": "cos_sg4",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg4": {
-            "name": "sin_sg4",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg5": {
-            "name": "cos_sg5",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg5": {
-            "name": "sin_sg5",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg6": {
-            "name": "cos_sg6",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg6": {
-            "name": "sin_sg6",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg7": {
-            "name": "cos_sg7",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg7": {
-            "name": "sin_sg7",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg8": {
-            "name": "cos_sg8",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg8": {
-            "name": "sin_sg8",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg9": {
-            "name": "cos_sg9",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg9": {
-            "name": "sin_sg9",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-    }
-
-    def compute_parallel(self, inputs, communicator):
-        namelist = self.namelist
-        grid_generator = MetricTerms.from_tile_sizing(
-            npx=namelist.npx,
-            npy=namelist.npy,
-            npz=1,
-            communicator=communicator,
-            backend=self.stencil_factory.backend,
-        )
-
-        in_state = self.state_from_inputs(inputs)
-        grid_generator._grid.data[:] = in_state["grid"].data[:]
-        grid_generator._agrid.data[:] = in_state["agrid"].data[:]
-        grid_generator._ec1 = in_state["ec1"]
-        grid_generator._ec2 = in_state["ec2"]
-        state = {}
-        for metric_term, metadata in self.outputs.items():
-            state[metadata["name"]] = getattr(grid_generator, metric_term)
-        return self.outputs_from_state(state)
-
-
-class TranslateAAMCorrection(ParallelTranslateGrid):
-    # TODO: THIS IS DISABLED because it fails on
-    # c48 and c128 with large relative errors, investigate!
-    # these values are super tiny, so ignore_near_zero
-    # will eliminate most points getting tested.
-    def __init__(
-        self,
-        rank_grids,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(rank_grids, namelist, stencil_factory)
-        self.max_error = 1e-14
-        self.near_zero = 1e-14
-        self.ignore_near_zero_errors = {"l2c_v": True, "l2c_u": True}
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist
-
-    inputs: Dict[str, Any] = {
-        "grid": {
-            "name": "grid",
-            "dims": [
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-                MetricTerms.LON_OR_LAT_DIM,
-            ],
-            "units": "radians",
-        },
-        "l2c_v": {
-            "name": "l2c_v",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-        "l2c_u": {
-            "name": "l2c_u",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-    }
-    outputs: Dict[str, Any] = {
-        "l2c_v": {
-            "name": "l2c_v",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-        "l2c_u": {
-            "name": "l2c_u",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-    }
-
-    def compute_parallel(self, inputs, communicator):
-        namelist = self.namelist
-        grid_generator = MetricTerms.from_tile_sizing(
-            npx=namelist.npx,
-            npy=namelist.npy,
-            npz=1,
-            communicator=communicator,
-            backend=self.stencil_factory.backend,
-        )
-
-        in_state = self.state_from_inputs(inputs)
-        grid_generator._grid.data[:] = in_state["grid"].data[:]
-        state = {}
-        for metric_term, metadata in self.outputs.items():
-            state[metadata["name"]] = getattr(grid_generator, metric_term)
-        return self.outputs_from_state(state)
-
-
-class TranslateDerivedTrig(ParallelTranslateGrid):
-    def __init__(
-        self,
-        grids,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grids, namelist, stencil_factory)
-        self.max_error = 8.5e-14
-        self.near_zero = 3e-14
-        self.ignore_near_zero_errors = {"ee1": True, "ee2": True}
-        self._base.in_vars["data_vars"] = {
-            "ee1": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "ee2": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-        }
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist
-
-    inputs: Dict[str, Any] = {
-        "grid": {
-            "name": "grid",
-            "dims": [
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-                MetricTerms.LON_OR_LAT_DIM,
-            ],
-            "units": "radians",
-        },
-        "cos_sg1": {
-            "name": "cos_sg1",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg1": {
-            "name": "sin_sg1",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg2": {
-            "name": "cos_sg2",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg2": {
-            "name": "sin_sg2",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg3": {
-            "name": "cos_sg3",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg3": {
-            "name": "sin_sg3",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg4": {
-            "name": "cos_sg4",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg4": {
-            "name": "sin_sg4",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg5": {
-            "name": "cos_sg5",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg5": {
-            "name": "sin_sg5",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg6": {
-            "name": "cos_sg6",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg6": {
-            "name": "sin_sg6",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg7": {
-            "name": "cos_sg7",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg7": {
-            "name": "sin_sg7",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg8": {
-            "name": "cos_sg8",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg8": {
-            "name": "sin_sg8",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg9": {
-            "name": "cos_sg9",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg9": {
-            "name": "sin_sg9",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "ee1": {
-            "name": "ee1",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-            ],
-            "units": "",
-        },
-        "ee2": {
-            "name": "ee2",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-            ],
-            "units": "",
-        },
-        "cosa_u": {
-            "name": "cosa_u",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-        },
-        "cosa_v": {
-            "name": "cosa_v",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "cosa_s": {
-            "name": "cosa_s",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sina_u": {
-            "name": "sina_u",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-        },
-        "sina_v": {
-            "name": "sina_v",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "rsin_u": {
-            "name": "rsin_u",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-        },
-        "rsin_v": {
-            "name": "rsin_v",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "rsina": {
-            "name": "rsina",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-        "rsin2": {
-            "name": "rsin2",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cosa": {
-            "name": "cosa",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "sina": {
-            "name": "sina",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-    }
-    outputs: Dict[str, Any] = {
-        "ee1": {
-            "name": "ee1",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-            ],
-            "units": "",
-        },
-        "ee2": {
-            "name": "ee2",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-            ],
-            "units": "",
-        },
-        "cosa_u": {
-            "name": "cosa_u",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-        },
-        "cosa_v": {
-            "name": "cosa_v",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "cosa_s": {
-            "name": "cosa_s",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sina_u": {
-            "name": "sina_u",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-        },
-        "sina_v": {
-            "name": "sina_v",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "rsin_u": {
-            "name": "rsin_u",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-        },
-        "rsin_v": {
-            "name": "rsin_v",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "rsina": {
-            "name": "rsina",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-        "rsin2": {
-            "name": "rsin2",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cosa": {
-            "name": "cosa",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "sina": {
-            "name": "sina",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-    }
-
-    def compute_parallel(self, inputs, communicator):
-        namelist = self.namelist
-        grid_generator = MetricTerms.from_tile_sizing(
-            npx=namelist.npx,
-            npy=namelist.npy,
-            npz=1,
-            communicator=communicator,
-            backend=self.stencil_factory.backend,
-        )
-
-        in_state = self.state_from_inputs(inputs)
-        grid_generator._grid.data[:] = in_state["grid"].data[:]
-        grid_generator._cos_sg1 = in_state["cos_sg1"]
-        grid_generator._cos_sg2 = in_state["cos_sg2"]
-        grid_generator._cos_sg3 = in_state["cos_sg3"]
-        grid_generator._cos_sg4 = in_state["cos_sg4"]
-        grid_generator._cos_sg5 = in_state["cos_sg5"]
-        grid_generator._cos_sg6 = in_state["cos_sg6"]
-        grid_generator._cos_sg7 = in_state["cos_sg7"]
-        grid_generator._cos_sg8 = in_state["cos_sg8"]
-        grid_generator._cos_sg9 = in_state["cos_sg9"]
-        grid_generator._sin_sg1 = in_state["sin_sg1"]
-        grid_generator._sin_sg2 = in_state["sin_sg2"]
-        grid_generator._sin_sg3 = in_state["sin_sg3"]
-        grid_generator._sin_sg4 = in_state["sin_sg4"]
-        grid_generator._sin_sg5 = in_state["sin_sg5"]
-        grid_generator._sin_sg6 = in_state["sin_sg6"]
-        grid_generator._sin_sg7 = in_state["sin_sg7"]
-        grid_generator._sin_sg8 = in_state["sin_sg8"]
-        grid_generator._sin_sg9 = in_state["sin_sg9"]
-        state = {}
-        grid_generator._calculate_derived_trig_terms_for_testing()
-        for metric_term, metadata in self.outputs.items():
-            state[metadata["name"]] = getattr(grid_generator, metric_term)
-        return self.outputs_from_state(state)
-
-
-class TranslateDivgDel6(ParallelTranslateGrid):
-    def __init__(
-        self,
-        rank_grids,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(rank_grids, namelist, stencil_factory)
-        self.max_error = 4e-14
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist
-
-    inputs: Dict[str, Any] = {
-        "sin_sg1": {
-            "name": "sin_sg1",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg2": {
-            "name": "sin_sg2",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg3": {
-            "name": "sin_sg3",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg4": {
-            "name": "sin_sg4",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sina_u": {
-            "name": "sina_u",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-        },
-        "sina_v": {
-            "name": "sina_v",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "dx": {
-            "name": "dx",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "m",
-        },
-        "dy": {
-            "name": "dy",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "m",
-        },
-        "dxc": {
-            "name": "dx_cgrid",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "m",
-        },
-        "dyc": {
-            "name": "dy_cgrid",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "divg_u": {
-            "name": "divg_u",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "divg_v": {
-            "name": "divg_v",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "m",
-        },
-        "del6_u": {
-            "name": "del6_u",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "del6_v": {
-            "name": "del6_v",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-        },
-    }
-    outputs: Dict[str, Any] = {
-        "divg_u": {
-            "name": "divg_u",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "divg_v": {
-            "name": "divg_v",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-        },
-        "del6_u": {
-            "name": "del6_u",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "del6_v": {
-            "name": "del6_v",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-        },
-    }
-
-    def compute_parallel(self, inputs, communicator):
-        namelist = self.namelist
-        grid_generator = MetricTerms.from_tile_sizing(
-            npx=namelist.npx,
-            npy=namelist.npy,
-            npz=1,
-            communicator=communicator,
-            backend=self.stencil_factory.backend,
-        )
-
-        in_state = self.state_from_inputs(inputs)
-        grid_generator._sin_sg1 = in_state["sin_sg1"]
-        grid_generator._sin_sg2 = in_state["sin_sg2"]
-        grid_generator._sin_sg3 = in_state["sin_sg3"]
-        grid_generator._sin_sg4 = in_state["sin_sg4"]
-        grid_generator._sina_u = in_state["sina_u"]
-        grid_generator._sina_v = in_state["sina_v"]
-        grid_generator._dx = in_state["dx"]
-        grid_generator._dy = in_state["dy"]
-        grid_generator._dx_cgrid = in_state["dx_cgrid"]
-        grid_generator._dy_cgrid = in_state["dy_cgrid"]
-        grid_generator._calculate_divg_del6_nohalos_for_testing()
-        state = {}
-        for metric_term, metadata in self.outputs.items():
-            state[metadata["name"]] = getattr(grid_generator, metric_term)
-        return self.outputs_from_state(state)
-
-
-class TranslateInitCubedtoLatLon(ParallelTranslateGrid):
-    def __init__(
-        self,
-        grids,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grids, namelist, stencil_factory)
-        self.max_error = 3.0e-14
-        self._base.in_vars["data_vars"] = {
-            "ec1": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "ec2": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-        }
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist
-
-    inputs: Dict[str, Any] = {
-        "agrid": {
-            "name": "agrid",
-            "dims": [X_DIM, Y_DIM, MetricTerms.LON_OR_LAT_DIM],
-            "units": "radians",
-        },
-        "ec1": {
-            "name": "ec1",
-            "dims": [MetricTerms.CARTESIAN_DIM, X_DIM, Y_DIM],
-            "units": "",
-        },
-        "ec2": {
-            "name": "ec2",
-            "dims": [MetricTerms.CARTESIAN_DIM, X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg5": {
-            "name": "sin_sg5",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-    }
-    outputs: Dict[str, Any] = {
-        "vlon": {
-            "name": "vlon",
-            "dims": [X_DIM, Y_DIM, MetricTerms.CARTESIAN_DIM],
-            "units": "",
-            "n_halo": 2,
-        },
-        "vlat": {
-            "name": "vlat",
-            "dims": [X_DIM, Y_DIM, MetricTerms.CARTESIAN_DIM],
-            "units": "",
-            "n_halo": 2,
-        },
-        "z11": {
-            "name": "z11",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-        "z12": {
-            "name": "z12",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-        "z21": {
-            "name": "z21",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-        "z22": {
-            "name": "z22",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-        "a11": {
-            "name": "a11",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-        "a12": {
-            "name": "a12",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-        "a21": {
-            "name": "a21",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-        "a22": {
-            "name": "a22",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-    }
-
-    def compute_parallel(self, inputs, communicator):
-        namelist = self.namelist
-        grid_generator = MetricTerms.from_tile_sizing(
-            npx=namelist.npx,
-            npy=namelist.npy,
-            npz=1,
-            communicator=communicator,
-            backend=self.stencil_factory.backend,
-        )
-
-        in_state = self.state_from_inputs(inputs)
-        grid_generator._sin_sg5 = in_state["sin_sg5"]
-        grid_generator._agrid.data[:] = in_state["agrid"].data[:]
-        grid_generator._ec1 = in_state["ec1"]
-        grid_generator._ec2 = in_state["ec2"]
-        state = {}
-        for metric_term, metadata in self.outputs.items():
-            state[metadata["name"]] = getattr(grid_generator, metric_term)
-        return self.outputs_from_state(state)
-
-
-class TranslateEdgeFactors(ParallelTranslateGrid):
-    def __init__(
-        self,
-        rank_grids,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(rank_grids, namelist, stencil_factory)
-        self.max_error = 3e-13
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist
-
-    inputs: Dict[str, Any] = {
-        "grid": {
-            "name": "grid",
-            "dims": [
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-                MetricTerms.LON_OR_LAT_DIM,
-            ],
-            "units": "radians",
-        },
-        "agrid": {
-            "name": "agrid",
-            "dims": [X_DIM, Y_DIM, MetricTerms.LON_OR_LAT_DIM],
-            "units": "radians",
-        },
-        "edge_s": {
-            "name": "edge_s",
-            "dims": [X_INTERFACE_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-        "edge_n": {
-            "name": "edge_n",
-            "dims": [X_INTERFACE_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-        "edge_e": {
-            "name": "edge_e",
-            "dims": [Y_INTERFACE_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-        "edge_w": {
-            "name": "edge_w",
-            "dims": [Y_INTERFACE_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-        "edge_vect_s": {
-            "name": "edge_vect_s",
-            "dims": [X_DIM],
-            "units": "",
-        },
-        "edge_vect_n": {
-            "name": "edge_vect_n",
-            "dims": [X_DIM],
-            "units": "",
-        },
-        "edge_vect_e": {
-            "name": "edge_vect_e",
-            "dims": [Y_DIM],
-            "units": "",
-        },
-        "edge_vect_w": {
-            "name": "edge_vect_w",
-            "dims": [Y_DIM],
-            "units": "",
-        },
-    }
-    outputs: Dict[str, Any] = {
-        "edge_s": {
-            "name": "edge_s",
-            "dims": [X_INTERFACE_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-        "edge_n": {
-            "name": "edge_n",
-            "dims": [X_INTERFACE_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-        "edge_e": {
-            "name": "edge_e",
-            "dims": [Y_INTERFACE_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-        "edge_w": {
-            "name": "edge_w",
-            "dims": [Y_INTERFACE_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-        "edge_vect_s": {
-            "name": "edge_vect_s",
-            "dims": [X_DIM],
-            "units": "",
-        },
-        "edge_vect_n": {
-            "name": "edge_vect_n",
-            "dims": [X_DIM],
-            "units": "",
-        },
-        "edge_vect_e": {
-            "name": "edge_vect_e",
-            "dims": [Y_DIM],
-            "units": "",
-        },
-        "edge_vect_w": {
-            "name": "edge_vect_w",
-            "dims": [Y_DIM],
-            "units": "",
-        },
-    }
-
-    def compute_parallel(self, inputs, communicator):
-        namelist = self.namelist
-        grid_generator = MetricTerms.from_tile_sizing(
-            npx=namelist.npx,
-            npy=namelist.npy,
-            npz=1,
-            communicator=communicator,
-            backend=self.stencil_factory.backend,
-        )
-
-        in_state = self.state_from_inputs(inputs)
-        grid_generator._grid.data[:] = in_state["grid"].data[:]
-        grid_generator._agrid.data[:] = in_state["agrid"].data[:]
-        state = {}
-        for metric_term, metadata in self.outputs.items():
-            state[metadata["name"]] = getattr(grid_generator, metric_term)
-
-        return self.outputs_from_state(state)
-
-
-class TranslateInitGridUtils(ParallelTranslateGrid):
-    def __init__(
-        self,
-        grids,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grids, namelist, stencil_factory)
-        self.max_error = 2.5e-10
-        self.near_zero = 5e-14
-        self.ignore_near_zero_errors = {
-            "l2c_v": True,
-            "l2c_u": True,
-            "ee1": True,
-            "ee2": True,
-            "ew1": True,
-            "ew2": True,
-            "es1": True,
-            "es2": True,
-            "cos_sg5": True,
-            "cos_sg6": True,
-            "cos_sg7": True,
-            "cos_sg8": True,
-            "cos_sg9": True,
-            "cosa": True,
-            "cosa_u": True,
-            "cosa_v": True,
-        }
-        self._base.in_vars["data_vars"] = {
-            "ec1": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "ec2": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "ew1": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "ew2": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "es1": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "es2": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "ee1": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-            "ee2": {
-                "kend": 2,
-                "kaxis": 0,
-            },
-        }
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist
-
-    inputs: Dict[str, Any] = {
-        "gridvar": {
-            "name": "grid",
-            "dims": [
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-                MetricTerms.LON_OR_LAT_DIM,
-            ],
-            "units": "radians",
-        },
-        "agrid": {
-            "name": "agrid",
-            "dims": [X_DIM, Y_DIM, MetricTerms.LON_OR_LAT_DIM],
-            "units": "radians",
-        },
-        "area": {
-            "name": "area",
-            "dims": [X_DIM, Y_DIM],
-            "units": "m^2",
-        },
-        "area_c": {
-            "name": "area_cgrid",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "m^2",
-        },
-        "dx": {
-            "name": "dx",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "m",
-        },
-        "dy": {
-            "name": "dy",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "m",
-        },
-        "dxc": {
-            "name": "dx_cgrid",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "m",
-        },
-        "dyc": {
-            "name": "dy_cgrid",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "m",
-        },
-        "dxa": {
-            "name": "dx_agrid",
-            "dims": [X_DIM, Y_DIM],
-            "units": "m",
-        },
-        "dya": {
-            "name": "dy_agrid",
-            "dims": [X_DIM, Y_DIM],
-            "units": "m",
-        },
-        "npz": {
-            "name": "npz",
-            "dims": [],
-            "units": "",
-        },
-    }
-    outputs: Dict[str, Any] = {
-        "ks": {
-            "name": "ks",
-            "dims": [],
-            "units": "",
-        },
-        "ptop": {
-            "name": "ptop",
-            "dims": [],
-            "units": "mb",
-        },
-        "ak": {
-            "name": "ak",
-            "dims": [Z_INTERFACE_DIM],
-            "units": "mb",
-        },
-        "bk": {
-            "name": "bk",
-            "dims": [Z_INTERFACE_DIM],
-            "units": "",
-        },
-        "ec1": {
-            "name": "ec1",
-            "dims": [MetricTerms.CARTESIAN_DIM, X_DIM, Y_DIM],
-            "units": "",
-        },
-        "ec2": {
-            "name": "ec2",
-            "dims": [MetricTerms.CARTESIAN_DIM, X_DIM, Y_DIM],
-            "units": "",
-        },
-        "ew1": {
-            "name": "ew1",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_INTERFACE_DIM,
-                Y_DIM,
-            ],
-            "units": "",
-        },
-        "ew2": {
-            "name": "ew2",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_INTERFACE_DIM,
-                Y_DIM,
-            ],
-            "units": "",
-        },
-        "es1": {
-            "name": "es1",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_DIM,
-                Y_INTERFACE_DIM,
-            ],
-            "units": "",
-        },
-        "es2": {
-            "name": "es2",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_DIM,
-                Y_INTERFACE_DIM,
-            ],
-            "units": "",
-        },
-        "cos_sg1": {
-            "name": "cos_sg1",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg1": {
-            "name": "sin_sg1",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg2": {
-            "name": "cos_sg2",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg2": {
-            "name": "sin_sg2",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg3": {
-            "name": "cos_sg3",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg3": {
-            "name": "sin_sg3",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg4": {
-            "name": "cos_sg4",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg4": {
-            "name": "sin_sg4",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg5": {
-            "name": "cos_sg5",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg5": {
-            "name": "sin_sg5",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg6": {
-            "name": "cos_sg6",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg6": {
-            "name": "sin_sg6",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg7": {
-            "name": "cos_sg7",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg7": {
-            "name": "sin_sg7",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg8": {
-            "name": "cos_sg8",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg8": {
-            "name": "sin_sg8",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cos_sg9": {
-            "name": "cos_sg9",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sin_sg9": {
-            "name": "sin_sg9",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "l2c_v": {
-            "name": "l2c_v",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-        "l2c_u": {
-            "name": "l2c_u",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-        "ee1": {
-            "name": "ee1",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-            ],
-            "units": "",
-        },
-        "ee2": {
-            "name": "ee2",
-            "dims": [
-                MetricTerms.CARTESIAN_DIM,
-                X_INTERFACE_DIM,
-                Y_INTERFACE_DIM,
-            ],
-            "units": "",
-        },
-        "cosa_u": {
-            "name": "cosa_u",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-        },
-        "cosa_v": {
-            "name": "cosa_v",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "cosa_s": {
-            "name": "cosa_s",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "sina_u": {
-            "name": "sina_u",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-        },
-        "sina_v": {
-            "name": "sina_v",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "rsin_u": {
-            "name": "rsin_u",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-        },
-        "rsin_v": {
-            "name": "rsin_v",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "rsina": {
-            "name": "rsina",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "",
-            "n_halo": 0,
-        },
-        "rsin2": {
-            "name": "rsin2",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-        },
-        "cosa": {
-            "name": "cosa",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "sina": {
-            "name": "sina",
-            "dims": [X_INTERFACE_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "divg_u": {
-            "name": "divg_u",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "divg_v": {
-            "name": "divg_v",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-        },
-        "del6_u": {
-            "name": "del6_u",
-            "dims": [X_DIM, Y_INTERFACE_DIM],
-            "units": "",
-        },
-        "del6_v": {
-            "name": "del6_v",
-            "dims": [X_INTERFACE_DIM, Y_DIM],
-            "units": "",
-        },
-        "vlon": {
-            "name": "vlon",
-            "dims": [X_DIM, Y_DIM, MetricTerms.CARTESIAN_DIM],
-            "units": "",
-            "n_halo": 2,
-        },
-        "vlat": {
-            "name": "vlat",
-            "dims": [X_DIM, Y_DIM, MetricTerms.CARTESIAN_DIM],
-            "units": "",
-            "n_halo": 2,
-        },
-        "z11": {
-            "name": "z11",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-        "z12": {
-            "name": "z12",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-        "z21": {
-            "name": "z21",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-        "z22": {
-            "name": "z22",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-        "a11": {
-            "name": "a11",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-        "a12": {
-            "name": "a12",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-        "a21": {
-            "name": "a21",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-        "a22": {
-            "name": "a22",
-            "dims": [X_DIM, Y_DIM],
-            "units": "",
-            "n_halo": 1,
-        },
-        "edge_vect_s": {
-            "name": "edge_vect_s",
-            "dims": [X_DIM],
-            "units": "",
-        },
-        "edge_vect_n": {
-            "name": "edge_vect_n",
-            "dims": [X_DIM],
-            "units": "",
-        },
-        "edge_vect_e": {
-            "name": "edge_vect_e",
-            "dims": [Y_DIM],
-            "units": "",
-        },
-        "edge_vect_w": {
-            "name": "edge_vect_w",
-            "dims": [Y_DIM],
-            "units": "",
-        },
-        "da_min": {
-            "name": "da_min",
-            "dims": [],
-            "units": "m^2",
-        },
-        "da_min_c": {
-            "name": "da_min_c",
-            "dims": [],
-            "units": "m^2",
-        },
-        "da_max": {
-            "name": "da_max",
-            "dims": [],
-            "units": "m^2",
-        },
-        "da_max_c": {
-            "name": "da_max_c",
-            "dims": [],
-            "units": "m^2",
-        },
-    }
-
-    def compute_parallel(self, inputs, communicator):
-        namelist = self.namelist
-        grid_generator = MetricTerms.from_tile_sizing(
-            npx=namelist.npx,
-            npy=namelist.npy,
-            npz=int(inputs["npz"]),
-            communicator=communicator,
-            backend=self.stencil_factory.backend,
-            grid_type=namelist.grid_type,
-            dx_const=namelist.dx_const,
-            dy_const=namelist.dy_const,
-            deglat=namelist.deglat,
-        )
-        input_state = self.state_from_inputs(inputs)
-        grid_generator._grid = input_state["grid"]
-        grid_generator._agrid = input_state["agrid"]
-        state = {}
-        for metric_term, metadata in self.outputs.items():
-            state[metadata["name"]] = getattr(grid_generator, metric_term)
-        return self.outputs_from_state(state)
diff --git a/pyFV3/tests/savepoint/translate/translate_haloupdate.py b/pyFV3/tests/savepoint/translate/translate_haloupdate.py
deleted file mode 100644
index c510125e..00000000
--- a/pyFV3/tests/savepoint/translate/translate_haloupdate.py
+++ /dev/null
@@ -1,245 +0,0 @@
-from ndsl.constants import (
-    N_HALO_DEFAULT,
-    X_DIM,
-    X_INTERFACE_DIM,
-    Y_DIM,
-    Y_INTERFACE_DIM,
-    Z_DIM,
-    Z_INTERFACE_DIM,
-)
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.logging import ndsl_log
-from ndsl.namelist import Namelist
-from ndsl.stencils.testing import ParallelTranslate
-
-
-class TranslateHaloUpdate(ParallelTranslate):
-    inputs = {
-        "array": {
-            "name": "air_temperature",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "degK",
-            "n_halo": N_HALO_DEFAULT,
-        }
-    }
-
-    outputs = {
-        "array": {
-            "name": "air_temperature",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "degK",
-            "n_halo": N_HALO_DEFAULT,
-        }
-    }
-    halo_update_varname = "air_temperature"
-
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-
-    def compute_parallel(self, inputs, communicator):
-        state = self.state_from_inputs(inputs)
-        req = communicator.start_halo_update(
-            state[self.halo_update_varname], n_points=N_HALO_DEFAULT
-        )
-        req.wait()
-        return self.outputs_from_state(state)
-
-    def compute_sequential(self, inputs_list, communicator_list):
-        state_list = self.state_list_from_inputs_list(inputs_list)
-        req_list = []
-        for state, communicator in zip(state_list, communicator_list):
-            ndsl_log.debug(f"starting on {communicator.rank}")
-            req_list.append(
-                communicator.start_halo_update(
-                    state[self.halo_update_varname], n_points=N_HALO_DEFAULT
-                )
-            )
-        for communicator, req in zip(communicator_list, req_list):
-            ndsl_log.debug(f"finishing on {communicator.rank}")
-            req.wait()
-        return self.outputs_list_from_state_list(state_list)
-
-
-class TranslateHaloUpdate_2(TranslateHaloUpdate):
-    inputs = {
-        "array2": {
-            "name": "height_on_interface_levels",
-            "dims": [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            "units": "m",
-            "n_halo": N_HALO_DEFAULT,
-        }
-    }
-
-    outputs = {
-        "array2": {
-            "name": "height_on_interface_levels",
-            "dims": [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            "units": "m",
-            "n_halo": N_HALO_DEFAULT,
-        }
-    }
-
-    halo_update_varname = "height_on_interface_levels"
-
-
-class TranslateMPPUpdateDomains(TranslateHaloUpdate):
-    inputs = {
-        "update_arr": {
-            "name": "z_wind_as_tendency_of_pressure",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "Pa/s",
-            "n_halo": N_HALO_DEFAULT,
-        }
-    }
-
-    outputs = {
-        "update_arr": {
-            "name": "z_wind_as_tendency_of_pressure",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "Pa/s",
-            "n_halo": N_HALO_DEFAULT,
-        }
-    }
-
-    halo_update_varname = "z_wind_as_tendency_of_pressure"
-
-
-class TranslateHaloVectorUpdate(ParallelTranslate):
-    inputs = {
-        "array_u": {
-            "name": "x_wind_on_c_grid",
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-            "n_halo": N_HALO_DEFAULT,
-        },
-        "array_v": {
-            "name": "y_wind_on_c_grid",
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "m/s",
-            "n_halo": N_HALO_DEFAULT,
-        },
-    }
-
-    outputs = {
-        "array_u": {
-            "name": "x_wind_on_c_grid",
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-            "n_halo": N_HALO_DEFAULT,
-        },
-        "array_v": {
-            "name": "y_wind_on_c_grid",
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "m/s",
-            "n_halo": N_HALO_DEFAULT,
-        },
-    }
-
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super(TranslateHaloVectorUpdate, self).__init__(grid, namelist, stencil_factory)
-
-    def compute_parallel(self, inputs, communicator):
-        ndsl_log.debug(f"starting on {communicator.rank}")
-        state = self.state_from_inputs(inputs)
-        req = communicator.start_vector_halo_update(
-            state["x_wind_on_c_grid"],
-            state["y_wind_on_c_grid"],
-            n_points=N_HALO_DEFAULT,
-        )
-
-        ndsl_log.debug(f"finishing on {communicator.rank}")
-        req.wait()
-        return self.outputs_from_state(state)
-
-    def compute_sequential(self, inputs_list, communicator_list):
-        state_list = self.state_list_from_inputs_list(inputs_list)
-        req_list = []
-        for state, communicator in zip(state_list, communicator_list):
-            ndsl_log.debug(f"starting on {communicator.rank}")
-            req_list.append(
-                communicator.start_vector_halo_update(
-                    state["x_wind_on_c_grid"],
-                    state["y_wind_on_c_grid"],
-                    n_points=N_HALO_DEFAULT,
-                )
-            )
-        for communicator, req in zip(communicator_list, req_list):
-            ndsl_log.debug(f"finishing on {communicator.rank}")
-            req.wait()
-        return self.outputs_list_from_state_list(state_list)
-
-
-class TranslateMPPBoundaryAdjust(ParallelTranslate):
-    inputs = {
-        "u": {
-            "name": "x_wind_on_d_grid",
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "m/s",
-            "n_halo": N_HALO_DEFAULT,
-        },
-        "v": {
-            "name": "y_wind_on_d_grid",
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-            "n_halo": N_HALO_DEFAULT,
-        },
-    }
-
-    outputs = {
-        "u": {
-            "name": "x_wind_on_d_grid",
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "m/s",
-            "n_halo": N_HALO_DEFAULT,
-        },
-        "v": {
-            "name": "y_wind_on_d_grid",
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-            "n_halo": N_HALO_DEFAULT,
-        },
-    }
-
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super(TranslateMPPBoundaryAdjust, self).__init__(
-            grid, namelist, stencil_factory
-        )
-
-    def compute_parallel(self, inputs, communicator):
-        ndsl_log.debug(f"starting on {communicator.rank}")
-        state = self.state_from_inputs(inputs)
-        req = communicator.start_synchronize_vector_interfaces(
-            state["x_wind_on_d_grid"], state["y_wind_on_d_grid"]
-        )
-        ndsl_log.debug(f"finishing on {communicator.rank}")
-        req.wait()
-        return self.outputs_from_state(state)
-
-    def compute_sequential(self, inputs_list, communicator_list):
-        state_list = self.state_list_from_inputs_list(inputs_list)
-        req_list = []
-        for state, communicator in zip(state_list, communicator_list):
-            req_list.append(
-                communicator.start_synchronize_vector_interfaces(
-                    state["x_wind_on_d_grid"], state["y_wind_on_d_grid"]
-                )
-            )
-        for communicator, req in zip(communicator_list, req_list):
-            ndsl_log.debug(f"finishing on {communicator.rank}")
-            req.wait()
-        return self.outputs_list_from_state_list(state_list)
diff --git a/pyFV3/tests/savepoint/translate/translate_init_case.py b/pyFV3/tests/savepoint/translate/translate_init_case.py
deleted file mode 100644
index d5a40113..00000000
--- a/pyFV3/tests/savepoint/translate/translate_init_case.py
+++ /dev/null
@@ -1,466 +0,0 @@
-from typing import Any, Dict
-
-import ndsl.constants as constants
-import ndsl.dsl.gt4py_utils as utils
-import numpy as np
-import pytest
-from ndsl.constants import (
-    N_HALO_DEFAULT,
-    X_DIM,
-    X_INTERFACE_DIM,
-    Y_DIM,
-    Y_INTERFACE_DIM,
-    Z_DIM,
-    Z_INTERFACE_DIM,
-)
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.grid import GridData, MetricTerms
-from ndsl.initialization.allocator import QuantityFactory
-from ndsl.initialization.sizer import SubtileGridSizer
-from ndsl.namelist import Namelist
-from ndsl.quantity import Quantity
-from ndsl.stencils.testing import ParallelTranslateBaseSlicing
-from ndsl.stencils.testing.grid import TRACER_DIM  # type: ignore
-
-import pyFV3.initialization.analytic_init as analytic_init
-import pyFV3.initialization.init_utils as init_utils
-import pyFV3.initialization.test_cases.initialize_baroclinic as baroclinic_init
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateInitCase(ParallelTranslateBaseSlicing):
-    outputs: Dict[str, Any] = {
-        "u": {
-            "name": "x_wind",
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "v": {
-            "name": "y_wind",
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "ua": {
-            "name": "eastward_wind",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "va": {
-            "name": "northward_wind",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "uc": {
-            "name": "x_wind_on_c_grid",
-            "dims": [X_INTERFACE_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "vc": {
-            "name": "y_wind_on_c_grid",
-            "dims": [X_DIM, Y_INTERFACE_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "w": {
-            "name": "vertical_wind",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m/s",
-        },
-        "phis": {
-            "name": "surface_geopotential",
-            "units": "m^2 s^-2",
-            "dims": [X_DIM, Y_DIM],
-        },
-        "delp": {
-            "name": "pressure_thickness_of_atmospheric_layer",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "Pa",
-        },
-        "delz": {
-            "name": "vertical_thickness_of_atmospheric_layer",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "m",
-        },
-        "ps": {
-            "name": "surface_pressure",
-            "dims": [X_DIM, Y_DIM],
-            "units": "Pa",
-        },
-        "pe": {
-            "name": "interface_pressure",
-            "dims": [X_DIM, Z_INTERFACE_DIM, Y_DIM],
-            "units": "Pa",
-            "n_halo": 1,
-        },
-        "pk": {
-            "name": "interface_pressure_raised_to_power_of_kappa",
-            "units": "unknown",
-            "dims": [X_DIM, Y_DIM, Z_INTERFACE_DIM],
-            "n_halo": 0,
-        },
-        "pkz": {
-            "name": "layer_mean_pressure_raised_to_power_of_kappa",
-            "units": "unknown",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "n_halo": 0,
-        },
-        "peln": {
-            "name": "logarithm_of_interface_pressure",
-            "units": "ln(Pa)",
-            "dims": [X_DIM, Z_INTERFACE_DIM, Y_DIM],
-            "n_halo": 0,
-        },
-        "pt": {
-            "name": "air_temperature",
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "degK",
-        },
-        "q4d": {
-            "name": "tracers",
-            "dims": [X_DIM, Y_DIM, Z_DIM, TRACER_DIM],
-            "units": "kg/kg",
-        },
-    }
-
-    def __init__(
-        self,
-        grid_list,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid_list, namelist, stencil_factory)
-        grid = grid_list[0]
-        self._base.in_vars["data_vars"] = {}
-        self._base.in_vars["parameters"] = ["ptop"]
-        self._base.out_vars = {
-            "u": grid.y3d_domain_dict(),
-            "v": grid.x3d_domain_dict(),
-            "uc": grid.x3d_domain_dict(),
-            "vc": grid.y3d_domain_dict(),
-            "ua": {},
-            "va": {},
-            "w": {},
-            "pt": {},
-            "delp": {},
-            "q4d": {},
-            "phis": {},
-            "delz": {},
-            "ps": {"kstart": grid.npz, "kend": grid.npz},
-            "pe": {
-                "istart": grid.is_ - 1,
-                "iend": grid.ie + 1,
-                "jstart": grid.js - 1,
-                "jend": grid.je + 1,
-                "kend": grid.npz + 1,
-                "kaxis": 1,
-            },
-            "peln": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.je,
-                "kend": grid.npz,
-                "kaxis": 1,
-            },
-            "pk": grid.compute_buffer_k_dict(),
-            "pkz": grid.compute_dict(),
-        }
-        self.max_error = 6e-14
-        self.ignore_near_zero_errors = {}
-        for var in ["u", "v"]:
-            self.ignore_near_zero_errors[var] = {"near_zero": 2e-13}
-        self.namelist = namelist  # type: ignore
-        self.stencil_factory = stencil_factory
-
-    def compute_sequential(self, *args, **kwargs):
-        pytest.skip(
-            f"{self.__class__} only has a mpirun implementation, "
-            "not running in mock-parallel"
-        )
-
-    def outputs_from_state(self, state: dict):
-        outputs = {}
-        arrays = {}
-        for name, properties in self.outputs.items():
-            if isinstance(state[name], dict):
-                for tracer, quantity in state[name].items():
-                    state[name][tracer] = state[name][tracer].data
-                arrays[name] = state[name]
-            elif len(self.outputs[name]["dims"]) > 0:
-                arrays[name] = state[name].data
-            else:
-                outputs[name] = state[name]  # scalar
-        outputs.update(self._base.slice_output(arrays))
-        return outputs
-
-    def compute_parallel(self, inputs, communicator):
-        state = {}
-        full_shape = (
-            *self.grid.domain_shape_full(add=(1, 1, 1)),
-            constants.NQ,
-        )
-        for variable, properties in self.outputs.items():
-            dims = properties["dims"]
-            state[variable] = Quantity(
-                np.zeros(full_shape[0 : len(dims)]),
-                dims,
-                properties["units"],
-                origin=self.grid.sizer.get_origin(dims),
-                extent=self.grid.sizer.get_extent(dims),
-                gt4py_backend=self.stencil_factory.backend,
-            )
-
-        metric_terms = MetricTerms.from_tile_sizing(
-            npx=self.namelist.npx,
-            npy=self.namelist.npy,
-            npz=self.namelist.npz,
-            communicator=communicator,
-            backend=self.stencil_factory.backend,
-        )
-
-        sizer = SubtileGridSizer.from_tile_params(
-            nx_tile=self.namelist.nx_tile,
-            ny_tile=self.namelist.nx_tile,
-            nz=self.namelist.nz,
-            n_halo=N_HALO_DEFAULT,
-            extra_dim_lengths={},
-            layout=self.namelist.layout,
-            tile_partitioner=communicator.partitioner.tile,
-            tile_rank=communicator.tile.rank,
-        )
-
-        quantity_factory = QuantityFactory.from_backend(
-            sizer, backend=self.stencil_factory.backend
-        )
-
-        grid_data = GridData.new_from_metric_terms(metric_terms)
-        quantity_factory = QuantityFactory()
-
-        state = analytic_init.init_analytic_state(
-            analytic_init_case="baroclinic",
-            grid_data=grid_data,
-            quantity_factory=quantity_factory,
-            adiabatic=self.namelist.adiabatic,
-            hydrostatic=self.namelist.hydrostatic,
-            moist_phys=self.namelist.moist_phys,
-            comm=communicator,
-        )
-
-        state.q4d = {}
-        for tracer in utils.tracer_variables:
-            state.q4d[tracer] = getattr(state, tracer)
-        return self.outputs_from_state(state.__dict__)
-
-
-def make_sliced_inputs_dict(inputs, slice_2d):
-    sliced_inputs = {}
-    for k, v in inputs.items():
-        if isinstance(v, np.ndarray) and len(v.shape) > 1:
-            if len(v.shape) == 3:
-                slices = (*slice_2d, slice(None))
-            if len(v.shape) == 2:
-                slices = slice_2d
-            sliced_inputs[k] = inputs[k][slices]
-        else:
-            sliced_inputs[k] = inputs[k]
-    return sliced_inputs
-
-
-class TranslateInitPreJab(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {"ak": {}, "bk": {}, "delp": {}}
-        self.in_vars["parameters"] = ["ptop"]
-        self.out_vars = {
-            "delp": {},
-            "ps": {"kstart": grid.npz, "kend": grid.npz},
-            "pe": {
-                "istart": grid.is_ - 1,
-                "iend": grid.ie + 1,
-                "jstart": grid.js - 1,
-                "jend": grid.je + 1,
-                "kend": grid.npz + 1,
-                "kaxis": 1,
-            },
-            "peln": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.je,
-                "kend": grid.npz,
-                "kaxis": 1,
-            },
-            "pk": grid.compute_buffer_k_dict(),
-            "pkz": grid.compute_dict(),
-            "eta": {"istart": 0, "iend": 0, "jstart": 0, "jend": 0},
-            "eta_v": {"istart": 0, "iend": 0, "jstart": 0, "jend": 0},
-        }
-        self.namelist = namelist  # type: ignore
-        self.stencil_factory = stencil_factory
-
-    def compute(self, inputs):
-        self.make_storage_data_input_vars(inputs)
-        for k, v in inputs.items():
-            if k != "ptop":
-                inputs[k] = v.data
-        full_shape = self.grid.domain_shape_full(add=(1, 1, 1))
-        for variable in ["pe", "peln", "pk", "pkz"]:
-            inputs[variable] = np.zeros(full_shape)
-        inputs["ps"] = np.zeros(full_shape[0:2])
-        for zvar in ["eta", "eta_v"]:
-            inputs[zvar] = np.zeros(self.grid.npz + 1)
-        inputs["ps"][:] = baroclinic_init.SURFACE_PRESSURE
-        sliced_inputs = make_sliced_inputs_dict(
-            inputs, self.grid.compute_interface()[0:2]
-        )
-
-        init_utils.setup_pressure_fields(
-            **sliced_inputs,
-        )
-        return self.slice_output(inputs)
-
-
-class TranslateJablonowskiBaroclinic(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "delp": {},
-            "eta_v": {"istart": 0, "iend": 0, "jstart": 0, "jend": 0},
-            "eta": {"istart": 0, "iend": 0, "jstart": 0, "jend": 0},
-            "peln": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.je,
-                "kend": grid.npz,
-                "kaxis": 1,
-            },
-        }
-
-        self.in_vars["parameters"] = ["ptop"]
-        self.out_vars = {
-            "u": grid.y3d_domain_dict(),
-            "v": grid.x3d_domain_dict(),
-            "w": {},
-            "pt": {},
-            "phis": {},
-            "delz": {},
-            "qvapor": {},
-        }
-        self.ignore_near_zero_errors = {}
-        for var in ["u", "v"]:
-            self.ignore_near_zero_errors[var] = {"near_zero": 2e-13}
-
-        self.max_error = 1e-13
-        self.namelist = namelist  # type: ignore
-        self.stencil_factory = stencil_factory
-
-    def compute(self, inputs):
-        self.make_storage_data_input_vars(inputs)
-        # testing just numpy arrays for this
-        for k, v in inputs.items():
-            if k != "ptop":
-                inputs[k] = v.data
-        full_shape = self.grid.domain_shape_full(add=(1, 1, 1))
-        for variable in ["u", "v", "pt", "delz", "w", "qvapor"]:
-            inputs[variable] = np.zeros(full_shape)
-        for var2d in ["phis"]:
-            inputs[var2d] = np.zeros(full_shape[0:2])
-
-        slice_2d = (
-            slice(self.grid.is_, self.grid.ie + 2),
-            slice(self.grid.js, self.grid.je + 2),
-        )
-        grid_vars = {
-            "lon": self.grid.bgrid1.data[slice_2d],
-            "lat": self.grid.bgrid2.data[slice_2d],
-            "lon_agrid": self.grid.agrid1.data[slice_2d],
-            "lat_agrid": self.grid.agrid2.data[slice_2d],
-            "ee1": self.grid.ee1.data[slice_2d],
-            "ee2": self.grid.ee2.data[slice_2d],
-            "es1": self.grid.es1.data[slice_2d],
-            "ew2": self.grid.ew2.data[slice_2d],
-        }
-        inputs["w"][:] = 1e30
-        inputs["delz"][:] = 1e30
-        inputs["pt"][:] = 1.0
-        inputs["phis"][:] = 1.0e25
-        sliced_inputs = make_sliced_inputs_dict(inputs, slice_2d)
-        baroclinic_init.baroclinic_initialization(
-            **sliced_inputs,
-            **grid_vars,
-            adiabatic=self.namelist.adiabatic,
-            hydrostatic=self.namelist.hydrostatic,
-            nx=self.grid.nic,
-            ny=self.grid.njc,
-        )
-        return self.slice_output(inputs)
-
-
-class TranslatePVarAuxiliaryPressureVars(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "delp": {},
-            "delz": {},
-            "pt": {},
-            "ps": {"kstart": grid.npz, "kend": grid.npz},
-            "qvapor": {},
-            "pe": {
-                "istart": grid.is_ - 1,
-                "iend": grid.ie + 1,
-                "jstart": grid.js - 1,
-                "jend": grid.je + 1,
-                "kend": grid.npz + 1,
-                "kaxis": 1,
-            },
-            "peln": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.je,
-                "kend": grid.npz,
-                "kaxis": 1,
-            },
-            "pkz": grid.compute_dict(),
-        }
-
-        self.in_vars["parameters"] = ["ptop"]
-        self.out_vars = {}
-        for var in ["delz", "delp", "ps", "peln"]:
-            self.out_vars[var] = self.in_vars["data_vars"][var]
-        self.namelist = namelist  # type: ignore
-        self.stencil_factory = stencil_factory
-
-    def compute(self, inputs):
-        self.make_storage_data_input_vars(inputs)
-        # testing just numpy arrays for this
-        for k, v in inputs.items():
-            if k != "ptop":
-                inputs[k] = v.data
-
-        namelist = self.namelist
-        inputs["delz"][:] = 1.0e25
-        sliced_inputs = make_sliced_inputs_dict(
-            inputs, self.grid.compute_interface()[0:2]
-        )
-        init_utils.p_var(
-            **sliced_inputs,
-            moist_phys=namelist.moist_phys,
-            make_nh=(not namelist.hydrostatic),
-        )
-        return self.slice_output(inputs)
diff --git a/pyFV3/tests/savepoint/translate/translate_last_step.py b/pyFV3/tests/savepoint/translate/translate_last_step.py
deleted file mode 100644
index 505cf30d..00000000
--- a/pyFV3/tests/savepoint/translate/translate_last_step.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-import pyFV3.stencils.moist_cv as moist_cv
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateLastStep(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.compute_func = stencil_factory.from_origin_domain(  # type: ignore
-            moist_cv.moist_pt_last_step,
-            origin=self.grid.compute_origin(),
-            domain=self.grid.domain_shape_compute(add=(0, 0, 1)),
-        )
-        self.in_vars["data_vars"] = {
-            "qvapor": {},
-            "qliquid": {},
-            "qice": {},
-            "qrain": {},
-            "qsnow": {},
-            "qgraupel": {},
-            "pt": {},
-            "pkz": {"istart": grid.is_, "jstart": grid.js},
-            "gz": {
-                "serialname": "gz1d",
-                "kstart": grid.is_,
-                "axis": 0,
-                "full_shape": True,
-            },
-        }
-        self.in_vars["parameters"] = ["r_vir", "dtmp"]
-        self.out_vars = {
-            "gz": {
-                "serialname": "gz1d",
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.je,
-                "jend": grid.je,
-                "kstart": grid.npz - 1,
-                "kend": grid.npz - 1,
-            },
-            "pt": {},
-        }
-        self.write_vars = ["gz"]
-        self.stencil_factory = stencil_factory
diff --git a/pyFV3/tests/savepoint/translate/translate_moistcvpluspkz_2d.py b/pyFV3/tests/savepoint/translate/translate_moistcvpluspkz_2d.py
deleted file mode 100644
index 7a53bda3..00000000
--- a/pyFV3/tests/savepoint/translate/translate_moistcvpluspkz_2d.py
+++ /dev/null
@@ -1,133 +0,0 @@
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import FloatField
-from ndsl.namelist import Namelist
-from ndsl.stencils.testing import pad_field_in_j
-
-import pyFV3.stencils.moist_cv as moist_cv
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class MoistPKZ:
-    """
-    Class to test with DaCe orchestration. test class is MoistCVPlusPkz_2d
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        grid,
-    ):
-        self._moist_cv_pkz = stencil_factory.from_origin_domain(
-            moist_cv.moist_pkz,
-            origin=grid.compute_origin(),
-            domain=(grid.nic, 1, grid.npz),
-        )
-
-    def __call__(
-        self,
-        qvapor: FloatField,
-        qliquid: FloatField,
-        qrain: FloatField,
-        qsnow: FloatField,
-        qice: FloatField,
-        qgraupel: FloatField,
-        q_con: FloatField,
-        gz: FloatField,
-        cvm: FloatField,
-        pkz: FloatField,
-        pt: FloatField,
-        cappa: FloatField,
-        delp: FloatField,
-        delz: FloatField,
-        r_vir: float,
-    ):
-        self._moist_cv_pkz(
-            qvapor,
-            qliquid,
-            qrain,
-            qsnow,
-            qice,
-            qgraupel,
-            q_con,
-            gz,
-            cvm,
-            pkz,
-            pt,
-            cappa,
-            delp,
-            delz,
-            r_vir,
-        )
-
-
-class TranslateMoistCVPlusPkz_2d(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.stencil_factory = stencil_factory
-        self.compute_func = MoistPKZ(stencil_factory, self.grid)  # type: ignore
-
-        self.in_vars["data_vars"] = {
-            "qvapor": {"serialname": "qvapor_js"},
-            "qliquid": {"serialname": "qliquid_js"},
-            "qice": {"serialname": "qice_js"},
-            "qrain": {"serialname": "qrain_js"},
-            "qsnow": {"serialname": "qsnow_js"},
-            "qgraupel": {"serialname": "qgraupel_js"},
-            "gz": {"serialname": "gz1d", "kstart": grid.is_, "axis": 0},
-            "cvm": {"kstart": grid.is_, "axis": 0},
-            "delp": {},
-            "delz": {},
-            "q_con": {},
-            "pkz": {"istart": grid.is_, "jstart": grid.js},
-            "pt": {},
-            "cappa": {},
-        }
-        self.write_vars = ["gz", "cvm"]
-        for k, v in self.in_vars["data_vars"].items():
-            if k not in self.write_vars:
-                v["axis"] = 1
-
-        self.in_vars["parameters"] = ["r_vir"]
-        self.out_vars = {
-            "gz": {
-                "serialname": "gz1d",
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.js,
-                "kstart": grid.npz - 1,
-                "kend": grid.npz - 1,
-            },
-            "cvm": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.js,
-                "kstart": grid.npz - 1,
-                "kend": grid.npz - 1,
-            },
-            "pkz": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.je,
-            },
-            "cappa": {},
-            "q_con": {},
-        }
-
-    def compute_from_storage(self, inputs):
-        for name, value in inputs.items():
-            if hasattr(value, "shape") and len(value.shape) > 1 and value.shape[1] == 1:
-                inputs[name] = self.make_storage_data(
-                    pad_field_in_j(
-                        value, self.grid.njd, backend=self.stencil_factory.backend
-                    )
-                )
-        self.compute_func(**inputs)
-        return inputs
diff --git a/pyFV3/tests/savepoint/translate/translate_moistcvpluspt_2d.py b/pyFV3/tests/savepoint/translate/translate_moistcvpluspt_2d.py
deleted file mode 100644
index d76fef76..00000000
--- a/pyFV3/tests/savepoint/translate/translate_moistcvpluspt_2d.py
+++ /dev/null
@@ -1,126 +0,0 @@
-from gt4py.cartesian.gtscript import PARALLEL, computation, interval
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import FloatField
-from ndsl.stencils.testing import TranslateFortranData2Py, pad_field_in_j
-
-import pyFV3.stencils.moist_cv as moist_cv
-
-
-def moist_pt(
-    qvapor: FloatField,
-    qliquid: FloatField,
-    qrain: FloatField,
-    qsnow: FloatField,
-    qice: FloatField,
-    qgraupel: FloatField,
-    q_con: FloatField,
-    pt: FloatField,
-    cappa: FloatField,
-    delp: FloatField,
-    delz: FloatField,
-    r_vir: float,
-):
-    with computation(PARALLEL), interval(...):
-        cvm, gz, q_con, cappa, pt = moist_cv.moist_pt_func(
-            qvapor,
-            qliquid,
-            qrain,
-            qsnow,
-            qice,
-            qgraupel,
-            q_con,
-            pt,
-            cappa,
-            delp,
-            delz,
-            r_vir,
-        )
-
-
-class MoistPT:
-    """
-    Class to test with DaCe orchestration. test class is MoistCVPlusPt_2d
-    """
-
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        grid,
-    ):
-        self._moist_cv_pt = stencil_factory.from_origin_domain(
-            moist_pt,
-            origin=grid.compute_origin(),
-            domain=(grid.nic, 1, grid.npz),
-        )
-
-    def __call__(
-        self,
-        qvapor: FloatField,
-        qliquid: FloatField,
-        qrain: FloatField,
-        qsnow: FloatField,
-        qice: FloatField,
-        qgraupel: FloatField,
-        q_con: FloatField,
-        pt: FloatField,
-        cappa: FloatField,
-        delp: FloatField,
-        delz: FloatField,
-        r_vir: float,
-    ):
-        self._moist_cv_pt(
-            qvapor,
-            qliquid,
-            qrain,
-            qsnow,
-            qice,
-            qgraupel,
-            q_con,
-            pt,
-            cappa,
-            delp,
-            delz,
-            r_vir,
-        )
-
-
-class TranslateMoistCVPlusPt_2d(TranslateFortranData2Py):
-    def __init__(self, grid, namelist, stencil_factory):
-        super().__init__(grid, namelist, stencil_factory)
-        self.stencil_factory = stencil_factory
-        self.compute_func = MoistPT(stencil_factory, self.grid)  # type: ignore
-        self.in_vars["data_vars"] = {
-            "qvapor": {"serialname": "qvapor_js"},
-            "qliquid": {"serialname": "qliquid_js"},
-            "qice": {"serialname": "qice_js"},
-            "qrain": {"serialname": "qrain_js"},
-            "qsnow": {"serialname": "qsnow_js"},
-            "qgraupel": {"serialname": "qgraupel_js"},
-            "delp": {},
-            "delz": {},
-            "q_con": {},
-            "pt": {},
-            "cappa": {},
-        }
-        self.write_vars = ["gz", "cvm"]
-        for k, v in self.in_vars["data_vars"].items():
-            if k not in self.write_vars:
-                v["axis"] = 1
-
-        self.in_vars["parameters"] = ["r_vir"]
-        self.out_vars = {
-            "pt": {},
-            "cappa": {},
-            "q_con": {},
-        }
-
-    def compute_from_storage(self, inputs):
-        for name, value in inputs.items():
-            if hasattr(value, "shape") and len(value.shape) > 1 and value.shape[1] == 1:
-                inputs[name] = self.make_storage_data(
-                    pad_field_in_j(
-                        value, self.grid.njd, backend=self.stencil_factory.backend
-                    )
-                )
-        self.compute_func(**inputs)
-        return inputs
diff --git a/pyFV3/tests/savepoint/translate/translate_neg_adj3.py b/pyFV3/tests/savepoint/translate/translate_neg_adj3.py
deleted file mode 100644
index 55a7d6a8..00000000
--- a/pyFV3/tests/savepoint/translate/translate_neg_adj3.py
+++ /dev/null
@@ -1,67 +0,0 @@
-from typing import Any, Dict
-
-import ndsl.dsl.gt4py_utils as utils
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-from pyFV3.stencils.neg_adj3 import AdjustNegativeTracerMixingRatio
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateNeg_Adj3(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "qvapor": {},
-            "qliquid": {},
-            "qice": {},
-            "qrain": {},
-            "qsnow": {},
-            "qgraupel": {},
-            "qcld": {},
-            "pt": {},
-            "delp": {},
-            "delz": {},
-            "peln": {"istart": grid.is_, "jstart": grid.js, "kaxis": 1},
-        }
-        self.in_vars["parameters"] = []
-        self.out_vars: Dict[str, Any] = {
-            "qvapor": {},
-            "qliquid": {},
-            "qice": {},
-            "qrain": {},
-            "qsnow": {},
-            "qgraupel": {},
-            "qcld": {},
-            # "pt": {},
-        }
-        for qvar in utils.tracer_variables:
-            self.ignore_near_zero_errors[qvar] = True
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist  # type: ignore
-
-    def compute(self, inputs):
-        self.make_storage_data_input_vars(inputs)
-        compute_fn = AdjustNegativeTracerMixingRatio(
-            self.stencil_factory,
-            quantity_factory=self.grid.quantity_factory,
-            check_negative=self.namelist.check_negative,
-            hydrostatic=self.namelist.hydrostatic,
-        )
-        compute_fn(
-            inputs["qvapor"],
-            inputs["qliquid"],
-            inputs["qrain"],
-            inputs["qsnow"],
-            inputs["qice"],
-            inputs["qgraupel"],
-            inputs["qcld"],
-            inputs["pt"],
-            inputs["delp"],
-        )
-        return self.slice_output(inputs)
diff --git a/pyFV3/tests/savepoint/translate/translate_nh_p_grad.py b/pyFV3/tests/savepoint/translate/translate_nh_p_grad.py
deleted file mode 100644
index 6ac41636..00000000
--- a/pyFV3/tests/savepoint/translate/translate_nh_p_grad.py
+++ /dev/null
@@ -1,47 +0,0 @@
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-import pyFV3.stencils.nh_p_grad as NH_P_Grad
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateNH_P_Grad(TranslateDycoreFortranData2Py):
-    max_error = 5e-10
-
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "u": {},
-            "v": {},
-            "pp": {},
-            "gz": {},
-            "pk3": {},
-            "delp": {},
-        }
-        self.in_vars["parameters"] = ["dt", "ptop", "akap"]
-        self.out_vars = {
-            "u": grid.y3d_domain_dict(),
-            "v": grid.x3d_domain_dict(),
-            "pp": {"kend": grid.npz + 1},
-            "gz": {"kend": grid.npz + 1},
-            "pk3": {"kend": grid.npz + 1},
-            "delp": {},
-        }
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist  # type: ignore
-
-    def compute(self, inputs):
-        self.compute_func = NH_P_Grad.NonHydrostaticPressureGradient(  # type: ignore
-            self.stencil_factory,
-            self.grid.quantity_factory,
-            grid_data=self.grid.grid_data,
-            grid_type=self.namelist.grid_type,
-        )
-        self.make_storage_data_input_vars(inputs)
-        self.compute_func(**inputs)
-        return self.slice_output(inputs)
diff --git a/pyFV3/tests/savepoint/translate/translate_pe_halo.py b/pyFV3/tests/savepoint/translate/translate_pe_halo.py
deleted file mode 100644
index 297c44e9..00000000
--- a/pyFV3/tests/savepoint/translate/translate_pe_halo.py
+++ /dev/null
@@ -1,49 +0,0 @@
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-from pyFV3.stencils import pe_halo
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class PE_Halo_Wrapper:
-    def __init__(self, stencil_factory) -> None:
-        ax_offsets_pe = stencil_factory.grid_indexing.axis_offsets(
-            stencil_factory.grid_indexing.origin_full(),
-            stencil_factory.grid_indexing.domain_full(add=(0, 0, 1)),
-        )
-        self._stencil = stencil_factory.from_origin_domain(
-            pe_halo.edge_pe,
-            origin=stencil_factory.grid_indexing.origin_full(),
-            domain=stencil_factory.grid_indexing.domain_full(add=(0, 0, 1)),
-            externals={**ax_offsets_pe},
-            skip_passes=("PruneKCacheFills",),
-        )
-
-    def __call__(self, pe, delp, ptop):
-        self._stencil(pe, delp, ptop)
-
-
-class TranslatePE_Halo(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "pe": {
-                "istart": grid.is_ - 1,
-                "iend": grid.ie + 1,
-                "jstart": grid.js - 1,
-                "jend": grid.je + 1,
-                "kend": grid.npz + 1,
-                "kaxis": 1,
-            },
-            "delp": {},
-        }
-        self.in_vars["parameters"] = ["ptop"]
-        self.out_vars = {"pe": self.in_vars["data_vars"]["pe"]}
-        self.stencil_factory = stencil_factory
-        stencil_class = PE_Halo_Wrapper(self.stencil_factory)
-        self.compute_func = stencil_class  # type: ignore
diff --git a/pyFV3/tests/savepoint/translate/translate_pk3_halo.py b/pyFV3/tests/savepoint/translate/translate_pk3_halo.py
deleted file mode 100644
index c7f8ce2a..00000000
--- a/pyFV3/tests/savepoint/translate/translate_pk3_halo.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-from pyFV3.stencils.pk3_halo import PK3Halo
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslatePK3_Halo(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.stencil_factory = stencil_factory
-        self.compute_func = PK3Halo(  # type: ignore
-            self.stencil_factory, self.grid.quantity_factory
-        )
-        self.in_vars["data_vars"] = {"pk3": {}, "delp": {}}
-        self.in_vars["parameters"] = ["akap", "ptop"]
-        self.out_vars = {"pk3": {"kend": grid.npz + 1}}
diff --git a/pyFV3/tests/savepoint/translate/translate_pressureadjustedtemperature_nonhydrostatic.py b/pyFV3/tests/savepoint/translate/translate_pressureadjustedtemperature_nonhydrostatic.py
deleted file mode 100644
index 00ece2c1..00000000
--- a/pyFV3/tests/savepoint/translate/translate_pressureadjustedtemperature_nonhydrostatic.py
+++ /dev/null
@@ -1,50 +0,0 @@
-from typing import Any, Dict
-
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-import pyFV3
-from pyFV3.stencils import temperature_adjust
-from pyFV3.stencils.dyn_core import get_nk_heat_dissipation
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslatePressureAdjustedTemperature_NonHydrostatic(
-    TranslateDycoreFortranData2Py
-):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        dycore_config = pyFV3.DynamicalCoreConfig.from_namelist(namelist)
-        self.namelist = dycore_config
-        n_adj = get_nk_heat_dissipation(
-            config=dycore_config.d_grid_shallow_water,
-            npz=grid.grid_indexing.domain[2],
-        )
-        self.compute_func = stencil_factory.from_origin_domain(  # type: ignore
-            temperature_adjust.apply_diffusive_heating,
-            origin=stencil_factory.grid_indexing.origin_compute(),
-            domain=stencil_factory.grid_indexing.restrict_vertical(
-                nk=n_adj
-            ).domain_compute(),
-        )
-        self.in_vars["data_vars"] = {
-            "cappa": {},
-            "delp": {},
-            "delz": {},
-            "pt": {},
-            "heat_source": {"serialname": "heat_source_dyn"},
-        }
-        self.in_vars["parameters"] = ["bdt"]
-        self.out_vars: Dict[str, Dict[Any, Any]] = {"pt": {}}
-        self.stencil_factory = stencil_factory
-
-    def compute_from_storage(self, inputs):
-        inputs["delt_time_factor"] = abs(inputs["bdt"] * self.namelist.delt_max)
-        del inputs["bdt"]
-        self.compute_func(**inputs)
-        return inputs
diff --git a/pyFV3/tests/savepoint/translate/translate_qsinit.py b/pyFV3/tests/savepoint/translate/translate_qsinit.py
deleted file mode 100644
index bb54622d..00000000
--- a/pyFV3/tests/savepoint/translate/translate_qsinit.py
+++ /dev/null
@@ -1,49 +0,0 @@
-import ndsl.dsl.gt4py_utils as utils
-import numpy as np
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-import pyFV3.stencils.saturation_adjustment as satadjust
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateQSInit(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "table": {},
-            "table2": {},
-            "tablew": {},
-            "des2": {},
-            "desw": {},
-        }
-        self.out_vars = self.in_vars["data_vars"]
-        self.maxshape = (1, 1, satadjust.QS_LENGTH)
-        self.write_vars = list(self.in_vars["data_vars"].keys())
-        self.stencil_factory = stencil_factory
-        self._compute_q_tables_stencil = self.stencil_factory.from_origin_domain(
-            satadjust.compute_q_tables, origin=(0, 0, 0), domain=self.maxshape
-        )
-        self.max_error = 1e-12
-
-    def compute(self, inputs):
-        self.make_storage_data_input_vars(inputs)
-        index = np.arange(satadjust.QS_LENGTH)
-        inputs["index"] = utils.make_storage_data(
-            index,
-            self.maxshape,
-            origin=(0, 0, 0),
-            read_only=False,
-            backend=self.stencil_factory.backend,
-        )
-        self._compute_q_tables_stencil(**inputs)
-        utils.device_sync(backend=self.stencil_factory.backend)
-        for k, v in inputs.items():
-            if v.shape == self.maxshape:
-                inputs[k] = np.squeeze(v)
-        return inputs
diff --git a/pyFV3/tests/savepoint/translate/translate_ray_fast.py b/pyFV3/tests/savepoint/translate/translate_ray_fast.py
deleted file mode 100644
index 0140085f..00000000
--- a/pyFV3/tests/savepoint/translate/translate_ray_fast.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-from pyFV3.stencils.ray_fast import RayleighDamping
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateRay_Fast(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.compute_func = RayleighDamping(  # type: ignore
-            stencil_factory,
-            namelist.rf_cutoff,
-            namelist.tau,
-            namelist.hydrostatic,
-        )
-        self.in_vars["data_vars"] = {
-            "u": grid.y3d_domain_dict(),
-            "v": grid.x3d_domain_dict(),
-            "w": {},
-            "dp": {},
-            "pfull": {},
-        }
-        self.in_vars["parameters"] = ["dt", "ptop"]
-        self.out_vars = {
-            "u": grid.y3d_domain_dict(),
-            "v": grid.x3d_domain_dict(),
-            "w": {},
-        }
-        self.stencil_factory = stencil_factory
diff --git a/pyFV3/tests/savepoint/translate/translate_remapping.py b/pyFV3/tests/savepoint/translate/translate_remapping.py
deleted file mode 100644
index 5cbdabc2..00000000
--- a/pyFV3/tests/savepoint/translate/translate_remapping.py
+++ /dev/null
@@ -1,124 +0,0 @@
-import ndsl.dsl.gt4py_utils as utils
-from ndsl.constants import Z_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-from pyFV3 import DynamicalCoreConfig
-from pyFV3.stencils.remapping import LagrangianToEulerian
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateRemapping(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "tracers": {},
-            "w": {},
-            "u": grid.y3d_domain_dict(),
-            "v": grid.x3d_domain_dict(),
-            "delz": {},
-            "pt": {},
-            "dp1": {},
-            "delp": {},
-            "cappa": {},
-            "q_con": {},
-            "pkz": grid.compute_dict(),
-            "pk": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.je,
-                "kend": grid.npz,
-            },
-            "peln": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.je,
-                "kaxis": 1,
-                "kend": grid.npz,
-            },
-            "pe": {
-                "istart": grid.is_ - 1,
-                "iend": grid.ie + 1,
-                "jstart": grid.js - 1,
-                "jend": grid.je + 1,
-                "kend": grid.npz + 1,
-                "kaxis": 1,
-            },
-            "hs": {"serialname": "phis"},
-            "ps": {},
-            "wsd": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.je,
-            },
-            # column variables...
-            "ak": {},
-            "bk": {},
-            "pfull": {},
-        }
-        self.in_vars["parameters"] = [
-            "ptop",
-            "akap",
-            "zvir",
-            "last_step",
-            "consv_te",
-            "mdt",
-            "nq",
-        ]
-        self.out_vars = {}
-        self.write_vars = ["wsd"]
-        for k in [
-            "pe",
-            "pkz",
-            "pk",
-            "peln",
-            "pt",
-            "tracers",
-            "cappa",
-            "delp",
-            "delz",
-            "q_con",
-            "u",
-            "v",
-            "w",
-            "ps",
-            "dp1",
-        ]:
-            self.out_vars[k] = self.in_vars["data_vars"][k]
-        self.out_vars["ps"] = {"kstart": grid.npz, "kend": grid.npz}
-        self.max_error = 2e-8
-        self.near_zero = 3e-18
-        self.ignore_near_zero_errors = {"q_con": True, "tracers": True}
-        self.stencil_factory = stencil_factory
-        self.namelist = DynamicalCoreConfig.from_namelist(namelist)
-
-    def compute_from_storage(self, inputs):
-        wsd_2d = utils.make_storage_from_shape(
-            inputs["wsd"].shape[0:2], backend=self.stencil_factory.backend
-        )
-        wsd_2d[:, :] = inputs["wsd"][:, :, 0]
-        inputs["wsd"] = wsd_2d
-        inputs["q_cld"] = inputs["tracers"]["qcld"]
-        inputs["last_step"] = bool(inputs["last_step"])
-        pfull = self.grid.quantity_factory.zeros([Z_DIM], units="Pa")
-        pfull.data[:] = pfull.np.asarray(inputs.pop("pfull"))
-        l_to_e_obj = LagrangianToEulerian(
-            self.stencil_factory,
-            quantity_factory=self.grid.quantity_factory,
-            config=DynamicalCoreConfig.from_namelist(self.namelist).remapping,
-            area_64=self.grid.area_64,
-            nq=inputs.pop("nq"),
-            pfull=pfull,
-            tracers=inputs["tracers"],
-        )
-        l_to_e_obj(**inputs)
-        inputs.pop("q_cld")
-        return inputs
diff --git a/pyFV3/tests/savepoint/translate/translate_riem_solver3.py b/pyFV3/tests/savepoint/translate/translate_riem_solver3.py
deleted file mode 100644
index ca936d42..00000000
--- a/pyFV3/tests/savepoint/translate/translate_riem_solver3.py
+++ /dev/null
@@ -1,85 +0,0 @@
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-from pyFV3 import _config as spec
-from pyFV3.stencils.riem_solver3 import NonhydrostaticVerticalSolver
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateRiem_Solver3(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.vertical_solver = NonhydrostaticVerticalSolver(
-            stencil_factory,
-            quantity_factory=self.grid.quantity_factory,
-            config=spec.RiemannConfig(
-                p_fac=namelist.p_fac,
-                a_imp=namelist.a_imp,
-                use_logp=namelist.use_logp,
-                beta=namelist.beta,
-            ),
-        )
-
-        self.in_vars["data_vars"] = {
-            "cappa": {},
-            "zs": {},
-            "w": {},
-            "delz": {},
-            "q_con": {},
-            "delp": {},
-            "pt": {},
-            "zh": {},
-            "p": {
-                "istart": grid.is_ - 1,
-                "jstart": grid.js - 1,
-                "kaxis": 1,
-                "serialname": "pe",
-            },
-            "ppe": {},
-            "pk3": {},
-            "pk": {},
-            "log_p_interface": {
-                "istart": grid.is_,
-                "jstart": grid.js,
-                "kaxis": 1,
-                "serialname": "peln",
-            },
-            "ws": {"istart": grid.is_, "jstart": grid.js, "serialname": "wsd"},
-        }
-        self.in_vars["parameters"] = ["dt", "ptop", "last_call"]
-        self.out_vars = {
-            "zh": {"kend": grid.npz},
-            "w": {},
-            "p": {
-                "istart": grid.is_ - 1,
-                "iend": grid.ie + 1,
-                "jstart": grid.js - 1,
-                "jend": grid.je + 1,
-                "kend": grid.npz,
-                "kaxis": 1,
-                "serialname": "pe",
-            },
-            "log_p_interface": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.je,
-                "kend": grid.npz,
-                "kaxis": 1,
-                "serialname": "peln",
-            },
-            "ppe": {"kend": grid.npz},
-            "delz": {},
-            "pk": grid.compute_buffer_k_dict(),
-            "pk3": grid.default_buffer_k_dict(),
-        }
-        self.stencil_factory = stencil_factory
-
-    def compute_func(self, **kwargs):
-        kwargs["last_call"] = bool(kwargs["last_call"])
-        return self.vertical_solver(**kwargs)
diff --git a/pyFV3/tests/savepoint/translate/translate_riem_solver_c.py b/pyFV3/tests/savepoint/translate/translate_riem_solver_c.py
deleted file mode 100644
index 33184d19..00000000
--- a/pyFV3/tests/savepoint/translate/translate_riem_solver_c.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-from pyFV3.stencils.riem_solver_c import NonhydrostaticVerticalSolverCGrid
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateRiem_Solver_C(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.compute_func = NonhydrostaticVerticalSolverCGrid(  # type: ignore
-            stencil_factory,
-            quantity_factory=self.grid.quantity_factory,
-            p_fac=namelist.p_fac,
-        )
-        self.in_vars["data_vars"] = {
-            "cappa": {},
-            "hs": {},
-            "w3": {},
-            "ptc": {},
-            "q_con": {},
-            "delpc": {},
-            "gz": {},
-            "pef": {},
-            "ws": {},
-        }
-        self.in_vars["parameters"] = ["dt2", "ptop"]
-        self.out_vars = {"pef": {"kend": grid.npz}, "gz": {"kend": grid.npz}}
-        self.max_error = 5e-14
-        self.stencil_factory = stencil_factory
diff --git a/pyFV3/tests/savepoint/translate/translate_satadjust3d.py b/pyFV3/tests/savepoint/translate/translate_satadjust3d.py
deleted file mode 100644
index 57884f92..00000000
--- a/pyFV3/tests/savepoint/translate/translate_satadjust3d.py
+++ /dev/null
@@ -1,79 +0,0 @@
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-import pyFV3
-from pyFV3 import DynamicalCoreConfig
-from pyFV3.stencils.saturation_adjustment import SatAdjust3d
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateSatAdjust3d(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "te": {},
-            "qvapor": {},
-            "qliquid": {},
-            "qice": {},
-            "qrain": {},
-            "qsnow": {},
-            "qgraupel": {},
-            "qcld": {},
-            "hs": {},
-            "peln": {"istart": grid.is_, "jstart": grid.js, "kaxis": 1},
-            "delp": {},
-            "delz": {},
-            "q_con": {},
-            "pt": {},
-            "pkz": {"istart": grid.is_, "jstart": grid.js},
-            "cappa": {},
-        }
-        self.max_error = 2e-11
-        # te0 is off by 1e-10 when you do nothing...
-        self.in_vars["parameters"] = [
-            "r_vir",
-            "mdt",
-            "fast_mp_consv",
-            "last_step",
-            "akap",
-            "kmp",
-        ]
-        self.out_vars = {
-            "te": {},
-            "qvapor": {},
-            "qliquid": {},
-            "qice": {},
-            "qrain": {},
-            "qsnow": {},
-            "qgraupel": {},
-            "qcld": {},
-            "q_con": {},
-            "pt": {},
-            "pkz": {
-                "istart": grid.is_,
-                "iend": grid.ie,
-                "jstart": grid.js,
-                "jend": grid.je,
-            },
-            "cappa": {},
-        }
-        self.namelist = pyFV3.DynamicalCoreConfig.from_namelist(namelist)
-        self.stencil_factory = stencil_factory
-
-    def compute_from_storage(self, inputs):
-        inputs["kmp"] -= 1
-        inputs["last_step"] = bool(inputs["last_step"])
-        inputs["fast_mp_consv"] = bool(inputs["fast_mp_consv"])
-        satadjust3d_obj = SatAdjust3d(
-            self.stencil_factory,
-            DynamicalCoreConfig.from_namelist(self.namelist).sat_adjust,
-            self.grid.area_64,
-            int(inputs["kmp"]),
-        )
-        satadjust3d_obj(**inputs)
-        return inputs
diff --git a/pyFV3/tests/savepoint/translate/translate_tracer2d1l.py b/pyFV3/tests/savepoint/translate/translate_tracer2d1l.py
deleted file mode 100644
index dad6d987..00000000
--- a/pyFV3/tests/savepoint/translate/translate_tracer2d1l.py
+++ /dev/null
@@ -1,117 +0,0 @@
-import ndsl.dsl.gt4py_utils as utils
-import pytest
-from ndsl.constants import X_DIM, Y_DIM, Z_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-from ndsl.stencils.testing import ParallelTranslate
-
-import pyFV3.stencils.fvtp2d
-import pyFV3.stencils.tracer_2d_1l
-from pyFV3.utils.functional_validation import get_subset_func
-
-
-class TranslateTracer2D1L(ParallelTranslate):
-    inputs = {
-        "tracers": {
-            "dims": [X_DIM, Y_DIM, Z_DIM],
-            "units": "kg/m^2",
-        }
-    }
-
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self._base.in_vars["data_vars"] = {
-            "tracers": {},
-            "dp1": {},
-            "mfxd": grid.x3d_compute_dict(),
-            "mfyd": grid.y3d_compute_dict(),
-            "cxd": grid.x3d_compute_domain_y_dict(),
-            "cyd": grid.y3d_compute_domain_x_dict(),
-        }
-        self._base.in_vars["parameters"] = ["nq"]
-        self._base.out_vars = self._base.in_vars["data_vars"]
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist
-        self._subset = get_subset_func(
-            self.grid.grid_indexing,
-            dims=[X_DIM, Y_DIM, Z_DIM],
-            n_halo=((0, 0), (0, 0)),
-        )
-
-    def collect_input_data(self, serializer, savepoint):
-        input_data = self._base.collect_input_data(serializer, savepoint)
-        return input_data
-
-    def compute_parallel(self, inputs, communicator):
-        self._base.make_storage_data_input_vars(inputs)
-        all_tracers = inputs["tracers"]
-        inputs["tracers"] = self.get_advected_tracer_dict(
-            inputs["tracers"], int(inputs.pop("nq"))
-        )
-        transport = pyFV3.stencils.fvtp2d.FiniteVolumeTransport(
-            stencil_factory=self.stencil_factory,
-            quantity_factory=self.grid.quantity_factory,
-            grid_data=self.grid.grid_data,
-            damping_coefficients=self.grid.damping_coefficients,
-            grid_type=self.grid.grid_type,
-            hord=self.namelist.hord_tr,
-        )
-
-        self.tracer_advection = pyFV3.stencils.tracer_2d_1l.TracerAdvection(
-            self.stencil_factory,
-            self.grid.quantity_factory,
-            transport,
-            self.grid.grid_data,
-            communicator,
-            inputs["tracers"],
-        )
-        inputs["x_mass_flux"] = inputs.pop("mfxd")
-        inputs["y_mass_flux"] = inputs.pop("mfyd")
-        inputs["x_courant"] = inputs.pop("cxd")
-        inputs["y_courant"] = inputs.pop("cyd")
-        self.tracer_advection(**inputs)
-        inputs["mfxd"] = inputs.pop("x_mass_flux")
-        inputs["mfyd"] = inputs.pop("y_mass_flux")
-        inputs["cxd"] = inputs.pop("x_courant")
-        inputs["cyd"] = inputs.pop("y_courant")
-        inputs[
-            "tracers"
-        ] = all_tracers  # some aren't advected, still need to be validated
-        # need to convert tracers dict to [x, y, z, n_tracer] array before subsetting
-        outputs = self._base.slice_output(inputs)
-        outputs["tracers"] = self.subset_output("tracers", outputs["tracers"])
-        return outputs
-
-    def get_advected_tracer_dict(self, all_tracers, nq):
-        all_tracers = {**all_tracers}  # make a new dict so we don't modify the input
-        properties = self.inputs["tracers"]
-        for name in utils.tracer_variables:
-            self.grid.quantity_dict_update(
-                all_tracers,
-                name,
-                dims=properties["dims"],
-                units=properties["units"],
-            )
-        tracer_names = utils.tracer_variables[:nq]
-        return {name: all_tracers[name + "_quantity"] for name in tracer_names}
-
-    def compute_sequential(self, a, b):
-        pytest.skip(
-            f"{self.__class__} only has a mpirun implementation, "
-            "not running in mock-parallel"
-        )
-
-    def subset_output(self, varname: str, output):
-        """
-        Given an output array, return the slice of the array which we'd
-        like to validate against reference data
-        """
-        if varname in ["tracers"]:
-            return self._subset(output)
-        else:
-            return output
diff --git a/pyFV3/tests/savepoint/translate/translate_updatedzc.py b/pyFV3/tests/savepoint/translate/translate_updatedzc.py
deleted file mode 100644
index bdcac7aa..00000000
--- a/pyFV3/tests/savepoint/translate/translate_updatedzc.py
+++ /dev/null
@@ -1,72 +0,0 @@
-import numpy as np
-from ndsl.constants import X_DIM, Y_DIM, Z_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-import pyFV3.stencils.updatedzc as updatedzc
-from pyFV3.testing import TranslateDycoreFortranData2Py
-from pyFV3.utils.functional_validation import get_subset_func
-
-
-class TranslateUpdateDzC(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.stencil_factory = stencil_factory
-        update_gz_on_c_grid = updatedzc.UpdateGeopotentialHeightOnCGrid(
-            self.stencil_factory,
-            quantity_factory=self.grid.quantity_factory,
-            area=grid.grid_data.area,
-            dp_ref=grid.grid_data.dp_ref,
-            grid_type=namelist.grid_type,
-        )
-
-        def compute(**kwargs):
-            kwargs["dt"] = kwargs.pop("dt2")
-            update_gz_on_c_grid(**kwargs)
-
-        self.compute_func = compute  # type: ignore
-        self.in_vars["data_vars"] = {
-            "zs": {},
-            "ut": {"serialname": "utc"},
-            "vt": {"serialname": "vtc"},
-            "gz": {},
-            "ws": {},
-        }
-        self.in_vars["parameters"] = ["dt2"]
-        self.out_vars = {
-            "gz": grid.default_buffer_k_dict(),
-            "ws": {"kstart": -1, "kend": None},
-        }
-        self._subset = get_subset_func(
-            self.grid.grid_indexing,
-            dims=[X_DIM, Y_DIM, Z_DIM],
-            n_halo=((0, 0), (0, 0)),
-        )
-        self._subset_2d = get_subset_func(
-            self.grid.grid_indexing,
-            dims=[X_DIM, Y_DIM],
-            n_halo=((0, 0), (0, 0)),
-        )
-
-    def compute(self, inputs):
-        outputs = super().compute(inputs)
-        outputs["gz"] = self.subset_output("gz", outputs["gz"])
-        outputs["ws"] = self.subset_output("ws", outputs["ws"])
-        return outputs
-
-    def subset_output(self, varname: str, output: np.ndarray) -> np.ndarray:
-        """
-        Given an output array, return the slice of the array which we'd
-        like to validate against reference data
-        """
-        if varname in ["gz"]:
-            return self._subset(output)
-        elif varname in ["ws"]:
-            return self._subset_2d(output)
-        else:
-            return output
diff --git a/pyFV3/tests/savepoint/translate/translate_updatedzd.py b/pyFV3/tests/savepoint/translate/translate_updatedzd.py
deleted file mode 100644
index 68f32cea..00000000
--- a/pyFV3/tests/savepoint/translate/translate_updatedzd.py
+++ /dev/null
@@ -1,88 +0,0 @@
-import numpy as np
-from ndsl.constants import X_DIM, Y_DIM, Z_DIM
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-
-import pyFV3
-import pyFV3.stencils.updatedzd
-from pyFV3.stencils import d_sw
-from pyFV3.testing import TranslateDycoreFortranData2Py
-from pyFV3.utils.functional_validation import get_subset_func
-
-
-class TranslateUpdateDzD(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "surface_height": {"serialname": "zs"},
-            "height": {"kend": grid.npz + 1},
-            "courant_number_x": grid.x3d_compute_domain_y_dict(),
-            "courant_number_y": grid.y3d_compute_domain_x_dict(),
-            "x_area_flux": grid.x3d_compute_domain_y_dict(),
-            "y_area_flux": grid.y3d_compute_domain_x_dict(),
-            "ws": grid.compute_dict(),
-        }
-        self.in_vars["data_vars"]["courant_number_x"]["serialname"] = "crx"
-        self.in_vars["data_vars"]["courant_number_y"]["serialname"] = "cry"
-        self.in_vars["data_vars"]["x_area_flux"]["serialname"] = "xfx"
-        self.in_vars["data_vars"]["y_area_flux"]["serialname"] = "yfx"
-        self.in_vars["data_vars"]["y_area_flux"]["serialname"] = "yfx"
-        self.in_vars["data_vars"]["height"]["serialname"] = "zh"
-        self.in_vars["data_vars"]["ws"]["serialname"] = "wsd"
-
-        self.in_vars["parameters"] = ["dt"]
-        out_vars = [
-            "height",
-            "courant_number_x",
-            "courant_number_y",
-            "x_area_flux",
-            "y_area_flux",
-            "ws",
-        ]
-        self.out_vars = {}
-        for v in out_vars:
-            self.out_vars[v] = self.in_vars["data_vars"][v]
-        self.out_vars["ws"]["kstart"] = grid.npz
-        self.out_vars["ws"]["kend"] = None
-        self.stencil_factory = stencil_factory
-        self.namelist = pyFV3.DynamicalCoreConfig.from_namelist(namelist)
-        self._subset = get_subset_func(
-            self.grid.grid_indexing,
-            dims=[X_DIM, Y_DIM, Z_DIM],
-            n_halo=((0, 0), (0, 0)),
-        )
-        self.ignore_near_zero_errors = {"zh": True, "wsd": True}
-        self.near_zero = 1e-30
-
-    def compute(self, inputs):
-        self.make_storage_data_input_vars(inputs)
-        self.updatedzd = pyFV3.stencils.updatedzd.UpdateHeightOnDGrid(
-            self.stencil_factory,
-            self.grid.quantity_factory,
-            self.grid.damping_coefficients,
-            self.grid.grid_data,
-            self.grid.grid_type,
-            self.namelist.hord_tm,
-            column_namelist=d_sw.get_column_namelist(
-                self.namelist, quantity_factory=self.grid.quantity_factory
-            ),
-        )
-        self.updatedzd(**inputs)
-        outputs = self.slice_output(inputs)
-        outputs["zh"] = self.subset_output("zh", outputs["zh"])
-        return outputs
-
-    def subset_output(self, varname: str, output: np.ndarray) -> np.ndarray:
-        """
-        Given an output array, return the slice of the array which we'd
-        like to validate against reference data
-        """
-        if varname in ["zh", "height"]:
-            return self._subset(output)
-        else:
-            return output
diff --git a/pyFV3/tests/savepoint/translate/translate_xppm.py b/pyFV3/tests/savepoint/translate/translate_xppm.py
deleted file mode 100644
index 5362380c..00000000
--- a/pyFV3/tests/savepoint/translate/translate_xppm.py
+++ /dev/null
@@ -1,71 +0,0 @@
-import ndsl.dsl.gt4py_utils as utils
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.namelist import Namelist
-from ndsl.stencils.testing import TranslateGrid
-
-from pyFV3.stencils import xppm
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateXPPM(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "q": {"serialname": "qx", "jstart": "jfirst"},
-            "c": {"serialname": "cx", "istart": grid.is_},
-        }
-        self.in_vars["parameters"] = ["iord", "jfirst", "jlast"]
-        self.out_vars = {
-            "xflux": {
-                "istart": grid.is_,
-                "iend": grid.ie + 1,
-                "jstart": "jfirst",
-                "jend": "jlast",
-            }
-        }
-        self.stencil_factory = stencil_factory
-
-    def jvars(self, inputs):
-        inputs["jfirst"] += TranslateGrid.fpy_model_index_offset
-        inputs["jlast"] += TranslateGrid.fpy_model_index_offset
-        inputs["jfirst"] = self.grid.global_to_local_y(inputs["jfirst"])
-        inputs["jlast"] = self.grid.global_to_local_y(inputs["jlast"])
-
-    def process_inputs(self, inputs):
-        self.jvars(inputs)
-        self.make_storage_data_input_vars(inputs)
-
-    def compute(self, inputs):
-        self.process_inputs(inputs)
-        inputs["xflux"] = utils.make_storage_from_shape(
-            inputs["q"].shape, backend=self.stencil_factory.backend
-        )
-        origin = self.grid.grid_indexing.origin_compute()
-        domain = self.grid.grid_indexing.domain_compute(add=(1, 1, 0))
-        self.compute_func = xppm.XPiecewiseParabolic(
-            stencil_factory=self.stencil_factory,
-            dxa=self.grid.dxa,
-            grid_type=self.grid.grid_type,
-            iord=int(inputs["iord"]),
-            origin=(origin[0], int(inputs["jfirst"]), origin[2]),
-            domain=(domain[0], int(inputs["jlast"] - inputs["jfirst"] + 1), domain[2]),
-        )
-        self.compute_func(inputs["q"], inputs["c"], inputs["xflux"])
-        return self.slice_output(inputs)
-
-
-class TranslateXPPM_2(TranslateXPPM):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"]["q"]["serialname"] = "q"
-        self.out_vars["xflux"]["serialname"] = "xflux_2"
diff --git a/pyFV3/tests/savepoint/translate/translate_xtp_u.py b/pyFV3/tests/savepoint/translate/translate_xtp_u.py
deleted file mode 100644
index 3b5645a6..00000000
--- a/pyFV3/tests/savepoint/translate/translate_xtp_u.py
+++ /dev/null
@@ -1,99 +0,0 @@
-from gt4py.cartesian.gtscript import PARALLEL, computation, interval
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import FloatField, FloatFieldIJ
-from ndsl.grid import GridData
-from ndsl.namelist import Namelist
-
-import pyFV3.stencils.xtp_u as xtp_u
-
-from .translate_ytp_v import TranslateYTP_V
-
-
-def xtp_u_stencil_defn(
-    ub_contra_times_dt: FloatField,
-    u: FloatField,
-    updated_u: FloatField,
-    dx: FloatFieldIJ,
-    dxa: FloatFieldIJ,
-    rdx: FloatFieldIJ,
-):
-    with computation(PARALLEL), interval(...):
-        updated_u = xtp_u.advect_u_along_x(u, ub_contra_times_dt, rdx, dx, dxa, 1.0)
-
-
-class XTP_U:
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        grid_data: GridData,
-        grid_type: int,
-        iord: int,
-    ):
-        if iord not in (5, 6, 7, 8):
-            raise NotImplementedError(
-                "Currently xtp_v is only supported for hord_mt == 5,6,7,8"
-            )
-        assert (grid_type < 3) or (grid_type == 4)
-        grid_indexing = stencil_factory.grid_indexing
-
-        origin = grid_indexing.origin_compute()
-        domain = grid_indexing.domain_compute(add=(1, 1, 0))
-        self._dx = grid_data.dx
-        self._dxa = grid_data.dxa
-        self._rdx = grid_data.rdx
-        ax_offsets = grid_indexing.axis_offsets(origin, domain)
-        self._stencil = stencil_factory.from_origin_domain(
-            xtp_u_stencil_defn,
-            externals={
-                "iord": iord,
-                "mord": iord,
-                "xt_minmax": False,
-                "grid_type": grid_type,
-                **ax_offsets,
-            },
-            origin=origin,
-            domain=domain,
-        )
-
-    def __call__(self, c: FloatField, u: FloatField, flux: FloatField):
-        """
-        Compute flux of kinetic energy in x-dir.
-
-        Args:
-            c (in): product of x-dir wind on cell corners and timestep
-            u (in): x-dir wind on D-grid
-            flux (out): Flux of kinetic energy
-        """
-        self._stencil(
-            c,
-            u,
-            flux,
-            self._dx,
-            self._dxa,
-            self._rdx,
-        )
-
-
-class TranslateXTP_U(TranslateYTP_V):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"]["u"] = {}
-        self.in_vars["data_vars"]["c"]["serialname"] = "ub"
-        self.in_vars["data_vars"]["flux"]["serialname"] = "vb"
-        self.stencil_factory = stencil_factory
-        self.namelist = namelist  # type: ignore
-
-    def compute_from_storage(self, inputs):
-        xtp_obj = XTP_U(
-            stencil_factory=self.stencil_factory,
-            grid_data=self.grid.grid_data,
-            grid_type=self.namelist.grid_type,
-            iord=self.namelist.hord_mt,
-        )
-        xtp_obj(inputs["c"], inputs["u"], inputs["flux"])
-        return inputs
diff --git a/pyFV3/tests/savepoint/translate/translate_yppm.py b/pyFV3/tests/savepoint/translate/translate_yppm.py
deleted file mode 100644
index 8ab7cfaf..00000000
--- a/pyFV3/tests/savepoint/translate/translate_yppm.py
+++ /dev/null
@@ -1,75 +0,0 @@
-import ndsl.dsl.gt4py_utils as utils
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import Float
-from ndsl.namelist import Namelist
-from ndsl.stencils.testing import TranslateGrid
-
-from pyFV3.stencils import yppm
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-class TranslateYPPM(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"] = {
-            "q": {"istart": "ifirst"},
-            "c": {"jstart": grid.js},
-        }
-        self.in_vars["parameters"] = ["jord", "ifirst", "ilast"]
-        self.out_vars = {
-            "flux": {
-                "istart": "ifirst",
-                "iend": "ilast",
-                "jstart": grid.js,
-                "jend": grid.je + 1,
-            }
-        }
-        self.grid = grid
-        self.stencil_factory = stencil_factory
-
-    def ivars(self, inputs):
-        inputs["ifirst"] += TranslateGrid.fpy_model_index_offset
-        inputs["ilast"] += TranslateGrid.fpy_model_index_offset
-        inputs["ifirst"] = self.grid.global_to_local_x(inputs["ifirst"])
-        inputs["ilast"] = self.grid.global_to_local_x(inputs["ilast"])
-
-    def process_inputs(self, inputs):
-        self.ivars(inputs)
-        self.make_storage_data_input_vars(inputs)
-        inputs["flux"] = utils.make_storage_from_shape(
-            inputs["q"].shape,
-            backend=self.stencil_factory.backend,
-            dtype=Float,
-        )
-
-    def compute(self, inputs):
-        self.process_inputs(inputs)
-        origin = self.grid.grid_indexing.origin_compute()
-        domain = self.grid.grid_indexing.domain_compute(add=(1, 1, 0))
-        self.compute_func = yppm.YPiecewiseParabolic(
-            stencil_factory=self.stencil_factory,
-            dya=self.grid.dya,
-            grid_type=self.grid.grid_type,
-            jord=int(inputs["jord"]),
-            origin=(inputs["ifirst"], origin[1], origin[2]),
-            domain=(inputs["ilast"] - inputs["ifirst"] + 1, domain[1], domain[2]),
-        )
-        self.compute_func(inputs["q"], inputs["c"], inputs["flux"])
-        return self.slice_output(inputs)
-
-
-class TranslateYPPM_2(TranslateYPPM):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        self.in_vars["data_vars"]["q"]["serialname"] = "q_2"
-        self.out_vars["flux"]["serialname"] = "flux_2"
diff --git a/pyFV3/tests/savepoint/translate/translate_ytp_v.py b/pyFV3/tests/savepoint/translate/translate_ytp_v.py
deleted file mode 100644
index 3465dc69..00000000
--- a/pyFV3/tests/savepoint/translate/translate_ytp_v.py
+++ /dev/null
@@ -1,98 +0,0 @@
-from gt4py.cartesian.gtscript import PARALLEL, computation, interval
-from ndsl.dsl.stencil import StencilFactory
-from ndsl.dsl.typing import FloatField, FloatFieldIJ
-from ndsl.grid import GridData
-from ndsl.namelist import Namelist
-
-import pyFV3
-import pyFV3.stencils.ytp_v as ytp_v
-from pyFV3.testing import TranslateDycoreFortranData2Py
-
-
-def ytp_v_stencil_defn(
-    vb_contra_times_dt: FloatField,
-    v: FloatField,
-    updated_v: FloatField,
-    dy: FloatFieldIJ,
-    dya: FloatFieldIJ,
-    rdy: FloatFieldIJ,
-):
-    with computation(PARALLEL), interval(...):
-        updated_v = ytp_v.advect_v_along_y(v, vb_contra_times_dt, rdy, dy, dya, 1.0)
-
-
-class YTP_V:
-    def __init__(
-        self,
-        stencil_factory: StencilFactory,
-        grid_data: GridData,
-        grid_type: int,
-        jord: int,
-    ):
-        if jord not in (5, 6, 7, 8):
-            raise NotImplementedError(
-                "Currently ytp_v is only supported for hord_mt == 5,6,7,8"
-            )
-        assert (grid_type < 3) or (grid_type == 4)
-        grid_indexing = stencil_factory.grid_indexing
-
-        origin = grid_indexing.origin_compute()
-        domain = grid_indexing.domain_compute(add=(1, 1, 0))
-        self._dy = grid_data.dy
-        self._dya = grid_data.dya
-        self._rdy = grid_data.rdy
-        ax_offsets = grid_indexing.axis_offsets(origin, domain)
-
-        self.stencil = stencil_factory.from_origin_domain(
-            ytp_v_stencil_defn,
-            externals={
-                "jord": jord,
-                "mord": jord,
-                "yt_minmax": False,
-                "grid_type": grid_type,
-                **ax_offsets,
-            },
-            origin=origin,
-            domain=domain,
-        )
-
-    def __call__(self, c: FloatField, v: FloatField, flux: FloatField):
-        """
-        Compute flux of kinetic energy in y-dir.
-
-        Args:
-        c (in): product of y-dir wind on cell corners and timestep
-        v (in): y-dir wind on Arakawa D-grid
-        flux (out): Flux of kinetic energy
-        """
-
-        self.stencil(c, v, flux, self._dy, self._dya, self._rdy)
-
-
-class TranslateYTP_V(TranslateDycoreFortranData2Py):
-    def __init__(
-        self,
-        grid,
-        namelist: Namelist,
-        stencil_factory: StencilFactory,
-    ):
-        super().__init__(grid, namelist, stencil_factory)
-        c_info = self.grid.compute_dict_buffer_2d()
-        c_info["serialname"] = "vb"
-        flux_info = self.grid.compute_dict_buffer_2d()
-        flux_info["serialname"] = "ub"
-        self.in_vars["data_vars"] = {"c": c_info, "v": {}, "flux": flux_info}
-        self.in_vars["parameters"] = []
-        self.out_vars = {"flux": flux_info}
-        self.stencil_factory = stencil_factory
-        self.namelist = pyFV3.DynamicalCoreConfig.from_namelist(namelist)
-
-    def compute_from_storage(self, inputs):
-        ytp_obj = YTP_V(
-            stencil_factory=self.stencil_factory,
-            grid_data=self.grid.grid_data,
-            grid_type=self.namelist.grid_type,
-            jord=self.namelist.hord_mt,
-        )
-        ytp_obj(inputs["c"], inputs["v"], inputs["flux"])
-        return inputs

From 498cf9f61f774743d8b366e28fbbba9770720a76 Mon Sep 17 00:00:00 2001
From: Frank Malatino <frank.malatino@noaa.gov>
Date: Fri, 2 Feb 2024 11:40:55 -0500
Subject: [PATCH 4/6] Added pyFV3 as submodule

---
 .gitmodules | 3 +++
 pyFV3       | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 pyFV3

diff --git a/.gitmodules b/.gitmodules
index 3420aa1b..31f23b26 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,6 @@
 [submodule "NDSL"]
 	path = NDSL
 	url = git@github.com:NOAA-GFDL/NDSL.git
+[submodule "pyFV3"]
+	path = pyFV3
+	url = git@github.com:NOAA-GFDL/PyFV3.git
diff --git a/pyFV3 b/pyFV3
new file mode 160000
index 00000000..29796d86
--- /dev/null
+++ b/pyFV3
@@ -0,0 +1 @@
+Subproject commit 29796d86fc19d19622df310f07b7bc6f041fa421

From cedf85300128a9579d8fe5ff1dc9a95865f2fa7d Mon Sep 17 00:00:00 2001
From: Frank Malatino <frank.malatino@noaa.gov>
Date: Fri, 2 Feb 2024 12:06:14 -0500
Subject: [PATCH 5/6] Updates to NDSL regarding dependencies oh 'fv3core' and
 constraints.txt to reflect new pyFV3 submodule

---
 NDSL            |  2 +-
 constraints.txt | 36 ++++++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/NDSL b/NDSL
index 44d98545..f74d364e 160000
--- a/NDSL
+++ b/NDSL
@@ -1 +1 @@
-Subproject commit 44d985452ef45e12ce7764aa4b8b90679af744d4
+Subproject commit f74d364eebb9854d3eb3123239a661afbd831ff4
diff --git a/constraints.txt b/constraints.txt
index e9a99ab6..d5f04873 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -53,8 +53,8 @@ cfgv==3.3.1
 cftime==1.5.0
     # via
     #   -r requirements_dev.txt
+    #   ndsl
     #   netcdf4
-    #   pace-util
 chardet==4.0.0
     # via aiohttp
 charset-normalizer==2.0.4
@@ -74,14 +74,16 @@ coverage==5.5
     # via pytest-cov
 cytoolz==0.12.1
     # via gt4py
-dace==0.15
+dace @ file:///home/Frank.Malatino/pace_refactor/NDSL/external/dace
     # via ndsl
 dacite==1.6.0
     # via
     #   fv3config
     #   pace-driver
 dask==2021.12.0
-    # via -r requirements_dev.txt
+    # via
+    #   -r requirements_dev.txt
+    #   ndsl
 debugpy==1.6.3
     # via ipykernel
 decorator==5.0.9
@@ -111,9 +113,8 @@ f90nml==1.3.1
     # via
     #   -r requirements_dev.txt
     #   fv3config
-    #   pace-fv3core
     #   pace-physics
-    #   pace-util
+    #   pyfv3
 fasteners==0.16.3
     # via zarr
 fastjsonschema==2.16.2
@@ -131,7 +132,7 @@ fsspec==2021.7.0
     #   dask
     #   fv3config
     #   gcsfs
-    #   pace-util
+    #   ndsl
 fv3config==0.9.0
     # via -r requirements_dev.txt
 gcsfs==2021.7.0
@@ -146,8 +147,12 @@ gprof2dot==2021.2.21
     # via pytest-profiling
 gridtools-cpp==2.3.1
     # via gt4py
-gt4py==1.0.1
+gt4py @ file:///home/Frank.Malatino/pace_refactor/NDSL/external/gt4py
+    # via ndsl
+h5netcdf==1.1.0
     # via ndsl
+h5py==3.10.0
+    # via h5netcdf
 identify==2.2.13
     # via pre-commit
 idna==3.2
@@ -204,6 +209,7 @@ matplotlib-inline==0.1.6
 mpi4py==3.1.4
     # via
     #   -r requirements_dev.txt
+    #   ndsl
     #   pace-driver
 mpmath==1.2.1
     # via sympy
@@ -231,6 +237,7 @@ nest-asyncio==1.5.6
 netcdf4==1.6.4
     # via
     #   -r requirements_dev.txt
+    #   ndsl
     #   pace-driver
 networkx==2.6.3
     # via dace
@@ -246,13 +253,13 @@ numpy==1.21.2
     #   cftime
     #   dace
     #   gt4py
+    #   h5py
     #   netcdf4
     #   numcodecs
     #   pace-driver
-    #   pace-fv3core
     #   pace-physics
-    #   pace-util
     #   pandas
+    #   pyfv3
     #   scipy
     #   xarray
     #   zarr
@@ -260,12 +267,11 @@ oauthlib==3.1.1
     # via requests-oauthlib
 ordered-set==4.1.0
     # via deepdiff
-pace-util==0.9.0
-    # via ndsl
 packaging==21.0
     # via
     #   dask
     #   gt4py
+    #   h5netcdf
     #   ipykernel
     #   pytest
     #   setuptools-scm
@@ -375,7 +381,9 @@ requests-oauthlib==1.3.0
 rsa==4.7.2
     # via google-auth
 scipy==1.10.1
-    # via -r requirements_dev.txt
+    # via
+    #   -r requirements_dev.txt
+    #   ndsl
 setuptools-scm==8.0.4
     # via fparser
 six==1.16.0
@@ -451,7 +459,6 @@ typing-extensions==4.3.0
     #   aiohttp
     #   black
     #   gt4py
-    #   pace-util
     #   setuptools-scm
 urllib3==1.26.6
     # via requests
@@ -468,9 +475,10 @@ wheel==0.37.0
 xarray==0.19.0
     # via
     #   -r requirements_dev.txt
+    #   ndsl
     #   pace-driver
-    #   pace-fv3core
     #   pace-physics
+    #   pyfv3
 xxhash==2.0.2
     # via gt4py
 yarl==1.6.3

From 2ecc4fee1a85ac29ca9df138384967e7da872ed2 Mon Sep 17 00:00:00 2001
From: Frank Malatino <frank.malatino@noaa.gov>
Date: Fri, 2 Feb 2024 12:25:55 -0500
Subject: [PATCH 6/6] Updates to constraints.txt

---
 constraints.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/constraints.txt b/constraints.txt
index d5f04873..6fbf9c92 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -74,7 +74,7 @@ coverage==5.5
     # via pytest-cov
 cytoolz==0.12.1
     # via gt4py
-dace @ file:///home/Frank.Malatino/pace_refactor/NDSL/external/dace
+dace
     # via ndsl
 dacite==1.6.0
     # via
@@ -147,7 +147,7 @@ gprof2dot==2021.2.21
     # via pytest-profiling
 gridtools-cpp==2.3.1
     # via gt4py
-gt4py @ file:///home/Frank.Malatino/pace_refactor/NDSL/external/gt4py
+gt4py
     # via ndsl
 h5netcdf==1.1.0
     # via ndsl