From 851d20db86c65090a10ad48cebc0ef5a49d45d74 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Fri, 17 May 2024 15:54:04 -0400 Subject: [PATCH] Syncing src/ sub-repos for gfdl-to-main-2024-05-16 - Sub-repos src/icebergs, src/SIS2, and src/MOM6 were updated to dev/gfdl without any changes to doc strings or results. - In preparation for PR to MOM6/main. src/MOM6: - NOAA_GFDL/MOM6@6272bbcdc Testing: Correct perf parsing of C++ output - NOAA_GFDL/MOM6@e25388369 Merge branch 'main' into dev/gfdl - NOAA_GFDL/MOM6@0c790f2dc SAL: Explicitly allocate sht variable in SAL_CS - NOAA_GFDL/MOM6@129e1bda0 Merge pull request #1623 from jiandewang/DEV-EMC-candidate-20240425 - NOAA_GFDL/MOM6@a89d085bf Merge pull request #12 from marshallward/db_type_fix - NOAA_GFDL/MOM6@aac5bb846 Replace db array default values with real literals - NOAA_GFDL/MOM6@0730606b8 Merge pull request #132 from jiandewang/feature/update-to-main-20240401 - NOAA_GFDL/MOM6@6d0150d6c Merge remote-tracking branch 'MAIN/main' into feature/update-to-main-20240401 - NOAA_GFDL/MOM6@ab7bd14d2 Merge pull request #130 from marshallward/emc_fix_warn - NOAA_GFDL/MOM6@dc248836f Error cleanup (Intel Fortran) - NOAA_GFDL/MOM6@10521a921 Merge pull request #127 from jiandewang/feature/update-to-main-20240228 src/SIS2: - NOAA-GFDL/SIS2@00c3b5b Fix to READ_HLIM_VALS - NOAA-GFDL/SIS2@2007324 Fix to READ_HLIM_VALS - NOAA-GFDL/SIS2@022bd89 Fix for specified ice layout non repro issue src/icebergs: - NOAA_GFDL/icebergs@729b231 Merge pull request #69 from alex-huth/iOM4_with_bergs - NOAA_GFDL/icebergs@4abac9e fixed heat budget - NOAA_GFDL/icebergs@e8f794b Merge pull request #68 from alex-huth/iOM4_with_bergs - NOAA_GFDL/icebergs@9d77ef1 Several miscellaneous updates - NOAA_GFDL/icebergs@89cf3e6 Use masked-out SST to determine units of SST - NOAA_GFDL/icebergs@9c8266d fixed noted units of calving --- src/MOM6 | 2 +- src/SIS2 | 2 +- src/icebergs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MOM6 b/src/MOM6 index bb8a65331..6272bbcdc 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit bb8a6533178533289b92847153ee0612aec1903c +Subproject commit 6272bbcdc670639f9508026da9b85698a3a29257 diff --git a/src/SIS2 b/src/SIS2 index ab2c9c4c6..00c3b5be1 160000 --- a/src/SIS2 +++ b/src/SIS2 @@ -1 +1 @@ -Subproject commit ab2c9c4c6d18507e0b2d94cff075a4b2a03743a3 +Subproject commit 00c3b5be13721a7af99f62f2163969e8dd303df7 diff --git a/src/icebergs b/src/icebergs index fd6478fec..729b231d1 160000 --- a/src/icebergs +++ b/src/icebergs @@ -1 +1 @@ -Subproject commit fd6478fecd8891aebcba904fe4b34a415fe30e73 +Subproject commit 729b231d173787a60e95f23854c671f90310641e