Skip to content

Commit

Permalink
Merge pull request ufs-community#1 from grantfirl/mynn_01March_gjf
Browse files Browse the repository at this point in the history 
add control_p8_mynn test
  • Loading branch information
@joeolson42
joeolson42 authored Mar 21, 2023
2 parents a36fd03 + 4af6f97 commit c0063e4
Show file tree
Hide file tree
Showing 28 changed files with 5,214 additions and 5,079 deletions.
2 changes: 1 addition & 1 deletion AQM
Submodule AQM updated 3 files
+2 −2 aqm_files.cmake
+0 −894 src/model/src/aero_depv.F
+25 −33 src/model/src/vdiffacmx.F
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 4 files
+13 −0 ccpp/data/GFS_typedefs.F90
+26 −5 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/framework
+1 −1 ccpp/physics
1,256 changes: 634 additions & 622 deletions tests/RegressionTests_acorn.intel.log
View file

Large diffs are not rendered by default.

422 changes: 211 additions & 211 deletions tests/RegressionTests_cheyenne.gnu.log
View file

Large diffs are not rendered by default.

1,904 changes: 915 additions & 989 deletions tests/RegressionTests_cheyenne.intel.log
View file

Large diffs are not rendered by default.

1,122 changes: 559 additions & 563 deletions tests/RegressionTests_gaea.intel.log
View file

Large diffs are not rendered by default.

416 changes: 208 additions & 208 deletions tests/RegressionTests_hera.gnu.log
View file

Large diffs are not rendered by default.

1,326 changes: 663 additions & 663 deletions tests/RegressionTests_hera.intel.log
View file

Large diffs are not rendered by default.

1,202 changes: 601 additions & 601 deletions tests/RegressionTests_jet.intel.log
View file

Large diffs are not rendered by default.

1,330 changes: 665 additions & 665 deletions tests/RegressionTests_orion.intel.log
View file

Large diffs are not rendered by default.

1,090 changes: 545 additions & 545 deletions tests/RegressionTests_wcoss2.intel.log
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,7 @@ export DNATS=2
export IMP_PHYSICS=8
export LGFDLMPRAD=.false.
export DO_SAT_ADJ=.false.
export SATMEDMF=.true.

# P7 default mushy thermo
export KTHERM=2
Expand Down
2 changes: 1 addition & 1 deletion tests/parm/aqm/aqm.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ csqy_data: CSQY_DATA_cb6r3_ae6_aq
optics_data: PHOT_OPTICS.dat
omi_data: omi_cmaq_2015_361X179.dat

init_concentrations: true
init_concentrations: false

run_aerosol: true

Expand Down
6 changes: 3 additions & 3 deletions tests/parm/cpld_control.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ deflate_level=1
oz_phys = .false.
oz_phys_2015 = .true.
lsoil_lsm = 4
do_mynnedmf = .false.
do_mynnedmf = @[DO_MYNNEDMF]
do_mynnsfclay = .false.
icloud_bl = 1
bl_mynn_edmf = 1
Expand Down Expand Up @@ -163,12 +163,12 @@ deflate_level=1
lwhtr = .true.
swhtr = .true.
cnvgwd = .true.
shal_cnv = .true.
shal_cnv = @[SHAL_CNV]
cal_pre = .false.
redrag = .true.
dspheat = .true.
hybedmf = .false.
satmedmf = .true.
satmedmf = @[SATMEDMF]
isatmedmf = 1
lheatstrg = @[LHEATSTRG]
lseaspray = @[LSEASPRAY]
Expand Down
11 changes: 6 additions & 5 deletions tests/rt.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ RUN | cpld_warmstart_c48
RUN | cpld_restart_c48 | | | cpld_warmstart_c48

COMPILE | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8,FV3_GFS_cpld_rasmgshocnsstnoahmp_ugwp -DFASTER=ON | | fv3 |
RUN | cpld_control_p8_faster | | fv3 |
RUN | cpld_control_p8_faster | - cheyenne.intel | fv3 |

###################################################################################################################################################################################
# ATM tests #
###################################################################################################################################################################################

COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0 -D32BIT=ON | | fv3 |
COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0,FV3_GFS_v17_p8_mynn -D32BIT=ON | | fv3 |
RUN | control_CubedSphereGrid | | fv3 |
RUN | control_CubedSphereGrid_parallel | - wcoss2.intel acorn.intel | fv3 |
RUN | control_latlon | | fv3 |
Expand All @@ -68,6 +68,7 @@ RUN | control_decomp_p8
RUN | control_2threads_p8 | | |

RUN | control_p8_rrtmgp | | fv3 |
RUN | control_p8_mynn | | fv3 |

RUN | merra2_thompson | | fv3 |

