Skip to content

Commit

Permalink
Gsl/may16 followup pr (#139)
Browse files Browse the repository at this point in the history 
* new tests

* point to gsl/may16-followup-pr branch of fv3

* Change suite_FV3_GFS_v15_thompson_mynn to not use mynn surface layer scheme (from Tanya Smirnova)

* move FV3/physics/smoke to FV3/physics/physics/smoke

* Corrections to new conus13km restart tests so they actually run.

* add alternative regional_spp_sppt_shum_skeb tests

* Enable flake in hrrr tests

* Conf files for testing rap&hrrr failures: rrfs.conf (intel) and rrfs_gnu.conf

* Add alternative hrrr tests to rt*conf since they do presently work

* jet.intel tests passed

* FV3: Switch to rad_sw_pre in ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.xml which replaced rrtmg_sw_pre.F90 a while ago

* hera.gnu tests passed

* hera.intel tests passed

* Update baseline date to 20220520

* final hera gnu test logs

* final hera intel tests passed

* jet.intel tests passed

* point to gsl develop for fv3atm
  • Loading branch information
@SamuelTrahanNOAA
SamuelTrahanNOAA committed May 23, 2022
1 parent 3d84073 commit 7b0be42
Show file tree
Hide file tree
Showing 39 changed files with 4,184 additions and 1,527 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 3 files
+3 −3 ccpp/config/ccpp_prebuild_config.py
+1 −1 ccpp/physics
+1 −1 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.xml
611 changes: 390 additions & 221 deletions tests/RegressionTests_hera.gnu.log
View file

Large diffs are not rendered by default.

1,559 changes: 864 additions & 695 deletions tests/RegressionTests_hera.intel.log
View file

Large diffs are not rendered by default.

1,379 changes: 774 additions & 605 deletions tests/RegressionTests_jet.intel.log
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -875,6 +875,11 @@ export NSSL_INVERTCCN=.true.
export RRFS_SMOKE=.false.
export SEAS_OPT=2

# The rrfs*conus13km* tests are all warm starts off of data
# assimilation output, so we need another flag to indicate a restart
# test:
export RRFS_RESTART=NO

# GWD
export LDIAG_UGWP=.false.
export DO_UGWP=.false.
Expand Down
24 changes: 23 additions & 1 deletion tests/fv3_conf/regional_run_stoch.IN
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,29 @@
rm -rf INPUT RESTART
mkdir INPUT RESTART

rsync -arv @[INPUTDATA_ROOT]/FV3_input_data_regional_stoch/. INPUT/.
if [ $WARM_START = .false. ]; then
rsync -arv @[INPUTDATA_ROOT]/FV3_input_data_regional_stoch/. INPUT/.
else
cp -r ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.* ./INPUT
rm -f INPUT/fv_core.res.*
rm -f INPUT/fv_srf_wnd.res.*
rm -f INPUT/fv_tracer.res.*
rm -f INPUT/phy_data.*
rm -f INPUT/sfc_data.*
cp @[INPUTDATA_ROOT]/FV3_input_data_regional_stoch/INPUT/grid_spec.nc INPUT/.
cp @[INPUTDATA_ROOT]/FV3_input_data_regional_stoch/INPUT/*_grid.tile*.nc INPUT/.
cp @[INPUTDATA_ROOT]/FV3_input_data_regional_stoch/INPUT/oro_data*.nc INPUT/.
for RFILE in ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
[ -e $RFILE ] || exit 1
RFILE_OLD=$(basename $RFILE)
RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
cp $RFILE "INPUT/$RFILE_NEW"
done
for x in gfs_ctrl.nc gfs_data.nc grid.tile7.halo4.nc ; do
cp @[INPUTDATA_ROOT]/FV3_input_data_regional_stoch/INPUT/$x INPUT/.
done
cp @[INPUTDATA_ROOT]/FV3_input_data_regional_stoch/INPUT/gfs_bndy.* INPUT/.
fi

cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .

Expand Down
26 changes: 25 additions & 1 deletion tests/fv3_conf/rrfs_warm_run.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,31 @@ mkdir INPUT RESTART

OPNREQ_TEST=${OPNREQ_TEST:-false}
SUFFIX=${RT_SUFFIX}
cp -r @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/* INPUT/

if [[ "${RRFS_RESTART:-NO}" == YES ]] ; then
cp -r ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.* ./INPUT
rm -f INPUT/fv_core.res.*
rm -f INPUT/fv_srf_wnd.res.*
rm -f INPUT/fv_tracer.res.*
rm -f INPUT/phy_data.*
rm -f INPUT/sfc_data.*
cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/grid_spec.nc INPUT/.
cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/*_grid.tile*.nc INPUT/.
cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/oro_data*.nc INPUT/.
for RFILE in ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.*; do
[ -e $RFILE ] || exit 1
RFILE_OLD=$(basename $RFILE)
RFILE_NEW="${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
cp $RFILE "INPUT/$RFILE_NEW"
done
for x in emi_data.nc SMOKE_GBBEPx_data.nc dust12m_data.nc gfs_ctrl.nc gfs_data.nc \
grid.tile7.halo4.nc ; do
cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/$x INPUT/.
done
cp @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/gfs_bndy.* INPUT/.
else
cp -r @[INPUTDATA_ROOT]/FV3_input_data_conus13km/INPUT/* INPUT/
fi

for x in global_glacier.2x2.grb global_h2oprdlos.f77 global_maxice.2x2.grb \
global_o3prdlos.f77 global_snoclim.1.875.grb global_zorclim.1x1.grb \
Expand Down
1 change: 1 addition & 0 deletions tests/parm/model_configure_rrfs_conus13km.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ start_hour: @[SHOUR]
start_minute: 0
start_second: 0
nhours_fcst: @[FHMAX]
fhrot: @[FHROT]

dt_atmos: @[DT_ATMOS]
calendar: 'julian'
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/rrfs_conus13km_hrrr.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
! lfnc_k = @[LFNC_K]
! lfnc_p0 = @[LFNC_P0]
lheatstrg = @[LHEATSTRG]
! lkm = @[LKM]
lkm = @[LKM]
lndp_type = @[LNDP_TYPE]
lradar = @[LRADAR]
lrefres = .true.
Expand Down
57 changes: 57 additions & 0 deletions tests/rrfs.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON | | fv3 |

# Success for rap, except decomposition
RUN | rap_control | | fv3 |
RUN | rap_2threads | - wcoss_cray jet.intel | |
RUN | rap_restart | | | rap_control
# rap_decomp fails
RUN | rap_decomp | | |


RUN | regional_spp_sppt_shum_skeb | | fv3 |
# regional_spp_sppt_shum_skeb fails for alternative threads and alternative decompositions
RUN | regional_spp_sppt_shum_skeb_decomp | | |
RUN | regional_spp_sppt_shum_skeb_4threads | | |
# regional_spp_sppt_shum_skeb Cannot do a restart for this because it only does a 1 hr forecast
#RUN | regional_spp_sppt_shum_skeb_restart | | | regional_spp_sppt_shum_skeb


# FV3_HRRR succeeds in all non-debug cases.
RUN | hrrr_control | | fv3 |
RUN | hrrr_control_restart | | | hrrr_control
RUN | hrrr_control_decomp | | |
RUN | hrrr_control_2threads | | |


RUN | rrfs_conus13km_hrrr_warm | | fv3 |
# All alternative versions of rrfs_conus13km_hrrr_warm fail
RUN | rrfs_conus13km_hrrr_warm_restart | | | rrfs_conus13km_hrrr_warm
RUN | rrfs_conus13km_hrrr_warm_decomp | | |
RUN | rrfs_conus13km_hrrr_warm_2threads | | |


RUN | rrfs_conus13km_radar_tten_warm | | fv3 |
# All alternative versions of rrfs_conus13km_radar_tten_warm fail
RUN | rrfs_conus13km_radar_tten_warm_restart | | | rrfs_conus13km_radar_tten_warm
RUN | rrfs_conus13km_radar_tten_warm_decomp | | |
RUN | rrfs_conus13km_radar_tten_warm_2threads | | |


RUN | rrfs_smoke_conus13km_hrrr_warm | | fv3 |
# All alternative versions of rrfs_smoke_conus13km_hrrr_warm fail
RUN | rrfs_smoke_conus13km_hrrr_warm_restart | | | rrfs_smoke_conus13km_hrrr_warm
RUN | rrfs_smoke_conus13km_hrrr_warm_decomp | | |
RUN | rrfs_smoke_conus13km_hrrr_warm_2threads | | |


COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DDEBUG=ON | | fv3 |

# The hrrr_control_debug succeeds:
RUN | hrrr_control_debug | | fv3 |

# These cannot create baselines because they crash:
RUN | rap_control_debug | | fv3 |
RUN | regional_spp_sppt_shum_skeb_debug | | fv3 |
RUN | rrfs_conus13km_hrrr_warm_debug | | fv3 |
RUN | rrfs_conus13km_radar_tten_warm_debug | | fv3 |
RUN | rrfs_smoke_conus13km_hrrr_warm_debug | | fv3 |
57 changes: 57 additions & 0 deletions tests/rrfs_gnu.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta -D32BIT=ON | | fv3 |

# Success for rap, except decomposition
RUN | rap_control | | fv3 |
RUN | rap_2threads | - wcoss_cray jet.intel | |
RUN | rap_restart | | | rap_control
# rap_decomp fails
RUN | rap_decomp | | |


# The gnu optimization level is set so low this does not fit in 30 minutes:
#RUN | regional_spp_sppt_shum_skeb | | fv3 |
#RUN | regional_spp_sppt_shum_skeb_decomp | | |
#RUN | regional_spp_sppt_shum_skeb_4threads | | |
# regional_spp_sppt_shum_skeb Cannot do a restart for this because it only does a 1 hr forecast
#RUN | regional_spp_sppt_shum_skeb_restart | | | regional_spp_sppt_shum_skeb


# FV3_HRRR succeeds in all non-debug cases.
RUN | hrrr_control | | fv3 |
RUN | hrrr_control_restart | | | hrrr_control
RUN | hrrr_control_decomp | | |
RUN | hrrr_control_2threads | | |


RUN | rrfs_conus13km_hrrr_warm | | fv3 |
# All alternative versions of rrfs_conus13km_hrrr_warm fail
RUN | rrfs_conus13km_hrrr_warm_restart | | | rrfs_conus13km_hrrr_warm
RUN | rrfs_conus13km_hrrr_warm_decomp | | |
RUN | rrfs_conus13km_hrrr_warm_2threads | | |


RUN | rrfs_conus13km_radar_tten_warm | | fv3 |
# All alternative versions of rrfs_conus13km_radar_tten_warm fail
RUN | rrfs_conus13km_radar_tten_warm_restart | | | rrfs_conus13km_radar_tten_warm
RUN | rrfs_conus13km_radar_tten_warm_decomp | | |
RUN | rrfs_conus13km_radar_tten_warm_2threads | | |


RUN | rrfs_smoke_conus13km_hrrr_warm | | fv3 |
# All alternative versions of rrfs_smoke_conus13km_hrrr_warm fail
RUN | rrfs_smoke_conus13km_hrrr_warm_restart | | | rrfs_smoke_conus13km_hrrr_warm
RUN | rrfs_smoke_conus13km_hrrr_warm_decomp | | |
RUN | rrfs_smoke_conus13km_hrrr_warm_2threads | | |


COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta -D32BIT=ON -DDEBUG=ON | | fv3 |

# The hrrr_control_debug succeeds:
RUN | hrrr_control_debug | | fv3 |

# These cannot create baselines because they crash:
RUN | rap_control_debug | | fv3 |
RUN | regional_spp_sppt_shum_skeb_debug | | fv3 |
RUN | rrfs_conus13km_hrrr_warm_debug | | fv3 |
RUN | rrfs_conus13km_radar_tten_warm_debug | | fv3 |
RUN | rrfs_smoke_conus13km_hrrr_warm_debug | | fv3 |
6 changes: 6 additions & 0 deletions tests/rt.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ RUN | regional_2threads
RUN | regional_netcdf_parallel | - wcoss2 | fv3 |
RUN | regional_3km | | fv3 |

COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON -DDEBUG=ON | | fv3 |
RUN | hrrr_control_debug | | fv3 |

COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON | | fv3 |

RUN | rap_control | | fv3 |
Expand All @@ -79,6 +82,9 @@ RUN | rap_sfcdiff
#RUN | rap_sfcdiff_decomp | | |
RUN | rap_sfcdiff_restart | | | rap_sfcdiff
RUN | hrrr_control | | fv3 |
RUN | hrrr_control_decomp | | |
RUN | hrrr_control_2threads | | |
RUN | hrrr_control_restart | | | hrrr_control
RUN | rrfs_v1beta | | fv3 |
RUN | rrfs_v1nssl | | fv3 |
RUN | rrfs_v1nssl_nohailnoccn | | 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 @@ -486,7 +486,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
TEST_35D=true
fi

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

0 comments on commit 7b0be42

Please sign in to comment.