From 6176ba5f0aab02391c9a7820e217a9c127eca6ae Mon Sep 17 00:00:00 2001 From: "Kate.Zhang" Date: Tue, 21 May 2024 04:43:13 +0000 Subject: [PATCH] Merge updates in submodules of CICE, CMEPS, MOM6, WW3, and stochastic_physics Upp CATChem grib2 output Update configure files for S2S run due to the issue in https://github.com/NOAA-EMC/fv3atm/issues/838 --- CICE-interface/CICE | 2 +- CMEPS-interface/CMEPS | 2 +- MOM6-interface/MOM6 | 2 +- WW3 | 2 +- stochastic_physics | 2 +- tests/parm/ufs.configure.s2scatchem.IN | 4 ++-- tests/parm/ufs.configure.s2scatchem_esmf.IN | 4 ++-- tests/parm/ufs.configure.s2swcatchem.IN | 4 ++-- tests/parm/ufs.configure.s2swcatchem_esmf.IN | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CICE-interface/CICE b/CICE-interface/CICE index 7d4e5defc1..c9e4679f44 160000 --- a/CICE-interface/CICE +++ b/CICE-interface/CICE @@ -1 +1 @@ -Subproject commit 7d4e5defc1c5ff6d67cd74470e8fdbce5de84be1 +Subproject commit c9e4679f449e30bb4cc0f22164b4401a8b50f7a6 diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index 758491ed66..4e19850cb0 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit 758491ed6681dd6054b1ff877027e6da381e86f8 +Subproject commit 4e19850cb083bc474b7cde5dc2f8506ec74cc442 diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6 index 10521a921d..0730606b80 160000 --- a/MOM6-interface/MOM6 +++ b/MOM6-interface/MOM6 @@ -1 +1 @@ -Subproject commit 10521a921d2f442de19a0cda240d912fd918c40c +Subproject commit 0730606b808f2979241d850e763955f5526a980c diff --git a/WW3 b/WW3 index 4ffc47e10e..d9b3172f41 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit 4ffc47e10e3d3f3bbee50251aacb28b7e0165b92 +Subproject commit d9b3172f4197c65d471662c6952a668152d71230 diff --git a/stochastic_physics b/stochastic_physics index 7dc4d9ba48..31e4e3e57b 160000 --- a/stochastic_physics +++ b/stochastic_physics @@ -1 +1 @@ -Subproject commit 7dc4d9ba48dea57f88f4f10091c8c2042105954e +Subproject commit 31e4e3e57bad8a7cdaa0ce2d3c4efbca63b5f74a diff --git a/tests/parm/ufs.configure.s2scatchem.IN b/tests/parm/ufs.configure.s2scatchem.IN index 995d3bd750..3efa42e6fe 100644 --- 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 index 6a0234e120..bf17be2a5e 100644 --- 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 index 885e8c3f22..95f35864bf 100644 --- 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 index 47c08442dd..e62fca65af 100644 --- 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]