ufs-community · DeniseWorthen · Feb 5, 2024 · Feb 6, 2024 · Feb 27, 2024 · Feb 27, 2024
diff --git a/.gitmodules b/.gitmodules
@@ -16,8 +16,10 @@
   branch = develop
 [submodule "CMEPS"]
   path = CMEPS-interface/CMEPS
-  url = https://github.com/NOAA-EMC/CMEPS
-  branch = emc/develop
+  #url = https://github.com/NOAA-EMC/CMEPS
+  #branch = emc/develop
+  url = https://github.com/DeniseWorthen/CMEPS.git
+  branch = feature/tiledhistory
 [submodule "HYCOM"]
   path = HYCOM-interface/HYCOM
   url = https://github.com/NOAA-EMC/HYCOM-src

diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -825,7 +825,7 @@ export_ww3
 
 # Set CMEPS component defauls
 export_cmeps
-export ATMTILESIZE=`expr $NPX - 1`
+export ATMTILESIZE="6,`expr $NPX - 1`,`expr $NPY - 1`"
 
 # FV3 defaults
 export FRAC_GRID=.true.

diff --git a/tests/parm/#ufs.configure.cpld_noaero_nowave.IN# b/tests/parm/#ufs.configure.cpld_noaero_nowave.IN#
@@ -0,0 +1,126 @@
+#############################################
+####  UFS Run-Time Configuration File  ######
+#############################################
+
+# ESMF #
+logKindFlag:            ESMF_LOGKIND_MULTI
+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 = false
+  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 = false
+  ProfileMemory = false
+  OverwriteSlice = true
+  mesh_ocn = @[MESHOCN_ICE]
+::
+
+# 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 = @[MESHOCN_ICE]
+  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_ocnnst_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 = RESTART/
+      case_name = ufs.cpld
+      restart_n = @[RESTART_N]
+      restart_option = nhours
+      restart_ymd = -999
+      dbug_flag = @[cap_dbug_flag]
+      use_coldstart = @[use_coldstart]
+      use_mommesh = @[use_mommesh]
+      eps_imesh = @[eps_imesh]
+      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.atm_lnd.IN b/tests/parm/ufs.configure.atm_lnd.IN
@@ -26,6 +26,8 @@ MED_attributes::
   history_option = nhours
   history_ymd = -999
   coupling_mode = @[CPLMODE]
+  history_tile_atm = @[ATMTILESIZE]
+  history_tile_lnd = @[LNDTILESIZE]
 ::
 
 # ATM #
@@ -45,7 +47,7 @@ LND_attributes::
   Verbosity = 1
   Diagnostic = 0
   mosaic_file = @[mosaic_file]
-  input_dir = @[lnd_input_dir] 
+  input_dir = @[lnd_input_dir]
   ic_type = @[lnd_ic_type]
   layout = @[layout_x]:@[layout_y] # need to be consistent with number of PEs
   num_soil_levels = 4
@@ -67,7 +69,7 @@ LND_attributes::
   surface_evap_resistance_option = 1 # not used, it is fixed to 4 in sfc_noahmp_drv.F90
   glacier_option = 1
   surface_thermal_roughness_option = 2
-  output_freq = 3600 
+  output_freq = 3600
   restart_freq = -1
   calc_snet = @[CALC_SNET]
   initial_albedo = @[initial_albedo]

diff --git a/tests/parm/ufs.configure.hafs_atm_docn.IN b/tests/parm/ufs.configure.hafs_atm_docn.IN
@@ -29,6 +29,7 @@ MED_attributes::
   normalization = none
   merge_type = copy
   pio_rearranger = @[pio_rearranger]
+  history_tile_atm = @[ATMTILESIZE]
 ::
 
 # ATM #

diff --git a/tests/parm/ufs.configure.hafs_atm_ocn.IN b/tests/parm/ufs.configure.hafs_atm_ocn.IN
@@ -29,6 +29,7 @@ MED_attributes::
   normalization = none
   merge_type = copy
   pio_rearranger = @[pio_rearranger]
+  history_tile_atm = @[ATMTILESIZE]
 ::
 
 # ATM #

diff --git a/tests/parm/ufs.configure.hafs_atm_ocn_wav.IN b/tests/parm/ufs.configure.hafs_atm_ocn_wav.IN
@@ -30,6 +30,7 @@ MED_attributes::
   normalization = none
   merge_type = copy
   pio_rearranger = @[pio_rearranger]
+  history_tile_atm = @[ATMTILESIZE]
 ::
 
 # ATM #

diff --git a/tests/parm/ufs.configure.hafs_atm_ocn_wav_inline.IN b/tests/parm/ufs.configure.hafs_atm_ocn_wav_inline.IN
@@ -32,6 +32,7 @@ MED_attributes::
   pio_rearranger = @[pio_rearranger]
   ocn_use_data_first_import = .true.
   wav_use_data_first_import = .true.
