Merge updates in submodules of CICE, CMEPS, MOM6, WW3, and stochasti…

…c_physics Upp CATChem grib2 output Update configure files for S2S run due to the issue in NOAA-EMC/fv3atm#838
zhanglikate · May 21, 2024 · 6176ba5 · 6176ba5
1 parent 76ddf9e
commit 6176ba5
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/CICE-interface/CICE b/CICE-interface/CICE
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/WW3 b/WW3
diff --git a/stochastic_physics b/stochastic_physics
diff --git a/tests/parm/ufs.configure.s2scatchem.IN b/tests/parm/ufs.configure.s2scatchem.IN
@@ -91,15 +91,15 @@ MED_attributes::
       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
+      ScalarFieldCount = 3
       ScalarFieldIdxGridNX = 1
       ScalarFieldIdxGridNY = 2
+      ScalarFieldIdxGridNTile = 3
       ScalarFieldName = cpl_scalars
       start_type = @[RUNTYPE]
       restart_dir = @[CMEPS_RESTART_DIR]

diff --git a/tests/parm/ufs.configure.s2scatchem_esmf.IN b/tests/parm/ufs.configure.s2scatchem_esmf.IN
@@ -95,15 +95,15 @@ MED_attributes::
       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
+      ScalarFieldCount = 3
       ScalarFieldIdxGridNX = 1
       ScalarFieldIdxGridNY = 2
+      ScalarFieldIdxGridNTile = 3
       ScalarFieldName = cpl_scalars
       start_type = @[RUNTYPE]
       restart_dir = @[CMEPS_RESTART_DIR]

diff --git a/tests/parm/ufs.configure.s2swcatchem.IN b/tests/parm/ufs.configure.s2swcatchem.IN
@@ -108,15 +108,15 @@ MED_attributes::
       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
+      ScalarFieldCount = 3
       ScalarFieldIdxGridNX = 1
       ScalarFieldIdxGridNY = 2
+      ScalarFieldIdxGridNTile = 3
       ScalarFieldName = cpl_scalars
       start_type = @[RUNTYPE]
       restart_dir = @[CMEPS_RESTART_DIR]

diff --git a/tests/parm/ufs.configure.s2swcatchem_esmf.IN b/tests/parm/ufs.configure.s2swcatchem_esmf.IN
@@ -112,14 +112,14 @@ MED_attributes::
       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
+      ScalarFieldCount = 3
       ScalarFieldIdxGridNX = 1
       ScalarFieldIdxGridNY = 2
+      ScalarFieldIdxGridNTile = 3
       ScalarFieldName = cpl_scalars
       start_type = @[RUNTYPE]
       restart_dir = @[CMEPS_RESTART_DIR]