Skip to content

Commit

Permalink
Merge pull request #2 from NOAA-GFDL/update/pyFV3
Browse files Browse the repository at this point in the history
pace.fv3core -> pyFV3
  • Loading branch information
fmalatino authored Feb 2, 2024
2 parents 44d9854 + e1033b2 commit f74d364
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion ndsl/grid/eta.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ def set_hybrid_pressure_coefficients(


def check_eta(ak, bk):
from pace.fv3core.initialization.init_utils import compute_eta
from pyFV3.initialization.init_utils import compute_eta

return compute_eta(ak, bk)
2 changes: 1 addition & 1 deletion ndsl/grid/generation.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class GridDefinitions:

# TODO
# corners use sizer + partitioner rather than GridIndexer,
# have to refactor fv3core calls to corners to do this as well
# have to refactor pyFV3 calls to corners to do this as well
class MetricTerms:
LON_OR_LAT_DIM = GridDefinitions.LON_OR_LAT_DIM
TILE_DIM = GridDefinitions.TILE_DIM
Expand Down
4 changes: 2 additions & 2 deletions ndsl/stencils/c2l_ord.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
interval,
region,
)
from pace import fv3core
import pyFV3

import ndsl.dsl.gt4py_utils as utils
from ndsl.comm.communicator import Communicator
Expand Down Expand Up @@ -157,7 +157,7 @@ class CubedToLatLon:

def __init__(
self,
state: fv3core.DycoreState,
state: pyFV3.DycoreState,
stencil_factory: StencilFactory,
quantity_factory: QuantityFactory,
grid_data: GridData,
Expand Down
5 changes: 1 addition & 4 deletions ndsl/stencils/testing/temporaries.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ def copy_temporaries(obj, max_depth: int) -> dict:
attr = None
if isinstance(attr, Quantity):
temporaries[attr_name] = copy.deepcopy(np.asarray(attr.data))
elif attr.__class__.__module__.split(".")[0] in ( # type: ignore
"fv3core",
"pace",
):
elif attr.__class__.__module__.split(".")[0] in ("pyFV3"): # type: ignore
if max_depth > 0:
sub_temporaries = copy_temporaries(attr, max_depth - 1)
if len(sub_temporaries) > 0:
Expand Down

0 comments on commit f74d364

Please sign in to comment.