Skip to content

Commit

Permalink
Issue NOAA-GFDL#22: Changed instances of 'FV3DYCORE' to 'GFDL' in uti…
Browse files Browse the repository at this point in the history
…l/pace/util/constants.py
  • Loading branch information
fmalatino committed Oct 13, 2023
1 parent fbe0cd5 commit 98aa979
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ After the run completes, you will see an output direcotry `output.zarr`. An exam
### Environment variable configuration

- `PACE_CONSTANTS`: Pace is bundled with various constants (see _util/pace/util/constants.py_).
- `FV3DYCORE` NOAA's FV3 dynamical core constants (original port)
- `GFDL` NOAA's FV3 dynamical core constants (original port)
- `GFS` Constant as defined in NOAA GFS
- `GEOS` Constant as defined in GEOS v13
- `PACE_FLOAT_PRECISION`: default precision of the field & scalars in the numerics. Default to 64.
Expand Down
8 changes: 3 additions & 5 deletions util/pace/util/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# package and the other used for the Dycore. Their difference are small but significant
# In addition the GSFC's GEOS model as its own variables
class ConstantVersions(Enum):
FV3DYCORE = "FV3DYCORE" # NOAA's FV3 dynamical core constants (original port)
GFDL = "GFDL" # NOAA's FV3 dynamical core constants (original port)
GFS = "GFS" # Constant as defined in NOAA GFS
GEOS = "GEOS" # Constant as defined in GEOS v13

Expand Down Expand Up @@ -66,9 +66,7 @@ class ConstantVersions(Enum):
if CONST_VERSION == ConstantVersions.GEOS:
# 'qlcd' is exchanged in GEOS
NQ = 9
elif (
CONST_VERSION == ConstantVersions.GFS or CONST_VERSION == ConstantVersions.FV3DYCORE
):
elif CONST_VERSION == ConstantVersions.GFS or CONST_VERSION == ConstantVersions.GFDL:
NQ = 8
else:
raise RuntimeError("Constant selector failed, bad code.")
Expand Down Expand Up @@ -104,7 +102,7 @@ class ConstantVersions(Enum):
KAPPA = RDGAS / CP_AIR # Specific heat capacity of dry air at
TFREEZE = 273.15
SAT_ADJUST_THRESHOLD = 1.0e-8
elif CONST_VERSION == ConstantVersions.FV3DYCORE:
elif CONST_VERSION == ConstantVersions.GFDL:
RADIUS = 6371.0e3 # Radius of the Earth [m] #6371.0e3
PI = 3.14159265358979323846 # 3.14159265358979323846
OMEGA = 7.292e-5 # Rotation of the earth # 7.292e-5
Expand Down

0 comments on commit 98aa979

Please sign in to comment.