Skip to content

Commit

Permalink
Merge branch 'ufs-community:develop' into feature/testrtchanges
Browse files Browse the repository at this point in the history
  • Loading branch information
@DeniseWorthen
DeniseWorthen authored May 10, 2022
2 parents 6ddbe69 + 0ee3448 commit 9d4245e
Show file tree
Hide file tree
Showing 46 changed files with 4,693 additions and 4,867 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 9 files
+0 −100 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_RRTMGP.xml
+0 −103 ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml
+0 −103 ccpp/suites/suite_FV3_GFS_v16_RRTMGP.xml
+0 −104 ccpp/suites/suite_FV3_GFS_v16_coupled_p7_rrtmgp.xml
+8 −17 ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml
+8 −17 ccpp/suites/suite_FV3_GFS_v17_p8.xml
+14 −13 ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
+0 −104 ccpp/suites/suite_FV3_GFSv17alp_cpldnsstrasugwprrtmgp.xml
+0 −4 ccpp/suites/suite_FV3_HAFS_v0_thompson_tedmf_gfdlsf.xml
474 changes: 221 additions & 253 deletions tests/RegressionTests_cheyenne.gnu.log
View file

Large diffs are not rendered by default.

1,452 changes: 719 additions & 733 deletions tests/RegressionTests_gaea.intel.log
View file

Large diffs are not rendered by default.

472 changes: 220 additions & 252 deletions tests/RegressionTests_hera.gnu.log
View file

Large diffs are not rendered by default.

1,468 changes: 727 additions & 741 deletions tests/RegressionTests_hera.intel.log
View file

Large diffs are not rendered by default.

1,286 changes: 637 additions & 649 deletions tests/RegressionTests_jet.intel.log
View file

Large diffs are not rendered by default.

1,472 changes: 729 additions & 743 deletions tests/RegressionTests_orion.intel.log
View file

Large diffs are not rendered by default.

1,026 changes: 506 additions & 520 deletions tests/RegressionTests_wcoss_cray.log
View file

Large diffs are not rendered by default.

1,587 changes: 691 additions & 896 deletions tests/RegressionTests_wcoss_dell_p3.log
View file

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -643,8 +643,8 @@ export EFFR_IN=.false.
export LRADAR=.true.
export LTAEROSOL=.true.
export EXT_DIAG_THOMPSON=.false.
export sedi_semi=.false.
export decfl=8
export SEDI_SEMI=.true.
export DECFL=10
# NSSL MP
export NSSL_CCCN=0.6e9
export NSSL_ALPHAH=0.0
Expand Down Expand Up @@ -950,6 +950,7 @@ export IOPT_ALB=1
export IOPT_STC=3
# P8
export IOPT_SFC=3
export IOPT_TRS=2

# FV3 P7 settings
export D2_BG_K1=0.20
Expand Down Expand Up @@ -982,7 +983,7 @@ export LDIAG_UGWP=.false.
export CDMBWD=${CDMBWD_c96}

# P8 RRTMGP
export DO_RRTMGP=.true.
export DO_RRTMGP=.false.
export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true
export DOGP_SGS_CNV=.true.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/control.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ deflate_level=1
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/control_ca.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ deflate_level=1
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/control_csawmg.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ deflate_level=1
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/control_flake.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ deflate_level=1
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/control_gdas.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ deflate_level=1
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/control_noahmp.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ deflate_level=1
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 3
iopt_trs = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down
5 changes: 3 additions & 2 deletions tests/parm/control_thompson.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ deflate_level=1
ltaerosol = @[LTAEROSOL]
lradar = @[LRADAR]
ttendlim = 0.004
sedi_semi = @[sedi_semi]
decfl = @[decfl]
sedi_semi = @[SEDI_SEMI]
decfl = @[DECFL]
ext_diag_thompson = @[EXT_DIAG_THOMPSON]
pdfcld = .false.
fhswr = 3600.
Expand Down Expand Up @@ -167,6 +167,7 @@ deflate_level=1
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/control_ugwpv1.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ deflate_level=1
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down
3 changes: 3 additions & 0 deletions tests/parm/cpld_control.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ deflate_level=1
lradar = .false.
ttendlim = -999
dt_inner = @[DT_INNER]
sedi_semi = @[SEDI_SEMI]
decfl = @[DECFL]
oz_phys = .false.
oz_phys_2015 = .true.
lsoil_lsm = 4
Expand Down Expand Up @@ -187,6 +189,7 @@ deflate_level=1
iopt_btr = 1
iopt_run = 1
iopt_sfc = @[IOPT_SFC]
iopt_trs = @[IOPT_TRS]
iopt_frz = 1
iopt_inf = 1
iopt_rad = @[IOPT_RAD]
Expand Down
1 change: 1 addition & 0 deletions tests/parm/cpt.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
oz_phys = .false.
oz_phys_2015 = .true.
debug = .false.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/csawmg3shoc127.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.

