diff --git a/physics/tests/savepoint/translate/__init__.py b/physics/tests/savepoint/translate/__init__.py index e75ee7b4..82a08c76 100644 --- a/physics/tests/savepoint/translate/__init__.py +++ b/physics/tests/savepoint/translate/__init__.py @@ -1,16 +1,11 @@ # flake8: noqa: F401 -from physics.tests.savepoint.translate.translate_update_dwind_phys import ( - TranslateUpdateDWindsPhys, -) - from .translate_atmos_phy_statein import TranslateAtmosPhysDriverStatein -from .translate_driver import TranslateDriver from .translate_fillgfs import TranslateFillGFS from .translate_fv_update_phys import TranslateFVUpdatePhys -from .translate_gfs_physics_driver import TranslateGFSPhysicsDriver from .translate_microphysics import TranslateMicroph from .translate_phifv3 import TranslatePhiFV3 from .translate_prsfv3 import TranslatePrsFV3 +from .translate_update_dwind_phys import TranslateUpdateDWindsPhys from .translate_update_pressure_sfc_winds_phys import ( TranslatePhysUpdatePressureSurfaceWinds, ) diff --git a/physics/tests/savepoint/translate/translate_atmos_phy_statein.py b/physics/tests/savepoint/translate/translate_atmos_phy_statein.py index 0b529527..47005f20 100644 --- a/physics/tests/savepoint/translate/translate_atmos_phy_statein.py +++ b/physics/tests/savepoint/translate/translate_atmos_phy_statein.py @@ -1,11 +1,9 @@ import numpy as np +from translate_physics import TranslatePhysicsFortranData2Py import ndsl.dsl.gt4py_utils as utils from ndsl.util.constants import KAPPA from pace.physics.stencils.physics import atmos_phys_driver_statein -from physics.tests.savepoint.translate.translate_physics import ( - TranslatePhysicsFortranData2Py, -) class TranslateAtmosPhysDriverStatein(TranslatePhysicsFortranData2Py): diff --git a/physics/tests/savepoint/translate/translate_fillgfs.py b/physics/tests/savepoint/translate/translate_fillgfs.py index e176f687..ecd43655 100644 --- a/physics/tests/savepoint/translate/translate_fillgfs.py +++ b/physics/tests/savepoint/translate/translate_fillgfs.py @@ -1,11 +1,9 @@ import numpy as np +from translate_physics import TranslatePhysicsFortranData2Py import ndsl.dsl.gt4py_utils as utils from ndsl.util.utils import safe_assign_array from pace.physics.update.update_atmos_state import fill_gfs_delp -from physics.tests.savepoint.translate.translate_physics import ( - TranslatePhysicsFortranData2Py, -) class TranslateFillGFS(TranslatePhysicsFortranData2Py): diff --git a/physics/tests/savepoint/translate/translate_fv_update_phys.py b/physics/tests/savepoint/translate/translate_fv_update_phys.py index 6d4cd0e9..f03822db 100644 --- a/physics/tests/savepoint/translate/translate_fv_update_phys.py +++ b/physics/tests/savepoint/translate/translate_fv_update_phys.py @@ -1,6 +1,10 @@ import dataclasses import numpy as np +from translate_physics import ( + ParallelPhysicsTranslate2Py, + transform_dwind_serialized_data, +) import ndsl.dsl import ndsl.dsl.gt4py_utils as utils @@ -8,10 +12,6 @@ from ndsl.dsl.typing import FloatField, FloatFieldIJ from ndsl.util.utils import safe_assign_array from pace.physics.update.fv_update_phys import ApplyPhysicsToDycore -from physics.tests.savepoint.translate.translate_physics import ( - ParallelPhysicsTranslate2Py, - transform_dwind_serialized_data, -) try: diff --git a/physics/tests/savepoint/translate/translate_gfs_physics_driver.py b/physics/tests/savepoint/translate/translate_gfs_physics_driver.py index 4a3d8073..e2e1a6b8 100644 --- a/physics/tests/savepoint/translate/translate_gfs_physics_driver.py +++ b/physics/tests/savepoint/translate/translate_gfs_physics_driver.py @@ -1,13 +1,12 @@ import copy +from translate_physics import TranslatePhysicsFortranData2Py + import ndsl.dsl.gt4py_utils as utils import ndsl.util as util from pace.physics import PHYSICS_PACKAGES from pace.physics.stencils.physics import Physics, PhysicsState from pace.physics.update import update_atmos_state -from physics.tests.savepoint.translate.translate_physics import ( - TranslatePhysicsFortranData2Py, -) class TranslateGFSPhysicsDriver(TranslatePhysicsFortranData2Py): diff --git a/physics/tests/savepoint/translate/translate_microphysics.py b/physics/tests/savepoint/translate/translate_microphysics.py index 5233067d..fea7c7b1 100644 --- a/physics/tests/savepoint/translate/translate_microphysics.py +++ b/physics/tests/savepoint/translate/translate_microphysics.py @@ -1,6 +1,7 @@ import copy import numpy as np +from translate_physics import TranslatePhysicsFortranData2Py import ndsl.dsl.gt4py_utils as utils import ndsl.util @@ -8,9 +9,6 @@ from pace.physics import PHYSICS_PACKAGES from pace.physics.stencils.microphysics import Microphysics from pace.physics.stencils.physics import PhysicsState -from physics.tests.savepoint.translate.translate_physics import ( - TranslatePhysicsFortranData2Py, -) class TranslateMicroph(TranslatePhysicsFortranData2Py): diff --git a/physics/tests/savepoint/translate/translate_phifv3.py b/physics/tests/savepoint/translate/translate_phifv3.py index b7e8685d..34d1ef22 100644 --- a/physics/tests/savepoint/translate/translate_phifv3.py +++ b/physics/tests/savepoint/translate/translate_phifv3.py @@ -1,7 +1,6 @@ +from translate_physics import TranslatePhysicsFortranData2Py + from pace.physics.stencils.get_phi_fv3 import get_phi_fv3 -from physics.tests.savepoint.translate.translate_physics import ( - TranslatePhysicsFortranData2Py, -) class TranslatePhiFV3(TranslatePhysicsFortranData2Py): diff --git a/physics/tests/savepoint/translate/translate_prsfv3.py b/physics/tests/savepoint/translate/translate_prsfv3.py index 3c0dd35b..71dad355 100644 --- a/physics/tests/savepoint/translate/translate_prsfv3.py +++ b/physics/tests/savepoint/translate/translate_prsfv3.py @@ -1,7 +1,6 @@ +from translate_physics import TranslatePhysicsFortranData2Py + from pace.physics.stencils.get_prs_fv3 import get_prs_fv3 -from physics.tests.savepoint.translate.translate_physics import ( - TranslatePhysicsFortranData2Py, -) class TranslatePrsFV3(TranslatePhysicsFortranData2Py): diff --git a/physics/tests/savepoint/translate/translate_update_dwind_phys.py b/physics/tests/savepoint/translate/translate_update_dwind_phys.py index 7efa709c..4d1b0ef1 100644 --- a/physics/tests/savepoint/translate/translate_update_dwind_phys.py +++ b/physics/tests/savepoint/translate/translate_update_dwind_phys.py @@ -1,11 +1,9 @@ import numpy as np +from translate_physics import TranslatePhysicsFortranData2Py import ndsl.util from ndsl.util.utils import safe_assign_array from pace.physics.update.update_dwind_phys import AGrid2DGridPhysics -from physics.tests.savepoint.translate.translate_physics import ( - TranslatePhysicsFortranData2Py, -) class TranslateUpdateDWindsPhys(TranslatePhysicsFortranData2Py): diff --git a/physics/tests/savepoint/translate/translate_update_pressure_sfc_winds_phys.py b/physics/tests/savepoint/translate/translate_update_pressure_sfc_winds_phys.py index 1cd3b471..2e6c7319 100644 --- a/physics/tests/savepoint/translate/translate_update_pressure_sfc_winds_phys.py +++ b/physics/tests/savepoint/translate/translate_update_pressure_sfc_winds_phys.py @@ -1,8 +1,7 @@ +from translate_physics import TranslatePhysicsFortranData2Py + from ndsl.util.constants import KAPPA from pace.physics.update.fv_update_phys import update_pressure_and_surface_winds -from physics.tests.savepoint.translate.translate_physics import ( - TranslatePhysicsFortranData2Py, -) class TranslatePhysUpdatePressureSurfaceWinds(TranslatePhysicsFortranData2Py): diff --git a/physics/tests/savepoint/translate/translate_update_tracers_phys.py b/physics/tests/savepoint/translate/translate_update_tracers_phys.py index 30b87b52..bc60b851 100644 --- a/physics/tests/savepoint/translate/translate_update_tracers_phys.py +++ b/physics/tests/savepoint/translate/translate_update_tracers_phys.py @@ -1,7 +1,6 @@ +from translate_physics import TranslatePhysicsFortranData2Py + from pace.physics.update.update_atmos_state import prepare_tendencies_and_update_tracers -from physics.tests.savepoint.translate.translate_physics import ( - TranslatePhysicsFortranData2Py, -) class TranslatePhysUpdateTracers(TranslatePhysicsFortranData2Py): diff --git a/tests/savepoint/translate/__init__.py b/tests/savepoint/translate/__init__.py new file mode 100644 index 00000000..e7f366ac --- /dev/null +++ b/tests/savepoint/translate/__init__.py @@ -0,0 +1 @@ +from .translate_driver import TranslateDriver diff --git a/physics/tests/savepoint/translate/translate_driver.py b/tests/savepoint/translate/translate_driver.py similarity index 100% rename from physics/tests/savepoint/translate/translate_driver.py rename to tests/savepoint/translate/translate_driver.py