Skip to content

Commit

Permalink
Merge pull request #16 from climbfuji/tendencies_sam_with_dom_mods
Browse files Browse the repository at this point in the history 
Bug fixes to 3D diagnostic tendencies (based on #12)
  • Loading branch information
@DomHeinzeller
DomHeinzeller authored Apr 22, 2020
2 parents fea9986 + 8c65dcf commit 4bca724
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 4 deletions.
1 change: 0 additions & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@
[submodule "stochastic_physics"]
path = stochastic_physics
url = https://github.com/noaa-psd/stochastic_physics

2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated from 096347 to 537df5
4 changes: 3 additions & 1 deletion parm/ccpp_gsd.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

&diag_manager_nml
prepend_date = .F.
max_output_fields = @[MAX_OUTPUT_FIELDS]
/

&fms_io_nml
Expand Down Expand Up @@ -117,7 +118,8 @@
&gfs_physics_nml
fhzero = 6.
h2o_phys = .true.
ldiag3d = .false.
ldiag3d = @[LDIAG3D]
qdiag3d = @[QDIAG3D]
fhcyc = @[FHCYC]
nst_anl = .true.
use_ufo = .true.
Expand Down
3 changes: 3 additions & 0 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,9 @@ export SHOUR=00
export FHMAX=${FHMAX:-`expr $DAYS \* 24`}
export DT_ATMOS=1800
export FHCYC=24
export LDIAG3D=.F.
export QDIAG3D=.F.
export MAX_OUTPUT_FIELDS=300

# Stochastic physics
export DO_SPPT=.F.
Expand Down
6 changes: 5 additions & 1 deletion tests/fv3_conf/ccpp_gsd_run.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ cp @[RTPWD]/FV3_input_data/*_table .
if [ $LSM = 1 ]; 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
if [ $LDIAG3D = .T. ] && [ $QDIAG3D = .T. ]; then
cp /scratch1/BMC/gmtb/ufs-weather-model/RT/NEMSfv3gfs/FV3_input_data_temporary_gsd_diag3d/diag_table_gsd_ruc_diag3d diag_table
else
cp @[RTPWD]/FV3_input_data_gsd/diag_table_gsd_ruc diag_table
fi
fi

# Copy field table, depending on microphysics choice and whether MYNN/SATMEDMF is used
Expand Down
1 change: 1 addition & 0 deletions tests/rt_ccpp_gsd.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_n
COMPILE | CCPP=Y DEBUG=Y STATIC=Y SUITES=FV3_GSD_v0,FV3_GSD_v0_mynnsfc,FV3_GSD_noah_mynnsfc,FV3_GFS_v15_thompson | standard | cheyenne.gnu | fv3 |
# Run tests
RUN | fv3_ccpp_gsd_debug | standard | | fv3 |
RUN | fv3_ccpp_gsd_diag3d_debug | standard | | fv3 |
RUN | fv3_ccpp_gsd_mynnsfc_debug | standard | | fv3 |
RUN | fv3_ccpp_gsd_noah_mynnsfc_debug | standard | | fv3 |
# Non-aerosol field_table staged only on hera for the moment
Expand Down
107 changes: 107 additions & 0 deletions tests/tests/fv3_ccpp_gsd_diag3d_debug
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
###############################################################################
#
# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + RUC LSM) test with 3d tendencies in DEBUG mode
#
###############################################################################

export TEST_DESCR="Compare FV3 CCPP GSD 3d tendencies debug results with previous trunk version"

export CNTL_DIR=fv3_gsd_diag3d_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 LDIAG3D=.T.
export QDIAG3D=.T.
export MAX_OUTPUT_FIELDS=400

export FV3_RUN=ccpp_gsd_run.IN
export CCPP_SUITE=FV3_GSD_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=3
export LSOIL_LSM=9

RUN_SCRIPT=rt_fv3.sh

export WLCLK=30

0 comments on commit 4bca724

Please sign in to comment.