ras = .false.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/csawmgshoc.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.

ras = .false.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/input_global_hafs.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down
1 change: 1 addition & 0 deletions tests/parm/input_nest02.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
nstf_name = @[NSTF_NAME]
xkzminv = 0.3
Expand Down
1 change: 1 addition & 0 deletions tests/parm/input_nest_hafs.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down
11 changes: 7 additions & 4 deletions tests/parm/input_regional_hafs.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,12 @@
use_ufo = .true.
pre_rad = .false.
imp_physics = @[IMP_PHYSICS]
ltaerosol = .false.
lradar = .true.
ttendlim = 0.004
sedi_semi = .false.
ltaerosol = .false.
lradar = .true.
ttendlim = -999
dt_inner = @[DT_INNER]
sedi_semi = @[SEDI_SEMI]
decfl = @[DECFL]
ext_diag_thompson = .false.
pdfcld = .false.
fhswr = @[FHSWR]
Expand Down Expand Up @@ -221,6 +223,7 @@
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down
3 changes: 3 additions & 0 deletions tests/parm/rap.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ deflate_level=1
imp_physics = @[IMP_PHYSICS]
ltaerosol = @[LTAEROSOL]
lradar = @[LRADAR]
sedi_semi = @[SEDI_SEMI]
decfl = @[DECFL]
nssl_cccn = @[NSSL_CCCN]
nssl_alphah = @[NSSL_ALPHAH]
nssl_alphahl = @[NSSL_ALPHAHL]
Expand Down Expand Up @@ -180,6 +182,7 @@ deflate_level=1
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 3
iopt_trs = 2
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
Expand Down
3 changes: 3 additions & 0 deletions tests/parm/regional.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@
imp_physics = 8
ltaerosol = .false.
ttendlim = -999.0
sedi_semi = @[SEDI_SEMI]
decfl = @[DECFL]
pdfcld = .false.
fhswr = 900.
fhlwr = 900.
Expand Down Expand Up @@ -179,6 +181,7 @@
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
oz_phys = @[OZ_PHYS_OLD]
oz_phys_2015 = @[OZ_PHYS_NEW]
Expand Down
3 changes: 3 additions & 0 deletions tests/parm/regional_3km.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@
imfdeepcnv = 2
imfshalcnv = 2
imp_physics = 8
sedi_semi = @[SEDI_SEMI]
decfl = @[DECFL]
iopt_alb = 2
iopt_btr = 1
iopt_crs = 1
Expand All @@ -184,6 +186,7 @@
iopt_sfc = 1
iopt_snf = 4
iopt_stc = 1
iopt_trs = 2
iopt_tbot = 2
iovr = 3
isol = 2
Expand Down
1 change: 1 addition & 0 deletions tests/parm/regional_c768.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
oz_phys = @[OZ_PHYS_OLD]
oz_phys_2015 = @[OZ_PHYS_NEW]
Expand Down
3 changes: 3 additions & 0 deletions tests/parm/regional_stoch.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@
imfdeepcnv = -1
imfshalcnv = -1
imp_physics = 8
sedi_semi = @[SEDI_SEMI]
decfl = @[DECFL]
iopt_alb = 2
iopt_btr = 1
iopt_crs = 1
Expand All @@ -191,6 +193,7 @@
iopt_sfc = 1
iopt_snf = 4
iopt_stc = 1
iopt_trs = 2
iopt_tbot = 2
iovr = 3
isol = 2
Expand Down
3 changes: 3 additions & 0 deletions tests/parm/rrfs_conus13km_hrrr.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@
imfdeepcnv = @[IMFDEEPCNV]
imfshalcnv = @[IMFSHALCNV]
imp_physics = @[IMP_PHYSICS]
sedi_semi = @[SEDI_SEMI]
decfl = @[DECFL]
iopt_dveg = 4
iopt_crs = 2
iopt_btr = 1
Expand All @@ -198,6 +200,7 @@
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 3
iopt_trs = 2
iovr = @[IOVR]
isol = 2
isot = 1
Expand Down
1 change: 1 addition & 0 deletions tests/parm/stretched-input.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
nstf_name = @[NSTF_NAME]
xkzminv = 0.3
Expand Down
1 change: 1 addition & 0 deletions tests/parm/stretched-nest-input.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
nstf_name = @[NSTF_NAME]
xkzminv = 0.3
Expand Down
1 change: 1 addition & 0 deletions tests/parm/wam.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@
iopt_snf = 4
iopt_tbot = 2
iopt_stc = 1
iopt_trs = 2
debug = .false.
levr = 90
h2o_phys = @[H2O_PHYS]
Expand Down
14 changes: 5 additions & 9 deletions tests/rt.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN | cpld_debug_p8
# PROD tests #
###################################################################################################################################################################################

COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_thompson_mynn_RRTMGP,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON | | fv3 |
COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km -D32BIT=ON | | fv3 |
RUN | control | | fv3 |
RUN | control_decomp | | |
RUN | control_2dwrtdecomp | | |
Expand All @@ -50,13 +50,14 @@ RUN | control_restart_p8
RUN | control_decomp_p8 | | |
RUN | control_2threads_p8 | - wcoss_cray | |

RUN | control_p8_rrtmgp | | fv3 |

RUN | regional_control | | fv3 |
RUN | regional_restart | | | regional_control
RUN | regional_control_2dwrtdecomp | | |
RUN | regional_noquilt | | fv3 |
RUN | regional_2threads | - wcoss_cray jet.intel | |
RUN | regional_netcdf_parallel | - wcoss2 | fv3 |
RUN | regional_RRTMGP | | fv3 |
RUN | regional_3km | | fv3 |

COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON | | fv3 |
Expand All @@ -80,11 +81,7 @@ RUN | rrfs_v1nssl_nohailnoccn
RUN | rrfs_conus13km_hrrr_warm | | fv3 |
RUN | rrfs_conus13km_radar_tten_warm | | fv3 |

COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp | | fv3 |
# fv3_gfs_v15p2 and fv3_gfs_v15p2_RRTMGP fail w/ sat.vap pressure error when cdmbgwd=0.14,1.8,1.0,1.0
RUN | control_rrtmgp | | fv3 |
#RUN | control_rrtmgp_2threads | | |
RUN | control_rrtmgp_c192 | | fv3 |
COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp | | fv3 |
RUN | control_csawmg | - gaea.intel | fv3 |
RUN | control_csawmgt | | fv3 |
RUN | control_flake | | fv3 |
Expand All @@ -101,15 +98,14 @@ RUN | control_wam
# DEBUG tests #
###################################################################################################################################################################################

COMPILE | -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_RRTMGP,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON | | fv3 |
COMPILE | -DAPP=ATM -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_noahmp,FV3_GFS_v16_thompson,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8 -D32BIT=ON | | fv3 |

RUN | control_debug | | fv3 |
RUN | control_2threads_debug | - wcoss_cray | |
RUN | control_CubedSphereGrid_debug | | fv3 |
RUN | control_wrtGauss_netcdf_parallel_debug | | fv3 |
RUN | control_stochy_debug | | fv3 |
RUN | control_lndp_debug | | fv3 |
RUN | control_rrtmgp_debug | | fv3 |
RUN | control_csawmg_debug | | fv3 |
RUN | control_csawmgt_debug | | fv3 |
RUN | control_ras_debug | | fv3 |
Expand Down
2 changes: 1 addition & 1 deletion tests/rt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
TEST_35D=true
fi

BL_DATE=20220503
BL_DATE=20220508
if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
else
Expand Down
Loading

0 comments on commit 9d4245e

Please sign in to comment.