Skip to content

Commit

Permalink
Turn of IPD stochy test, turn off IPD Thompson test, add GSD debug te…
Browse files Browse the repository at this point in the history 
…st, add Thompson/Thompson-no-aerosol prod and debug test
  • Loading branch information
@climbfuji
climbfuji committed Mar 12, 2020
1 parent def339f commit 6f9002b
Show file tree
Hide file tree
Showing 7 changed files with 324 additions and 14 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 1 files
+4 −2 .gitmodules
15 changes: 12 additions & 3 deletions tests/fv3_conf/ccpp_gsd_run.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,19 @@ fi

# Copy field table, depending on microphysics choice and whether MYNN/SATMEDMF is used
if [ $IMP_PHYSICS = 8 ]; then
if [ $DO_MYNNEDMF = .T. ] || [ $SATMEDMF = .T. ]; then
cp @[RTPWD]/FV3_input_data_gsd/field_table_gsd field_table
if [ $LTAEROSOL = .T. ]; then
if [ $DO_MYNNEDMF = .T. ] || [ $SATMEDMF = .T. ]; then
cp @[RTPWD]/FV3_input_data_gsd/field_table_gsd field_table
else
cp @[RTPWD]/FV3_input_data_gsd/field_table_gf_thompson field_table
fi
else
cp @[RTPWD]/FV3_input_data_gsd/field_table_gf_thompson field_table
if [ $DO_MYNNEDMF = .T. ] || [ $SATMEDMF = .T. ]; then
echo "ERROR, no field table configured for Thompson MP without aerosols but with MYNN or SATMEDMF (need TKE)"
exit 1
else
cp @[RTPWD]/FV3_input_data_gsd/field_table_thompson_noaero field_table
fi
fi
elif [ $IMP_PHYSICS = 11 ]; then
if [ $DO_MYNNEDMF = .T. ] || [ $SATMEDMF = .T. ]; then
Expand Down
28 changes: 20 additions & 8 deletions tests/rt.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN | fv3_read_inc
RUN | fv3_gfdlmp | standard | | fv3 |
RUN | fv3_gfdlmprad_gwd | standard | | fv3 |
RUN | fv3_gfdlmprad_noahmp | standard | | fv3 |
RUN | fv3_thompson | standard | | fv3 |
#RUN | fv3_thompson | standard | | fv3 |
RUN | fv3_wsm6 | standard | | fv3 |
RUN | fv3_wrtGauss_netcdf_esmf | standard | | fv3 |
RUN | fv3_wrtGauss_netcdf | standard | | fv3 |
Expand Down Expand Up @@ -99,7 +99,7 @@ RUN | fv3_wrtGauss_netcdf_esmf
RUN | fv3_wrtGauss_netcdf | standard | | fv3 |
RUN | fv3_wrtGauss_nemsio | standard | | fv3 |
RUN | fv3_wrtGauss_nemsio_c192 | standard | | fv3 |
RUN | fv3_stochy | standard | | fv3 |
#RUN | fv3_stochy | standard | | fv3 |
RUN | fv3_iau | standard | | fv3 |
RUN | fv3_gfdlmp | standard | | fv3 |
RUN | fv3_gfdlmprad_gwd | standard | | fv3 |
Expand Down Expand Up @@ -171,7 +171,7 @@ RUN | fv3_ccpp_wrtGauss_netcdf_esmf
RUN | fv3_ccpp_wrtGauss_netcdf | standard | | |
RUN | fv3_ccpp_wrtGauss_nemsio | standard | | |
RUN | fv3_ccpp_wrtGauss_nemsio_c192 | standard | | |
RUN | fv3_ccpp_stochy | standard | | |
RUN | fv3_ccpp_stochy | standard | | fv3s |
RUN | fv3_ccpp_iau | standard | | |

COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp WW3=Y | standard | wcoss_cray | |
Expand Down Expand Up @@ -355,18 +355,20 @@ COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_csawmgshoc,FV3_GFS_2017_csawmg,FV3
RUN | fv3_ccpp_csawmg | standard | | fv3 |
RUN | fv3_ccpp_satmedmf | standard | | fv3 |

COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | wcoss_cray | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | wcoss_dell_p3 | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | hera.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | gaea.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0 32BIT=Y | standard | jet.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v15_thompson 32BIT=Y | standard | wcoss_cray | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v15_thompson 32BIT=Y | standard | wcoss_dell_p3 | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v15_thompson 32BIT=Y | standard | hera.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v15_thompson 32BIT=Y | standard | gaea.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_2017_gfdlmp,FV3_CPT_v0,FV3_GSD_v0,FV3_GFS_v15_thompson 32BIT=Y | standard | jet.intel | fv3 |