Expand Down Expand Up @@ -282,10 +283,10 @@ RUN | atmaero_control_p8_rad_micro
# ATM-CMAQ tests
###################################################################################################################################################################################

COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 | | fv3 |
COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -D32BIT=ON | | fv3 |
RUN | regional_atmaq | | fv3 |
COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DDEBUG=ON | | fv3 |
COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DDEBUG=ON -D32BIT=ON | | fv3 |
RUN | regional_atmaq_debug | - jet.intel gaea.intel cheyenne.intel | fv3 |

COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DFASTER=ON | | fv3 |
COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DFASTER=ON -D32BIT=ON | | fv3 |
RUN | regional_atmaq_faster | | fv3 |
2 changes: 1 addition & 1 deletion tests/rt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
fi


BL_DATE=20230308
BL_DATE=20230320

RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}

Expand Down
2 changes: 2 additions & 0 deletions tests/tests/atmaero_control_p8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.

if [[ $MACHINE_ID = cheyenne.* ]]; then
TPN=18
fi
2 changes: 2 additions & 0 deletions tests/tests/atmaero_control_p8_rad
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.

if [[ $MACHINE_ID = cheyenne.* ]]; then
TPN=18
fi
2 changes: 2 additions & 0 deletions tests/tests/control_2threads_p8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,3 +166,5 @@ export DO_RRTMGP=.false.
export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.
2 changes: 2 additions & 0 deletions tests/tests/control_debug_p8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.

if [[ $MACHINE_ID = cheyenne.* ]]; then
TPN=18
fi
2 changes: 2 additions & 0 deletions tests/tests/control_decomp_p8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.

if [[ $MACHINE_ID = cheyenne.* ]]; then
TPN=18
fi
2 changes: 2 additions & 0 deletions tests/tests/control_p8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.

if [[ $MACHINE_ID = cheyenne.* ]]; then
TPN=18
fi
2 changes: 2 additions & 0 deletions tests/tests/control_p8_atmlnd_sbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.

if [[ $MACHINE_ID = cheyenne.* ]]; then
TPN=18
fi
Expand Down
2 changes: 2 additions & 0 deletions tests/tests/control_p8_faster
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.

if [[ $MACHINE_ID = cheyenne.* ]]; then
TPN=18
fi
2 changes: 2 additions & 0 deletions tests/tests/control_p8_lndp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.

if [[ $MACHINE_ID = cheyenne.* ]]; then
TPN=18
fi
177 changes: 177 additions & 0 deletions tests/tests/control_p8_mynn
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
###############################################################################
#
# Global control test GFSv16 atmosphere only at C96L127, P8 + MYNN configuration
#
###############################################################################

export TEST_DESCR="Compare global control results with previous trunk version"

export CNTL_DIR=control_p8_mynn

export LIST_FILES="sfcf000.nc \
sfcf021.nc \
sfcf024.nc \
atmf000.nc \
atmf021.nc \
atmf024.nc \
GFSFLX.GrbF00 \
GFSFLX.GrbF21 \
GFSFLX.GrbF24 \
GFSPRS.GrbF00 \
GFSPRS.GrbF21 \
GFSPRS.GrbF24 \
RESTART/20210323.060000.coupler.res \
RESTART/20210323.060000.fv_core.res.nc \
RESTART/20210323.060000.fv_core.res.tile1.nc \
RESTART/20210323.060000.fv_core.res.tile2.nc \
RESTART/20210323.060000.fv_core.res.tile3.nc \
RESTART/20210323.060000.fv_core.res.tile4.nc \
RESTART/20210323.060000.fv_core.res.tile5.nc \
RESTART/20210323.060000.fv_core.res.tile6.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile1.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile2.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile3.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile4.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile5.nc \
RESTART/20210323.060000.fv_srf_wnd.res.tile6.nc \
RESTART/20210323.060000.fv_tracer.res.tile1.nc \
RESTART/20210323.060000.fv_tracer.res.tile2.nc \
RESTART/20210323.060000.fv_tracer.res.tile3.nc \
RESTART/20210323.060000.fv_tracer.res.tile4.nc \
RESTART/20210323.060000.fv_tracer.res.tile5.nc \
RESTART/20210323.060000.fv_tracer.res.tile6.nc \
RESTART/20210323.060000.phy_data.tile1.nc \
RESTART/20210323.060000.phy_data.tile2.nc \
RESTART/20210323.060000.phy_data.tile3.nc \
RESTART/20210323.060000.phy_data.tile4.nc \
RESTART/20210323.060000.phy_data.tile5.nc \
RESTART/20210323.060000.phy_data.tile6.nc \
RESTART/20210323.060000.sfc_data.tile1.nc \
RESTART/20210323.060000.sfc_data.tile2.nc \
RESTART/20210323.060000.sfc_data.tile3.nc \
RESTART/20210323.060000.sfc_data.tile4.nc \
RESTART/20210323.060000.sfc_data.tile5.nc \
RESTART/20210323.060000.sfc_data.tile6.nc"

