From b90847235995c3309a7ddc5645282b415c33670e Mon Sep 17 00:00:00 2001 From: fmalatino <142349306+fmalatino@users.noreply.github.com> Date: Mon, 16 Oct 2023 09:41:39 -0400 Subject: [PATCH] Issue #22: Changed instances of 'FV3DYCORE' to 'GFDL' in util/pace/util/constants.py (#31) --- README.md | 2 +- util/pace/util/constants.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5884cee8..151bea93 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/util/pace/util/constants.py b/util/pace/util/constants.py index d5485aea..a470581d 100644 --- a/util/pace/util/constants.py +++ b/util/pace/util/constants.py @@ -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 @@ -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.") @@ -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