diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 9a8eb118ed..8677f7694e 100644 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -456,6 +456,8 @@ export DO_UGWP_V0=.false. export DO_GSL_DRAG_SS=.false. export SATMEDMF=.false. export ISATMEDMF=0 +export LRADAR=.true. +export LTAEROSOL=.true. export LSM=1 export LANDICE=.true. @@ -511,7 +513,11 @@ export CDEPS_INLINE=false export POSTAPP='global' export USE_MERRA2=.true. export NESTED=.false. +export BLOCKSIZE=32 +export CHKSUM_DEBUG=.false. +export DYCORE_ONLY=.false. +export IO_LAYOUT=1,1 export NTILES=6 export INPES=${INPES_dflt} export JNPES=${JNPES_dflt} @@ -576,13 +582,43 @@ export MAKE_NH=.true. export MOUNTAIN=.false. export NA_INIT=1 export DO_VORT_DAMP=.true. +export N_SPONGE=42 +export NUDGE_QV=.true. +export NUDGE_DZ=.false. export HYDROSTATIC=.false. -export KORD_XX=9 +export KORD_MT=9 +export KORD_WZ=9 +export KORD_TR=9 export KORD_TM=-9 +export PHYS_HYDROSTATIC=.false. +export USE_HYDRO_PRESSURE=.false. +export NWAT=6 +export NORD=2 +export D4_BG=0.12 +export VTDM4=0.02 +export DELT_MAX=0.002 +export EXTERNAL_ETA=.true. +export GFS_PHIL=.false. +export NCEP_IC=.false. export D_CON=1. -export HORD_XX=5 +export HORD_MT=5 +export HORD_VT=5 +export HORD_TM=5 export HORD_DP=-5 export HORD_TR=8 +export ADJUST_DRY_MASS=.false. +export DRY_MASS=98320.0 +export CONSV_TE=1. +export PRINT_FREQ=6 +export NO_DYCORE=.false. + +export FILTERED_TERRAIN=.true. +export GFS_DWINDS=.true. + +export USE_UFO=.true. +export PRE_RAD=.false. +export TTENDLIM=-999 + # Radiation export DO_RRTMGP=.false. @@ -593,11 +629,27 @@ export USE_LW_JACOBIAN=.false. export DAMP_LW_FLUXADJ=.false. export RRTMGP_LW_PHYS_BLKSZ=2 export ICLOUD=0 +export ICLOUD_BL=1 export IAER=1011 export ICLIQ_SW=2 export IOVR=3 export LFNC_K=-999 export LFNC_P0=-999 +export PDFCLD=.false. +export FHSWR=3600. +export FHLWR=3600. + +export ICO2=2 +export ISUBC_SW=2 +export ISUBC_LW=2 +export ISOL=2 +export LWHTR=.true. +export SWHTR=.true. +export CNVGWD=.true. +export CAL_PRE=.false. +export REDRAG=.true. +export DSPHEAT=.true. +export HYBEDMF=.false. # Microphysics export IMP_PHYSICS=8 @@ -610,8 +662,8 @@ export LSEASPRAY=.true. export LGFDLMPRAD=.false. export EFFR_IN=.false. # Thompson MP -export LRADAR=.true. -export LTAEROSOL=.true. +export LRADAR=.false. +export LTAEROSOL=.false. export EXT_DIAG_THOMPSON=.false. export SEDI_SEMI=.true. export DECFL=10 @@ -644,11 +696,28 @@ export PSL_GWD_DX_FACTOR=6.0 export DO_GSL_DRAG_TOFD=.false. export DO_UGWP_V1=.false. export DO_UGWP_V1_OROG_ONLY=.false. +export KNOB_UGWP_SOLVER=2 +export KNOB_UGWP_SOURCE=1,1,0,0 +export KNOB_UGWP_WVSPEC=1,25,25,25 +export KNOB_UGWP_AZDIR=2,4,4,4 +export KNOB_UGWP_STOCH=0,0,0,0 +export KNOB_UGWP_EFFAC=1,1,1,1 +export KNOB_UGWP_DOAXYZ=1 +export KNOB_UGWP_DOHEAT=1 +export LAUNCH_LEVEL=54 export KNOB_UGWP_DOKDIS=1 export KNOB_UGWP_NDX4LH=1 export KNOB_UGWP_VERSION=0 -export KNOB_UGWP_PALAUNCH=500.e2 +export KNOB_UGWP_PALAUNCH=275.e2 export KNOB_UGWP_NSLOPE=1 +export KNOB_UGWP_LZMAX=15.750e3 +export KNOB_UGWP_LZMIN=0.75e3 +export KNOB_UGWP_LZSTAR=2.0e3 +export KNOB_UGWP_TAUMIN=0.25e-3 +export KNOB_UGWP_TAUAMP=3.0e-3 +export KNOB_UGWP_LHMET=200.0e3 +export KNOB_UGWP_OROSOLV="'pss-1986'" + export KNOB_UGWP_TAUAMP=3.0e-3 export DO_UGWP_V0_NST_ONLY=.false. @@ -669,9 +738,12 @@ export DT_INNER_c768=75 export CDMBWD=${CDMBWD_c96} export DT_INNER=${DT_INNER_c96} +export ISATMEDMF=1 +export TRANS_TRAC=.true. + # PBL export SATMEDMF=.true. -export HYBEDMF=.true. +export HYBEDMF=.false. export SHINHONG=.false. export DO_YSU=.false. export DO_MYNNEDMF=.false. @@ -700,9 +772,15 @@ export FSCAV_AERO='"*:0.3","so2:0.0","msa:0.0","dms:0.0","nh3:0.4","nh4:0.6","bc # SFC export DO_MYJSFC=.false. export DO_MYNNSFCLAY=.false. -export BL_MYNN_TKEADVECT=.false. +export BL_MYNN_EDMF=1 +export BL_MYNN_TKEADVECT=.true. +export BL_MYNN_EDMF_MOM=1 # LSM +export PRSLRD0=0. +export IVEGSRC=1 +export ISOT=1 +export LSOIL=4 export LSM=2 export LSOIL_LSM=4 export LANDICE=.false. @@ -711,13 +789,33 @@ export IALB=2 export IEMS=2 export IOPT_DVEG=4 export IOPT_CRS=2 +export IOPT_BTR=1 +export IOPT_RUN=1 export IOPT_RAD=3 export IOPT_ALB=1 export IOPT_STC=3 - +export IOPT_FRZ=1 +export IOPT_INF=1 export IOPT_SFC=3 export IOPT_TRS=2 export IOPT_DIAG=2 +export IOPT_SNF=4 +export IOPT_TBOT=2 +export DEBUG=.false. +export NST_ANL=.true. +export PSAUTCO=0.0008,0.0005 +export PRAUTCO=0.00015,0.00015 +export EFFR_IN=.true. +export ACTIVE_GASES="'h2o_co2_o3_n2o_ch4_o2'" +export NGASES=6 +export LW_FILE_GAS="'rrtmgp-data-lw-g128-210809.nc'" +export LW_FILE_CLOUDS="'rrtmgp-cloud-optics-coeffs-lw.nc'" +export SW_FILE_GAS="'rrtmgp-data-sw-g112-210809.nc'" +export SW_FILE_CLOUDS="'rrtmgp-cloud-optics-coeffs-sw.nc'" +export RRTMGP_NGPTSSW=112 +export RRTMGP_NGPTSLW=128 +export RRTMGP_NBANDSLW=16 +export RRTMGP_NBANDSSW=14 export D2_BG_K1=0.20 export D2_BG_K2=0.04 @@ -728,6 +826,7 @@ export DDDMP=0.1 # Ozone / stratospheric H2O export OZ_PHYS_OLD=.true. export OZ_PHYS_NEW=.false. + export H2O_PHYS=.false. # Lake models @@ -782,6 +881,20 @@ export MAX_OUTPUT_FIELDS=310 export UPDATE_FULL_OMEGA=.false. # Stochastic physics +export HIDE_LAND_PERT=' ' +export HIDE_NEST='!' +export HIDE_SPPT='!' +export HIDE_SKEB='!' +export HIDE_SHUM='!' +export HIDE_OCNSPPT='!' +export HIDE_EPBL='!' +export HIDE_IAU='!' + +export LCNORM=.false. +export PERT_MP=.false. +export PERT_RADTEND=.false. +export PERT_CLDS=.true. + export STOCHINI=.false. export DO_SPPT=.false. export DO_SHUM=.false. @@ -797,12 +910,37 @@ export LNDP_MODEL_TYPE=0 export LNDP_TAU=21600, export LNDP_LSCALE=500000, export ISEED_LNDP=2010, +export ISEED_SKEB=0 +export SKEB_TAU=21600, +export SKEB_LSCALE=500000, +export SKEBNORM=1, +export SKEB_NPASS=30, +export SKEB_VDOF=5, +export ISEED_SHUM=1, +export SHUM_TAU=21600, +export SHUM_LSCALE=500000, +export ISEED_SPPT=20210325000103,20210325000104,20210325000105,20210325000106,20210325000107 +export SPPT_TAU=2.16E4,2.592E5,2.592E6,7.776E6,3.1536E7 +export SPPT_LSCALE=500.E3,1000.E3,2000.E3,2000.E3,2000.E3 +export SPPT_LOGIT=.true., +export SPPT_SFCLIMIT=.true., +export USE_ZMTNBLCK=.true. +export PBL_TAPER=0,0,0,0.125,0.25,0.5,0.75 +export OCNSPPT=0.8,0.4,0.2,0.08,0.04 +export OCNSPPT_LSCALE=500.E3,1000.E3,2000.E3,2000.E3,2000.E3 +export OCNSPPT_TAU=2.16E4,2.592E5,2.592E6,7.776E6,3.1536E7 +export ISEED_OCNSPPT=20210325000108,20210325000109,20210325000110,20210325000111,20210325000112 +export EPBL=0.8,0.4,0.2,0.08,0.04 +export EPBL_LSCALE=500.E3,1000.E3,2000.E3,2000.E3,2000.E3 +export EPBL_TAU=2.16E4,2.592E5,2.592E6,7.776E6,3.1536E7 +export ISEED_EPBL=20210325000113,20210325000114,20210325000115,20210325000116,20210325000117 #IAU export IAU_INC_FILES="''" export IAU_DELTHRS=0 export IAUFHRS=-1 export IAU_OFFSET=0 +export IAU_FILTER_INCREMENTS=.false. export FH_DFI_RADAR='-2e10' @@ -888,7 +1026,7 @@ export USE_CICE_ALB=.false. # GFDL Cloud Microphysics export FTSFS=90 - +export REIFLAG=2 # NAM sfc export FNGLAC="'global_glacier.2x2.grb'" @@ -897,6 +1035,7 @@ export FNTSFC="'RTGSST.1982.2012.monthly.clim.grb'" export FNSNOC="'global_snoclim.1.875.grb'" export FNZORC="'igbp'" export FNAISC="'IMS-NIC.blended.ice.monthly.clim.grb'" +export LDEBUG=.false. } # Add section for tiled grid namelist @@ -1250,9 +1389,12 @@ export WRITE_NSFLIP=.true. export OUTPUT_FH='6 -1' # default atm/ocn/ice resolution -export ATMRES=C96 -export OCNRES=100 -export ICERES=1.00 +if [[ -z ${OCNRES+x} || -z ${OCNRES} ]]; then + export OCNRES=100 +fi +if [[ -z ${ICERES+x} || -z ${ICERES} ]]; then + export ICERES=1.00 +fi export NX_GLB=360 export NY_GLB=320 export NPZ=127 @@ -1542,6 +1684,7 @@ export_hafs_regional () export INPES=${INPES_dflt} export JNPES=${JNPES_dflt} export NTILES=1 + export BLOCKSIZE=24 # model_configure export SYEAR=2019 diff --git a/tests/parm/global_control.nml.IN b/tests/parm/global_control.nml.IN index 675bc19739..aeb1c11b2e 100644 --- a/tests/parm/global_control.nml.IN +++ b/tests/parm/global_control.nml.IN @@ -1,7 +1,7 @@ &atmos_model_nml - blocksize = 32 - chksum_debug = .false. - dycore_only = .false. + blocksize = @[BLOCKSIZE] + chksum_debug = @[CHKSUM_DEBUG] + dycore_only = @[DYCORE_ONLY] ccpp_suite = '@[CCPP_SUITE]' / @@ -22,10 +22,10 @@ &fv_core_nml layout = @[INPES],@[JNPES] - io_layout = 1,1 + io_layout = @[IO_LAYOUT] npx = @[NPX] npy = @[NPY] - ntiles = 6 + ntiles = @[NTILES] npz = @[NPZ] dz_min = @[DZ_MIN] psm_bc = @[PSM_BC] @@ -34,62 +34,62 @@ fv_debug = .false. range_warn = .true. reset_eta = .false. - n_sponge = 42 - nudge_qv = .true. - nudge_dz = .false. + n_sponge = @[N_SPONGE] + nudge_qv = @[NUDGE_QV] + nudge_dz = @[NUDGE_DZ] tau = @[TAU] - fast_tau_w_sec = 0.2 + fast_tau_w_sec = @[FAST_TAU_W_SEC] rf_cutoff = @[RF_CUTOFF] d2_bg_k1 = @[D2_BG_K1] d2_bg_k2 = @[D2_BG_K2] kord_tm = @[KORD_TM] - kord_mt = @[KORD_XX] - kord_wz = @[KORD_XX] - kord_tr = @[KORD_XX] + kord_mt = @[KORD_MT] + kord_wz = @[KORD_WZ] + kord_tr = @[KORD_TR] hydrostatic = @[HYDROSTATIC] - phys_hydrostatic = .false. - use_hydro_pressure = .false. + phys_hydrostatic = @[PHYS_HYDROSTATIC] + use_hydro_pressure = @[USE_HYDRO_PRESSURE] pass_full_omega_to_physics_in_non_hydrostatic_mode = @[UPDATE_FULL_OMEGA] beta = 0. a_imp = 1. p_fac = 0.1 k_split = @[K_SPLIT] n_split = @[N_SPLIT] - nwat = 6 + nwat = @[NWAT] na_init = @[NA_INIT] d_ext = 0. dnats = @[DNATS] fv_sg_adj = @[FV_SG_ADJ] d2_bg = 0. - nord = 2 + nord = @[NORD] dddmp = @[DDDMP] - d4_bg = 0.12 - vtdm4 = 0.02 - delt_max = 0.002 + d4_bg = @[D4_BG] + vtdm4 = @[VTDM4] + delt_max = @[DELT_MAX] ke_bg = 0. do_vort_damp = @[DO_VORT_DAMP] external_ic = @[EXTERNAL_IC] - external_eta = .true. - gfs_phil = .false. + external_eta = @[EXTERNAL_ETA] + gfs_phil = @[GFS_PHIL] nggps_ic = @[NGGPS_IC] mountain = @[MOUNTAIN] - ncep_ic = .false. + ncep_ic = @[NCEP_IC] d_con = @[D_CON] - hord_mt = @[HORD_XX] - hord_vt = @[HORD_XX] - hord_tm = @[HORD_XX] + hord_mt = @[HORD_MT] + hord_vt = @[HORD_VT] + hord_tm = @[HORD_TM] hord_dp = @[HORD_DP] hord_tr = @[HORD_TR] - adjust_dry_mass = .false. - dry_mass = 98320.0 - consv_te = 1. + adjust_dry_mass = @[ADJUST_DRY_MASS] + dry_mass = @[DRY_MASS] + consv_te = @[CONSV_TE] do_sat_adj = @[DO_SAT_ADJ] consv_am = .false. fill = .true. dwind_2d = .false. - print_freq = 6 + print_freq = @[PRINT_FREQ] warm_start = @[WARM_START] - no_dycore = .false. + no_dycore = @[NO_DYCORE] z_tracer = .true. agrid_vel_rst = .true. read_increment = @[READ_INCREMENT] @@ -98,9 +98,9 @@ / &external_ic_nml - filtered_terrain = .true. + filtered_terrain = @[FILTERED_TERRAIN] levp = @[NPZP] - gfs_dwinds = .true. + gfs_dwinds = @[GFS_DWINDS] checker_tr = .false. nt_checker = 0 / @@ -112,31 +112,31 @@ qdiag3d = @[QDIAG3D] print_diff_pgr = @[PRINT_DIFF_PGR] fhcyc = @[FHCYC] - use_ufo = .true. - pre_rad = .false. + use_ufo = @[USE_UFO] + pre_rad = @[PRE_RAD] imp_physics = @[IMP_PHYSICS] iovr = @[IOVR] - ltaerosol = .false. - lradar = .false. - ttendlim = -999 + ltaerosol = @[LTAEROSOL] + lradar = @[LRADAR] + ttendlim = @[TTENDLIM] dt_inner = @[DT_INNER] sedi_semi = @[SEDI_SEMI] decfl = @[DECFL] - oz_phys = .false. - oz_phys_2015 = .true. - lsoil_lsm = 4 + oz_phys = @[OZ_PHYS_NEW] + oz_phys_2015 = @[OZ_PHYS_OLD] + lsoil_lsm = @[LSOIL_LSM] do_mynnedmf = @[DO_MYNNEDMF] - do_mynnsfclay = .false. - icloud_bl = 1 - bl_mynn_edmf = 1 - bl_mynn_tkeadvect = .true. - bl_mynn_edmf_mom = 1 - do_ugwp = .false. - do_tofd = .false. + do_mynnsfclay = @[DO_MYNNSFCLAY] + icloud_bl = @[ICLOUD_BL] + bl_mynn_edmf = @[BL_MYNN_EDMF] + bl_mynn_tkeadvect = @[BL_MYNN_TKEADVECT] + bl_mynn_edmf_mom = @[BL_MYNN_EDMF_MOM] + do_ugwp = @[DO_UGWP] + do_tofd = @[DO_TOFD] gwd_opt = @[GWD_OPT] do_ugwp_v0 = @[DO_UGWP_V0] do_ugwp_v1 = @[DO_UGWP_V1] - do_ugwp_v0_orog_only = .false. + do_ugwp_v0_orog_only = @[DO_UGWP_V0_OROG_ONLY] do_ugwp_v0_nst_only = @[DO_UGWP_V0_NST_ONLY] do_gsl_drag_ls_bl = @[DO_GSL_DRAG_LS_BL] do_gsl_drag_ss = @[DO_GSL_DRAG_SS] @@ -147,31 +147,31 @@ min_lakeice = @[MIN_LAKEICE] min_seaice = @[MIN_SEAICE] use_cice_alb = @[USE_CICE_ALB] - pdfcld = .false. - fhswr = 3600. - fhlwr = 3600. + pdfcld = @[PDFCLD] + fhswr = @[FHSWR] + fhlwr = @[FHLWR] ialb = @[IALB] iems = @[IEMS] iaer = @[IAER] icliq_sw = @[ICLIQ_SW] - ico2 = 2 - isubc_sw = 2 - isubc_lw = 2 - isol = 2 - lwhtr = .true. - swhtr = .true. - cnvgwd = .true. + ico2 = @[ICO2] + isubc_sw = @[ISUBC_SW] + isubc_lw = @[ISUBC_LW] + isol = @[ISOL] + lwhtr = @[LWHTR] + swhtr = @[SWHTR] + cnvgwd = @[CNVGWD] shal_cnv = @[SHAL_CNV] - cal_pre = .false. - redrag = .true. - dspheat = .true. - hybedmf = .false. + cal_pre = @[CAL_PRE] + redrag = @[REDRAG] + dspheat = @[DSPHEAT] + hybedmf = @[HYBEDMF] satmedmf = @[SATMEDMF] - isatmedmf = 1 + isatmedmf = @[ISATMEDMF] lheatstrg = @[LHEATSTRG] lseaspray = @[LSEASPRAY] random_clds = @[RANDOM_CLDS] - trans_trac = .true. + trans_trac = @[TRANS_TRAC] cnvcld = @[CNVCLD] imfshalcnv = @[IMFSHALCNV] imfdeepcnv = @[IMFDEEPCNV] @@ -181,45 +181,45 @@ betadcu = @[BETADCU] ras = @[RAS] cdmbgwd = @[CDMBWD] - prslrd0 = 0. - ivegsrc = 1 - isot = 1 - lsoil = 4 + prslrd0 = @[PRSLRD0] + ivegsrc = @[IVEGSRC] + isot = @[ISOT] + lsoil = @[LSOIL] lsm = @[LSM] iopt_dveg = @[IOPT_DVEG] iopt_crs = @[IOPT_CRS] - iopt_btr = 1 - iopt_run = 1 + iopt_btr = @[IOPT_BTR] + iopt_run = @[IOPT_RUN] iopt_sfc = @[IOPT_SFC] iopt_trs = @[IOPT_TRS] iopt_diag = @[IOPT_DIAG] - iopt_frz = 1 - iopt_inf = 1 + iopt_frz = @[IOPT_FRZ] + iopt_inf = @[IOPT_INF] iopt_rad = @[IOPT_RAD] iopt_alb = @[IOPT_ALB] - iopt_snf = 4 - iopt_tbot = 2 + iopt_snf = @[IOPT_SNF] + iopt_tbot = @[IOPT_TBOT] iopt_stc = @[IOPT_STC] - debug = .false. + debug = @[DEBUG] nstf_name = @[NSTF_NAME] - nst_anl = .true. - psautco = 0.0008,0.0005 - prautco = 0.00015,0.00015 + nst_anl = @[NST_ANL] + psautco = @[PSAUTCO] + prautco = @[PRAUTCO] lgfdlmprad = @[LGFDLMPRAD] - effr_in = .true. + effr_in = @[EFFR_IN] ldiag_ugwp = @[LDIAG_UGWP] fscav_aero = @[FSCAV_AERO] do_RRTMGP = @[DO_RRTMGP] - active_gases = 'h2o_co2_o3_n2o_ch4_o2' - ngases = 6 - lw_file_gas = 'rrtmgp-data-lw-g128-210809.nc' - lw_file_clouds = 'rrtmgp-cloud-optics-coeffs-lw.nc' - sw_file_gas = 'rrtmgp-data-sw-g112-210809.nc' - sw_file_clouds = 'rrtmgp-cloud-optics-coeffs-sw.nc' - rrtmgp_nGptsSW = 112 - rrtmgp_nGptsLW = 128 - rrtmgp_nBandsLW = 16 - rrtmgp_nBandsSW = 14 + active_gases = @[ACTIVE_GASES] + ngases = @[NGASES] + lw_file_gas = @[LW_FILE_GAS] + lw_file_clouds = @[LW_FILE_CLOUDS] + sw_file_gas = @[SW_FILE_GAS] + sw_file_clouds = @[SW_FILE_CLOUDS] + rrtmgp_nGptsSW = @[RRTMGP_NGPTSSW] + rrtmgp_nGptsLW = @[RRTMGP_NGPTSLW] + rrtmgp_nBandsLW = @[RRTMGP_NBANDSLW] + rrtmgp_nBandsSW = @[RRTMGP_NBANDSSW] doGP_cldoptics_LUT = @[DOGP_CLDOPTICS_LUT] doGP_lwscat = @[DOGP_LWSCAT] doGP_sgs_cnv = @[DOGP_SGS_CNV] @@ -251,34 +251,41 @@ ca_trigger = @[CA_TRIGGER] nspinup = @[NSPINUP] iseed_ca = @[ISEED_CA] - lndp_type = @[LNDP_TYPE] - n_var_lndp = @[N_VAR_LNDP] +@[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] / &cires_ugwp_nml - knob_ugwp_solver = 2 - knob_ugwp_source = 1,1,0,0 - knob_ugwp_wvspec = 1,25,25,25 - knob_ugwp_azdir = 2,4,4,4 - knob_ugwp_stoch = 0,0,0,0 - knob_ugwp_effac = 1,1,1,1 - knob_ugwp_doaxyz = 1 - knob_ugwp_doheat = 1 + knob_ugwp_solver = @[KNOB_UGWP_SOLVER] + knob_ugwp_source = @[KNOB_UGWP_SOURCE] + knob_ugwp_wvspec = @[KNOB_UGWP_WVSPEC] + knob_ugwp_azdir = @[KNOB_UGWP_AZDIR] + knob_ugwp_stoch = @[KNOB_UGWP_STOCH] + knob_ugwp_effac = @[KNOB_UGWP_EFFAC] + knob_ugwp_doaxyz = @[KNOB_UGWP_DOAXYZ] + knob_ugwp_doheat = @[KNOB_UGWP_DOHEAT] knob_ugwp_dokdis = @[KNOB_UGWP_DOKDIS] knob_ugwp_ndx4lh = @[KNOB_UGWP_NDX4LH] knob_ugwp_version = @[KNOB_UGWP_VERSION] ! This is only for UGWP v0 -@[HIDE_UGWPV0] launch_level = 54 +@[HIDE_UGWPV0] launch_level = @[LAUNCH_LEVEL] ! These are only for UGWP v1 -@[HIDE_UGWPV1] knob_ugwp_palaunch = 275.0e2 +@[HIDE_UGWPV1] knob_ugwp_palaunch = @[KNOB_UGWP_PALAUNCH] @[HIDE_UGWPV1] knob_ugwp_nslope = @[KNOB_UGWP_NSLOPE] -@[HIDE_UGWPV1] knob_ugwp_lzmax = 15.750e3 -@[HIDE_UGWPV1] knob_ugwp_lzmin = 0.75e3 -@[HIDE_UGWPV1] knob_ugwp_lzstar = 2.0e3 -@[HIDE_UGWPV1] knob_ugwp_taumin = 0.25e-3 +@[HIDE_UGWPV1] knob_ugwp_lzmax = @[KNOB_UGWP_LZMAX] +@[HIDE_UGWPV1] knob_ugwp_lzmin = @[KNOB_UGWP_LZMIN] +@[HIDE_UGWPV1] knob_ugwp_lzstar = @[KNOB_UGWP_LZSTAR] +@[HIDE_UGWPV1] knob_ugwp_taumin = @[KNOB_UGWP_TAUMIN] @[HIDE_UGWPV1] knob_ugwp_tauamp = @[KNOB_UGWP_TAUAMP] -@[HIDE_UGWPV1] knob_ugwp_lhmet = 200.0e3 -@[HIDE_UGWPV1] knob_ugwp_orosolv = 'pss-1986' +@[HIDE_UGWPV1] knob_ugwp_lhmet = @[KNOB_UGWP_LHMET] +@[HIDE_UGWPV1] knob_ugwp_orosolv = @[KNOB_UGWP_OROSOLV] / &gfdl_cloud_microphysics_nml @@ -328,7 +335,7 @@ fix_negative = .true. icloud_f = 1 mp_time = 150. - reiflag = 2 + reiflag = @[REIFLAG] / &interpolator_nml @@ -358,7 +365,7 @@ FNVMXC = @[FNVMXC] FNSLPC = @[FNSLPC] FNABSC = @[FNABSC] - LDEBUG = .false. + LDEBUG = @[LDEBUG] FSMCL(2) = 99999 FSMCL(3) = 99999 FSMCL(4) = 99999 @@ -384,16 +391,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] / &nam_sfcperts - 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] +@[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] / &MOM_input_nml @@ -401,5 +435,4 @@ input_filename = '@[MOM6_RESTART_SETTING]' restart_input_dir = 'INPUT/', restart_output_dir = '@[MOM6_RESTART_DIR]' - parameter_filename = 'INPUT/MOM_input', - 'INPUT/MOM_override'/ + parameter_filename = 'INPUT/MOM_input','INPUT/MOM_override'/ diff --git a/tests/tests/control_p8_mynn b/tests/tests/control_p8_mynn index 9eac9bb346..e129bd4cde 100644 --- a/tests/tests/control_p8_mynn +++ b/tests/tests/control_p8_mynn @@ -93,6 +93,12 @@ export NSTF_NAME=2,1,0,0,0 export LHEATSTRG=.false. export LSEASPRAY=.true. +export FAST_TAU_W_SEC=0.2 +export RF_CUTOFF=10. +export ISATMEDMF=1 +export LRADAR=.false. +export LTAEROSOL=.false. + # UGWP1 export GWD_OPT=2 export DO_UGWP_V1=.false. diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8 index 8a0229c38e..e97f7ce686 100644 --- a/tests/tests/cpld_bmark_p8 +++ b/tests/tests/cpld_bmark_p8 @@ -50,6 +50,7 @@ export LIST_FILES="sfcf006.nc \ RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc \ 20130401.060000.out_pnt.ww3 \ 20130401.060000.out_grd.ww3 " +export ATMRES=C384 export_fv3 export_cpl @@ -89,7 +90,6 @@ export ice_omp_num_threads=$ICE_thrds_cpl_bmrk export wav_omp_num_threads=$WAV_thrds_cpl_bmrk # atm/ocn/ice resolution -export ATMRES=C384 export NPX=385 export NPY=385 export IMO=1536 diff --git a/tests/tests/cpld_bmark_p8_35d b/tests/tests/cpld_bmark_p8_35d index c4fca78a23..0e3b2a2bba 100644 --- a/tests/tests/cpld_bmark_p8_35d +++ b/tests/tests/cpld_bmark_p8_35d @@ -7,6 +7,8 @@ export CNTL_DIR=cpld_bmark_p8 export LIST_FILES="" +export ATMRES=C384 + export_fv3 export_cpl @@ -43,7 +45,6 @@ export ice_omp_num_threads=$ICE_thrds_cpl_bmrk export wav_omp_num_threads=$WAV_thrds_cpl_bmrk # atm/ocn/ice resolution -export ATMRES=C384 export NPX=385 export NPY=385 export IMO=1536 diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8 index 41f8d426b4..f74c38ab13 100644 --- a/tests/tests/cpld_control_c192_p8 +++ b/tests/tests/cpld_control_c192_p8 @@ -56,6 +56,7 @@ export LIST_FILES="sfcf030.tile1.nc \ 20210323.120000.out_grd.ww3 \ 20210323.120000.out_pnt.ww3 " +export ATMRES=C192 export_fv3 export_cpl @@ -82,7 +83,6 @@ export chm_omp_num_threads=$atm_omp_num_threads export med_omp_num_threads=$atm_omp_num_threads # atm/ocn/ice resolution -export ATMRES=C192 export NPX=193 export NPY=193 export IMO=768 @@ -134,8 +134,6 @@ export FNVMXC="'C192.vegetation_greenness.tileX.nc'" export FNSLPC="'C192.slope_type.tileX.nc'" export FNABSC="'C192.maximum_snow_albedo.tileX.nc'" -export CDMBWD=${CDMBWD_c192} - export FV3_RUN=cpld_control_run.IN if [[ $MACHINE_ID = derecho ]]; then diff --git a/tests/tests/cpld_control_c48 b/tests/tests/cpld_control_c48 index f90cad4b81..2f34b561ac 100644 --- a/tests/tests/cpld_control_c48 +++ b/tests/tests/cpld_control_c48 @@ -52,6 +52,7 @@ export LIST_FILES="sfcf024.tile1.nc \ RESTART/20210323.060000.MOM.res.nc \ RESTART/iced.2021-03-23-21600.nc \ RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc" +export ATMRES=C48 export_fv3 export_cpl @@ -74,7 +75,6 @@ OCN_tasks=$OCN_tasks_cpl_c48 ICE_tasks=$ICE_tasks_cpl_c48 # atm/ocn/ice resolution -export ATMRES=C48 export NPX=49 export NPY=49 export IMO=192 diff --git a/tests/tests/cpld_control_sfs b/tests/tests/cpld_control_sfs index 9f0d327e00..e1d0581285 100644 --- a/tests/tests/cpld_control_sfs +++ b/tests/tests/cpld_control_sfs @@ -27,10 +27,14 @@ export MAKE_NH=.false. export DDDMP=0 export DO_VORT_DAMP=.false. export HYDROSTATIC=.true. -export HORD_XX=10 export HORD_DP=10 -export KORD_XX=12 export KORD_TM=-12 +export KORD_MT=12 +export KORD_WZ=12 +export KORD_TR=12 +export HORD_MT=10 +export HORD_VT=10 +export HORD_TM=10 export D_CON=0 export RESTART_N=3 @@ -84,6 +88,9 @@ fi export K_SPLIT=2 export N_SPLIT=5 +export NUDGE_QV=.false. +export VTDM4=0.05 + # HR4 GFSv17 GWD update export DO_GWD_OPT_PSL=.true. export DO_GSL_DRAG_SS=.false. diff --git a/tests/tests/cpld_restart_bmark_p8 b/tests/tests/cpld_restart_bmark_p8 index ca3dc70ffc..3dd9c46610 100644 --- a/tests/tests/cpld_restart_bmark_p8 +++ b/tests/tests/cpld_restart_bmark_p8 @@ -50,7 +50,7 @@ export LIST_FILES="sfcf006.nc \ RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc \ 20130401.060000.out_pnt.ww3 \ 20130401.060000.out_grd.ww3 " - +export ATMRES=C384 export_fv3 export_cpl export_ugwpv1 @@ -93,7 +93,6 @@ export ice_omp_num_threads=$ICE_thrds_cpl_bmrk export wav_omp_num_threads=$WAV_thrds_cpl_bmrk # atm/ocn/ice resolution -export ATMRES=C384 export NPX=385 export NPY=385 export IMO=1536 diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8 index dce8254328..1fa0e6e9a0 100644 --- a/tests/tests/cpld_restart_c192_p8 +++ b/tests/tests/cpld_restart_c192_p8 @@ -56,6 +56,7 @@ export LIST_FILES="sfcf030.tile1.nc \ 20210323.120000.out_grd.ww3 \ 20210323.120000.out_pnt.ww3 " +export ATMRES=C192 export_fv3 export_cpl @@ -84,7 +85,6 @@ export chm_omp_num_threads=$atm_omp_num_threads export med_omp_num_threads=$atm_omp_num_threads # atm/ocn/ice resolution -export ATMRES=C192 export NPX=193 export NPY=193 export IMO=768 diff --git a/tests/tests/cpld_restart_c48 b/tests/tests/cpld_restart_c48 index bafb92a4b5..6297d59471 100644 --- a/tests/tests/cpld_restart_c48 +++ b/tests/tests/cpld_restart_c48 @@ -53,6 +53,7 @@ export LIST_FILES="sfcf006.tile1.nc \ RESTART/iced.2021-03-23-43200.nc \ RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc" +export ATMRES=C48 export_fv3 export_cpl @@ -86,7 +87,6 @@ OCN_tasks=$OCN_tasks_cpl_c48 ICE_tasks=$ICE_tasks_cpl_c48 # atm/ocn/ice resolution -export ATMRES=C48 export NPX=49 export NPY=49 export IMO=192 diff --git a/tests/tests/cpld_warmstart_c48 b/tests/tests/cpld_warmstart_c48 index 3c2c18e6b1..ed61689de0 100644 --- a/tests/tests/cpld_warmstart_c48 +++ b/tests/tests/cpld_warmstart_c48 @@ -53,6 +53,7 @@ export LIST_FILES="sfcf006.tile1.nc \ RESTART/iced.2021-03-23-43200.nc \ RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc" +export ATMRES=C48 export_fv3 export_cpl @@ -83,7 +84,6 @@ OCN_tasks=$OCN_tasks_cpl_c48 ICE_tasks=$ICE_tasks_cpl_c48 # atm/ocn/ice resolution -export ATMRES=C48 export NPX=49 export NPY=49 export IMO=192