From a6b42dce59f8571e7cb121532fd718f90cc88c61 Mon Sep 17 00:00:00 2001 From: "Linlin.Pan" Date: Sun, 7 Jun 2020 22:49:15 +0000 Subject: [PATCH 1/6] adding file parm/ccpp_gsd_sar_v1.nml.IN --- parm/ccpp_gsd_sar_v1.nml.IN | 310 ++++++++++++++++++++++++++++++++++++ 1 file changed, 310 insertions(+) create mode 100644 parm/ccpp_gsd_sar_v1.nml.IN diff --git a/parm/ccpp_gsd_sar_v1.nml.IN b/parm/ccpp_gsd_sar_v1.nml.IN new file mode 100644 index 0000000000..5494d40b5e --- /dev/null +++ b/parm/ccpp_gsd_sar_v1.nml.IN @@ -0,0 +1,310 @@ +&amip_interp_nml + interp_oi_sst = .true. + use_ncep_sst = .true. + use_ncep_ice = .false. + no_anom_sst = .false. + data_set = 'reynolds_oi', + date_out_of_range = 'climo', +/ + +&atmos_model_nml + blocksize = 32 + chksum_debug = .false. + dycore_only = .false. + fdiag = 3 + ccpp_suite = 'FV3_GSD_SAR_v1' +/ + +&diag_manager_nml + prepend_date = .F. +/ + +&fms_io_nml + checksum_required = .false. + max_files_r = 100, + max_files_w = 100, +/ + +&fms_nml + clock_grain = 'ROUTINE', + domains_stack_size = 2000200, + print_memory_usage = .false. +/ + +&fv_grid_nml + grid_file = 'INPUT/grid_spec.nc' +/ + + &fv_core_nml + layout = 34,24 + io_layout = 1,1 + npx = 1735 + npy = 1009 + ntiles = 1, + npz = 64 + !grid_type = -1 + make_nh = .T. + fv_debug = .T. + range_warn = .T. + reset_eta = .F. + n_sponge = 24 + nudge_qv = .F. + tau = 5. + rf_cutoff = 20.e2 + d2_bg_k1 = 0.20 + d2_bg_k2 = 0.04 + kord_tm = -11 + kord_mt = 11 + kord_wz = 11 + kord_tr = 11 + hydrostatic = .F. + phys_hydrostatic = .F. + use_hydro_pressure = .F. + beta = 0. + a_imp = 1. + p_fac = 0.1 + k_split = 4 + n_split = 5 + nwat = 6 + na_init = 1 + d_ext = 0.0 + dnats = 0 + fv_sg_adj = 300 + d2_bg = 0. + nord = 2 + dddmp = 0.1 + d4_bg = 0.12 + vtdm4 = 0.02 + ke_bg = 0. + do_vort_damp = .true. + external_ic = .T. + external_eta = .T. + gfs_phil = .false. + nggps_ic = .T. + mountain = .F. + ncep_ic = .F. + d_con = 1.0 + delt_max = 0.002 + hord_mt = 6 + hord_vt = 6 + hord_tm = 6 + hord_dp = -6 + hord_tr = 8 + adjust_dry_mass = .F. + consv_te = 0. + do_sat_adj = .F. + consv_am = .F. + fill = .T. + dwind_2d = .F. + print_freq = 6 + warm_start = .F. + no_dycore = .false. + z_tracer = .T. + read_increment = .F. + res_latlon_dynamics = "fv3_increment.nc" + + do_schmidt = .true. + target_lat = 38.5 + target_lon = -97.5 + stretch_fac = 0.999 +!! nord_zs_filter = 4 + n_zs_filter = 0 + regional = .true. + bc_update_interval = 3 + + full_zs_filter = .F. !unreleased feature + + nord_zs_filter = 4 + n_zs_filter = 0 ! safety +/ + +&surf_map_nml + zero_ocean = .F. + cd4 = 0.12 + cd2 = -1 + n_del2_strong = 0 + n_del2_weak = 2 + n_del4 = 1 + max_slope = 0.4 + peak_fac = 1. +/ + +&external_ic_nml + filtered_terrain = .true. + levp = 65 + gfs_dwinds = .true. + checker_tr = .F. + nt_checker = 0 +/ + +&gfs_physics_nml + fhzero = 6. + h2o_phys = .true. + ldiag3d = .false. + fhcyc = 0 + nst_anl = .true. + use_ufo = .true. + pre_rad = .false. + ncld = 5 + imp_physics = 8 + ttendlim = 0.005 + ltaerosol = .T. + lradar = .T. + pdfcld = .false. + fhswr = 3600. + fhlwr = 3600. + ialb = 1 + iems = 1 + iaer = 111 + ico2 = 2 + isubc_sw = 2 + isubc_lw = 2 + isol = 2 + lwhtr = .true. + swhtr = .true. + cnvgwd = .false. + shal_cnv = .false. + cal_pre = .false. + redrag = .true. + dspheat = .true. + hybedmf = .F. + satmedmf = .false. + lheatstrg = .F. + do_mynnedmf = .T. + do_mynnsfclay = .false. + random_clds = .false. + trans_trac = .true. + cnvcld = .false. + imfshalcnv = 0 + imfdeepcnv = 0 + cdmbgwd = 3.5,0.25 + prslrd0 = 0. + ivegsrc = 1 + isot = 1 + debug = .false. + oz_phys = .false. + oz_phys_2015 = .true. + nstf_name = 2,1,1,0,5 + cplflx = .F. + iau_delthrs = 6 + iaufhrs = 30 + iau_inc_files = '' + do_sppt = .F. + do_shum = .F. + do_skeb = .F. + do_sfcperts = .F. + lsm = 2 + lsoil = 4 + iopt_dveg = 2 + iopt_crs = 1 + iopt_btr = 1 + iopt_run = 1 + iopt_sfc = 1 + iopt_frz = 1 + iopt_inf = 1 + iopt_rad = 1 + iopt_alb = 2 + iopt_snf = 4 + iopt_tbot = 2 + iopt_stc = 1 + icloud_bl = 1 + bl_mynn_tkeadvect = .true. + bl_mynn_edmf = 1 + bl_mynn_edmf_mom = 1 +/ + +&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 = "global_snowfree_albedo.bosu.t126.384.190.rg.grb", + FNALBC2 = "global_albedo4.1x1.grb", + FNAISC = "CFSR.SEAICE.1982.2012.monthly.clim.grb", + FNTG3C = "global_tg3clim.2.6x1.5.grb", + FNVEGC = "global_vegfrac.0.144.decpercent.grb", + FNVETC = "global_vegtype.igbp.t126.384.190.rg.grb", + FNSOTC = "global_soiltype.statsgo.t126.384.190.rg.grb", + FNSMCC = "global_soilmgldas.t126.384.190.grb", + FNMSKH = "seaice_newland.grb", + FNTSFA = "", + FNACNA = "", + FNSNOA = "", + FNVMNC = "global_shdmin.0.144x0.144.grb", + FNVMXC = "global_shdmax.0.144x0.144.grb", + FNSLPC = "global_slope.1x1.grb", + FNABSC = "global_mxsnoalb.uariz.t126.384.190.rg.grb", + LDEBUG =.false., + FSMCL(2) = 99999 + FSMCL(3) = 99999 + FSMCL(4) = 99999 + FTSFS = 90 + FAISS = 99999 + FSNOL = 99999 + FSICL = 99999 + FTSFL = 99999, + FAISL = 99999, + FVETL = 99999, + FSOTL = 99999, + FvmnL = 99999, + FvmxL = 99999, + FSLPL = 99999, + FABSL = 99999, + FSNOS = 99999, + FSICS = 99999, +/ +&nam_stochy + lon_s=768, + lat_s=384, + ntrunc=382, + SKEBNORM=1, + SKEB_NPASS=30, + SKEB_VDOF=5, + SKEB=@[SKEB], + SKEB_TAU=2.16E4, + SKEB_LSCALE=1000.E3, + SHUM=@[SHUM], + SHUM_TAU=21600, + SHUM_LSCALE=500000, + SPPT=@[SPPT], + SPPT_TAU=21600, + SPPT_LSCALE=500000, + SPPT_LOGIT=.TRUE., + SPPT_SFCLIMIT=.TRUE., + ISEED_SHUM=1, + ISEED_SKEB=2, + ISEED_SPPT=3, +/ +&nam_sfcperts + NSFCPERT=6, + PERTZ0=-999., + PERTSHC=-999., + PERTZT=-999., + PERTLAI=-999., + PERTVEGF=-999., + PERTALB=-999., + SFC_TAU=21600, + SFC_LSCALE=500000, + ISEED_SFC=0, + SPPT_LAND=.FALSE., +/ + +&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_dokdis = 1 + knob_ugwp_ndx4lh = 1 + knob_ugwp_version = 0 + launch_level = 25 +/ From 644b2f2534c807ce2dd4420702925ddd843596f2 Mon Sep 17 00:00:00 2001 From: "Linlin.Pan" Date: Wed, 10 Jun 2020 16:04:40 +0000 Subject: [PATCH 2/6] update the descriptions of the tests and test parameters. modified files: tests/tests/fv3_ccpp_gsd_sar_v1 tests/tests/fv3_ccpp_rrfs_v0 parm/ccpp_gsd_sar_v1.nml.IN --- parm/ccpp_gsd_sar_v1.nml.IN | 6 +++--- tests/tests/fv3_ccpp_gsd_sar_v1 | 2 +- tests/tests/fv3_ccpp_rrfs_v0 | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/parm/ccpp_gsd_sar_v1.nml.IN b/parm/ccpp_gsd_sar_v1.nml.IN index 5494d40b5e..7085b805a1 100644 --- a/parm/ccpp_gsd_sar_v1.nml.IN +++ b/parm/ccpp_gsd_sar_v1.nml.IN @@ -175,8 +175,8 @@ random_clds = .false. trans_trac = .true. cnvcld = .false. - imfshalcnv = 0 - imfdeepcnv = 0 + imfshalcnv = -1 + imfdeepcnv = -1 cdmbgwd = 3.5,0.25 prslrd0 = 0. ivegsrc = 1 @@ -193,7 +193,7 @@ do_shum = .F. do_skeb = .F. do_sfcperts = .F. - lsm = 2 + lsm = 1 lsoil = 4 iopt_dveg = 2 iopt_crs = 1 diff --git a/tests/tests/fv3_ccpp_gsd_sar_v1 b/tests/tests/fv3_ccpp_gsd_sar_v1 index d9eced9747..f38e11df0e 100644 --- a/tests/tests/fv3_ccpp_gsd_sar_v1 +++ b/tests/tests/fv3_ccpp_gsd_sar_v1 @@ -1,6 +1,6 @@ ############################################################################### # -# FV3 CCPP GSD SAR (GF CU + Thompson MP + MYNN PBL + RUC LSM) test +# FV3 CCPP GSD SAR ( Thompson MP + MYNN PBL + NOAH LSM) test # ############################################################################### diff --git a/tests/tests/fv3_ccpp_rrfs_v0 b/tests/tests/fv3_ccpp_rrfs_v0 index 05a0a3e93d..b282981303 100644 --- a/tests/tests/fv3_ccpp_rrfs_v0 +++ b/tests/tests/fv3_ccpp_rrfs_v0 @@ -1,6 +1,6 @@ ############################################################################### # -# FV3 CCPP GSD (GF CU + Thompson MP + MYNN PBL + NOAH LSM) test +# FV3 CCPP RRFS (Thompson MP + MYNN PBL + NOAHMP LSM) test # ############################################################################### @@ -115,8 +115,8 @@ export INPUT_NML=ccpp_gsd.nml.IN export HYBEDMF=.F. export DO_MYNNEDMF=.T. -export IMFSHALCNV=3 -export IMFDEEPCNV=3 +export IMFSHALCNV=-1 +export IMFDEEPCNV=-1 export FHCYC=0 export LSM=2 export LSOIL_LSM=4 From de68acf2a5998a1ae2a5a0a7406c7aa798379558 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 15 Jun 2020 10:24:24 -0600 Subject: [PATCH 3/6] Update .gitmodules and submodule pointer for fv3atm for code review and testing --- .gitmodules | 3 ++- FV3 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 901dd4edbe..0fe4984a6d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NCAR/fv3atm + #url = https://github.com/NCAR/fv3atm + url = https://github.com/panll/fv3atm branch = dtc/develop [submodule "NEMS"] path = NEMS diff --git a/FV3 b/FV3 index e7fe5faa24..15b048ddb3 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit e7fe5faa24447f2fd4c9557cea0690818f097a6c +Subproject commit 15b048ddb378e70e2588617cc5d60efeecd9c251 From 1a47539ed5d048c46c0c0a8f90637cae77e54a38 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 15 Jun 2020 14:40:11 -0600 Subject: [PATCH 4/6] cmake/configure_jet.intel.cmake: bugfix for Jet to compile CCPP with multiple SIMD instructions --- cmake/configure_jet.intel.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/configure_jet.intel.cmake b/cmake/configure_jet.intel.cmake index 846fa0c7d3..4caba51b5b 100644 --- a/cmake/configure_jet.intel.cmake +++ b/cmake/configure_jet.intel.cmake @@ -21,9 +21,11 @@ option(INLINE_POST "Enable inline post" OFF) include( cmake/${CMAKE_Fortran_COMPILER_ID}.cmake ) -message("AVX2 is ENABLED on Jet (multi-tagret executable)") +message("AVX2 is ENABLED on Jet (multi-target executable)") string (REPLACE "-xHOST" "-axSSE4.2,AVX,CORE-AVX2" CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}") string (REPLACE "-xHOST" "-axSSE4.2,AVX,CORE-AVX2" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") +# For CCPP +option(SIMDMULTIARCH "Enable multi-target SIMD instruction sets" ON) string(REPLACE "-i_dynamic" "-shared-intel" CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS From bed5243afe47e796bc3d73f96449207d6ed3db3a Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 15 Jun 2020 14:40:29 -0600 Subject: [PATCH 5/6] build.sh: bring in update from public release branch --- build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 85e9547815..c146c00f64 100755 --- a/build.sh +++ b/build.sh @@ -3,8 +3,7 @@ set -eu MYDIR=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P) -export COMPILER=${COMPILER:?"Please set COMPILER environment variable [gnu|intel]"} -export CMAKE_Platform=linux.${COMPILER} +export CMAKE_Platform=${CMAKE_Platform:?"Please set the CMAKE_Platform environment variable, e.g. [macosx.gnu|linux.gnu|linux.intel|hera.intel|...]"} export CMAKE_C_COMPILER=${CMAKE_C_COMPILER:-mpicc} export CMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER:-mpicxx} export CMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER:-mpif90} From 8385b885d6975c5299836343b002b21c91766236 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 16 Jun 2020 07:45:14 -0600 Subject: [PATCH 6/6] Revert change to .gitmoddules and update submodule pointer for fv3atm --- .gitmodules | 3 +-- FV3 | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0fe4984a6d..901dd4edbe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,6 @@ [submodule "FV3"] path = FV3 - #url = https://github.com/NCAR/fv3atm - url = https://github.com/panll/fv3atm + url = https://github.com/NCAR/fv3atm branch = dtc/develop [submodule "NEMS"] path = NEMS diff --git a/FV3 b/FV3 index 15b048ddb3..5ed88a715e 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 15b048ddb378e70e2588617cc5d60efeecd9c251 +Subproject commit 5ed88a715eb19ff596533934508dcb74b0d880fb