From 8ead5751343560581ad4ed904b0b15cb874d1807 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 11 Nov 2021 23:39:02 +0000 Subject: [PATCH 1/8] Updated FV3/physics --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index b5bdf4c591..5d8d9e0135 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit b5bdf4c5912a6dbdafdf0c126fe0b7c65277ae60 +Subproject commit 5d8d9e013548f72ad85ff5ef22c6d8bc852a0899 From 4cf89711267c90a8977a4019f74b95a47863c7dc Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 11 Nov 2021 23:43:24 +0000 Subject: [PATCH 2/8] Updated .gitmodules --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8b5b737335..e88c2dec87 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-EMC/fv3atm - branch = develop + url = https://github.com/NOAA-EMC/dustinswales + branch = add_GPorts [submodule "NEMS"] path = NEMS url = https://github.com/NOAA-EMC/NEMS From 6f10c1387c10ef45e83f15ba8d2ce29512202b99 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 11 Nov 2021 23:47:42 +0000 Subject: [PATCH 3/8] Updated .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index e88c2dec87..a81dc7123d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-EMC/dustinswales + url = https://github.com/dustinswales/fv3atm branch = add_GPorts [submodule "NEMS"] path = NEMS From 818502bef09342dd1276d9b97f752d482e7fe4df Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 17 Nov 2021 15:24:15 +0000 Subject: [PATCH 4/8] New ORT for RRTMGP. --- tests/fv3_conf/cpld_control_run.IN | 5 + tests/parm/cpld_control_rrtmgp.nml.IN | 398 ++++++++++++++++++++++++++ tests/tests/cpld_control_p7_rrtmgp | 67 +++++ 3 files changed, 470 insertions(+) create mode 100644 tests/parm/cpld_control_rrtmgp.nml.IN create mode 100644 tests/tests/cpld_control_p7_rrtmgp diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN index 7579dece75..6785b455f0 100644 --- a/tests/fv3_conf/cpld_control_run.IN +++ b/tests/fv3_conf/cpld_control_run.IN @@ -18,6 +18,11 @@ else ICE_IC=@[INPUTDATA_ROOT]/CICE_IC/${OCNRES} fi +# RRTMGP +if [ $DO_RRTMGP = .true. ]; then + cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* . +fi + # FV3 fixed input cp @[INPUTDATA_ROOT_BMIC]/FV3_fix/INPUT/co2historicaldata_201*.txt . cp @[INPUTDATA_ROOT]/${FV3_DIR}/INPUT/aerosol.dat . diff --git a/tests/parm/cpld_control_rrtmgp.nml.IN b/tests/parm/cpld_control_rrtmgp.nml.IN new file mode 100644 index 0000000000..c94ece7e65 --- /dev/null +++ b/tests/parm/cpld_control_rrtmgp.nml.IN @@ -0,0 +1,398 @@ +&atmos_model_nml + blocksize = 32 + chksum_debug = .false. + dycore_only = .false. + ccpp_suite = '@[CCPP_SUITE]' +/ + +&diag_manager_nml + prepend_date = .false. + max_output_fields = @[MAX_OUTPUT_FIELDS] +/ + +&fms_io_nml + checksum_required = .false. + max_files_r = 100 + max_files_w = 100 +/ + +&mpp_io_nml +shuffle=1 +deflate_level=1 +/ + +&fms_nml + clock_grain = 'ROUTINE' + domains_stack_size = 3000000 + print_memory_usage = .false. +/ + +&fv_core_nml + layout = @[INPES],@[JNPES] + io_layout = 1,1 + npx = @[NPX] + npy = @[NPY] + ntiles = 6 + npz = @[NPZ] + dz_min = @[DZ_MIN] + psm_bc = @[PSM_BC] + grid_type = -1 + make_nh = @[MAKE_NH] + fv_debug = .false. + range_warn = .false. + reset_eta = .false. + n_sponge = 42 + nudge_qv = .true. + nudge_dz = .false. + tau = 10. + rf_cutoff = 7.5e2 + d2_bg_k1 = @[D2_BG_K1] + d2_bg_k2 = @[D2_BG_K2] + kord_tm = -9 + kord_mt = 9 + kord_wz = 9 + kord_tr = 9 + hydrostatic = .false. + phys_hydrostatic = .false. + use_hydro_pressure = .false. + beta = 0. + a_imp = 1. + p_fac = 0.1 + k_split = 2 + n_split = 6 + nwat = 6 + na_init = @[NA_INIT] + d_ext = 0. + dnats = @[DNATS] + fv_sg_adj = 450 + d2_bg = 0. + nord = 2 + dddmp = @[DDDMP] + d4_bg = 0.12 + vtdm4 = 0.02 + delt_max = 0.002 + ke_bg = 0. + do_vort_damp = .true. + external_ic = @[EXTERNAL_IC] + external_eta = .true. + gfs_phil = .false. + nggps_ic = @[NGGPS_IC] + mountain = @[MOUNTAIN] + ncep_ic = .false. + d_con = 1. + hord_mt = 5 + hord_vt = 5 + hord_tm = 5 + hord_dp = -5 + hord_tr = 8 + adjust_dry_mass = .false. + consv_te = 1. + do_sat_adj = .true. + consv_am = .false. + fill = .true. + dwind_2d = .false. + print_freq = 6 + warm_start = @[WARM_START] + no_dycore = .false. + z_tracer = .true. + agrid_vel_rst = .true. + read_increment = @[READ_INCREMENT] + res_latlon_dynamics = @[RES_LATLON_DYNAMICS] +/ + +&external_ic_nml + filtered_terrain = .true. + levp = @[NPZP] + gfs_dwinds = .true. + checker_tr = .false. + nt_checker = 0 +/ + +&gfs_physics_nml + fhzero = @[FHZERO] + h2o_phys = .true. + ldiag3d = @[LDIAG3D] + qdiag3d = @[QDIAG3D] + print_diff_pgr = @[PRINT_DIFF_PGR] + fhcyc = @[FHCYC] + use_ufo = .true. + pre_rad = .false. + imp_physics = 11 + pdfcld = .false. + fhswr = 3600. + fhlwr = 3600. + ialb = @[IALB] + iems = @[IEMS] + iaer = @[IAER] + icliq_sw = 2 + iovr = 3 + ico2 = 2 + isubc_sw = 2 + isubc_lw = 2 + isol = 2 + lwhtr = .true. + swhtr = .true. + cnvgwd = .true. + shal_cnv = .true. + cal_pre = .false. + redrag = .true. + dspheat = .true. + hybedmf = .false. + satmedmf = .true. + isatmedmf = 1 + lheatstrg = @[LHEATSTRG] + lseaspray = @[LSEASPRAY] + random_clds = @[RANDOM_CLDS] + trans_trac = .true. + cnvcld = @[CNVCLD] + imfshalcnv = @[IMFSHALCNV] + imfdeepcnv = @[IMFDEEPCNV] + ras = @[RAS] + cdmbgwd = @[CDMBWD] + prslrd0 = 0. + ivegsrc = 1 + isot = 1 + lsoil = 4 + lsm = @[LSM] + iopt_dveg = @[IOPT_DVEG] + iopt_crs = @[IOPT_CRS] + iopt_btr = 1 + iopt_run = 1 + iopt_sfc = 1 + iopt_frz = 1 + iopt_inf = 1 + iopt_rad = @[IOPT_RAD] + iopt_alb = @[IOPT_ALB] + iopt_snf = 4 + iopt_tbot = 2 + iopt_stc = @[IOPT_STC] + debug = .false. + oz_phys = .false. + oz_phys_2015 = .true. + nstf_name = @[NSTF_NAME] + nst_anl = .true. + psautco = 0.0008,0.0005 + prautco = 0.00015,0.00015 + lgfdlmprad = .true. + cplchm = @[CPLCHM] + cplwav = @[CPLWAV] + cplwav2atm = @[CPLWAV2ATM] + cplflx = @[CPLFLX] + cplice = @[CPLICE] + min_seaice = @[MIN_SEAICE] + use_cice_alb = @[USE_CICE_ALB] + frac_grid = @[FRAC_GRID] + effr_in = .true. + ldiag_ugwp = @[LDIAG_UGWP] + do_ugwp = .false. + do_tofd = .false. + do_sppt = @[DO_SPPT] + do_shum = @[DO_SHUM] + do_skeb = @[DO_SKEB] + lndp_type = @[LNDP_TYPE] + n_var_lndp = @[N_VAR_LNDP] + fscav_aero = @[FSCAV_AERO] + do_ca = @[DO_CA] + ca_global = @[CA_GLOBAL] + ca_sgs = @[CA_SGS] + nca = @[NCA] + ncells = @[NCELLS] + nlives = @[NLIVES] + nseed = @[NSEED] + nfracseed = @[NFRACSEED] + nthresh = @[NTHRESH] + ca_trigger = @[CA_TRIGGER] + nspinup = @[NSPINUP] + iseed_ca = @[ISEED_CA] + gwd_opt = @[GWD_OPT] + do_ugwp_v0 = @[DO_UGWP_V0] + do_ugwp_v1 = @[DO_UGWP_V1] + do_gsl_drag_ls_bl = @[DO_GSL_DRAG_LS_BL] + do_gsl_drag_ss = @[DO_GSL_DRAG_SS] + do_gsl_drag_tofd = @[DO_GSL_DRAG_TOFD] + do_ugwp_v1_orog_only = @[DO_UGWP_V1_OROG_ONLY] + do_ugwp_v0_nst_only = @[DO_UGWP_V0_NST_ONLY] + do_RRTMGP = .true. + 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 + doGP_cldoptics_LUT = .true. + doGP_lwscat = .true. + use_LW_jacobian = .true. + damp_LW_fluxadj = .true. + lfnc_k = 3125. + lfnc_p0 = 60000. +/ + +&gfdl_cloud_microphysics_nml + sedi_transport = .true. + do_sedi_heat = .false. + rad_snow = .true. + rad_graupel = .true. + rad_rain = .true. + const_vi = .false. + const_vs = .false. + const_vg = .false. + const_vr = .false. + vi_max = 1. + vs_max = 2. + vg_max = 12. + vr_max = 12. + qi_lim = 1. + prog_ccn = .false. + do_qa = .true. + fast_sat_adj = .true. + tau_l2v = 225. + tau_v2l = 150. + tau_g2v = 900. + rthresh = 10.e-6 ! This is a key parameter for cloud water + dw_land = 0.16 + dw_ocean = 0.10 + ql_gen = 1.0e-3 + ql_mlt = 1.0e-3 + qi0_crt = 8.0E-5 + qs0_crt = 1.0e-3 + tau_i2s = 1000. + c_psaci = 0.05 + c_pgacs = 0.01 + rh_inc = 0.30 + rh_inr = 0.30 + rh_ins = 0.30 + ccn_l = 300. + ccn_o = 100. + c_paut = 0.5 + c_cracw = 0.8 + use_ppm = .false. + use_ccn = .true. + mono_prof = .true. + z_slope_liq = .true. + z_slope_ice = .true. + de_ice = .false. + fix_negative = .true. + icloud_f = 1 + mp_time = 150. + reiflag = 2 +/ + +&interpolator_nml + interp_method = 'conserve_great_circle' +/ + +&namsfc + FNGLAC = 'global_glacier.2x2.grb' + FNMXIC = 'global_maxice.2x2.grb' + FNTSFC = 'RTGSST.1982.2012.monthly.clim.grb' + FNSNOC = 'global_snoclim.1.875.grb' + FNZORC = 'igbp' + FNALBC = @[FNALBC] + FNALBC2 = @[FNALBC2] + FNAISC = 'CFSR.SEAICE.1982.2012.monthly.clim.grb' + FNTG3C = @[FNTG3C] + FNVEGC = @[FNVEGC] + FNVETC = @[FNVETC] + FNSOTC = @[FNSOTC] + FNSMCC = @[FNSMCC] + FNMSKH = @[FNMSKH] + FNTSFA = '' + FNACNA = '' + FNSNOA = '' + FNVMNC = @[FNVMNC] + FNVMXC = @[FNVMXC] + FNSLPC = @[FNSLPC] + FNABSC = @[FNABSC] + LDEBUG =.false. + FSMCL(2) = 99999 + FSMCL(3) = 99999 + FSMCL(4) = 99999 + LANDICE = @[LANDICE] + FTSFS = 90 + FAISL = 99999 + FAISS = 99999 + FSNOL = 99999 + FSNOS = 99999 + FSICL = @[FSICL] + FSICS = 99999 + FTSFL = 99999 + FVETL = 99999 + FSOTL = 99999 + FvmnL = 99999 + FvmxL = 99999 + FSLPL = 99999 + FABSL = 99999 +/ + +&fv_grid_nml + grid_file = 'INPUT/grid_spec.nc' +/ + +&nam_stochy + STOCHINI=@[STOCHINI] + SKEBNORM=1 + SKEB_NPASS=30 + SKEB_VDOF=5 + SKEB=@[SKEB] + SKEB_TAU=2.16E4 + SKEB_LSCALE=1000.E3 + SKEBINT=1800 + SHUM=@[SHUM] + SHUM_TAU=21600 + SHUM_LSCALE=500000 + SHUMINT=3600 + SPPT=@[SPPT] + SPPT_TAU=21600 + SPPT_LSCALE=500000 + SPPT_LOGIT=.TRUE. + SPPT_SFCLIMIT=.TRUE. + SPPTINT=1800 + ISEED_SHUM=1 + ISEED_SKEB=2 + ISEED_SPPT=3 +/ + +&nam_sfcperts + lndp_type = @[LNDP_TYPE] + LNDP_TAU=21600 + LNDP_LSCALE=500000 + ISEED_LNDP=2010 + lndp_var_list = @[LNDP_VAR_LIST] + lndp_prt_list = @[LNDP_PRT_LIST] +/ + +&cires_ugwp_nml + knob_ugwp_solver = 2 + knob_ugwp_version = @[KNOB_UGWP_VERSION] + 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_dokdis = 2 + knob_ugwp_ndx4lh = 4 + knob_ugwp_palaunch = 275.0e2 + knob_ugwp_nslope = @[KNOB_UGWP_NSLOPE] + knob_ugwp_lzmax = 15.750e3 + knob_ugwp_lzmin = 0.75e3 + knob_ugwp_lzstar = 2.0e3 + knob_ugwp_taumin = 0.25e-3 + knob_ugwp_tauamp = 3.0e-3 + knob_ugwp_lhmet = 200.0e3 + knob_ugwp_orosolv = 'pss-1986' +/ + +&MOM_input_nml + output_directory = 'MOM6_OUTPUT/', + input_filename = '@[MOM6_RESTART_SETTING]' + restart_input_dir = 'INPUT/', + restart_output_dir = 'RESTART/', + parameter_filename = 'INPUT/MOM_input', + 'INPUT/MOM_override'/ + diff --git a/tests/tests/cpld_control_p7_rrtmgp b/tests/tests/cpld_control_p7_rrtmgp new file mode 100644 index 0000000000..0a571e4d65 --- /dev/null +++ b/tests/tests/cpld_control_p7_rrtmgp @@ -0,0 +1,67 @@ +# +# cpld_control P7 test +# + +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100 + RRTMGP" + +export CNTL_DIR="cpld_control_p7_rrtmgp" + +export LIST_FILES="sfcf024.tile1.nc \ + sfcf024.tile2.nc \ + sfcf024.tile3.nc \ + sfcf024.tile4.nc \ + sfcf024.tile5.nc \ + sfcf024.tile6.nc \ + atmf024.tile1.nc \ + atmf024.tile2.nc \ + atmf024.tile3.nc \ + atmf024.tile4.nc \ + atmf024.tile5.nc \ + atmf024.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 \ + RESTART/MOM.res.nc \ + RESTART/iced.2021-03-23-21600.nc \ + RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc" + +#TODO: add comparison of CA restart files? + +export_fv3 +export_cpl +export DO_RRTMGP=.true. +export RESTART_N=12 +export RESTART_INTERVAL="${RESTART_N} -1" +export eps_imesh=2.5e-1 +export CCPP_SUITE=FV3_GFS_v16_coupled_rrtmgp +export FV3_RUN=cpld_control_run.IN +export INPUT_NML=cpld_control_rrtmgp.nml.IN From b7fc53962d74810cf1650ea07eacd4a1ffb048d6 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 17 Nov 2021 15:25:41 +0000 Subject: [PATCH 5/8] Omission from previous commit --- tests/rt.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/rt.conf b/tests/rt.conf index 3bd1580d9d..74317d6a28 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -2,9 +2,10 @@ # S2S tests # ################################################################################################################################################################################### -COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 | - wcoss_cray | fv3 | +COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_rrtmgp | - wcoss_cray | fv3 | # Waves off RUN | cpld_control_p7 | - wcoss_cray | fv3 | +RUN | cpld_control_p7_rrtmgp | - wcoss_cray | fv3 | RUN | cpld_restart_p7 | - wcoss_cray | | cpld_control_p7 RUN | cpld_2threads_p7 | - wcoss_cray | | RUN | cpld_decomp_p7 | - wcoss_cray jet.intel | | From 94c9d3d1b028eb756b01ba745d6d658b908126be Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 17 Nov 2021 21:19:01 +0000 Subject: [PATCH 6/8] More RRTMGP coupled operational regression tests! --- FV3 | 2 +- tests/rt.conf | 6 +- tests/tests/cpld_control_c192_p7_rrtmgp | 130 ++++++++++++++++++++++++ tests/tests/cpld_control_c384_p7_rrtmgp | 126 +++++++++++++++++++++++ tests/tests/cpld_debug_p7_rrtmgp | 71 +++++++++++++ tests/tests/cpld_restart_p7_rrtmgp | 90 ++++++++++++++++ 6 files changed, 423 insertions(+), 2 deletions(-) create mode 100644 tests/tests/cpld_control_c192_p7_rrtmgp create mode 100644 tests/tests/cpld_control_c384_p7_rrtmgp create mode 100644 tests/tests/cpld_debug_p7_rrtmgp create mode 100644 tests/tests/cpld_restart_p7_rrtmgp diff --git a/FV3 b/FV3 index 5d8d9e0135..e7ca2927ad 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 5d8d9e013548f72ad85ff5ef22c6d8bc852a0899 +Subproject commit e7ca2927ad4a3102730f6f6633bbeb4a30cf7105 diff --git a/tests/rt.conf b/tests/rt.conf index 74317d6a28..6c6526be30 100644 --- a/tests/rt.conf +++ b/tests/rt.conf @@ -7,6 +7,7 @@ COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_ RUN | cpld_control_p7 | - wcoss_cray | fv3 | RUN | cpld_control_p7_rrtmgp | - wcoss_cray | fv3 | RUN | cpld_restart_p7 | - wcoss_cray | | cpld_control_p7 +RUN | cpld_restart_p7_rrtmgp | - wcoss_cray | | cpld_control_p7_rrtmgp RUN | cpld_2threads_p7 | - wcoss_cray | | RUN | cpld_decomp_p7 | - wcoss_cray jet.intel | | # Waves on @@ -14,15 +15,18 @@ RUN | cpld_control_wave_p7 RUN | cpld_control_c192_p7 | - wcoss_cray | fv3 | RUN | cpld_restart_c192_p7 | - wcoss_cray | | cpld_control_c192_p7 +RUN | cpld_control_c192_p7_rrtmgp | - wcoss_cray | fv3 | RUN | cpld_control_c384_p7 | - wcoss_cray | fv3 | RUN | cpld_restart_c384_p7 | - wcoss_cray | | cpld_control_c384_p7 +RUN | cpld_control_c384_p7_rrtmgp | - wcoss_cray | fv3 | # Waves on, BM IC RUN | cpld_bmark_p7 | - wcoss_cray | fv3 | -COMPILE | -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 | - wcoss_cray | fv3 | +COMPILE | -DAPP=S2S -DDEBUG=ON -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_rrtmgp | - wcoss_cray | fv3 | RUN | cpld_debug_p7 | - wcoss_cray | fv3 | +RUN | cpld_debug_p7_rrtmgp | - wcoss_cray | fv3 | ################################################################################################################################################################################### # PROD tests # diff --git a/tests/tests/cpld_control_c192_p7_rrtmgp b/tests/tests/cpld_control_c192_p7_rrtmgp new file mode 100644 index 0000000000..3de3a83331 --- /dev/null +++ b/tests/tests/cpld_control_c192_p7_rrtmgp @@ -0,0 +1,130 @@ +# +# cpld_control_c192_p7 test +# +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C192 MX050 - P7 test + RRTMGP" + +export CNTL_DIR="cpld_control_c192_p7_rrtmgp" + +export LIST_FILES="sfcf036.tile1.nc \ + sfcf036.tile2.nc \ + sfcf036.tile3.nc \ + sfcf036.tile4.nc \ + sfcf036.tile5.nc \ + sfcf036.tile6.nc \ + atmf036.tile1.nc \ + atmf036.tile2.nc \ + atmf036.tile3.nc \ + atmf036.tile4.nc \ + atmf036.tile5.nc \ + atmf036.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 \ + RESTART/MOM.res.nc \ + RESTART/iced.2021-03-23-64800.nc \ + RESTART/ufs.cpld.cpl.r.2021-03-23-64800.nc" + +export_fv3 +export_cpl + +export DAYS=1.5 +export FHMAX=36 +export RESTART_N=12 +export RESTART_INTERVAL="${RESTART_N} -1" + +export TASKS=$TASKS_cpl_c192 +export TPN=$TPN_cpl_c192 +export INPES=$INPES_cpl_c192 +export JNPES=$JNPES_cpl_c192 +export THRD=$THRD_cpl_c192 +export WRTTASK_PER_GROUP=$WPG_cpl_c192 + +export med_petlist_bounds=$MPB_cpl_c192 +export atm_petlist_bounds=$APB_cpl_c192 +export ocn_petlist_bounds=$OPB_cpl_c192 +export ice_petlist_bounds=$IPB_cpl_c192 + +# atm/ocn/ice resolution +export ATMRES=C192 +export NPX=193 +export NPY=193 +export IMO=768 +export JMO=384 + +export OCNRES=050 +export ICERES=0.50 +export NX_GLB=720 +export NY_GLB=576 +export NPROC_ICE=24 +export np2=`expr $NPROC_ICE / 2` +export BLCKX=`expr $NX_GLB / $np2` +export BLCKY=`expr $NY_GLB / 2` + +# resolution dependent setting +export CDMBWD=${CDMBWD_c192} + +# set component and coupling timesteps +export DT_ATMOS=600 +export DT_CICE=${DT_ATMOS} +export DT_DYNAM_MOM6=1800 +export DT_THERM_MOM6=3600 + +# nems.configure +export coupling_interval_slow_sec=${DT_THERM_MOM6} +export coupling_interval_fast_sec=${DT_ATMOS} + +# resolution dependent files +export MOM_INPUT=MOM_input_template_${OCNRES} +export MESHOCN_ICE=mesh.mx${OCNRES}.nc +export CICEGRID=grid_cice_NEMS_mx${OCNRES}.nc +export CICEMASK=kmtu_cice_NEMS_mx${OCNRES}.nc +export CHLCLIM=seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc +export FRUNOFF=runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc +export MOM6_RIVER_RUNOFF=True + +export FNALBC="'C192.snowfree_albedo.tileX.nc'" +export FNALBC2="'C192.facsf.tileX.nc'" +export FNTG3C="'C192.substrate_temperature.tileX.nc'" +export FNVEGC="'C192.vegetation_greenness.tileX.nc'" +export FNVETC="'C192.vegetation_type.tileX.nc'" +export FNSOTC="'C192.soil_type.tileX.nc'" +export FNVMNC="'C192.vegetation_greenness.tileX.nc'" +export FNVMXC="'C192.vegetation_greenness.tileX.nc'" +export FNSLPC="'C192.slope_type.tileX.nc'" +export FNABSC="'C192.maximum_snow_albedo.tileX.nc'" + +# RRTMGP +export DO_RRTMGP=.true. +export CCPP_SUITE=FV3_GFS_v16_coupled_rrtmgp +export INPUT_NML=cpld_control_rrtmgp.nml.IN + +export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_control_c384_p7_rrtmgp b/tests/tests/cpld_control_c384_p7_rrtmgp new file mode 100644 index 0000000000..86b4cf1b33 --- /dev/null +++ b/tests/tests/cpld_control_c384_p7_rrtmgp @@ -0,0 +1,126 @@ +# +# cpld_control_c384_p7 test +# +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C384L127 MX025 - P7 test + RRTMGP" + +export CNTL_DIR="cpld_control_c384_p7_rrtmgp" + +export LIST_FILES="sfcf006.nc \ + atmf006.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 \ + RESTART/MOM.res.nc \ + RESTART/MOM.res_1.nc \ + RESTART/MOM.res_2.nc \ + RESTART/MOM.res_3.nc \ + RESTART/iced.2021-03-22-43200.nc \ + RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc" + +export_fv3 +export_cpl + +export DAYS=0.25 +export FHMAX=6 +export RESTART_N=3 +export RESTART_INTERVAL="${RESTART_N} -1" +export OUTPUT_FH="3 -1" +export FHZERO=3 + +export TASKS=$TASKS_cpl_c384 +export TPN=$TPN_cpl_c384 +export INPES=$INPES_cpl_c384 +export JNPES=$JNPES_cpl_c384 +export THRD=$THRD_cpl_c384 +export WRTTASK_PER_GROUP=$WPG_cpl_c384 + +export med_petlist_bounds=$MPB_cpl_c384 +export atm_petlist_bounds=$APB_cpl_c384 +export ocn_petlist_bounds=$OPB_cpl_c384 +export ice_petlist_bounds=$IPB_cpl_c384 + +# atm/ocn/ice resolution +export ATMRES=C384 +export NPX=385 +export NPY=385 +export IMO=1536 +export JMO=768 +export OUTPUT_GRID="'gaussian_grid'" + +export OCNRES=025 +export ICERES=0.25 +export NX_GLB=1440 +export NY_GLB=1080 +export NPROC_ICE=48 +export np2=`expr $NPROC_ICE / 2` +export BLCKX=`expr $NX_GLB / $np2` +export BLCKY=`expr $NY_GLB / 2` + +# resolution dependent setting +export CDMBWD=${CDMBWD_c384} + +# set component and coupling timesteps +export DT_ATMOS=300 +export DT_CICE=${DT_ATMOS} +export DT_DYNAM_MOM6=900 +export DT_THERM_MOM6=1800 + +# nems.configure +export coupling_interval_slow_sec=${DT_THERM_MOM6} +export coupling_interval_fast_sec=${DT_ATMOS} + +# resolution dependent files +export MOM_INPUT=MOM_input_template_${OCNRES} +export MESHOCN_ICE=mesh.mx${OCNRES}.nc +export CICEGRID=grid_cice_NEMS_mx${OCNRES}.nc +export CICEMASK=kmtu_cice_NEMS_mx${OCNRES}.nc +export CHLCLIM=seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc +export FRUNOFF=runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc +export MOM6_RIVER_RUNOFF=True + +export FNALBC="'C384.snowfree_albedo.tileX.nc'" +export FNALBC2="'C384.facsf.tileX.nc'" +export FNTG3C="'C384.substrate_temperature.tileX.nc'" +export FNVEGC="'C384.vegetation_greenness.tileX.nc'" +export FNVETC="'C384.vegetation_type.tileX.nc'" +export FNSOTC="'C384.soil_type.tileX.nc'" +export FNVMNC="'C384.vegetation_greenness.tileX.nc'" +export FNVMXC="'C384.vegetation_greenness.tileX.nc'" +export FNSLPC="'C384.slope_type.tileX.nc'" +export FNABSC="'C384.maximum_snow_albedo.tileX.nc'" + +# RRTMGP +export DO_RRTMGP=.true. +export CCPP_SUITE=FV3_GFS_v16_coupled_rrtmgp +export INPUT_NML=cpld_control_rrtmgp.nml.IN + +export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_debug_p7_rrtmgp b/tests/tests/cpld_debug_p7_rrtmgp new file mode 100644 index 0000000000..413594f5a9 --- /dev/null +++ b/tests/tests/cpld_debug_p7_rrtmgp @@ -0,0 +1,71 @@ +# +# cpld_debug_p7 test +# + +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100 - P7 debug + RRTMGP" + +export CNTL_DIR="cpld_debug_p7_rrtmgp" + +export LIST_FILES="sfcf006.tile1.nc \ + sfcf006.tile2.nc \ + sfcf006.tile3.nc \ + sfcf006.tile4.nc \ + sfcf006.tile5.nc \ + sfcf006.tile6.nc \ + atmf006.tile1.nc \ + atmf006.tile2.nc \ + atmf006.tile3.nc \ + atmf006.tile4.nc \ + atmf006.tile5.nc \ + atmf006.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 \ + RESTART/MOM.res.nc \ + RESTART/iced.2021-03-22-43200.nc \ + RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc" + +export_fv3 +export_cpl + +# RRTMGP +export DO_RRTMGP=.true. +export CCPP_SUITE=FV3_GFS_v16_coupled_rrtmgp +export INPUT_NML=cpld_control_rrtmgp.nml.IN + +export DAYS=0.25 +export FHMAX=6 + +export RESTART_N=${FHMAX} +export eps_imesh=2.5e-1 + +export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_restart_p7_rrtmgp b/tests/tests/cpld_restart_p7_rrtmgp new file mode 100644 index 0000000000..d9e6ff0728 --- /dev/null +++ b/tests/tests/cpld_restart_p7_rrtmgp @@ -0,0 +1,90 @@ +# +# cpld_restart_p7 test +# + +export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100 - P7 restart + RRTMGP" + +export CNTL_DIR="cpld_control_p7_rrtmgp" + +export LIST_FILES="sfcf024.tile1.nc \ + sfcf024.tile2.nc \ + sfcf024.tile3.nc \ + sfcf024.tile4.nc \ + sfcf024.tile5.nc \ + sfcf024.tile6.nc \ + atmf024.tile1.nc \ + atmf024.tile2.nc \ + atmf024.tile3.nc \ + atmf024.tile4.nc \ + atmf024.tile5.nc \ + atmf024.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 \ + RESTART/MOM.res.nc \ + RESTART/iced.2021-03-23-21600.nc \ + RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc" + +export_fv3 +export_cpl + +export FHROT=12 +export RESTART_N=$((FHMAX-$FHROT)) + +export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT} + ${SHOUR} )))0000" +export RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT} + ${SHOUR})))" +export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( (${FHROT}+ ${SHOUR})*3600 )))" + +# RRTMGP +export DO_RRTMGP=.true. +export CCPP_SUITE=FV3_GFS_v16_coupled_rrtmgp +export INPUT_NML=cpld_control_rrtmgp.nml.IN + +# ATM warm start +export WARM_START=.true. +export MAKE_NH=.false. +export NA_INIT=0 +export EXTERNAL_IC=.false. +export NGGPS_IC=.false. +export MOUNTAIN=.true. +export NSTF_NAME=2,0,0,0,0 + +# ICE warm start +export CICERUNTYPE=continue +export RUNTYPE=continue +export USE_RESTART_TIME=.true. + +# MOM6 warm start +export MOM6_RESTART_SETTING=r +export eps_imesh=2.5e-1 + +export FV3_RUN=cpld_control_run.IN From c795cbcaeb2aac71ec317dbd04111eef30c85d4e Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 18 Nov 2021 21:28:47 +0000 Subject: [PATCH 7/8] Synced with origin --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index e7ca2927ad..8e55a859d7 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit e7ca2927ad4a3102730f6f6633bbeb4a30cf7105 +Subproject commit 8e55a859d7e237f644dbfc02d55ffc37cd9f2899 From b7ec3c3530b1199c695e6322908c27d3ebb0ef21 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 18 Nov 2021 21:34:15 +0000 Subject: [PATCH 8/8] Updated submodules --- WW3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WW3 b/WW3 index 1c2a28dbd5..46b3896eca 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit 1c2a28dbd533a5901ddbce488fba24d300511e95 +Subproject commit 46b3896ecac921f24335c8f1ef81daaaf4287b1b