From d50a307844d06d07e106fd77f3bf328b4f09bea3 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Fri, 15 Mar 2019 14:06:51 -0400 Subject: [PATCH 1/2] Updates to run OMIP, slab-model configs with Xanadu - Updates to calling data_override needed for generic_abiotic.F90 - Updates to SIS to make compatible with slab-model config - New logic to flag old-style restarts that use K[d,v]_turb - Update to generic_tracer.F90 to set ca13csed to zeroat k>1 --- src/MOM6 | 2 +- src/SIS2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MOM6 b/src/MOM6 index 50c4f60e29..3d854b55d2 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 50c4f60e2984b30d97266674b7549e81c686d02c +Subproject commit 3d854b55d28c11d9dd618e4e34a0ed133d67c2ad diff --git a/src/SIS2 b/src/SIS2 index b47317d683..e35b40650b 160000 --- a/src/SIS2 +++ b/src/SIS2 @@ -1 +1 @@ -Subproject commit b47317d68336ee8f5be1f2a65eeb7293f0ebc2a7 +Subproject commit e35b40650bb844e562684c2302e35cd0172655b9 From bda8c457c395138a3d2f72b893a95b726cdfafcc Mon Sep 17 00:00:00 2001 From: John Krasting Date: Tue, 16 Apr 2019 14:52:23 -0400 Subject: [PATCH 2/2] Removed 13cased update from ESM4-maintenance branch This is a post-CMIP6 activity --- src/MOM6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MOM6 b/src/MOM6 index 3d854b55d2..acfee0b601 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 3d854b55d28c11d9dd618e4e34a0ed133d67c2ad +Subproject commit acfee0b60117d51598e2ba7dfb0c6e0b92e85220