diff --git a/.gitmodules b/.gitmodules index 5fee9f245a..a3e091afaa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,8 +16,8 @@ branch = develop [submodule "CMEPS"] path = CMEPS-interface/CMEPS - url = https://github.com/NOAA-EMC/CMEPS - branch = emc/develop + url = https://github.com/JustinPerket/CMEPS + branch = cpld_LM4 [submodule "HYCOM"] path = HYCOM-interface/HYCOM url = https://github.com/NOAA-EMC/HYCOM-src diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index 9e69750c44..323a0c33b2 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit 9e69750c44bee5c42de687ced740a8bce22848a2 +Subproject commit 323a0c33b20a70c99dbdb769c6493d4b174e9df8 diff --git a/tests/parm/input_atm_lm4.nml.IN b/tests/parm/input_atm_lm4.nml.IN index 4bc398b9ec..528d50cfa8 100644 --- a/tests/parm/input_atm_lm4.nml.IN +++ b/tests/parm/input_atm_lm4.nml.IN @@ -190,6 +190,7 @@ random_clds = @[RANDOM_CLDS] trans_trac = @[TRANS_TRAC] cnvcld = @[CNVCLD] + xr_cnvcld = @[XR_CNVCLD] imfshalcnv = @[IMFSHALCNV] imfdeepcnv = @[IMFDEEPCNV] progsigma = @[PROGSIGMA] @@ -268,15 +269,28 @@ ca_trigger = @[CA_TRIGGER] nspinup = @[NSPINUP] iseed_ca = @[ISEED_CA] -@[HIDE_LAND_PERT] lndp_type = @[LNDP_TYPE] -@[HIDE_LAND_PERT] n_var_lndp = @[N_VAR_LNDP] -@[HIDE_NEST] lcnorm = @[LCNORM] -@[HIDE_SPPT] pert_mp = @[PERT_MP] -@[HIDE_SPPT] pert_radtend = @[PERT_RADTEND] -@[HIDE_SPPT] pert_clds = @[PERT_CLDS] -@[HIDE_IAU] iau_inc_files= @[IAU_INC_FILES] -@[HIDE_IAU] iau_drymassfixer = .false. -@[HIDE_IAU] iau_filter_increments = @[IAU_FILTER_INCREMENTS] + lndp_type = @[LNDP_TYPE] + n_var_lndp = @[N_VAR_LNDP] + lcnorm = @[LCNORM] + pert_mp = @[PERT_MP] + pert_radtend = @[PERT_RADTEND] + pert_clds = @[PERT_CLDS] + iau_inc_files= @[IAU_INC_FILES] + iau_drymassfixer = .false. + iau_filter_increments = @[IAU_FILTER_INCREMENTS] +/ + +&land_iau_nml + do_land_iau = @[DO_LAND_IAU] + land_iau_fhrs = @[LAND_IAU_FHRS] + land_iau_delthrs = @[LAND_IAU_DELHRS] + land_iau_inc_files = @[LAND_IAU_INC_FILES] + lsoil_incr = @[LSOIL_INCR] + land_iau_filter_increments = @[LAND_IAU_FILTER_INC] + land_iau_upd_stc = @[LAND_IAU_UPD_STC] + land_iau_upd_slc = @[LAND_IAU_UPD_SLC] + land_iau_do_stcsmc_adjustment = @[LAND_IAU_DP_STCSMC_ADJ] + land_iau_min_T_increment = @[LAND_IAU_MIN_T_INC] / &cires_ugwp_nml @@ -408,43 +422,43 @@ / &nam_stochy -@[HIDE_SKEB] skeb = @[SKEB] -@[HIDE_SKEB] iseed_skeb = @[ISEED_SKEB] -@[HIDE_SKEB] skeb_tau = @[SKEB_TAU] -@[HIDE_SKEB] skeb_lscale = @[SKEB_LSCALE] -@[HIDE_SKEB] skebnorm = @[SKEBNORM] -@[HIDE_SKEB] skeb_npass = @[SKEB_NPASS] -@[HIDE_SKEB] skeb_vdof = @[SKEB_VDOF] -@[HIDE_SHUM] shum = @[SHUM] -@[HIDE_SHUM] iseed_shum = @[ISEED_SHUM] -@[HIDE_SHUM] shum_tau = @[SHUM_TAU] -@[HIDE_SHUM] shum_lscale = @[SHUM_LSCALE] -@[HIDE_SPPT] sppt = @[SPPT] -@[HIDE_SPPT] iseed_sppt = @[ISEED_SPPT] -@[HIDE_SPPT] sppt_tau = @[SPPT_TAU] -@[HIDE_SPPT] sppt_lscale = @[SPPT_LSCALE] -@[HIDE_SPPT] sppt_logit = @[SPPT_LOGIT] -@[HIDE_SPPT] sppt_sfclimit = @[SPPT_SFCLIMIT] -@[HIDE_SPPT] use_zmtnblck = @[USE_ZMTNBLCK] -@[HIDE_SPPT] pbl_taper = @[PBL_TAPER] -@[HIDE_OCNSPPT] OCNSPPT = @[OCNSPPT] -@[HIDE_OCNSPPT] OCNSPPT_LSCALE = @[OCNSPPT_LSCALE] -@[HIDE_OCNSPPT] OCNSPPT_TAU = @[OCNSPPT_TAU] -@[HIDE_OCNSPPT] ISEED_OCNSPPT =@[ISEED_OCNSPPT] -@[HIDE_EPBL] EPBL = @[EPBL] -@[HIDE_EPBL] EPBL_LSCALE = @[EPBL_LSCALE] -@[HIDE_EPBL] EPBL_TAU = @[EPBL_TAU] -@[HIDE_EPBL] ISEED_EPBL = @[ISEED_EPBL] + skeb = @[SKEB] + iseed_skeb = @[ISEED_SKEB] + skeb_tau = @[SKEB_TAU] + skeb_lscale = @[SKEB_LSCALE] + skebnorm = @[SKEBNORM] + skeb_npass = @[SKEB_NPASS] + skeb_vdof = @[SKEB_VDOF] + shum = @[SHUM] + iseed_shum = @[ISEED_SHUM] + shum_tau = @[SHUM_TAU] + shum_lscale = @[SHUM_LSCALE] + sppt = @[SPPT] + iseed_sppt = @[ISEED_SPPT] + sppt_tau = @[SPPT_TAU] + sppt_lscale = @[SPPT_LSCALE] + sppt_logit = @[SPPT_LOGIT] + sppt_sfclimit = @[SPPT_SFCLIMIT] + use_zmtnblck = @[USE_ZMTNBLCK] + pbl_taper = @[PBL_TAPER] + OCNSPPT = @[OCNSPPT] + OCNSPPT_LSCALE = @[OCNSPPT_LSCALE] + OCNSPPT_TAU = @[OCNSPPT_TAU] + ISEED_OCNSPPT =@[ISEED_OCNSPPT] + EPBL = @[EPBL] + EPBL_LSCALE = @[EPBL_LSCALE] + EPBL_TAU = @[EPBL_TAU] + ISEED_EPBL = @[ISEED_EPBL] / &nam_sfcperts -@[HIDE_LAND_PERT] lndp_type = @[LNDP_TYPE] -@[HIDE_LAND_PERT] lndp_model_type = @[LNDP_MODEL_TYPE] -@[HIDE_LAND_PERT] LNDP_TAU=@[LNDP_TAU] -@[HIDE_LAND_PERT] LNDP_LSCALE=@[LNDP_LSCALE] -@[HIDE_LAND_PERT] ISEED_LNDP=@[ISEED_LNDP] -@[HIDE_LAND_PERT] lndp_var_list = @[LNDP_VAR_LIST] -@[HIDE_LAND_PERT] lndp_prt_list = @[LNDP_PRT_LIST] + lndp_type = @[LNDP_TYPE] + lndp_model_type = @[LNDP_MODEL_TYPE] + LNDP_TAU=@[LNDP_TAU] + LNDP_LSCALE=@[LNDP_LSCALE] + ISEED_LNDP=@[ISEED_LNDP] + lndp_var_list = @[LNDP_VAR_LIST] + lndp_prt_list = @[LNDP_PRT_LIST] / &MOM_input_nml diff --git a/tests/rt.conf b/tests/rt.conf index f2c14b4a52..1fd708c769 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -298,8 +298,8 @@ RUN | datm_cdeps_lnd_era5_rst | - wcoss2 noaacloud ### CDEPS Data Atmosphere tests with LM4 ### COMPILE | datm_cdeps_lm4 | intel | -DAPP=LND-LM4 | + hera orion gaeac5 | fv3 | -RUN | datm_cdeps_lm4_gswp3 | + hera orion gaeac5 | baseline | -RUN | datm_cdeps_lm4_gswp3_rst | + hera orion gaeac5 | | datm_cdeps_lm4_gswp3 +RUN | datm_cdeps_lm4_gswp3 | - wcoss2 noaacloud | baseline | +RUN | datm_cdeps_lm4_gswp3_rst | - wcoss2 noaacloud | | datm_cdeps_lm4_gswp3 ### AMIP+ tests ### COMPILE | atm_ds2s_docn_pcice | intel | -DAPP=ATM_DS2S-PCICE -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 | @@ -316,7 +316,7 @@ COMPILE | atml_debug | intel | -DAPP=ATML -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_ RUN | control_p8_atmlnd_debug | - noaacloud wcoss2 | baseline | ### ATM-LM4 tests ### -COMPILE | atml_lm4 | intel | -DAPP=ATML-LM4 -DCCPP_SUITES=FV3_GFS_v17_p8 | | fv3 | +COMPILE | atml_lm4 | intel | -DAPP=ATML-LM4 -DCCPP_SUITES=FV3_GFS_v17_p8,FV3_GFS_v17_p8_ugwpv1 | | fv3 | RUN | control_p8_atmlm4 | - noaacloud wcoss2 | baseline | diff --git a/tests/tests/control_p8_atmlm4 b/tests/tests/control_p8_atmlm4 index 8f223f23fd..ecf61d241f 100644 --- a/tests/tests/control_p8_atmlm4 +++ b/tests/tests/control_p8_atmlm4 @@ -4,6 +4,8 @@ # ############################################################################### +source tests/control_p8 + export TEST_DESCR="Active Atmosphere and GFDL Land Model 4" export CNTL_DIR=control_p8_atmlm4 @@ -59,115 +61,12 @@ export LIST_FILES="\ RESTART/vegn2.res.tile5.nc\ RESTART/vegn2.res.tile6.nc" -export_fv3 -export_tiled -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='cubed_sphere_grid' -export WRITE_DOPOST=.false. -export OUTPUT_FH='0 21 24' - -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 -export IOPT_SFC=3 -export IOPT_TRS=2 -export IOPT_DIAG=2 - -export D2_BG_K1=0.20 -export D2_BG_K2=0.04 -export PSM_BC=1 -export DDDMP=0.1 - -# Merra2 Aerosols & NSST -export USE_MERRA2=.true. -export IAER=1011 -export NSTF_NAME=2,1,0,0,0 - -export LHEATSTRG=.false. -export LSEASPRAY=.true. - -# 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. - -# 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 - -export TILEDFIX=.true. -export FNALBC="'INPUT/C96.snowfree_albedo.tileX.nc'" -export FNALBC2="'INPUT/C96.facsf.tileX.nc'" -export FNTG3C="'INPUT/C96.substrate_temperature.tileX.nc'" -export FNVEGC="'INPUT/C96.vegetation_greenness.tileX.nc'" -export FNVETC="'INPUT/C96.vegetation_type.tileX.nc'" -export FNSOTC="'INPUT/C96.soil_type.tileX.nc'" -export FNSOCC="'INPUT/C96.soil_color.tileX.nc'" -export FNSMCC_control="'global_soilmgldas.statsgo.t1534.3072.1536.grb'" -export FNMSKH_control="'global_slmask.t1534.3072.1536.grb'" -export FNSMCC=${FNSMCC_control} -export FNMSKH=${FNMSKH_control} -export FNVMNC="'INPUT/C96.vegetation_greenness.tileX.nc'" -export FNVMXC="'INPUT/C96.vegetation_greenness.tileX.nc'" -export FNSLPC="'INPUT/C96.slope_type.tileX.nc'" -export FNABSC="'INPUT/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_OUTPUT_DIR=./MOM6_OUTPUT -export MOM6_RESTART_DIR=./RESTART/ -export MOM6_RESTART_SETTING=n -# Following not used for standalone -export USE_CICE_ALB=.false. - -export WRITE_NSFLIP=.true. # export FV3_RUN="control_run.IN noahmp_run.IN" export FV3_RUN="control_run.IN lm4_common.IN lm4_atm.IN" -export CCPP_SUITE=FV3_GFS_v17_p8 -export FIELD_TABLE=field_table_thompson_noaero_tke +#export CCPP_SUITE=FV3_GFS_v17_p8 +#export FIELD_TABLE=field_table_thompson_noaero_tke export FIELD_TABLE_ADDITIONAL=field_table_lm4 export DIAG_TABLE=diag_table_cpld.IN @@ -176,15 +75,6 @@ export DIAG_TABLE=diag_table_cpld.IN # export INPUT_NML=global_control.nml.IN export INPUT_NML="input_atm_lm4.nml.IN" -export V2_SFC_FILE=true - -# RRTMGP -export DO_RRTMGP=.false. -export DOGP_CLDOPTICS_LUT=.true. -export DOGP_LWSCAT=.true. -export DOGP_SGS_CNV=.true. - -export SATMEDMF=.true. export CPLLND=.true. export CPLLND2ATM=.true. @@ -214,13 +104,17 @@ export snow_albedo_option=1 export precip_partition_option=4 export initial_albedo=0.2 export OUTPUT_FH="1 -1" + if [[ "$ATMRES" = "$LNDRES" ]]; then export lnd_input_dir="INPUT/" export mosaic_file="INPUT/${LNDRES}_mosaic.nc" + export samegrid_atmlnd=.true. else export lnd_input_dir="INPUT/${LNDRES}/" export mosaic_file="INPUT/${LNDRES}/${LNDRES}_mosaic.nc" + export samegrid_atmlnd=.false. fi + export MOM6_TOPOEDITS="" # needed to get grid spec files