RUN | fv3_ccpp_gfdlmp_32bit | standard | | fv3 |
RUN | fv3_ccpp_gfdlmprad_32bit_post | standard | wcoss_cray | fv3 |
RUN | fv3_ccpp_gfdlmprad_32bit_post | standard | wcoss_dell_p3 | fv3 |
RUN | fv3_ccpp_gfdlmprad_32bit_post | standard | hera.intel | fv3 |
RUN | fv3_ccpp_cpt | standard | | fv3 |
RUN | fv3_ccpp_gsd | standard | | fv3 |
RUN | fv3_ccpp_thompson | standard | | fv3 |
RUN | fv3_ccpp_thompson_no_aero | standard | | fv3 |

#######################################################################################################################################################################################
# CCPP PROD tests #
Expand All @@ -386,6 +388,16 @@ COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta DEBUG=Y
RUN | fv3_ccpp_gfs_v15p2_debug | standard | hera.intel | fv3 |
RUN | fv3_ccpp_gfs_v16beta_debug | standard | hera.intel | fv3 |

COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson 32BIT=Y DEBUG=Y | standard | wcoss_cray | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson 32BIT=Y DEBUG=Y | standard | wcoss_dell_p3 | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson 32BIT=Y DEBUG=Y | standard | hera.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson 32BIT=Y DEBUG=Y | standard | gaea.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GFS_v15_thompson 32BIT=Y DEBUG=Y | standard | jet.intel | fv3 |

RUN | fv3_ccpp_gsd_debug | standard | | fv3 |
RUN | fv3_ccpp_thompson_debug | standard | | fv3 |
RUN | fv3_ccpp_thompson_no_aero_debug | standard | | fv3 |

#######################################################################################################################################################################################
# CCPP REPRO tests #
#######################################################################################################################################################################################
Expand Down
3 changes: 1 addition & 2 deletions tests/rt_ccpp_dtc.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ RUN | fv3_wsm6
RUN | fv3_gfdlmp | standard | | fv3 |
RUN | fv3_gfdlmprad_gwd | standard | | fv3 |
RUN | fv3_gfdlmprad_noahmp | standard | | fv3 |
RUN | fv3_stochy | standard | | fv3 |
RUN | fv3_satmedmf | standard | | fv3 |
RUN | fv3_satmedmfq | standard | | fv3 |
RUN | fv3_lheatstrg | standard | | fv3 |
Expand Down Expand Up @@ -89,7 +88,7 @@ COMPILE | CCPP=Y REPRO=Y STATIC=Y SUITES=FV3_GFS_2017,FV3_GFS_2017_satmedmf,FV3_
RUN | fv3_ccpp_control | standard | | |
RUN | fv3_ccpp_decomp | standard | | |
RUN | fv3_ccpp_2threads | standard | | |
RUN | fv3_ccpp_stochy | standard | | |
RUN | fv3_ccpp_stochy | standard | | fv3 |
RUN | fv3_ccpp_lheatstrg | standard | | |
RUN | fv3_ccpp_satmedmf | standard | | |
RUN | fv3_ccpp_satmedmfq | standard | | |
Expand Down
97 changes: 97 additions & 0 deletions tests/tests/fv3_ccpp_thompson_debug
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
###############################################################################
#
# FV3 CCPP Thompson MP debug test
#
###############################################################################

export TEST_DESCR="Compare FV3 CCPP Thompson MP debug results with previous trunk version"

export CNTL_DIR=fv3_thompson_debug

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 \
phyf006.tile1.nc \
phyf006.tile2.nc \
phyf006.tile3.nc \
phyf006.tile4.nc \
phyf006.tile5.nc \
phyf006.tile6.nc \
dynf000.tile1.nc \
dynf000.tile2.nc \
dynf000.tile3.nc \
dynf000.tile4.nc \
dynf000.tile5.nc \
dynf000.tile6.nc \
dynf006.tile1.nc \
dynf006.tile2.nc \
dynf006.tile3.nc \
dynf006.tile4.nc \
dynf006.tile5.nc \
dynf006.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=6
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_GFS_v15_thompson
export CCPP_LIB_DIR=ccpp/lib
export INPUT_NML=ccpp_gsd.nml.IN

export HYBEDMF=.T.
export DO_MYNNEDMF=.F.
export IMFSHALCNV=2
export IMFDEEPCNV=2

RUN_SCRIPT=rt_fv3.sh
Loading

0 comments on commit 6f9002b

Please sign in to comment.