Skip to content
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

Bug fixes to 3D diagnostic tendencies (based on #12) #16

Merged
merged 24 commits into from
Apr 22, 2020
Merged

Bug fixes to 3D diagnostic tendencies (based on #12) #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8ddbb9c
add qdiag3d support in FV3
SamuelTrahanNOAA Dec 27, 2019
3719ee3
Further bug fixes to tendency accumulation
SamuelTrahanNOAA Jan 3, 2020
36e4bb8
fix several bugs mentioned in code review
SamuelTrahanNOAA Jan 6, 2020
83c5a37
Move PBL tendencies into the PBL run subroutine.
SamuelTrahanNOAA Jan 14, 2020
7fa7a12
add ldiag3d and qdiag3d support to physics/module_MYNNPBL_wrapper.F90…
SamuelTrahanNOAA Jan 16, 2020
247e385
Point to sam's repo
SamuelTrahanNOAA Jan 16, 2020
201fd68
3d diagnostic tendency changes
SamuelTrahanNOAA Jan 28, 2020
54cf175
Correct tendency flag names, implement some more diagnostic tendencie…
SamuelTrahanNOAA Feb 6, 2020
17a5829
rt.sh: allow caller to specify PTMP and STMP. Add an "ANNIHILATE_EVE…
SamuelTrahanNOAA Feb 6, 2020
a42a50e
merge from gsd develop
SamuelTrahanNOAA Feb 7, 2020
cec4ff4
All gfs v15p2 and v16beta 3d diagnostic tendencies look reasonable; a…
SamuelTrahanNOAA Feb 13, 2020
618dd3c
Add timestep_init and timestep_final actions to CCPP. Update code so …
SamuelTrahanNOAA Mar 4, 2020
cf431dd
Remove debug prints and commented-out code.
SamuelTrahanNOAA Mar 4, 2020
1789ba2
Add total tendency calculations for gfsv15p2 and gsdv0. Calculate pbl…
SamuelTrahanNOAA Mar 12, 2020
5f86234
Add some #ifdef CCPP to avoid breaking non-CCPP runs. Add the regress…
SamuelTrahanNOAA Mar 17, 2020
61e32d1
merge gsd/develop
SamuelTrahanNOAA Apr 3, 2020
b3d6e3c
point to head of gsd/develop for FV3 and update regression test logs …
SamuelTrahanNOAA Apr 8, 2020
0bde787
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Apr 16, 2020
8d70150
Revert unnecessary changes to tests.rt.sh made in original PR
climbfuji Apr 16, 2020
0152415
Revert the update of the regression test logs on hera
climbfuji Apr 17, 2020
787cf33
Merge branch 'gsd/develop' of https://github.com/NOAA-GSD/ufs-weather…
climbfuji Apr 18, 2020
bbfa184
Add new regression test fv3_ccpp_gsd_diag3d_debug
climbfuji Apr 20, 2020
96c9183
Increase maximum number of diagnostic output fields for diag3d test
climbfuji Apr 21, 2020
8c65dcf
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Apr 22, 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
1 change: 0 additions & 1 deletion .gitmodules
View file
Open in desktop
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
Open in desktop
Submodule FV3 updated from 096347 to 537df5
4 changes: 3 additions & 1 deletion parm/ccpp_gsd.nml.IN
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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