+  history_tile_atm = @[ATMTILESIZE]
 ::
 
 # ATM #

diff --git a/tests/parm/ufs.configure.hafs_atm_ocn_wav_mom6.IN b/tests/parm/ufs.configure.hafs_atm_ocn_wav_mom6.IN
@@ -32,6 +32,7 @@ MED_attributes::
   pio_rearranger = @[pio_rearranger]
   ocn_use_data_first_import = .true.
   wav_use_data_first_import = .true.
+  history_tile_atm = @[ATMTILESIZE]
 ::
 
 # ATM #

diff --git a/tests/parm/ufs.configure.hafs_atm_wav.IN b/tests/parm/ufs.configure.hafs_atm_wav.IN
@@ -29,6 +29,7 @@ MED_attributes::
   normalization = none
   merge_type = copy
   pio_rearranger = @[pio_rearranger]
+  history_tile_atm = @[ATMTILESIZE]
 ::
 
 # ATM #

diff --git a/tests/tests/atmwav_control_noaero_p8 b/tests/tests/atmwav_control_noaero_p8
@@ -77,7 +77,7 @@ export med_model=cmeps
 export atm_model=fv3
 export wav_model=ww3
 
-export ATMTILESIZE=`expr $NPX - 1`
+export ATMTILESIZE="6,`expr $NPX - 1`,`expr $NPY - 1`"
 export WW3_MULTIGRID=false
 export WW3_MODDEF=mod_def.glo_1deg
 export MESH_WAV=mesh.glo_1deg.nc

diff --git a/tests/tests/control_p8_atmlnd b/tests/tests/control_p8_atmlnd
@@ -244,8 +244,11 @@ export OUTPUT_FH="1 -1"
 if [[ "$ATMRES" = "$LNDRES" ]]; then
   export lnd_input_dir="INPUT/"
   export mosaic_file="INPUT/${LNDRES}_mosaic.nc"
+  export ATMTILESIZE="6,`expr $NPX - 1`,`expr $NPY - 1`"
+  export LNDTILESIZE="6,`expr $NPX - 1`,`expr $NPY - 1`"
 else
   export lnd_input_dir="INPUT/${LNDRES}/"
   export mosaic_file="INPUT/${LNDRES}/${LNDRES}_mosaic.nc"
+  export LNDTILESIZE="6,`expr $NPX - 1`,`expr $NPY - 1`"
 fi
 export MOM6_TOPOEDITS=""
diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8
@@ -93,7 +93,7 @@ export NPY=385
 export IMO=1536
 export JMO=768
 export OUTPUT_GRID="'gaussian_grid'"
-export ATMTILESIZE=`expr $NPX - 1`
+export ATMTILESIZE="6,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export OCNRES=025
 export ICERES=0.25

diff --git a/tests/tests/cpld_bmark_p8_35d b/tests/tests/cpld_bmark_p8_35d
@@ -49,7 +49,7 @@ export NPY=385
 export IMO=1536
 export JMO=768
 export OUTPUT_GRID="'gaussian_grid'"
-export ATMTILESIZE=`expr $NPX - 1`
+export ATMTILESIZE="6,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export OCNRES=025
 export ICERES=0.25

diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
@@ -87,7 +87,7 @@ export NPX=193
 export NPY=193
 export IMO=768
 export JMO=384
-export ATMTILESIZE=`expr $NPX - 1`
+export ATMTILESIZE="6,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export OCNRES=050
 export ICERES=0.50

diff --git a/tests/tests/cpld_control_c48 b/tests/tests/cpld_control_c48
@@ -76,7 +76,7 @@ export NPX=49
 export NPY=49
 export IMO=192
 export JMO=94
-export ATMTILESIZE=`expr $NPX - 1`
+export ATMTILESIZE="6,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export OCNRES=500
 export ICERES=5.00

diff --git a/tests/tests/cpld_restart_bmark_p8 b/tests/tests/cpld_restart_bmark_p8
@@ -97,7 +97,7 @@ export NPY=385
 export IMO=1536
 export JMO=768
 export OUTPUT_GRID="'gaussian_grid'"
-export ATMTILESIZE=`expr $NPX - 1`
+export ATMTILESIZE="6,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export OCNRES=025
 export ICERES=0.25

diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
@@ -89,7 +89,7 @@ export NPX=193
 export NPY=193
 export IMO=768
 export JMO=384
-export ATMTILESIZE=`expr $NPX - 1`
+export ATMTILESIZE="6,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export OCNRES=050
 export ICERES=0.50

diff --git a/tests/tests/cpld_restart_c48 b/tests/tests/cpld_restart_c48
@@ -91,7 +91,7 @@ export NPX=49
 export NPY=49
 export IMO=192
 export JMO=94
