Skip to content

Adding regression test for FV3_RRFS_v0 from @panll (#43) with submodule updates #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
climbfuji merged 11 commits into from
Jun 7, 2020
Merged

Adding regression test for FV3_RRFS_v0 from @panll (#43) with submodule updates #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6780bd2
Merge pull request #2 from NCAR/dtc/develop
panll Apr 21, 2020
2ecf837
adding regression test for suite FV3_GSD_SAR_v1
linlin-pan Apr 21, 2020
64cb641
adding regression test option for suite FV3_GSD_SAR_v1
linlin-pan Apr 21, 2020
fa234c2
adding one test for suite RRFS_v0 for SRWeather release
linlin-pan May 19, 2020
290d1ec
update rrfs_v0 test using ccpp_gsd_run.IN
linlin-pan Jun 2, 2020
14027b7
including test for GSD_SAR_v1
linlin-pan Jun 4, 2020
074d0b8
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Jun 5, 2020
9ffc108
Remove legacy regression test config rt_ipd_prod_only.conf
climbfuji Jun 5, 2020
3328673
tests/rt_ccpp_gsd.conf: turn off dynamic CCPP tests
climbfuji Jun 5, 2020
87dae30
Update .gitmodules and submodule pointer again for fv3atm for code re…
climbfuji Jun 6, 2020
8d135f8
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Jun 7, 2020
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 FV3
Open in desktop
Submodule FV3 updated 3 files
+80 −0 ccpp/suites/suite_FV3_GSD_SAR_v1.xml
+81 −0 ccpp/suites/suite_FV3_RRFS_v0.xml
+3 −3 gfsphysics/GFS_layer/GFS_typedefs.F90
2 changes: 1 addition & 1 deletion tests/fv3_conf/ccpp_gsd_run.IN
View file
Open in desktop
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
View file
Open in desktop
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

58 changes: 30 additions & 28 deletions tests/rt_ccpp_gsd.conf
View file
Open in desktop
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 All @@ -35,28 +37,28 @@ COMPILE | 32BIT=Y CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_SAR
# Run tests
RUN | fv3_ccpp_gsd_sar_25km_debug | standard | | fv3 |

#############################################################################################################################################################################
# CCPP DYNAMIC tests #
#############################################################################################################################################################################
# Compile with CCPP - dynamic mode
COMPILE | CCPP=Y REPRO=Y | standard | hera.intel | |
COMPILE | CCPP=Y REPRO=Y | standard | cheyenne.intel | |
COMPILE | CCPP=Y REPRO=Y | standard | cheyenne.gnu | |
# Run tests
RUN | fv3_ccpp_thompson_mynn | standard | | |
RUN | fv3_ccpp_gf_thompson | standard | | |
RUN | fv3_ccpp_gsd | standard | | |
RUN | fv3_ccpp_gsd_coldstart | standard | | |
RUN | fv3_ccpp_gsd_warmstart | standard | | |
RUN | fv3_ccpp_gsd_noah | standard | | |
RUN | fv3_ccpp_thompson | standard | | |
RUN | fv3_ccpp_gf | standard | | |
RUN | fv3_ccpp_mynn | standard | | |
RUN | fv3_ccpp_gsd_drag_suite | standard | | |
RUN | fv3_ccpp_gsd_sar | standard | | |
# Do not run debug tests in dynamic mode, these time out because of excessive log statements
## Compile with CCPP - dynamic mode, debug
#COMPILE | CCPP=Y DEBUG=Y | standard | hera.intel | fv3 |
#COMPILE | CCPP=Y DEBUG=Y | standard | cheyenne.intel | fv3 |
#COMPILE | CCPP=Y DEBUG=Y | standard | cheyenne.gnu | fv3 |
#RUN | fv3_ccpp_gsd_debug | standard | | |
# #############################################################################################################################################################################
# # CCPP DYNAMIC tests #
# #############################################################################################################################################################################
# # Compile with CCPP - dynamic mode
# COMPILE | CCPP=Y REPRO=Y | standard | hera.intel | |
# COMPILE | CCPP=Y REPRO=Y | standard | cheyenne.intel | |
# COMPILE | CCPP=Y REPRO=Y | standard | cheyenne.gnu | |
# # Run tests
# RUN | fv3_ccpp_thompson_mynn | standard | | |
# RUN | fv3_ccpp_gf_thompson | standard | | |
# RUN | fv3_ccpp_gsd | standard | | |
# RUN | fv3_ccpp_gsd_coldstart | standard | | |
# RUN | fv3_ccpp_gsd_warmstart | standard | | |
# RUN | fv3_ccpp_gsd_noah | standard | | |
# RUN | fv3_ccpp_thompson | standard | | |
# RUN | fv3_ccpp_gf | standard | | |
# RUN | fv3_ccpp_mynn | standard | | |
# RUN | fv3_ccpp_gsd_drag_suite | standard | | |
# RUN | fv3_ccpp_gsd_sar | standard | | |
# # Do not run debug tests in dynamic mode, these time out because of excessive log statements
# ## Compile with CCPP - dynamic mode, debug
# #COMPILE | CCPP=Y DEBUG=Y | standard | hera.intel | fv3 |
# #COMPILE | CCPP=Y DEBUG=Y | standard | cheyenne.intel | fv3 |
# #COMPILE | CCPP=Y DEBUG=Y | standard | cheyenne.gnu | fv3 |
# #RUN | fv3_ccpp_gsd_debug | standard | | |
Loading