export_fv3
export NPZ=127
export NPZP=128
export DT_ATMOS=720
export DT_INNER=${DT_ATMOS}
export SYEAR=2021
export SMONTH=03
export SDAY=22
export SHOUR=06
export RESTART_INTERVAL="12 -1"
export OUTPUT_GRID='gaussian_grid'
export WRITE_DOPOST=.true.
export OUTPUT_FH='0 21 24'

# P7 default
export IALB=2
export IEMS=2
export LSM=2
export IOPT_DVEG=4
export IOPT_CRS=2
export IOPT_RAD=3
export IOPT_ALB=1
export IOPT_STC=3
# P8
export IOPT_SFC=3
export IOPT_TRS=2

# FV3 P7 settings
export D2_BG_K1=0.20
export D2_BG_K2=0.04
export PSM_BC=1
# P8
export DDDMP=0.1

# P7 Merra2 Aerosols & NSST
export USE_MERRA2=.true.
export IAER=1011
export NSTF_NAME=2,1,0,0,0

export LHEATSTRG=.false.
export LSEASPRAY=.true.

# P7 UGWP1
export GWD_OPT=2
export DO_UGWP_V1=.false.
export KNOB_UGWP_VERSION=0
export KNOB_UGWP_NSLOPE=1
export DO_UGWP_V0=.true.
export DO_GSL_DRAG_LS_BL=.false.
export DO_GSL_DRAG_SS=.true.
export DO_GSL_DRAG_TOFD=.false.
export DO_UGWP_V1_OROG_ONLY=.false.
export DO_UGWP_V0_NST_ONLY=.false.
export LDIAG_UGWP=.false.

# P7 CA
export DO_CA=.true.
export CA_SGS=.true.
export CA_GLOBAL=.false.
export NCA=1
export NCELLS=5
export NLIVES=12
export NTHRESH=18
export NSEED=1
export NFRACSEED=0.5
export CA_TRIGGER=.true.
export NSPINUP=1
export ISEED_CA=12345

# P7 settings
export TILEDFIX=.true.
export FNALBC="'C96.snowfree_albedo.tileX.nc'"
export FNALBC2="'C96.facsf.tileX.nc'"
export FNTG3C="'C96.substrate_temperature.tileX.nc'"
export FNVEGC="'C96.vegetation_greenness.tileX.nc'"
export FNVETC="'C96.vegetation_type.tileX.nc'"
export FNSOTC="'C96.soil_type.tileX.nc'"
export FNSMCC=${FNSMCC_control}
export FNMSKH=${FNMSKH_control}
export FNVMNC="'C96.vegetation_greenness.tileX.nc'"
export FNVMXC="'C96.vegetation_greenness.tileX.nc'"
export FNSLPC="'C96.slope_type.tileX.nc'"
export FNABSC="'C96.maximum_snow_albedo.tileX.nc'"
export LANDICE=".false."
export FSICL=0
export FSICS=0

export IMP_PHYSICS=8
export LGFDLMPRAD=.false.
export DO_SAT_ADJ=.false.
export DNATS=0
export DZ_MIN=6

#required for NML.IN sharing
export MIN_SEAICE=0.15
export FRAC_GRID=.true.
export MOM6_RESTART_SETTING=n
# P8 (not used for standalone)
export USE_CICE_ALB=.false.

export WRITE_NSFLIP=.true.

export FV3_RUN=control_run.IN
export CCPP_SUITE=FV3_GFS_v17_p8_mynn
export FIELD_TABLE=field_table_thompson_noaero_tke
export DIAG_TABLE=diag_table_p8_template
# use same namelist for standalone,coupled P7
export INPUT_NML=cpld_control.nml.IN

# RRTMGP
export DO_RRTMGP=.false.
export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export IMFSHALCNV=-1
export SHAL_CNV=.false.
export DO_MYNNEDMF=.true.

if [[ $MACHINE_ID = cheyenne.* ]]; then
TPN=18
fi
2 changes: 2 additions & 0 deletions tests/tests/control_p8_rrtmgp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.

if [[ $MACHINE_ID = cheyenne.* ]]; then
TPN=18
fi
2 changes: 2 additions & 0 deletions tests/tests/control_restart_p8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,3 +166,5 @@ export DO_RRTMGP=.false.
export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.

0 comments on commit c0063e4

Please sign in to comment.