-export ATMTILESIZE=`expr $NPX - 1`
+export ATMTILESIZE="6,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export OCNRES=500
 export ICERES=5.00

diff --git a/tests/tests/cpld_warmstart_c48 b/tests/tests/cpld_warmstart_c48
@@ -88,7 +88,7 @@ export NPX=49
 export NPY=49
 export IMO=192
 export JMO=94
-export ATMTILESIZE=`expr $NPX - 1`
+export ATMTILESIZE="6,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export OCNRES=500
 export ICERES=5.00

diff --git a/tests/tests/hafs_regional_atm_ocn b/tests/tests/hafs_regional_atm_ocn
@@ -93,6 +93,7 @@ export ocn_model=hycom
 OCN_tasks=60
 export coupling_interval_sec=360
 export MESH_ATM=unset
+export ATMTILESIZE="1,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export FIELD_TABLE=field_table_hafs
 export DIAG_TABLE=diag_table_hafs_template

diff --git a/tests/tests/hafs_regional_atm_ocn_wav b/tests/tests/hafs_regional_atm_ocn_wav
@@ -97,6 +97,7 @@ OCN_tasks=60
 WAV_tasks=60
 export coupling_interval_sec=360
 export MESH_ATM=unset
+export ATMTILESIZE="1,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export FIELD_TABLE=field_table_hafs
 export DIAG_TABLE=diag_table_hafs_template

diff --git a/tests/tests/hafs_regional_atm_wav b/tests/tests/hafs_regional_atm_wav
@@ -95,6 +95,7 @@ export coupling_interval_sec=360
 export MESH_ATM=unset
 # ATM-WAV coupling only
 export WW3_CUR='F'
+export ATMTILESIZE="1,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export FIELD_TABLE=field_table_hafs
 export DIAG_TABLE=diag_table_hafs_template

diff --git a/tests/tests/hafs_regional_docn b/tests/tests/hafs_regional_docn
@@ -97,6 +97,7 @@ export ocn_data="INPUT/hycom_201908_surf_nolev.nc"
 export ocn_data_var=temp
 export ocn_nx_global=1135
 export ocn_ny_global=633
+export ATMTILESIZE="1,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export FIELD_TABLE=field_table_hafs
 export DIAG_TABLE=diag_table_hafs_template

diff --git a/tests/tests/hafs_regional_docn_oisst b/tests/tests/hafs_regional_docn_oisst
@@ -97,6 +97,7 @@ export ocn_data="INPUT/sst.day.mean.2019.nc"
 export ocn_data_var=sst
 export ocn_nx_global=1440
 export ocn_ny_global=720
+export ATMTILESIZE="1,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export FIELD_TABLE=field_table_hafs
 export DIAG_TABLE=diag_table_hafs_template

diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn
@@ -110,6 +110,7 @@ export RESTART_N=${FHMAX}
 export CPLMODE=hafs
 export RUNTYPE=startup
 export USE_COLDSTART=false
+export ATMTILESIZE="1,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export CDEPS_DOCN=false
 export OCEAN_START_DTG=43702.50000

diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_debug
@@ -108,6 +108,7 @@ export RESTART_N=${FHMAX}
 export CPLMODE=hafs
 export RUNTYPE=startup
 export USE_COLDSTART=false
+export ATMTILESIZE="1,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export CDEPS_DOCN=false
 export OCEAN_START_DTG=43702.50000

diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav
@@ -116,6 +116,7 @@ export RESTART_N=${FHMAX}
 export CPLMODE=hafs
 export RUNTYPE=startup
 export USE_COLDSTART=false
+export ATMTILESIZE="1,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export CDEPS_DOCN=false
 export OCEAN_START_DTG=43702.50000

diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_inline b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_inline
@@ -116,6 +116,7 @@ export RESTART_N=${FHMAX}
 export CPLMODE=hafs
 export RUNTYPE=startup
 export USE_COLDSTART=false
+export ATMTILESIZE="1,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export CDEPS_DOCN=false
 export OCEAN_START_DTG=43702.50000

diff --git a/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_mom6 b/tests/tests/hafs_regional_storm_following_1nest_atm_ocn_wav_mom6
@@ -115,6 +115,7 @@ export RESTART_N=${FHMAX}
 export CPLMODE=hafs.mom6
 export RUNTYPE=startup
 export USE_COLDSTART=false
+export ATMTILESIZE="1,`expr $NPX - 1`,`expr $NPY - 1`"
 
 export CDEPS_DOCN=false
+6 −6		mediator/med.F90
+3 −3		mediator/med_fraction_mod.F90
+2 −2		mediator/med_internalstate_mod.F90
+14 −14		mediator/med_io_mod.F90
+51 −51		mediator/med_map_mod.F90
+22 −6		mediator/med_phases_history_mod.F90
+4 −1		ufs/glc_elevclass_mod.F90