Skip to content

Commit 81fad3d

Browse files
romancromanc
committed
[DSL] fixes for GFDL_1M
1 parent 9c24e57 commit 81fad3d

13 files changed

Lines changed: 39 additions & 46 deletions

File tree

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/microphysics/GFDL_1M/PhaseChange/evaporate.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ def evaporate(
3434
from __externals__ import CCW_EVAP_EFF, DT_MOIST
3535

3636
with computation(PARALLEL), interval(...):
37-
evaporation = mixing_ratio_vapor
3837
rh_crit = 1
3938
# Evaporation of cloud water. DelGenio et al formulation
4039
# (Eq.s 15-17, 1996, J. Clim., 9, 270-303)

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/microphysics/GFDL_1M/PhaseChange/hydrostatic_pdf.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ def hydrostatic_pdf(
266266
qc_n = (mixing_ratio_large_scale_liquid + mixing_ratio_large_scale_ice) * inv_clcn
267267
qc_i = mixing_ratio_large_scale_ice * inv_clcn
268268
t_n = t
269-
qs_x, _ = saturation_specific_humidity(t=t, p=p_mb * 100, ese=ese, esx=esx)
269+
qs_x, _ = saturation_specific_humidity(t=t, p=p_mb * 100.0, ese=ese, esx=esx)
270270
qv_n = (mixing_ratio_vapor - qs_x * convective_cloud_fraction) * inv_clcn
271271

272272
qt = qc_n + qv_n # Total LS water after microphysics
@@ -277,7 +277,7 @@ def hydrostatic_pdf(
277277
qc_p = qc_n
278278
cf_p = cf_n
279279
t_p = t_n
280-
qs_n, dqs = saturation_specific_humidity(t=t_n, p=p_mb * 100, ese=ese, esx=esx)
280+
qs_n, dqs = saturation_specific_humidity(t=t_n, p=p_mb * 100.0, ese=ese, esx=esx)
281281

282282
if PDF_SHAPE < 3: # 1 = top-hat 2 = triangulat
283283
sigmaqt1 = alpha * qs_n

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/microphysics/GFDL_1M/PhaseChange/rh_calculations.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def rh_calculations(
3333
with computation(PARALLEL), interval(...):
3434
# determine the turn pressure using the LCL
3535
if TURNRHCRIT_PARAM <= 0:
36-
turnrhcrit = p_mb.at(K=lcl_level) - 250
36+
turnrhcrit = p_mb.at(K=lcl_level) - 250.0
3737
else:
3838
turnrhcrit = TURNRHCRIT_PARAM
3939

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/microphysics/GFDL_1M/finalize.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def fix_humidity(
106106
esx: GlobalTable_saturation_tables,
107107
):
108108
with computation(PARALLEL), interval(...):
109-
qsat, _ = saturation_specific_humidity(t, p_mb * 100, ese, esx)
109+
qsat, _ = saturation_specific_humidity(t, p_mb * 100.0, ese, esx)
110110
relative_humidity = vapor / qsat
111111

112112

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/microphysics/GFDL_1M/radiation_coupling.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def update_humidity(
2828
esx (GlobalTable_saturation_tables)
2929
"""
3030
with computation(PARALLEL), interval(...):
31-
qsat, _ = saturation_specific_humidity(temperature, pressure * 100, ese, esx)
31+
qsat, _ = saturation_specific_humidity(temperature, pressure * 100.0, ese, esx)
3232
humidity = vapor * qsat
3333

3434

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/pyMoist/microphysics/GFDL_1M/setup.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def calculate_derived_states(
103103
dp = p_interface[0, 0, 1] - p_interface
104104
mass = dp / MAPL_GRAV
105105
mass_inverse = 1 / mass
106-
sat, dsat = saturation_specific_humidity(t=t, p=p_mb * 100, ese=ese, esx=esx)
106+
sat, dsat = saturation_specific_humidity(t=t, p=p_mb * 100.0, ese=ese, esx=esx)
107107
u_unmodified = u
108108
v_unmodified = v
109109
th = (100.0 * p_mb / MAPL_P00) ** (MAPL_KAPPA)
@@ -159,7 +159,7 @@ def find_lcl_level(
159159

160160
# get LCL pressure
161161
with computation(PARALLEL), interval(-1, None):
162-
qsat, _ = saturation_specific_humidity(t=t, p=p_mb * 100, ese=ese, esx=esx)
162+
qsat, _ = saturation_specific_humidity(t=t, p=p_mb * 100.0, ese=ese, esx=esx)
163163
rhsfc = 100 * vapor / qsat
164164
tlcl = find_t_lcl(t=t, rh=rhsfc)
165165
rm = (1 - vapor) * MAPL_RGAS + vapor * MAPL_RVAP
@@ -227,7 +227,7 @@ def compute_estimated_inversion_strength(
227227

228228
# Simplified single adiabat eq4 of https://doi.org/10.1175/JCLI3988.1
229229
t850 = 0.5 * (t + t700)
230-
qs850, _ = saturation_specific_humidity(t=t850, p=100 * 850, ese=ese, esx=esx)
230+
qs850, _ = saturation_specific_humidity(t=t850, p=100.0 * 850.0, ese=ese, esx=esx)
231231
gamma850 = (1.0 + (MAPL_ALHL * qs850 / (MAPL_RGAS * t850))) / (1.0 + (MAPL_ALHL * MAPL_ALHL * qs850 / (MAPL_CP * MAPL_RVAP * t850 * t850)))
232232
gamma850 = MAPL_GRAV / MAPL_CP * (1.0 - gamma850)
233233
estimated_inversion_strength = lower_tropospheric_stability - gamma850 * (z700 - lcl_height)

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/scripts/run_all.sh‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
#!/bin/bash
22

3-
# Usage: ./run_tests.sh [/path/to/data] [debug|dace:cpu_kfirst]
3+
# Usage: ./run_all.sh [/path/to/data] [st:python:cpu:IJK|st:dace:cpu:IJK]
44

5+
# NDSL configuration
56
export NDSL_LITERAL_PRECISION=32
6-
export NDSL_TEST_N_THRESHOLD_SAMPLES=0
77
export GT4PY_COMPILE_OPT_LEVEL=0
8-
export FV3_DACEMODE=BuildAndRun
9-
export NDSL_LOGLEVEL=Critical
8+
export NDSL_LOGLEVEL=Info
9+
10+
# pyMoist configuration
11+
export EXP_NAME='gcm-fp'
1012

1113
# UW specific
1214
export GT4PY_EXTRA_COMPILE_OPT_FLAGS='-fconstexpr-ops-limit=1000000000'
1315

14-
python -m pytest -s -v --disable-warnings --multimodal_metric \
16+
python -m pytest -s -v --multimodal_metric \
1517
--data_path=$1 \
1618
--backend=$2 \
1719
--grid=default \

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/scripts/run_tests.sh‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
#!/bin/bash
22

3-
# Usage: ./run_tests.sh [/path/to/data] [debug|dace:cpu_kfirst] [TranslateName]
3+
# Usage: ./run_tests.sh [/path/to/data] [st:python:cpu:IJK|st:dace:cpu:IJK] [TranslateName]
44

5+
# NDSL configuration
56
export NDSL_LITERAL_PRECISION=32
6-
export NDSL_TEST_N_THRESHOLD_SAMPLES=0
77
export GT4PY_COMPILE_OPT_LEVEL=0
8-
export FV3_DACEMODE=BuildAndRun
9-
# export OPENMP_CPPFLAGS=" "
10-
# export OPENMP_LDFLAGS=" "
11-
12-
# UW specific
13-
#export GT4PY_EXTRA_COMPILE_OPT_FLAGS='-fconstexpr-ops-limit=1000000000'
8+
export NDSL_LOGLEVEL=Info
149

10+
# pyMoist configuration
1511
export EXP_NAME='gcm-fp'
1612

17-
python -m pytest -s -v --disable-warnings --multimodal_metric \
13+
# UW specific
14+
export GT4PY_EXTRA_COMPILE_OPT_FLAGS='-fconstexpr-ops-limit=1000000000'
15+
16+
python -m pytest -s -v --multimodal_metric \
1817
--data_path=$1 \
1918
--backend=$2\
2019
--which_modules=$3 \
21-
--which_rank=0 \
2220
--grid=default \
2321
--no_report \
2422
--threshold_overrides_file=./overrides.yml \

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/microphysics/GFDL_1M/PhaseChange/translate_GFDL_1M_Evaporate.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ def compute(self, inputs):
6767
code(
6868
p_mb=locals_.p_mb,
6969
t=state.t,
70-
vapor=state.mixing_ratio.vapor,
71-
convective_liquid=state.mixing_ratio.convective_liquid,
72-
convective_ice=state.mixing_ratio.convective_ice,
70+
mixing_ratio_vapor=state.mixing_ratio.vapor,
71+
mixing_ratio_convective_liquid=state.mixing_ratio.convective_liquid,
72+
mixing_ratio_convective_ice=state.mixing_ratio.convective_ice,
7373
convective_cloud_fraction=state.cloud_fraction.convective,
7474
liquid_concentration=state.concentration.liquid,
7575
ice_concentration=state.concentration.ice,

‎GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/translate_tests/microphysics/GFDL_1M/PhaseChange/translate_GFDL_1M_HydrostaticPDF.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ def compute(self, inputs):
9696
convection_fraction=state.convection_fraction,
9797
surface_type=state.surface_type,
9898
p_mb=locals_.p_mb,
99-
vapor=state.mixing_ratio.vapor,
100-
large_scale_liquid=state.mixing_ratio.large_scale_liquid,
101-
convective_liquid=state.mixing_ratio.convective_liquid,
102-
large_scale_ice=state.mixing_ratio.large_scale_ice,
103-
convective_ice=state.mixing_ratio.convective_ice,
99+
mixing_ratio_vapor=state.mixing_ratio.vapor,
100+
mixing_ratio_large_scale_liquid=state.mixing_ratio.large_scale_liquid,
101+
mixing_ratio_convective_liquid=state.mixing_ratio.convective_liquid,
102+
mixing_ratio_large_scale_ice=state.mixing_ratio.large_scale_ice,
103+
mixing_ratio_convective_ice=state.mixing_ratio.convective_ice,
104104
t=state.t,
105105
large_scale_cloud_fraction=state.cloud_fraction.large_scale,
106106
convective_cloud_fraction=state.cloud_fraction.convective,

0 commit comments

Comments
 (0)