From 085976bd778249544bf91ad2c4f9b780af8900f1 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Thu, 8 Jun 2023 11:55:12 -0400
Subject: [PATCH 1/3] Update CI to use Baselibs 7.13.0

This PR updates the CI to point to Baselibs 7.13.0 which is the version used by GEOSgcm on `main`

It also adds small runs of GEOSgcm uncoupled and coupled-MOM6 to the CI
---
 .circleci/config.yml | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8fabd1d..0ecb6b2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,8 +1,8 @@
 version: 2.1
 
 # Anchors to prevent forgetting to update a version
-baselibs_version: &baselibs_version v7.7.0
-bcs_version: &bcs_version v10.23.0
+baselibs_version: &baselibs_version v7.13.0
+bcs_version: &bcs_version v11.00.0
 
 orbs:
   ci: geos-esm/circleci-tools@1
@@ -22,4 +22,34 @@ workflows:
           repo: GEOSgcm
           checkout_fixture: true
           mepodevelop: true
-          persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra
+          persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
+
+      # Run AMIP GCM (1 hour, no ExtData)
+      - ci/run_gcm:
+          name: run-GCM-on-<< matrix.compiler >>
+          context:
+            - docker-hub-creds
+          matrix:
+            parameters:
+              compiler: [gfortran, ifort]
+          requires:
+            - build-GEOSgcm-on-<< matrix.compiler >>
+          repo: GEOSgcm
+          baselibs_version: *baselibs_version
+          bcs_version: *bcs_version
+
+      # Run Coupled GCM (1 hour, no ExtData)
+      - ci/run_gcm:
+          name: run-coupled-GCM-on-<< matrix.compiler >>
+          context:
+            - docker-hub-creds
+          matrix:
+            parameters:
+              compiler: [gfortran, ifort]
+          requires:
+            - build-GEOSgcm-on-<< matrix.compiler >>
+          repo: GEOSgcm
+          baselibs_version: *baselibs_version
+          bcs_version: *bcs_version
+          gcm_ocean_type: MOM6
+          change_layout: false

From 6f6e9f23ae9667b6f5bf53a398e044a6c6cbcbfd Mon Sep 17 00:00:00 2001
From: Yury Vikhliaev <yury.v.vikhliaev@nasa.gov>
Date: Wed, 12 Jul 2023 14:37:23 -0400
Subject: [PATCH 2/3] HFREEZE option added for 1/3 degree resolution (540x458),
 which is needed by sea ice model.

---
 MOM6_GEOSPlug/mom6_app/540x458/MOM_override | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MOM6_GEOSPlug/mom6_app/540x458/MOM_override b/MOM6_GEOSPlug/mom6_app/540x458/MOM_override
index 06034fa..847f146 100755
--- a/MOM6_GEOSPlug/mom6_app/540x458/MOM_override
+++ b/MOM6_GEOSPlug/mom6_app/540x458/MOM_override
@@ -34,3 +34,5 @@ TOPO_FILE = "ocean_topog.nc"
 !#override NIPROC = 4
 !#override NJPROC = 4
 #override LAYOUT = 45,2
+
+HFREEZE = 10.0

From 4dfae677e90043ed2f25dce6d66573e12e300954 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Mon, 31 Jul 2023 12:02:09 -0400
Subject: [PATCH 3/3] Update CircleCI to use Orb Default Baselibs and BCs

This PR updates the CircleCI config to default to using the Baselibs in
the CircleCI orb rather than explicitly specifying the versions. In most
cases, this is the "best" way as a change to the orb can fix this for
projects without the need for a PR.

Note that we keep commented the explicit anchors in case needed.
---
 .circleci/config.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0ecb6b2..4b7d97e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,8 +1,8 @@
 version: 2.1
 
 # Anchors to prevent forgetting to update a version
-baselibs_version: &baselibs_version v7.13.0
-bcs_version: &bcs_version v11.00.0
+#baselibs_version: &baselibs_version v7.14.0
+#bcs_version: &bcs_version v11.1.0
 
 orbs:
   ci: geos-esm/circleci-tools@1
@@ -18,7 +18,7 @@ workflows:
           matrix:
             parameters:
               compiler: [gfortran, ifort]
-          baselibs_version: *baselibs_version
+          #baselibs_version: *baselibs_version
           repo: GEOSgcm
           checkout_fixture: true
           mepodevelop: true
@@ -35,8 +35,8 @@ workflows:
           requires:
             - build-GEOSgcm-on-<< matrix.compiler >>
           repo: GEOSgcm
-          baselibs_version: *baselibs_version
-          bcs_version: *bcs_version
+          #baselibs_version: *baselibs_version
+          #bcs_version: *bcs_version
 
       # Run Coupled GCM (1 hour, no ExtData)
       - ci/run_gcm:
@@ -49,7 +49,7 @@ workflows:
           requires:
             - build-GEOSgcm-on-<< matrix.compiler >>
           repo: GEOSgcm
-          baselibs_version: *baselibs_version
-          bcs_version: *bcs_version
+          #baselibs_version: *baselibs_version
+          #bcs_version: *bcs_version
           gcm_ocean_type: MOM6
           change_layout: false