Reflecting changes from move of basic_operations.py to NDSL

examples/notebook/test_functionality.ipynb

@@ -161,7 +161,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pyFV3.stencils.basic_operations import copy_defn\n",
+    "from ndsl.stencils.basic_operations import copy_defn\n",
     "\n",
     "from_field = quantity_factory.ones(dims=(X_DIM, Y_DIM, Z_DIM), units=\"none\", dtype=\"float\")\n",
     "to_field = quantity_factory.zeros(dims=(X_DIM, Y_DIM, Z_DIM), units=\"none\", dtype=\"float\")\n",

pyFV3/stencils/a2b_ord4.py

@@ -15,7 +15,7 @@
 from ndsl.constants import X_DIM, X_INTERFACE_DIM, Y_DIM, Y_INTERFACE_DIM, Z_DIM
 from ndsl.dsl.typing import Float, FloatField, FloatFieldI, FloatFieldIJ
 from ndsl.grid import GridData
-from pyFV3.stencils.basic_operations import copy_defn
+from ndsl.stencils.basic_operations import copy_defn
 
 
 # comact 4-pt cubic interpolation

pyFV3/stencils/del2cubed.py

@@ -6,7 +6,7 @@
 from ndsl.dsl.stencil import get_stencils_with_varied_bounds
 from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ, cast_to_index3d
 from ndsl.grid import DampingCoefficients
-from pyFV3.stencils.basic_operations import copy_defn
+from ndsl.stencils.basic_operations import copy_defn
 
 
 #

pyFV3/stencils/divergence_damping.py

@@ -9,8 +9,8 @@
     sqrt,
 )
 
+import ndsl.stencils.basic_operations as basic
 import ndsl.stencils.corners as corners
-import pyFV3.stencils.basic_operations as basic
 from ndsl import Quantity, QuantityFactory, StencilFactory
 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

pyFV3/stencils/dyn_core.py

@@ -13,7 +13,7 @@
 )
 
 import ndsl.constants as constants
-import pyFV3.stencils.basic_operations as basic
+import ndsl.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

pyFV3/stencils/fv_dynamics.py

@@ -15,12 +15,12 @@
 from ndsl.grid import DampingCoefficients, GridData
 from ndsl.logging import ndsl_log
 from ndsl.performance import NullTimer, Timer
+from ndsl.stencils.basic_operations import copy_defn
 from ndsl.stencils.c2l_ord import CubedToLatLon
 from ndsl.typing import Checkpointer, Communicator
 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

pyFV3/stencils/fv_subgridz.py

@@ -27,8 +27,8 @@
     ZVIR,
 )
 from ndsl.dsl.typing import Float, FloatField
+from ndsl.stencils.basic_operations import dim
 from pyFV3.dycore_state import DycoreState
-from pyFV3.stencils.basic_operations import dim
 
 
 RK = CP_AIR / RDGAS + 1.0

pyFV3/stencils/map_single.py

@@ -5,7 +5,7 @@
 from ndsl import QuantityFactory, StencilFactory, orchestrate
 from ndsl.constants import X_DIM, Y_DIM, Z_DIM
 from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ, IntFieldIJ  # noqa: F401
-from pyFV3.stencils.basic_operations import copy_defn
+from ndsl.stencils.basic_operations import copy_defn
 from pyFV3.stencils.remap_profile import RemapProfile
 
 

pyFV3/stencils/remapping.py

@@ -23,10 +23,10 @@
     Z_INTERFACE_DIM,
 )
 from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ, FloatFieldK
+from ndsl.stencils.basic_operations import adjust_divide_stencil
 from ndsl.typing import Checkpointer
 from pyFV3._config import RemappingConfig
 from pyFV3.stencils import moist_cv
-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

pyFV3/stencils/saturation_adjustment.py

@@ -14,8 +14,8 @@
 import ndsl.constants as constants
 from ndsl import StencilFactory
 from ndsl.dsl.typing import Float, FloatField, FloatFieldIJ
+from ndsl.stencils.basic_operations import dim
 from pyFV3._config import SatAdjustConfig
-from pyFV3.stencils.basic_operations import dim
 from pyFV3.stencils.moist_cv import compute_pkz_func
 
 

pyFV3/stencils/temperature_adjust.py

@@ -2,7 +2,7 @@
 
 import ndsl.constants as constants
 from ndsl.dsl.typing import Float, FloatField
-from pyFV3.stencils.basic_operations import sign
+from ndsl.stencils.basic_operations import sign
 
 
 def apply_diffusive_heating(

pyFV3/stencils/xppm.py

@@ -11,8 +11,8 @@
 
 from ndsl import StencilFactory
 from ndsl.dsl.typing import FloatField, FloatFieldIJ, Index3D
+from ndsl.stencils.basic_operations import sign
 from pyFV3.stencils import ppm
-from pyFV3.stencils.basic_operations import sign
 
 
 @gtscript.function

pyFV3/stencils/yppm.py

@@ -11,8 +11,8 @@
 
 from ndsl import StencilFactory, orchestrate
 from ndsl.dsl.typing import FloatField, FloatFieldIJ, Index3D
+from ndsl.stencils.basic_operations import sign
 from pyFV3.stencils import ppm
-from pyFV3.stencils.basic_operations import sign
 
 
 @gtscript.function

setup.py

@@ -16,7 +16,7 @@
 ]
 
 test_requirements = ["pytest", "pytest-subtests", "serialbox"]
-ndsl_requirements = ["ndsl @ git+https://github.com/NOAA-GFDL/NDSL.git@2024.03.01"]
+ndsl_requirements = ["ndsl @ git+https://github.com/NOAA-GFDL/NDSL.git@develop"]
 develop_requirements = test_requirements + ndsl_requirements + ["pre-commit"]
 
 extras_requires = {