From 03d1aaa6023b96d9dbb80f98d0c3c6912186d47c Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Wed, 3 Jan 2024 14:48:56 -0500 Subject: [PATCH 1/9] update ufs.configure templates for global use cases --- tests/default_vars.sh | 6 +- tests/parm/ufs.configure.atm.IN | 2 +- tests/parm/ufs.configure.atmaero.IN | 2 +- tests/parm/ufs.configure.leapfrog_atm_wav.IN | 4 +- tests/parm/ufs.configure.s2s.IN | 8 +- tests/parm/ufs.configure.s2sa.IN | 9 +- tests/parm/ufs.configure.s2sw_slow.IN | 20 +-- tests/parm/ufs.configure.s2swa_slow.IN | 151 +++++++++++++++++++ 8 files changed, 179 insertions(+), 23 deletions(-) create mode 100644 tests/parm/ufs.configure.s2swa_slow.IN diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 2906da8ac8..b76f803597 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -249,7 +249,7 @@ elif [[ $MACHINE_ID = derecho ]]; then INPES_thrd=3 ; JNPES_thrd=4 INPES_c384=8 ; JNPES_c384=6 ; THRD_c384=2 INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2 - + THRD_cpl_atmw_gdas=2 INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24 WAV_tasks_atmw_gdas=248 @@ -320,6 +320,10 @@ WLCLK_dflt=30 export WLCLK=$WLCLK_dflt export CMP_DATAONLY=false +# Defaults for ufs.configure +export esmf_logkind="ESMF_LOGKIND_MULTI" +export DumpFields="false" + export_fv3 () { # ufs.configure defaults diff --git a/tests/parm/ufs.configure.atm.IN b/tests/parm/ufs.configure.atm.IN index a21ec75dbe..8eb7b94dc7 100644 --- a/tests/parm/ufs.configure.atm.IN +++ b/tests/parm/ufs.configure.atm.IN @@ -3,7 +3,7 @@ ############################################# # ESMF # -logKindFlag: ESMF_LOGKIND_MULTI +logKindFlag: @[esmf_logkind] globalResourceControl: true # EARTH # diff --git a/tests/parm/ufs.configure.atmaero.IN b/tests/parm/ufs.configure.atmaero.IN index addc59ff27..0c20f20905 100644 --- a/tests/parm/ufs.configure.atmaero.IN +++ b/tests/parm/ufs.configure.atmaero.IN @@ -3,7 +3,7 @@ ############################################# # ESMF # -logKindFlag: ESMF_LOGKIND_MULTI +logKindFlag: @[esmf_logkind] globalResourceControl: true # EARTH # diff --git a/tests/parm/ufs.configure.leapfrog_atm_wav.IN b/tests/parm/ufs.configure.leapfrog_atm_wav.IN index 627bdfcfdc..c4b6055fd1 100644 --- a/tests/parm/ufs.configure.leapfrog_atm_wav.IN +++ b/tests/parm/ufs.configure.leapfrog_atm_wav.IN @@ -3,7 +3,7 @@ ############################################# # ESMF # -logKindFlag: ESMF_LOGKIND_MULTI +logKindFlag: @[esmf_logkind] globalResourceControl: true # EARTH # @@ -18,7 +18,7 @@ ATM_petlist_bounds: @[atm_petlist_bounds] ATM_omp_num_threads: @[atm_omp_num_threads] ATM_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] :: # WAV # diff --git a/tests/parm/ufs.configure.s2s.IN b/tests/parm/ufs.configure.s2s.IN index 1b5efbd297..6a0234e120 100644 --- a/tests/parm/ufs.configure.s2s.IN +++ b/tests/parm/ufs.configure.s2s.IN @@ -3,7 +3,7 @@ ############################################# # ESMF # -logKindFlag: ESMF_LOGKIND_MULTI +logKindFlag: @[esmf_logkind] globalResourceControl: true # EARTH # @@ -24,7 +24,7 @@ ATM_petlist_bounds: @[atm_petlist_bounds] ATM_omp_num_threads: @[atm_omp_num_threads] ATM_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true :: @@ -35,7 +35,7 @@ OCN_petlist_bounds: @[ocn_petlist_bounds] OCN_omp_num_threads: @[ocn_omp_num_threads] OCN_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true mesh_ocn = @[MESH_OCN] @@ -49,7 +49,7 @@ ICE_petlist_bounds: @[ice_petlist_bounds] ICE_omp_num_threads: @[ice_omp_num_threads] ICE_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true mesh_ice = @[MESH_ICE] diff --git a/tests/parm/ufs.configure.s2sa.IN b/tests/parm/ufs.configure.s2sa.IN index e5f9439e17..1cfe5047e9 100644 --- a/tests/parm/ufs.configure.s2sa.IN +++ b/tests/parm/ufs.configure.s2sa.IN @@ -3,7 +3,7 @@ ############################################# # ESMF # -logKindFlag: ESMF_LOGKIND_MULTI +logKindFlag: @[esmf_logkind] globalResourceControl: true # EARTH # @@ -16,6 +16,7 @@ EARTH_attributes:: MED_model: @[med_model] MED_petlist_bounds: @[med_petlist_bounds] MED_omp_num_threads: @[med_omp_num_threads] +:: # ATM # ATM_model: @[atm_model] @@ -23,7 +24,7 @@ ATM_petlist_bounds: @[atm_petlist_bounds] ATM_omp_num_threads: @[atm_omp_num_threads] ATM_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true :: @@ -42,7 +43,7 @@ OCN_petlist_bounds: @[ocn_petlist_bounds] OCN_omp_num_threads: @[ocn_omp_num_threads] OCN_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true mesh_ocn = @[MESH_OCN] @@ -56,7 +57,7 @@ ICE_petlist_bounds: @[ice_petlist_bounds] ICE_omp_num_threads: @[ice_omp_num_threads] ICE_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true mesh_ice = @[MESH_ICE] diff --git a/tests/parm/ufs.configure.s2sw_slow.IN b/tests/parm/ufs.configure.s2sw_slow.IN index 63e691c892..c7bde0821f 100644 --- a/tests/parm/ufs.configure.s2sw_slow.IN +++ b/tests/parm/ufs.configure.s2sw_slow.IN @@ -3,7 +3,8 @@ ############################################# # ESMF # -logKindFlag: ESMF_LOGKIND_MULTI +logKindFlag: @[esmf_logkind] +globalResourceControl: true # EARTH # EARTH_component_list: MED ATM OCN ICE WAV @@ -14,14 +15,16 @@ EARTH_attributes:: # MED # MED_model: @[med_model] MED_petlist_bounds: @[med_petlist_bounds] +MED_omp_num_threads: @[med_omp_num_threads] :: # ATM # ATM_model: @[atm_model] ATM_petlist_bounds: @[atm_petlist_bounds] +ATM_omp_num_threads: @[atm_omp_num_threads] ATM_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true :: @@ -29,12 +32,11 @@ ATM_attributes:: # OCN # OCN_model: @[ocn_model] OCN_petlist_bounds: @[ocn_petlist_bounds] +OCN_omp_num_threads: @[ocn_omp_num_threads] OCN_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] ProfileMemory = false - diro = "." - logfile = "mom6.log" OverwriteSlice = true mesh_ocn = @[MESH_OCN] use_coldstart = @[use_coldstart] @@ -44,9 +46,10 @@ OCN_attributes:: # ICE # ICE_model: @[ice_model] ICE_petlist_bounds: @[ice_petlist_bounds] +ICE_omp_num_threads: @[ice_omp_num_threads] ICE_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true mesh_ice = @[MESH_ICE] @@ -59,11 +62,11 @@ ICE_attributes:: # WAV # WAV_model: @[wav_model] WAV_petlist_bounds: @[wav_petlist_bounds] +WAV_omp_num_threads: @[wav_omp_num_threads] WAV_attributes:: Verbosity = 0 OverwriteSlice = false mesh_wav = @[MESH_WAV] - user_sets_restname = true :: # CMEPS warm run sequence @@ -102,7 +105,6 @@ runSeq:: DRIVER_attributes:: :: - MED_attributes:: ATM_model = @[atm_model] ICE_model = @[ice_model] @@ -113,7 +115,6 @@ MED_attributes:: pio_rearranger = @[pio_rearranger] ocean_albedo_limit = @[ocean_albedo_limit] :: - ALLCOMP_attributes:: ScalarFieldCount = 2 ScalarFieldIdxGridNX = 1 @@ -121,7 +122,6 @@ ALLCOMP_attributes:: ScalarFieldName = cpl_scalars start_type = @[RUNTYPE] restart_dir = @[CMEPS_RESTART_DIR] - RunTimeLog = true case_name = ufs.cpld restart_n = @[RESTART_N] restart_option = nhours diff --git a/tests/parm/ufs.configure.s2swa_slow.IN b/tests/parm/ufs.configure.s2swa_slow.IN new file mode 100644 index 0000000000..4d5d8bb360 --- /dev/null +++ b/tests/parm/ufs.configure.s2swa_slow.IN @@ -0,0 +1,151 @@ +############################################# +#### UFS Run-Time Configuration File ###### +############################################# + +# ESMF # +logKindFlag: @[esmf_logkind] +globalResourceControl: true + +# EARTH # +EARTH_component_list: MED ATM CHM OCN ICE WAV +EARTH_attributes:: + Verbosity = 0 +:: + +# MED # +MED_model: @[med_model] +MED_petlist_bounds: @[med_petlist_bounds] +MED_omp_num_threads: @[med_omp_num_threads] +:: + +# ATM # +ATM_model: @[atm_model] +ATM_petlist_bounds: @[atm_petlist_bounds] +ATM_omp_num_threads: @[atm_omp_num_threads] +ATM_attributes:: + Verbosity = 0 + DumpFields = @[DumpFields] + ProfileMemory = false + OverwriteSlice = true +:: + +# CHM # +CHM_model: @[chm_model] +CHM_petlist_bounds: @[chm_petlist_bounds] +CHM_omp_num_threads: @[chm_omp_num_threads] +CHM_attributes:: + Verbosity = 0 +:: + +# OCN # +OCN_model: @[ocn_model] +OCN_petlist_bounds: @[ocn_petlist_bounds] +OCN_omp_num_threads: @[ocn_omp_num_threads] +OCN_attributes:: + Verbosity = 0 + DumpFields = @[DumpFields] + ProfileMemory = false + OverwriteSlice = true + mesh_ocn = @[MESH_OCN] + use_coldstart = @[use_coldstart] + use_mommesh = @[use_mommesh] +:: + +# ICE # +ICE_model: @[ice_model] +ICE_petlist_bounds: @[ice_petlist_bounds] +ICE_omp_num_threads: @[ice_omp_num_threads] +ICE_attributes:: + Verbosity = 0 + DumpFields = @[DumpFields] + ProfileMemory = false + OverwriteSlice = true + mesh_ice = @[MESH_ICE] + eps_imesh = @[eps_imesh] + stop_n = @[RESTART_N] + stop_option = nhours + stop_ymd = -999 +:: + +# WAV # +WAV_model: @[wav_model] +WAV_petlist_bounds: @[wav_petlist_bounds] +WAV_omp_num_threads: @[wav_omp_num_threads] +WAV_attributes:: + Verbosity = 0 + OverwriteSlice = false + mesh_wav = @[MESH_WAV] +:: + +# CMEPS warm run sequence +runSeq:: +@@[coupling_interval_slow_sec] + MED med_phases_prep_wav_avg + MED med_phases_prep_ocn_avg + MED -> WAV :remapMethod=redist + MED -> OCN :remapMethod=redist + WAV + OCN + @@[coupling_interval_fast_sec] + MED med_phases_prep_atm + MED med_phases_prep_ice + MED -> ATM :remapMethod=redist + MED -> ICE :remapMethod=redist + ATM phase1 + ATM -> CHM + CHM + CHM -> ATM + ATM phase2 + ICE + ATM -> MED :remapMethod=redist + MED med_phases_post_atm + ICE -> MED :remapMethod=redist + MED med_phases_post_ice + MED med_phases_ocnalb_run + MED med_phases_prep_ocn_accum + MED med_phases_prep_wav_accum + @ + OCN -> MED :remapMethod=redist + WAV -> MED :remapMethod=redist + MED med_phases_post_ocn + MED med_phases_post_wav + MED med_phases_restart_write +@ +:: + +# CMEPS variables + +DRIVER_attributes:: +:: +MED_attributes:: + ATM_model = @[atm_model] + ICE_model = @[ice_model] + OCN_model = @[ocn_model] + WAV_model = @[wav_model] + coupling_mode = @[CPLMODE] + history_tile_atm = @[ATMTILESIZE] + pio_rearranger = @[pio_rearranger] + ocean_albedo_limit = @[ocean_albedo_limit] +:: +ALLCOMP_attributes:: + ScalarFieldCount = 2 + ScalarFieldIdxGridNX = 1 + ScalarFieldIdxGridNY = 2 + ScalarFieldName = cpl_scalars + start_type = @[RUNTYPE] + restart_dir = @[CMEPS_RESTART_DIR] + case_name = ufs.cpld + restart_n = @[RESTART_N] + restart_option = nhours + restart_ymd = -999 + dbug_flag = @[cap_dbug_flag] + stop_n = @[FHMAX] + stop_option = nhours + stop_ymd = -999 + orb_eccen = 1.e36 + orb_iyear = 2000 + orb_iyear_align = 2000 + orb_mode = fixed_year + orb_mvelp = 1.e36 + orb_obliq = 1.e36 +:: From 4154fded61549296e45df7f4e4a3c4fbedbd8b03 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Thu, 4 Jan 2024 15:47:24 -0500 Subject: [PATCH 2/9] remove slow from the name, instead name the other fast. Add _esmf to identify ESMF managed threading --- tests/parm/ufs.configure.s2sw.IN | 26 ++- ...2sw_slow.IN => ufs.configure.s2sw_esmf.IN} | 0 tests/parm/ufs.configure.s2sw_fast_esmf.IN | 139 ++++++++++++++++ tests/parm/ufs.configure.s2swa.IN | 30 ++-- ...wa_slow.IN => ufs.configure.s2swa_esmf.IN} | 0 tests/parm/ufs.configure.s2swa_fast_esmf.IN | 153 ++++++++++++++++++ 6 files changed, 313 insertions(+), 35 deletions(-) rename tests/parm/{ufs.configure.s2sw_slow.IN => ufs.configure.s2sw_esmf.IN} (100%) create mode 100644 tests/parm/ufs.configure.s2sw_fast_esmf.IN rename tests/parm/{ufs.configure.s2swa_slow.IN => ufs.configure.s2swa_esmf.IN} (100%) create mode 100644 tests/parm/ufs.configure.s2swa_fast_esmf.IN diff --git a/tests/parm/ufs.configure.s2sw.IN b/tests/parm/ufs.configure.s2sw.IN index 84efa7ca6b..411f35e57e 100644 --- a/tests/parm/ufs.configure.s2sw.IN +++ b/tests/parm/ufs.configure.s2sw.IN @@ -3,7 +3,7 @@ ############################################# # ESMF # -logKindFlag: ESMF_LOGKIND_MULTI +logKindFlag: @[esmf_logkind] globalResourceControl: true # EARTH # @@ -15,16 +15,14 @@ EARTH_attributes:: # MED # MED_model: @[med_model] MED_petlist_bounds: @[med_petlist_bounds] -MED_omp_num_threads: @[med_omp_num_threads] :: # ATM # ATM_model: @[atm_model] ATM_petlist_bounds: @[atm_petlist_bounds] -ATM_omp_num_threads: @[atm_omp_num_threads] ATM_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true :: @@ -32,10 +30,9 @@ ATM_attributes:: # OCN # OCN_model: @[ocn_model] OCN_petlist_bounds: @[ocn_petlist_bounds] -OCN_omp_num_threads: @[ocn_omp_num_threads] OCN_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true mesh_ocn = @[MESH_OCN] @@ -46,10 +43,9 @@ OCN_attributes:: # ICE # ICE_model: @[ice_model] ICE_petlist_bounds: @[ice_petlist_bounds] -ICE_omp_num_threads: @[ice_omp_num_threads] ICE_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true mesh_ice = @[MESH_ICE] @@ -62,42 +58,40 @@ ICE_attributes:: # WAV # WAV_model: @[wav_model] WAV_petlist_bounds: @[wav_petlist_bounds] -WAV_omp_num_threads: @[wav_omp_num_threads] WAV_attributes:: Verbosity = 0 OverwriteSlice = false mesh_wav = @[MESH_WAV] - user_sets_restname = true :: # CMEPS warm run sequence runSeq:: @@[coupling_interval_slow_sec] + MED med_phases_prep_wav_avg MED med_phases_prep_ocn_avg + MED -> WAV :remapMethod=redist MED -> OCN :remapMethod=redist + WAV OCN @@[coupling_interval_fast_sec] MED med_phases_prep_atm MED med_phases_prep_ice - MED med_phases_prep_wav_accum - MED med_phases_prep_wav_avg MED -> ATM :remapMethod=redist MED -> ICE :remapMethod=redist - MED -> WAV :remapMethod=redist ATM ICE - WAV ATM -> MED :remapMethod=redist MED med_phases_post_atm ICE -> MED :remapMethod=redist MED med_phases_post_ice - WAV -> MED :remapMethod=redist - MED med_phases_post_wav MED med_phases_ocnalb_run MED med_phases_prep_ocn_accum + MED med_phases_prep_wav_accum @ OCN -> MED :remapMethod=redist + WAV -> MED :remapMethod=redist MED med_phases_post_ocn + MED med_phases_post_wav MED med_phases_restart_write @ :: diff --git a/tests/parm/ufs.configure.s2sw_slow.IN b/tests/parm/ufs.configure.s2sw_esmf.IN similarity index 100% rename from tests/parm/ufs.configure.s2sw_slow.IN rename to tests/parm/ufs.configure.s2sw_esmf.IN diff --git a/tests/parm/ufs.configure.s2sw_fast_esmf.IN b/tests/parm/ufs.configure.s2sw_fast_esmf.IN new file mode 100644 index 0000000000..d664e8910b --- /dev/null +++ b/tests/parm/ufs.configure.s2sw_fast_esmf.IN @@ -0,0 +1,139 @@ +############################################# +#### UFS Run-Time Configuration File ###### +############################################# + +# ESMF # +logKindFlag: @[esmf_logkind] +globalResourceControl: true + +# EARTH # +EARTH_component_list: MED ATM OCN ICE WAV +EARTH_attributes:: + Verbosity = 0 +:: + +# MED # +MED_model: @[med_model] +MED_petlist_bounds: @[med_petlist_bounds] +MED_omp_num_threads: @[med_omp_num_threads] +:: + +# ATM # +ATM_model: @[atm_model] +ATM_petlist_bounds: @[atm_petlist_bounds] +ATM_omp_num_threads: @[atm_omp_num_threads] +ATM_attributes:: + Verbosity = 0 + DumpFields = @[DumpFields] + ProfileMemory = false + OverwriteSlice = true +:: + +# OCN # +OCN_model: @[ocn_model] +OCN_petlist_bounds: @[ocn_petlist_bounds] +OCN_omp_num_threads: @[ocn_omp_num_threads] +OCN_attributes:: + Verbosity = 0 + DumpFields = @[DumpFields] + ProfileMemory = false + OverwriteSlice = true + mesh_ocn = @[MESH_OCN] + use_coldstart = @[use_coldstart] + use_mommesh = @[use_mommesh] +:: + +# ICE # +ICE_model: @[ice_model] +ICE_petlist_bounds: @[ice_petlist_bounds] +ICE_omp_num_threads: @[ice_omp_num_threads] +ICE_attributes:: + Verbosity = 0 + DumpFields = @[DumpFields] + ProfileMemory = false + OverwriteSlice = true + mesh_ice = @[MESH_ICE] + eps_imesh = @[eps_imesh] + stop_n = @[RESTART_N] + stop_option = nhours + stop_ymd = -999 +:: + +# WAV # +WAV_model: @[wav_model] +WAV_petlist_bounds: @[wav_petlist_bounds] +WAV_omp_num_threads: @[wav_omp_num_threads] +WAV_attributes:: + Verbosity = 0 + OverwriteSlice = false + mesh_wav = @[MESH_WAV] +:: + +# CMEPS warm run sequence +runSeq:: +@@[coupling_interval_slow_sec] + MED med_phases_prep_ocn_avg + MED -> OCN :remapMethod=redist + OCN + @@[coupling_interval_fast_sec] + MED med_phases_prep_atm + MED med_phases_prep_ice + MED med_phases_prep_wav_accum + MED med_phases_prep_wav_avg + MED -> ATM :remapMethod=redist + MED -> ICE :remapMethod=redist + MED -> WAV :remapMethod=redist + ATM + ICE + WAV + ATM -> MED :remapMethod=redist + MED med_phases_post_atm + ICE -> MED :remapMethod=redist + MED med_phases_post_ice + WAV -> MED :remapMethod=redist + MED med_phases_post_wav + MED med_phases_ocnalb_run + MED med_phases_prep_ocn_accum + @ + OCN -> MED :remapMethod=redist + MED med_phases_post_ocn + MED med_phases_restart_write +@ +:: + +# CMEPS variables + +DRIVER_attributes:: +:: +MED_attributes:: + ATM_model = @[atm_model] + ICE_model = @[ice_model] + OCN_model = @[ocn_model] + WAV_model = @[wav_model] + coupling_mode = @[CPLMODE] + history_tile_atm = @[ATMTILESIZE] + pio_rearranger = @[pio_rearranger] + ocean_albedo_limit = @[ocean_albedo_limit] +:: +ALLCOMP_attributes:: + ScalarFieldCount = 2 + ScalarFieldIdxGridNX = 1 + ScalarFieldIdxGridNY = 2 + ScalarFieldName = cpl_scalars + start_type = @[RUNTYPE] + restart_dir = @[CMEPS_RESTART_DIR] + case_name = ufs.cpld + restart_n = @[RESTART_N] + restart_option = nhours + restart_ymd = -999 + dbug_flag = @[cap_dbug_flag] + stop_n = @[FHMAX] + stop_option = nhours + stop_ymd = -999 + orb_eccen = 1.e36 + orb_iyear = 2000 + orb_iyear_align = 2000 + orb_mode = fixed_year + orb_mvelp = 1.e36 + orb_obliq = 1.e36 +:: diff --git a/tests/parm/ufs.configure.s2swa.IN b/tests/parm/ufs.configure.s2swa.IN index 48f999c211..d6ee4b89a2 100644 --- a/tests/parm/ufs.configure.s2swa.IN +++ b/tests/parm/ufs.configure.s2swa.IN @@ -3,7 +3,7 @@ ############################################# # ESMF # -logKindFlag: ESMF_LOGKIND_MULTI +logKindFlag: @[esmf_logkind] globalResourceControl: true # EARTH # @@ -15,15 +15,14 @@ EARTH_attributes:: # MED # MED_model: @[med_model] MED_petlist_bounds: @[med_petlist_bounds] -MED_omp_num_threads: @[med_omp_num_threads] +:: # ATM # ATM_model: @[atm_model] ATM_petlist_bounds: @[atm_petlist_bounds] -ATM_omp_num_threads: @[atm_omp_num_threads] ATM_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true :: @@ -31,7 +30,6 @@ ATM_attributes:: # CHM # CHM_model: @[chm_model] CHM_petlist_bounds: @[chm_petlist_bounds] -CHM_omp_num_threads: @[chm_omp_num_threads] CHM_attributes:: Verbosity = 0 :: @@ -39,10 +37,9 @@ CHM_attributes:: # OCN # OCN_model: @[ocn_model] OCN_petlist_bounds: @[ocn_petlist_bounds] -OCN_omp_num_threads: @[ocn_omp_num_threads] OCN_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true mesh_ocn = @[MESH_OCN] @@ -53,10 +50,9 @@ OCN_attributes:: # ICE # ICE_model: @[ice_model] ICE_petlist_bounds: @[ice_petlist_bounds] -ICE_omp_num_threads: @[ice_omp_num_threads] ICE_attributes:: Verbosity = 0 - DumpFields = false + DumpFields = @[DumpFields] ProfileMemory = false OverwriteSlice = true mesh_ice = @[MESH_ICE] @@ -69,46 +65,44 @@ ICE_attributes:: # WAV # WAV_model: @[wav_model] WAV_petlist_bounds: @[wav_petlist_bounds] -WAV_omp_num_threads: @[wav_omp_num_threads] WAV_attributes:: Verbosity = 0 OverwriteSlice = false mesh_wav = @[MESH_WAV] - user_sets_restname = true :: # CMEPS warm run sequence runSeq:: @@[coupling_interval_slow_sec] + MED med_phases_prep_wav_avg MED med_phases_prep_ocn_avg + MED -> WAV :remapMethod=redist MED -> OCN :remapMethod=redist + WAV OCN @@[coupling_interval_fast_sec] MED med_phases_prep_atm MED med_phases_prep_ice - MED med_phases_prep_wav_accum - MED med_phases_prep_wav_avg MED -> ATM :remapMethod=redist MED -> ICE :remapMethod=redist - MED -> WAV :remapMethod=redist ATM phase1 ATM -> CHM CHM CHM -> ATM ATM phase2 ICE - WAV ATM -> MED :remapMethod=redist MED med_phases_post_atm ICE -> MED :remapMethod=redist MED med_phases_post_ice - WAV -> MED :remapMethod=redist - MED med_phases_post_wav MED med_phases_ocnalb_run MED med_phases_prep_ocn_accum + MED med_phases_prep_wav_accum @ OCN -> MED :remapMethod=redist + WAV -> MED :remapMethod=redist MED med_phases_post_ocn + MED med_phases_post_wav MED med_phases_restart_write @ :: @@ -117,7 +111,6 @@ runSeq:: DRIVER_attributes:: :: - MED_attributes:: ATM_model = @[atm_model] ICE_model = @[ice_model] @@ -128,7 +121,6 @@ MED_attributes:: pio_rearranger = @[pio_rearranger] ocean_albedo_limit = @[ocean_albedo_limit] :: - ALLCOMP_attributes:: ScalarFieldCount = 2 ScalarFieldIdxGridNX = 1 diff --git a/tests/parm/ufs.configure.s2swa_slow.IN b/tests/parm/ufs.configure.s2swa_esmf.IN similarity index 100% rename from tests/parm/ufs.configure.s2swa_slow.IN rename to tests/parm/ufs.configure.s2swa_esmf.IN diff --git a/tests/parm/ufs.configure.s2swa_fast_esmf.IN b/tests/parm/ufs.configure.s2swa_fast_esmf.IN new file mode 100644 index 0000000000..48f999c211 --- /dev/null +++ b/tests/parm/ufs.configure.s2swa_fast_esmf.IN @@ -0,0 +1,153 @@ +############################################# +#### UFS Run-Time Configuration File ###### +############################################# + +# ESMF # +logKindFlag: ESMF_LOGKIND_MULTI +globalResourceControl: true + +# EARTH # +EARTH_component_list: MED ATM CHM OCN ICE WAV +EARTH_attributes:: + Verbosity = 0 +:: + +# MED # +MED_model: @[med_model] +MED_petlist_bounds: @[med_petlist_bounds] +MED_omp_num_threads: @[med_omp_num_threads] + +# ATM # +ATM_model: @[atm_model] +ATM_petlist_bounds: @[atm_petlist_bounds] +ATM_omp_num_threads: @[atm_omp_num_threads] +ATM_attributes:: + Verbosity = 0 + DumpFields = false + ProfileMemory = false + OverwriteSlice = true +:: + +# CHM # +CHM_model: @[chm_model] +CHM_petlist_bounds: @[chm_petlist_bounds] +CHM_omp_num_threads: @[chm_omp_num_threads] +CHM_attributes:: + Verbosity = 0 +:: + +# OCN # +OCN_model: @[ocn_model] +OCN_petlist_bounds: @[ocn_petlist_bounds] +OCN_omp_num_threads: @[ocn_omp_num_threads] +OCN_attributes:: + Verbosity = 0 + DumpFields = false + ProfileMemory = false + OverwriteSlice = true + mesh_ocn = @[MESH_OCN] + use_coldstart = @[use_coldstart] + use_mommesh = @[use_mommesh] +:: + +# ICE # +ICE_model: @[ice_model] +ICE_petlist_bounds: @[ice_petlist_bounds] +ICE_omp_num_threads: @[ice_omp_num_threads] +ICE_attributes:: + Verbosity = 0 + DumpFields = false + ProfileMemory = false + OverwriteSlice = true + mesh_ice = @[MESH_ICE] + eps_imesh = @[eps_imesh] + stop_n = @[RESTART_N] + stop_option = nhours + stop_ymd = -999 +:: + +# WAV # +WAV_model: @[wav_model] +WAV_petlist_bounds: @[wav_petlist_bounds] +WAV_omp_num_threads: @[wav_omp_num_threads] +WAV_attributes:: + Verbosity = 0 + OverwriteSlice = false + mesh_wav = @[MESH_WAV] + user_sets_restname = true +:: + +# CMEPS warm run sequence +runSeq:: +@@[coupling_interval_slow_sec] + MED med_phases_prep_ocn_avg + MED -> OCN :remapMethod=redist + OCN + @@[coupling_interval_fast_sec] + MED med_phases_prep_atm + MED med_phases_prep_ice + MED med_phases_prep_wav_accum + MED med_phases_prep_wav_avg + MED -> ATM :remapMethod=redist + MED -> ICE :remapMethod=redist + MED -> WAV :remapMethod=redist + ATM phase1 + ATM -> CHM + CHM + CHM -> ATM + ATM phase2 + ICE + WAV + ATM -> MED :remapMethod=redist + MED med_phases_post_atm + ICE -> MED :remapMethod=redist + MED med_phases_post_ice + WAV -> MED :remapMethod=redist + MED med_phases_post_wav + MED med_phases_ocnalb_run + MED med_phases_prep_ocn_accum + @ + OCN -> MED :remapMethod=redist + MED med_phases_post_ocn + MED med_phases_restart_write +@ +:: + +# CMEPS variables + +DRIVER_attributes:: +:: + +MED_attributes:: + ATM_model = @[atm_model] + ICE_model = @[ice_model] + OCN_model = @[ocn_model] + WAV_model = @[wav_model] + coupling_mode = @[CPLMODE] + history_tile_atm = @[ATMTILESIZE] + pio_rearranger = @[pio_rearranger] + ocean_albedo_limit = @[ocean_albedo_limit] +:: + +ALLCOMP_attributes:: + ScalarFieldCount = 2 + ScalarFieldIdxGridNX = 1 + ScalarFieldIdxGridNY = 2 + ScalarFieldName = cpl_scalars + start_type = @[RUNTYPE] + restart_dir = @[CMEPS_RESTART_DIR] + case_name = ufs.cpld + restart_n = @[RESTART_N] + restart_option = nhours + restart_ymd = -999 + dbug_flag = @[cap_dbug_flag] + stop_n = @[FHMAX] + stop_option = nhours + stop_ymd = -999 + orb_eccen = 1.e36 + orb_iyear = 2000 + orb_iyear_align = 2000 + orb_mode = fixed_year + orb_mvelp = 1.e36 + orb_obliq = 1.e36 +:: From 3690898fb281639aaf46fd760a9cb99d9f857ed5 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Thu, 4 Jan 2024 15:49:42 -0500 Subject: [PATCH 3/9] add _esmf to s2s esmf-managed ufs.configure file and add one with traditional threading --- tests/parm/ufs.configure.s2s.IN | 4 - tests/parm/ufs.configure.s2s_esmf.IN | 124 +++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 4 deletions(-) create mode 100644 tests/parm/ufs.configure.s2s_esmf.IN diff --git a/tests/parm/ufs.configure.s2s.IN b/tests/parm/ufs.configure.s2s.IN index 6a0234e120..8f777577fb 100644 --- a/tests/parm/ufs.configure.s2s.IN +++ b/tests/parm/ufs.configure.s2s.IN @@ -15,13 +15,11 @@ EARTH_attributes:: # MED # MED_model: @[med_model] MED_petlist_bounds: @[med_petlist_bounds] -MED_omp_num_threads: @[med_omp_num_threads] :: # ATM # ATM_model: @[atm_model] ATM_petlist_bounds: @[atm_petlist_bounds] -ATM_omp_num_threads: @[atm_omp_num_threads] ATM_attributes:: Verbosity = 0 DumpFields = @[DumpFields] @@ -32,7 +30,6 @@ ATM_attributes:: # OCN # OCN_model: @[ocn_model] OCN_petlist_bounds: @[ocn_petlist_bounds] -OCN_omp_num_threads: @[ocn_omp_num_threads] OCN_attributes:: Verbosity = 0 DumpFields = @[DumpFields] @@ -46,7 +43,6 @@ OCN_attributes:: # ICE # ICE_model: @[ice_model] ICE_petlist_bounds: @[ice_petlist_bounds] -ICE_omp_num_threads: @[ice_omp_num_threads] ICE_attributes:: Verbosity = 0 DumpFields = @[DumpFields] diff --git a/tests/parm/ufs.configure.s2s_esmf.IN b/tests/parm/ufs.configure.s2s_esmf.IN new file mode 100644 index 0000000000..6a0234e120 --- /dev/null +++ b/tests/parm/ufs.configure.s2s_esmf.IN @@ -0,0 +1,124 @@ +############################################# +#### UFS Run-Time Configuration File ###### +############################################# + +# ESMF # +logKindFlag: @[esmf_logkind] +globalResourceControl: true + +# EARTH # +EARTH_component_list: MED ATM OCN ICE +EARTH_attributes:: + Verbosity = 0 +:: + +# MED # +MED_model: @[med_model] +MED_petlist_bounds: @[med_petlist_bounds] +MED_omp_num_threads: @[med_omp_num_threads] +:: + +# ATM # +ATM_model: @[atm_model] +ATM_petlist_bounds: @[atm_petlist_bounds] +ATM_omp_num_threads: @[atm_omp_num_threads] +ATM_attributes:: + Verbosity = 0 + DumpFields = @[DumpFields] + ProfileMemory = false + OverwriteSlice = true +:: + +# OCN # +OCN_model: @[ocn_model] +OCN_petlist_bounds: @[ocn_petlist_bounds] +OCN_omp_num_threads: @[ocn_omp_num_threads] +OCN_attributes:: + Verbosity = 0 + DumpFields = @[DumpFields] + ProfileMemory = false + OverwriteSlice = true + mesh_ocn = @[MESH_OCN] + use_coldstart = @[use_coldstart] + use_mommesh = @[use_mommesh] +:: + +# ICE # +ICE_model: @[ice_model] +ICE_petlist_bounds: @[ice_petlist_bounds] +ICE_omp_num_threads: @[ice_omp_num_threads] +ICE_attributes:: + Verbosity = 0 + DumpFields = @[DumpFields] + ProfileMemory = false + OverwriteSlice = true + mesh_ice = @[MESH_ICE] + eps_imesh = @[eps_imesh] + stop_n = @[RESTART_N] + stop_option = nhours + stop_ymd = -999 +:: + +# CMEPS warm run sequence +runSeq:: +@@[coupling_interval_slow_sec] + MED med_phases_prep_ocn_avg + MED -> OCN :remapMethod=redist + OCN + @@[coupling_interval_fast_sec] + MED med_phases_prep_atm + MED med_phases_prep_ice + MED -> ATM :remapMethod=redist + MED -> ICE :remapMethod=redist + ATM + ICE + ATM -> MED :remapMethod=redist + MED med_phases_post_atm + ICE -> MED :remapMethod=redist + MED med_phases_post_ice + MED med_phases_ocnalb_run + MED med_phases_prep_ocn_accum + @ + OCN -> MED :remapMethod=redist + MED med_phases_post_ocn + MED med_phases_restart_write +@ +:: + +# CMEPS variables + +DRIVER_attributes:: +:: + +MED_attributes:: + ATM_model = @[atm_model] + ICE_model = @[ice_model] + OCN_model = @[ocn_model] + coupling_mode = @[CPLMODE] + history_tile_atm = @[ATMTILESIZE] + pio_rearranger = @[pio_rearranger] + ocean_albedo_limit = @[ocean_albedo_limit] +:: + +ALLCOMP_attributes:: + ScalarFieldCount = 2 + ScalarFieldIdxGridNX = 1 + ScalarFieldIdxGridNY = 2 + ScalarFieldName = cpl_scalars + start_type = @[RUNTYPE] + restart_dir = @[CMEPS_RESTART_DIR] + case_name = ufs.cpld + restart_n = @[RESTART_N] + restart_option = nhours + restart_ymd = -999 + dbug_flag = @[cap_dbug_flag] + stop_n = @[FHMAX] + stop_option = nhours + stop_ymd = -999 + orb_eccen = 1.e36 + orb_iyear = 2000 + orb_iyear_align = 2000 + orb_mode = fixed_year + orb_mvelp = 1.e36 + orb_obliq = 1.e36 +:: From ea18637fa7ef7d8c24a32650a08b013c32f555fe Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Thu, 4 Jan 2024 15:50:54 -0500 Subject: [PATCH 4/9] do the same for s2sa as for s2s and s2sw, s2swa --- tests/parm/ufs.configure.s2sa.IN | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/parm/ufs.configure.s2sa.IN b/tests/parm/ufs.configure.s2sa.IN index 1cfe5047e9..6c127b2f1d 100644 --- a/tests/parm/ufs.configure.s2sa.IN +++ b/tests/parm/ufs.configure.s2sa.IN @@ -15,13 +15,11 @@ EARTH_attributes:: # MED # MED_model: @[med_model] MED_petlist_bounds: @[med_petlist_bounds] -MED_omp_num_threads: @[med_omp_num_threads] :: # ATM # ATM_model: @[atm_model] ATM_petlist_bounds: @[atm_petlist_bounds] -ATM_omp_num_threads: @[atm_omp_num_threads] ATM_attributes:: Verbosity = 0 DumpFields = @[DumpFields] @@ -32,7 +30,6 @@ ATM_attributes:: # CHM # CHM_model: @[chm_model] CHM_petlist_bounds: @[chm_petlist_bounds] -CHM_omp_num_threads: @[chm_omp_num_threads] CHM_attributes:: Verbosity = 0 :: @@ -40,7 +37,6 @@ CHM_attributes:: # OCN # OCN_model: @[ocn_model] OCN_petlist_bounds: @[ocn_petlist_bounds] -OCN_omp_num_threads: @[ocn_omp_num_threads] OCN_attributes:: Verbosity = 0 DumpFields = @[DumpFields] @@ -54,7 +50,6 @@ OCN_attributes:: # ICE # ICE_model: @[ice_model] ICE_petlist_bounds: @[ice_petlist_bounds] -ICE_omp_num_threads: @[ice_omp_num_threads] ICE_attributes:: Verbosity = 0 DumpFields = @[DumpFields] From de3e26cf67a09c914265cf407dd6736f63a40607 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Thu, 4 Jan 2024 15:58:55 -0500 Subject: [PATCH 5/9] globalresourcecontrol is false for traditional threading --- tests/parm/ufs.configure.s2s.IN | 2 +- tests/parm/ufs.configure.s2sa.IN | 2 +- tests/parm/ufs.configure.s2sa_esmf.IN | 136 ++++++++++++++++++++++++++ tests/parm/ufs.configure.s2sw.IN | 2 +- tests/parm/ufs.configure.s2swa.IN | 2 +- 5 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 tests/parm/ufs.configure.s2sa_esmf.IN diff --git a/tests/parm/ufs.configure.s2s.IN b/tests/parm/ufs.configure.s2s.IN index 8f777577fb..995d3bd750 100644 --- a/tests/parm/ufs.configure.s2s.IN +++ b/tests/parm/ufs.configure.s2s.IN @@ -4,7 +4,7 @@ # ESMF # logKindFlag: @[esmf_logkind] -globalResourceControl: true +globalResourceControl: false # EARTH # EARTH_component_list: MED ATM OCN ICE diff --git a/tests/parm/ufs.configure.s2sa.IN b/tests/parm/ufs.configure.s2sa.IN index 6c127b2f1d..0d3d3f313f 100644 --- a/tests/parm/ufs.configure.s2sa.IN +++ b/tests/parm/ufs.configure.s2sa.IN @@ -4,7 +4,7 @@ # ESMF # logKindFlag: @[esmf_logkind] -globalResourceControl: true +globalResourceControl: false # EARTH # EARTH_component_list: MED ATM CHM OCN ICE diff --git a/tests/parm/ufs.configure.s2sa_esmf.IN b/tests/parm/ufs.configure.s2sa_esmf.IN new file mode 100644 index 0000000000..1cfe5047e9 --- /dev/null +++ b/tests/parm/ufs.configure.s2sa_esmf.IN @@ -0,0 +1,136 @@ +############################################# +#### UFS Run-Time Configuration File ###### +############################################# + +# ESMF # +logKindFlag: @[esmf_logkind] +globalResourceControl: true + +# EARTH # +EARTH_component_list: MED ATM CHM OCN ICE +EARTH_attributes:: + Verbosity = 0 +:: + +# MED # +MED_model: @[med_model] +MED_petlist_bounds: @[med_petlist_bounds] +MED_omp_num_threads: @[med_omp_num_threads] +:: + +# ATM # +ATM_model: @[atm_model] +ATM_petlist_bounds: @[atm_petlist_bounds] +ATM_omp_num_threads: @[atm_omp_num_threads] +ATM_attributes:: + Verbosity = 0 + DumpFields = @[DumpFields] + ProfileMemory = false + OverwriteSlice = true +:: + +# CHM # +CHM_model: @[chm_model] +CHM_petlist_bounds: @[chm_petlist_bounds] +CHM_omp_num_threads: @[chm_omp_num_threads] +CHM_attributes:: + Verbosity = 0 +:: + +# OCN # +OCN_model: @[ocn_model] +OCN_petlist_bounds: @[ocn_petlist_bounds] +OCN_omp_num_threads: @[ocn_omp_num_threads] +OCN_attributes:: + Verbosity = 0 + DumpFields = @[DumpFields] + ProfileMemory = false + OverwriteSlice = true + mesh_ocn = @[MESH_OCN] + use_coldstart = @[use_coldstart] + use_mommesh = @[use_mommesh] +:: + +# ICE # +ICE_model: @[ice_model] +ICE_petlist_bounds: @[ice_petlist_bounds] +ICE_omp_num_threads: @[ice_omp_num_threads] +ICE_attributes:: + Verbosity = 0 + DumpFields = @[DumpFields] + ProfileMemory = false + OverwriteSlice = true + mesh_ice = @[MESH_ICE] + eps_imesh = @[eps_imesh] + stop_n = @[RESTART_N] + stop_option = nhours + stop_ymd = -999 +:: + +# CMEPS warm run sequence +runSeq:: +@@[coupling_interval_slow_sec] + MED med_phases_prep_ocn_avg + MED -> OCN :remapMethod=redist + OCN + @@[coupling_interval_fast_sec] + MED med_phases_prep_atm + MED med_phases_prep_ice + MED -> ATM :remapMethod=redist + MED -> ICE :remapMethod=redist + ATM phase1 + ATM -> CHM + CHM + CHM -> ATM + ATM phase2 + ICE + ATM -> MED :remapMethod=redist + MED med_phases_post_atm + ICE -> MED :remapMethod=redist + MED med_phases_post_ice + MED med_phases_ocnalb_run + MED med_phases_prep_ocn_accum + @ + OCN -> MED :remapMethod=redist + MED med_phases_post_ocn + MED med_phases_restart_write +@ +:: + +# CMEPS variables + +DRIVER_attributes:: +:: + +MED_attributes:: + ATM_model = @[atm_model] + ICE_model = @[ice_model] + OCN_model = @[ocn_model] + coupling_mode = @[CPLMODE] + history_tile_atm = @[ATMTILESIZE] + pio_rearranger = @[pio_rearranger] + ocean_albedo_limit = @[ocean_albedo_limit] +:: + +ALLCOMP_attributes:: + ScalarFieldCount = 2 + ScalarFieldIdxGridNX = 1 + ScalarFieldIdxGridNY = 2 + ScalarFieldName = cpl_scalars + start_type = @[RUNTYPE] + restart_dir = @[CMEPS_RESTART_DIR] + case_name = ufs.cpld + restart_n = @[RESTART_N] + restart_option = nhours + restart_ymd = -999 + dbug_flag = @[cap_dbug_flag] + stop_n = @[FHMAX] + stop_option = nhours + stop_ymd = -999 + orb_eccen = 1.e36 + orb_iyear = 2000 + orb_iyear_align = 2000 + orb_mode = fixed_year + orb_mvelp = 1.e36 + orb_obliq = 1.e36 +:: diff --git a/tests/parm/ufs.configure.s2sw.IN b/tests/parm/ufs.configure.s2sw.IN index 411f35e57e..3855a4031e 100644 --- a/tests/parm/ufs.configure.s2sw.IN +++ b/tests/parm/ufs.configure.s2sw.IN @@ -4,7 +4,7 @@ # ESMF # logKindFlag: @[esmf_logkind] -globalResourceControl: true +globalResourceControl: false # EARTH # EARTH_component_list: MED ATM OCN ICE WAV diff --git a/tests/parm/ufs.configure.s2swa.IN b/tests/parm/ufs.configure.s2swa.IN index d6ee4b89a2..69be2d727e 100644 --- a/tests/parm/ufs.configure.s2swa.IN +++ b/tests/parm/ufs.configure.s2swa.IN @@ -4,7 +4,7 @@ # ESMF # logKindFlag: @[esmf_logkind] -globalResourceControl: true +globalResourceControl: false # EARTH # EARTH_component_list: MED ATM CHM OCN ICE WAV From 1e0317d2e0df8c1f99645b391e6c8aa0400acf7a Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Thu, 4 Jan 2024 16:39:34 -0500 Subject: [PATCH 6/9] update UFS_CONFIGURE variable for impacted tests --- tests/default_vars.sh | 2 +- ...configure.s2s_aoflux.IN => ufs.configure.s2s_aoflux_esmf.IN} | 0 tests/tests/cpld_control_c48 | 2 +- tests/tests/cpld_control_gfsv17_iau | 2 +- tests/tests/cpld_control_noaero_p8 | 2 +- tests/tests/cpld_control_noaero_p8_agrid | 2 +- tests/tests/cpld_control_nowave_noaero_p8 | 2 +- tests/tests/cpld_control_pdlib_p8 | 2 +- tests/tests/cpld_debug_gfsv17 | 2 +- tests/tests/cpld_debug_noaero_p8 | 2 +- tests/tests/cpld_debug_pdlib_p8 | 2 +- tests/tests/cpld_mpi_gfsv17 | 2 +- tests/tests/cpld_mpi_pdlib_p8 | 2 +- tests/tests/cpld_restart_c48 | 2 +- tests/tests/cpld_restart_gfsv17 | 2 +- tests/tests/cpld_restart_pdlib_p8 | 2 +- tests/tests/cpld_s2sa_p8 | 2 +- tests/tests/cpld_warmstart_c48 | 2 +- 18 files changed, 17 insertions(+), 17 deletions(-) rename tests/parm/{ufs.configure.s2s_aoflux.IN => ufs.configure.s2s_aoflux_esmf.IN} (100%) diff --git a/tests/default_vars.sh b/tests/default_vars.sh index b76f803597..4e291b7714 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -742,7 +742,7 @@ export WW3_IC5='F' # Defaults for the coupled 5-component export_cmeps() { -export UFS_CONFIGURE=ufs.configure.s2swa.IN +export UFS_CONFIGURE=ufs.configure.s2swa_fast_esmf.IN export med_model=cmeps export atm_model=fv3 export chm_model=gocart diff --git a/tests/parm/ufs.configure.s2s_aoflux.IN b/tests/parm/ufs.configure.s2s_aoflux_esmf.IN similarity index 100% rename from tests/parm/ufs.configure.s2s_aoflux.IN rename to tests/parm/ufs.configure.s2s_aoflux_esmf.IN diff --git a/tests/tests/cpld_control_c48 b/tests/tests/cpld_control_c48 index ebb6f4c386..1b8fd090af 100644 --- a/tests/tests/cpld_control_c48 +++ b/tests/tests/cpld_control_c48 @@ -136,6 +136,6 @@ export eps_imesh=4.0e-1 export DIAG_TABLE=diag_table_template export FIELD_TABLE=field_table_thompson_noaero_tke -export UFS_CONFIGURE=ufs.configure.s2s.IN +export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_control_gfsv17_iau b/tests/tests/cpld_control_gfsv17_iau index b34e596869..e0bd065597 100644 --- a/tests/tests/cpld_control_gfsv17_iau +++ b/tests/tests/cpld_control_gfsv17_iau @@ -84,7 +84,7 @@ export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1 export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma export DIAG_TABLE=diag_table_cpld_template export INPUT_NML=cpld_control.nml.IN -export UFS_CONFIGURE=ufs.configure.s2sw_slow.IN +export UFS_CONFIGURE=ufs.configure.s2sw.IN #GFSv17 settings export PROGSIGMA=.true. diff --git a/tests/tests/cpld_control_noaero_p8 b/tests/tests/cpld_control_noaero_p8 index 5b24e45697..728a896bd6 100644 --- a/tests/tests/cpld_control_noaero_p8 +++ b/tests/tests/cpld_control_noaero_p8 @@ -83,6 +83,6 @@ export eps_imesh=2.5e-1 export DIAG_TABLE=diag_table_template export FIELD_TABLE=field_table_thompson_noaero_tke -export UFS_CONFIGURE=ufs.configure.s2sw.IN +export UFS_CONFIGURE=ufs.configure.s2sw_fast_esmf.IN export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_control_noaero_p8_agrid b/tests/tests/cpld_control_noaero_p8_agrid index 8dce041975..72cf32df77 100644 --- a/tests/tests/cpld_control_noaero_p8_agrid +++ b/tests/tests/cpld_control_noaero_p8_agrid @@ -93,6 +93,6 @@ export MOM6_ALLOW_LANDMASK_CHANGES=True export eps_imesh=2.5e-1 export DIAG_TABLE=diag_table_template -export UFS_CONFIGURE=ufs.configure.s2s_aoflux.IN +export UFS_CONFIGURE=ufs.configure.s2s_aoflux_esmf.IN export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_control_nowave_noaero_p8 b/tests/tests/cpld_control_nowave_noaero_p8 index a7bdb29cf0..a809e89cc2 100644 --- a/tests/tests/cpld_control_nowave_noaero_p8 +++ b/tests/tests/cpld_control_nowave_noaero_p8 @@ -100,6 +100,6 @@ export MOM6_TOPOEDITS=ufs.topo_edits_011818.nc export MOM6_ALLOW_LANDMASK_CHANGES=True export DIAG_TABLE=diag_table_template -export UFS_CONFIGURE=ufs.configure.s2s.IN +export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_control_pdlib_p8 b/tests/tests/cpld_control_pdlib_p8 index ca73570f27..17bb7805ef 100644 --- a/tests/tests/cpld_control_pdlib_p8 +++ b/tests/tests/cpld_control_pdlib_p8 @@ -98,7 +98,7 @@ export WW3_MODDEF=mod_def.exp.${WW3_DOMAIN} export DIAG_TABLE=diag_table_template export FIELD_TABLE=field_table_thompson_noaero_tke -export UFS_CONFIGURE=ufs.configure.s2sw.IN +export UFS_CONFIGURE=ufs.configure.s2sw_fast_esmf.IN export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_debug_gfsv17 b/tests/tests/cpld_debug_gfsv17 index 4662ea3b22..b2f940f33f 100644 --- a/tests/tests/cpld_debug_gfsv17 +++ b/tests/tests/cpld_debug_gfsv17 @@ -113,7 +113,7 @@ export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1 export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma export DIAG_TABLE=diag_table_cpld_template export INPUT_NML=cpld_control.nml.IN -export UFS_CONFIGURE=ufs.configure.s2sw_slow.IN +export UFS_CONFIGURE=ufs.configure.s2sw.IN export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_debug_noaero_p8 b/tests/tests/cpld_debug_noaero_p8 index 3e28f3fa22..cd3d746d8c 100644 --- a/tests/tests/cpld_debug_noaero_p8 +++ b/tests/tests/cpld_debug_noaero_p8 @@ -74,6 +74,6 @@ export CICE_DIAGFREQ=`expr $((FHMAX-$FHROT)) \* 3600 / $DT_CICE` export DIAG_TABLE=diag_table_template export FIELD_TABLE=field_table_thompson_noaero_tke -export UFS_CONFIGURE=ufs.configure.s2sw.IN +export UFS_CONFIGURE=ufs.configure.s2sw_fast_esmf.IN export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_debug_pdlib_p8 b/tests/tests/cpld_debug_pdlib_p8 index 3086203b4b..fcede8710c 100644 --- a/tests/tests/cpld_debug_pdlib_p8 +++ b/tests/tests/cpld_debug_pdlib_p8 @@ -91,7 +91,7 @@ export WW3_MODDEF=mod_def.exp.${WW3_DOMAIN} export DIAG_TABLE=diag_table_template export FIELD_TABLE=field_table_thompson_noaero_tke -export UFS_CONFIGURE=ufs.configure.s2sw.IN +export UFS_CONFIGURE=ufs.configure.s2sw_fast_esmf.IN export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_mpi_gfsv17 b/tests/tests/cpld_mpi_gfsv17 index 71529cab46..0941f8c0d1 100644 --- a/tests/tests/cpld_mpi_gfsv17 +++ b/tests/tests/cpld_mpi_gfsv17 @@ -128,7 +128,7 @@ export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1 export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma export DIAG_TABLE=diag_table_cpld_template export INPUT_NML=cpld_control.nml.IN -export UFS_CONFIGURE=ufs.configure.s2sw_slow.IN +export UFS_CONFIGURE=ufs.configure.s2sw.IN #GFSv17 settings export PROGSIGMA=.true. diff --git a/tests/tests/cpld_mpi_pdlib_p8 b/tests/tests/cpld_mpi_pdlib_p8 index 07994612c0..18dcc1ee74 100644 --- a/tests/tests/cpld_mpi_pdlib_p8 +++ b/tests/tests/cpld_mpi_pdlib_p8 @@ -101,6 +101,6 @@ export WW3_MODDEF=mod_def.exp.${WW3_DOMAIN} export DIAG_TABLE=diag_table_template export FIELD_TABLE=field_table_thompson_noaero_tke -export UFS_CONFIGURE=ufs.configure.s2sw.IN +export UFS_CONFIGURE=ufs.configure.s2sw_fast_esmf.IN export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_restart_c48 b/tests/tests/cpld_restart_c48 index ad8ec1c2c8..eeb2626a8f 100644 --- a/tests/tests/cpld_restart_c48 +++ b/tests/tests/cpld_restart_c48 @@ -167,6 +167,6 @@ export eps_imesh=4.0e-1 export DIAG_TABLE=diag_table_template export FIELD_TABLE=field_table_thompson_noaero_tke -export UFS_CONFIGURE=ufs.configure.s2s.IN +export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_restart_gfsv17 b/tests/tests/cpld_restart_gfsv17 index 8b33cbfefb..43fa59b1c1 100644 --- a/tests/tests/cpld_restart_gfsv17 +++ b/tests/tests/cpld_restart_gfsv17 @@ -128,7 +128,7 @@ export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1 export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma export DIAG_TABLE=diag_table_cpld_template export INPUT_NML=cpld_control.nml.IN -export UFS_CONFIGURE=ufs.configure.s2sw_slow.IN +export UFS_CONFIGURE=ufs.configure.s2sw.IN #GFSv17 settings export PROGSIGMA=.true. diff --git a/tests/tests/cpld_restart_pdlib_p8 b/tests/tests/cpld_restart_pdlib_p8 index 176a4e4698..01a351be21 100644 --- a/tests/tests/cpld_restart_pdlib_p8 +++ b/tests/tests/cpld_restart_pdlib_p8 @@ -105,6 +105,6 @@ export WW3_MODDEF=mod_def.exp.${WW3_DOMAIN} export DIAG_TABLE=diag_table_template export FIELD_TABLE=field_table_thompson_noaero_tke -export UFS_CONFIGURE=ufs.configure.s2sw.IN +export UFS_CONFIGURE=ufs.configure.s2sw_fast_esmf.IN export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_s2sa_p8 b/tests/tests/cpld_s2sa_p8 index a403a45e19..efb61f024a 100644 --- a/tests/tests/cpld_s2sa_p8 +++ b/tests/tests/cpld_s2sa_p8 @@ -73,6 +73,6 @@ export MOM6_ALLOW_LANDMASK_CHANGES=True export eps_imesh=2.5e-1 export DIAG_TABLE=diag_table_template -export UFS_CONFIGURE=ufs.configure.s2sa.IN +export UFS_CONFIGURE=ufs.configure.s2sa_esmf.IN export FV3_RUN=cpld_control_run.IN diff --git a/tests/tests/cpld_warmstart_c48 b/tests/tests/cpld_warmstart_c48 index 4a03dae4a2..ea963defc4 100644 --- a/tests/tests/cpld_warmstart_c48 +++ b/tests/tests/cpld_warmstart_c48 @@ -164,6 +164,6 @@ export eps_imesh=4.0e-1 export DIAG_TABLE=diag_table_template export FIELD_TABLE=field_table_thompson_noaero_tke -export UFS_CONFIGURE=ufs.configure.s2s.IN +export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN export FV3_RUN=cpld_control_run.IN From 1f33a4b1e3ea200b47573e4e455aa778c68283f9 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Tue, 9 Jan 2024 12:13:54 -0500 Subject: [PATCH 7/9] update missed ufs_configure template --- tests/tests/cpld_control_gfsv17 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests/cpld_control_gfsv17 b/tests/tests/cpld_control_gfsv17 index 37f7ba1f80..cf17fc0c6e 100644 --- a/tests/tests/cpld_control_gfsv17 +++ b/tests/tests/cpld_control_gfsv17 @@ -119,7 +119,7 @@ export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1 export FIELD_TABLE=field_table_thompson_noaero_tke_progsigma export DIAG_TABLE=diag_table_cpld_template export INPUT_NML=cpld_control.nml.IN -export UFS_CONFIGURE=ufs.configure.s2sw_slow.IN +export UFS_CONFIGURE=ufs.configure.s2sw.IN #GFSv17 settings export PROGSIGMA=.true. From 1ec28291c63e4261b58298763ccafc25f22003ee Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Wed, 10 Jan 2024 09:20:43 -0500 Subject: [PATCH 8/9] define and set variable user_sets_restname for WW3 --- tests/default_vars.sh | 1 + tests/parm/ufs.configure.atmw.IN | 2 +- tests/parm/ufs.configure.s2sw.IN | 1 + tests/parm/ufs.configure.s2sw_esmf.IN | 1 + tests/parm/ufs.configure.s2sw_fast_esmf.IN | 1 + tests/parm/ufs.configure.s2swa.IN | 1 + tests/parm/ufs.configure.s2swa_esmf.IN | 1 + tests/parm/ufs.configure.s2swa_fast_esmf.IN | 2 +- 8 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 40fc4fea89..37bf3ec41d 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -725,6 +725,7 @@ export WW3_CUR='C' export WW3_ICE='C' export WW3_IC1='F' export WW3_IC5='F' +export WW3_user_sets_restname="true" } # Defaults for the coupled 5-component diff --git a/tests/parm/ufs.configure.atmw.IN b/tests/parm/ufs.configure.atmw.IN index 8434d5a7cb..7ece3eef97 100644 --- a/tests/parm/ufs.configure.atmw.IN +++ b/tests/parm/ufs.configure.atmw.IN @@ -35,7 +35,7 @@ WAV_attributes:: Verbosity = 0 OverwriteSlice = false mesh_wav = @[MESH_WAV] - user_sets_restname = true + user_sets_restname = @[WW3_user_sets_restname] :: diff --git a/tests/parm/ufs.configure.s2sw.IN b/tests/parm/ufs.configure.s2sw.IN index 3855a4031e..885e8c3f22 100644 --- a/tests/parm/ufs.configure.s2sw.IN +++ b/tests/parm/ufs.configure.s2sw.IN @@ -62,6 +62,7 @@ WAV_attributes:: Verbosity = 0 OverwriteSlice = false mesh_wav = @[MESH_WAV] + user_sets_restname = @[WW3_user_sets_restname] :: # CMEPS warm run sequence diff --git a/tests/parm/ufs.configure.s2sw_esmf.IN b/tests/parm/ufs.configure.s2sw_esmf.IN index c7bde0821f..47c08442dd 100644 --- a/tests/parm/ufs.configure.s2sw_esmf.IN +++ b/tests/parm/ufs.configure.s2sw_esmf.IN @@ -67,6 +67,7 @@ WAV_attributes:: Verbosity = 0 OverwriteSlice = false mesh_wav = @[MESH_WAV] + user_sets_restname = @[WW3_user_sets_restname] :: # CMEPS warm run sequence diff --git a/tests/parm/ufs.configure.s2sw_fast_esmf.IN b/tests/parm/ufs.configure.s2sw_fast_esmf.IN index d664e8910b..5c4c17a2a6 100644 --- a/tests/parm/ufs.configure.s2sw_fast_esmf.IN +++ b/tests/parm/ufs.configure.s2sw_fast_esmf.IN @@ -67,6 +67,7 @@ WAV_attributes:: Verbosity = 0 OverwriteSlice = false mesh_wav = @[MESH_WAV] + user_sets_restname = @[WW3_user_sets_restname] :: # CMEPS warm run sequence diff --git a/tests/parm/ufs.configure.s2swa.IN b/tests/parm/ufs.configure.s2swa.IN index 69be2d727e..5960da0118 100644 --- a/tests/parm/ufs.configure.s2swa.IN +++ b/tests/parm/ufs.configure.s2swa.IN @@ -69,6 +69,7 @@ WAV_attributes:: Verbosity = 0 OverwriteSlice = false mesh_wav = @[MESH_WAV] + user_sets_restname = @[WW3_user_sets_restname] :: # CMEPS warm run sequence diff --git a/tests/parm/ufs.configure.s2swa_esmf.IN b/tests/parm/ufs.configure.s2swa_esmf.IN index 4d5d8bb360..69a4851dec 100644 --- a/tests/parm/ufs.configure.s2swa_esmf.IN +++ b/tests/parm/ufs.configure.s2swa_esmf.IN @@ -75,6 +75,7 @@ WAV_attributes:: Verbosity = 0 OverwriteSlice = false mesh_wav = @[MESH_WAV] + user_sets_restname = @[WW3_user_sets_restname] :: # CMEPS warm run sequence diff --git a/tests/parm/ufs.configure.s2swa_fast_esmf.IN b/tests/parm/ufs.configure.s2swa_fast_esmf.IN index 48f999c211..cba72ec139 100644 --- a/tests/parm/ufs.configure.s2swa_fast_esmf.IN +++ b/tests/parm/ufs.configure.s2swa_fast_esmf.IN @@ -74,7 +74,7 @@ WAV_attributes:: Verbosity = 0 OverwriteSlice = false mesh_wav = @[MESH_WAV] - user_sets_restname = true + user_sets_restname = @[WW3_user_sets_restname] :: # CMEPS warm run sequence From 7f142151da9b0767fc6d4921eb0049ddae3dfd15 Mon Sep 17 00:00:00 2001 From: Rahul Mahajan Date: Wed, 10 Jan 2024 09:27:26 -0500 Subject: [PATCH 9/9] revert parm/ufs.configure.atmw.IN. The global application does not intend to use this template --- tests/parm/ufs.configure.atmw.IN | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/parm/ufs.configure.atmw.IN b/tests/parm/ufs.configure.atmw.IN index 7ece3eef97..8434d5a7cb 100644 --- a/tests/parm/ufs.configure.atmw.IN +++ b/tests/parm/ufs.configure.atmw.IN @@ -35,7 +35,7 @@ WAV_attributes:: Verbosity = 0 OverwriteSlice = false mesh_wav = @[MESH_WAV] - user_sets_restname = @[WW3_user_sets_restname] + user_sets_restname = true ::