Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/fv3_conf/ccpp_gsd_run.IN
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cp @[RTPWD]/FV3_input_data/*grb .
cp @[RTPWD]/FV3_input_data/*_table .

# Copy diag table file depending on LSM
if [ $LSM = 1 ]; then
if [ $LSM = 1 ] || [ $LSM = 2 ]; then
cp @[RTPWD]/FV3_input_data_gsd/diag_table_gsd_noah diag_table
elif [ $LSM = 3 ]; then
cp @[RTPWD]/FV3_input_data_gsd/diag_table_gsd_ruc diag_table
Expand Down
34 changes: 34 additions & 0 deletions tests/fv3_conf/ccpp_gsd_sar_v1_run.IN
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
rm -fr INPUT RESTART
mkdir INPUT RESTART
cp -r /scratch1/BMC/gmtb/ufs-weather-model/RT/NEMSfv3gfs/FV3_input_data_temporary_gsd_sar/*.nc INPUT/

cp @[RTPWD]/FV3_input_data/INPUT/aerosol.dat .
cp @[RTPWD]/FV3_input_data/INPUT/co2historicaldata_201*.txt .
cp @[RTPWD]/FV3_input_data/INPUT/sfc_emissivity_idx.txt .
cp @[RTPWD]/FV3_input_data/INPUT/solarconstant_noaa_an.txt .
cp @[RTPWD]/FV3_input_data/ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77 ./global_o3prdlos.f77
cp @[RTPWD]/FV3_input_data/global_h2o_pltc.f77 ./global_h2oprdlos.f77
cp @[RTPWD]/FV3_input_data/*grb .
cp @[RTPWD]/FV3_input_data/*_table .

# Copy SAR diag and field table files
cp @[RTPWD]/FV3_input_data_gsd/diag_table_gsd_noah diag_table
cp /scratch1/BMC/gmtb/ufs-weather-model/RT/NEMSfv3gfs/FV3_input_data_temporary_gsd_sar/field_table_gsd_sar field_table

cp @[RTPWD]/FV3_input_data/*configure .

# Thompson MP lookup tables - copy standard and SIONlib tables of precomputed tables
cp @[RTPWD]/FV3_input_data_gsd/thompson_tables_precomp.sl .
cp @[RTPWD]/FV3_input_data_gsd/qr_acr_qs.dat .
cp @[RTPWD]/FV3_input_data_gsd/qr_acr_qg.dat .
cp @[RTPWD]/FV3_input_data_gsd/freezeH2O.dat .
cp @[RTPWD]/FV3_input_data_gsd/CCN_ACTIVATE.BIN .

cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml

# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH, append to module-setup.sh
echo " " >> module-setup.sh
echo "# Add path to libccpp.so and libccpphys.so to LD_LIBRARY_PATH"
echo "export LD_LIBRARY_PATH=${PATHRT}/../FV3/${CCPP_LIB_DIR}:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" >> module-setup.sh
echo " " >> module-setup.sh

8 changes: 5 additions & 3 deletions tests/rt_ccpp_gsd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@
# CCPP STATIC tests #
#############################################################################################################################################################################
# Compile with CCPP - static mode
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | hera.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | cheyenne.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah | standard | cheyenne.gnu | fv3 |
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah,FV3_GSD_SAR_v1,FV3_RRFS_v0 | standard | hera.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah,FV3_GSD_SAR_v1,FV3_RRFS_v0 | standard | cheyenne.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson_mynn,FV3_GFS_v15_gf_thompson,FV3_GSD_v0,FV3_GSD_noah,FV3_GSD_SAR_v1,FV3_RRFS_v0 | standard | cheyenne.gnu | fv3 |
# Run tests
RUN | fv3_ccpp_thompson_mynn | standard | | fv3 |
RUN | fv3_ccpp_gf_thompson | standard | | fv3 |
RUN | fv3_ccpp_gsd | standard | | fv3 |
RUN | fv3_ccpp_gsd_coldstart | standard | | |
RUN | fv3_ccpp_gsd_warmstart | standard | | |
RUN | fv3_ccpp_gsd_noah | standard | | fv3 |
RUN | fv3_ccpp_rrfs_v0 | standard | | fv3 |
RUN | fv3_ccpp_gsd_sar_v1 | standard | | fv3 |
# Compile with CCPP - static mode
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR| standard | hera.intel | fv3 |
COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_v15_thompson,FV3_GFS_v15_gf,FV3_GFS_v15_mynn,FV3_GSD_v0_drag_suite,FV3_GSD_SAR| standard | cheyenne.intel | fv3 |
Expand Down
37 changes: 37 additions & 0 deletions tests/tests/fv3_ccpp_gsd_sar_v1
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
###############################################################################
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we are adding a new test fv3_ccpp_gsd_sar_v1, then we will also want to run it as part of rt_ccpp_gsd.conf, or?

#
# FV3 CCPP GSD SAR (GF CU + Thompson MP + MYNN PBL + RUC LSM) test
#
###############################################################################

export TEST_DESCR="Compare FV3 CCPP GSD SAR v1 results with previous trunk version"

export CNTL_DIR=fv3_gsd_sar_v1

export LIST_FILES="atmos_4xdaily.nc \
dynf000.nc \
dynf003.nc \
phyf000.nc \
phyf003.nc \
RESTART/coupler.res \
RESTART/fv_core.res.nc \
RESTART/fv_core.res.tile1.nc \
RESTART/fv_srf_wnd.res.tile1.nc \
RESTART/fv_tracer.res.tile1.nc \
RESTART/phy_data.nc \
RESTART/sfc_data.nc"

export_fv3
export TASKS=840
export NODES=$(expr $TASKS / $TPN + 1)

export MODEL_CONFIGURE=ccpp_gsd_sar-model_configure.IN
export FV3_RUN=ccpp_gsd_sar_v1_run.IN
export CCPP_SUITE=FV3_GSD_SAR_v1
export CCPP_LIB_DIR=ccpp/lib
export INPUT_NML=ccpp_gsd_sar_v1.nml.IN

RUN_SCRIPT=rt_fv3.sh

export WLCLK=30

127 changes: 127 additions & 0 deletions tests/tests/fv3_ccpp_rrfs_v0
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
###############################################################################
#
# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + NOAH LSM) test
#
###############################################################################

export TEST_DESCR="Compare FV3 CCPP RRFS_v0 results with previous trunk version"

export CNTL_DIR=fv3_gsd_rrfs_v0

export LIST_FILES="atmos_4xdaily.tile1.nc \
atmos_4xdaily.tile2.nc \
atmos_4xdaily.tile3.nc \
atmos_4xdaily.tile4.nc \
atmos_4xdaily.tile5.nc \
atmos_4xdaily.tile6.nc \
phyf000.tile1.nc \
phyf000.tile2.nc \
phyf000.tile3.nc \
phyf000.tile4.nc \
phyf000.tile5.nc \
phyf000.tile6.nc \
phyf024.tile1.nc \
phyf024.tile2.nc \
phyf024.tile3.nc \
phyf024.tile4.nc \
phyf024.tile5.nc \
phyf024.tile6.nc \
phyf027.tile1.nc \
phyf027.tile2.nc \
phyf027.tile3.nc \
phyf027.tile4.nc \
phyf027.tile5.nc \
phyf027.tile6.nc \
phyf048.tile1.nc \
phyf048.tile2.nc \
phyf048.tile3.nc \
phyf048.tile4.nc \
phyf048.tile5.nc \
phyf048.tile6.nc \
dynf000.tile1.nc \
dynf000.tile2.nc \
dynf000.tile3.nc \
dynf000.tile4.nc \
dynf000.tile5.nc \
dynf000.tile6.nc \
dynf024.tile1.nc \
dynf024.tile2.nc \
dynf024.tile3.nc \
dynf024.tile4.nc \
dynf024.tile5.nc \
dynf024.tile6.nc \
dynf027.tile1.nc \
dynf027.tile2.nc \
dynf027.tile3.nc \
dynf027.tile4.nc \
dynf027.tile5.nc \
dynf027.tile6.nc \
dynf048.tile1.nc \
dynf048.tile2.nc \
dynf048.tile3.nc \
dynf048.tile4.nc \
dynf048.tile5.nc \
dynf048.tile6.nc \
RESTART/coupler.res \
RESTART/fv_core.res.nc \
RESTART/fv_core.res.tile1.nc \
RESTART/fv_core.res.tile2.nc \
RESTART/fv_core.res.tile3.nc \
RESTART/fv_core.res.tile4.nc \
RESTART/fv_core.res.tile5.nc \
RESTART/fv_core.res.tile6.nc \
RESTART/fv_srf_wnd.res.tile1.nc \
RESTART/fv_srf_wnd.res.tile2.nc \
RESTART/fv_srf_wnd.res.tile3.nc \
RESTART/fv_srf_wnd.res.tile4.nc \
RESTART/fv_srf_wnd.res.tile5.nc \
RESTART/fv_srf_wnd.res.tile6.nc \
RESTART/fv_tracer.res.tile1.nc \
RESTART/fv_tracer.res.tile2.nc \
RESTART/fv_tracer.res.tile3.nc \
RESTART/fv_tracer.res.tile4.nc \
RESTART/fv_tracer.res.tile5.nc \
RESTART/fv_tracer.res.tile6.nc \
RESTART/phy_data.tile1.nc \
RESTART/phy_data.tile2.nc \
RESTART/phy_data.tile3.nc \
RESTART/phy_data.tile4.nc \
RESTART/phy_data.tile5.nc \
RESTART/phy_data.tile6.nc \
RESTART/sfc_data.tile1.nc \
RESTART/sfc_data.tile2.nc \
RESTART/sfc_data.tile3.nc \
RESTART/sfc_data.tile4.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc"

export_fv3
export NODES=$(expr $TASKS / $TPN + 1)

export FHMAX=48
export FDIAG=3

export DT_ATMOS="600"
export IMP_PHYSICS=8
export DNATS=0
export DO_SAT_ADJ=.F.
export LRADAR=.T.
export LTAEROSOL=.T.

export FV3_RUN=ccpp_gsd_run.IN
export CCPP_SUITE=FV3_RRFS_v0
export CCPP_LIB_DIR=ccpp/lib
export INPUT_NML=ccpp_gsd.nml.IN

export HYBEDMF=.F.
export DO_MYNNEDMF=.T.
export IMFSHALCNV=3
export IMFDEEPCNV=3
export FHCYC=0
export LSM=2
export LSOIL_LSM=4

RUN_SCRIPT=rt_fv3.sh

export WLCLK=30