From e4dc52c3caf85410ff5afa9e100a931e235ca174 Mon Sep 17 00:00:00 2001
From: Weiyuan Jiang <weiyuan.jiang@nasa.gov>
Date: Fri, 27 May 2022 11:03:48 -0400
Subject: [PATCH 1/3] geocachem ==> achem name changed

---
 GEOS_Util/post/regrid.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/GEOS_Util/post/regrid.pl b/GEOS_Util/post/regrid.pl
index 532a0dd8..e2e955a0 100755
--- a/GEOS_Util/post/regrid.pl
+++ b/GEOS_Util/post/regrid.pl
@@ -150,7 +150,7 @@
 %UPPERAIR_OPT = ("agcm_import_rst"           => 1,
                  "agcm_internal_rst"         => 1,
                  "carma_internal_rst"        => 1,
-                 "geosachem_internal_rst"    => 1,
+                 "achem_internal_rst"        => 1,
                  "geoschemchem_internal_rst" => 1,
                  "gmichem_internal_rst"      => 1,
                  "gocart_internal_rst"       => 1,
@@ -2467,7 +2467,7 @@ sub regrid_upperair_rsts_CS {
     $DYN       = rstname($expid, "fvcore_internal_rst",       $rstIN_template);
     $MOIST     = rstname($expid, "moist_internal_rst",        $rstIN_template);
 
-    $ACHEM     = rstname($expid, "geosachem_internal_rst",    $rstIN_template);
+    $ACHEM     = rstname($expid, "achem_internal_rst",        $rstIN_template);
     $CCHEM     = rstname($expid, "geoschemchem_internal_rst", $rstIN_template);
     $CARMA     = rstname($expid, "carma_internal_rst",        $rstIN_template);
     $AGCM      = rstname($expid, "agcm_import_rst",           $rstIN_template);
@@ -2554,7 +2554,7 @@ sub regrid_upperair_rsts_CS {
 
 /bin/touch input.nml
 
-if( ".$ACHEM"     != . ) /bin/ln -s $ACHEM  geosachem_internal_restart_in
+if( ".$ACHEM"     != . ) /bin/ln -s $ACHEM  achem_internal_restart_in
 if( ".$CCHEM"     != . ) /bin/ln -s $CCHEM  geoschemchem_internal_restart_in
 if( ".$CARMA"     != . ) /bin/ln -s $CARMA  carma_internal_restart_in
 if( ".$AGCM"      != . ) /bin/ln -s $AGCM   agcm_import_restart_in

From c3802e79857e8b3faa82a69ee22207990ec36ac4 Mon Sep 17 00:00:00 2001
From: Weiyuan Jiang <weiyuan.jiang@nasa.gov>
Date: Fri, 27 May 2022 11:14:31 -0400
Subject: [PATCH 2/3] change log

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89d20690..87ceba4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Changed restart file geosachem to achem in regrid.pl
+
 ### Fixed
 
 - More updates to CMake to more canonical CMake style (NetCDF, ESMF, etc.). These were missed in previous go-arounds as they are only built with ADAS. (Requires ESMA_cmake v3.15.1)

From 60684c211c824a5548a2bcc34ec19de925673fe6 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Wed, 8 Jun 2022 13:08:02 -0400
Subject: [PATCH 3/3] Update CI to use v1 orb and job

---
 .circleci/config.yml | 40 +++++++++-------------------------------
 CHANGELOG.md         |  1 +
 2 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5cebab87..11bd2786 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,42 +1,20 @@
 version: 2.1
 
 orbs:
-  circleci-tools: geos-esm/circleci-tools@0.10.0
+  ci: geos-esm/circleci-tools@1
 
 workflows:
   build-test:
     jobs:
-      - build-GEOSgcm:
+      # Build GEOSgcm
+      - ci/build:
           name: build-GEOSgcm-on-<< matrix.compiler >>
+          context:
+            - docker-hub-creds
           matrix:
             parameters:
               compiler: [gfortran, ifort]
-          context:
-            - docker-hub-creds
-
-jobs:
-  build-GEOSgcm:
-    parameters:
-      compiler:
-        type: string
-    executor:
-      name: circleci-tools/<< parameters.compiler >>
-      resource_class: large
-    working_directory: /root/project
-    steps:
-      - run:
-          name: "GMAO_Shared branch"
-          command: echo ${CIRCLE_BRANCH}
-      - circleci-tools/versions:
-          compiler: << parameters.compiler >>
-      - circleci-tools/checkout_fixture
-      - circleci-tools/mepoclone
-      - circleci-tools/mepodevelop
-      - circleci-tools/checkout_if_exists
-      - circleci-tools/cmake:
-          compiler: << parameters.compiler >>
-      - circleci-tools/buildinstall
-      - circleci-tools/compress_artifacts
-      - store_artifacts:
-          path: /logfiles
-
+          repo: GEOSgcm
+          checkout_fixture: true
+          mepodevelop: true
+          persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87ceba4a..1a04077b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Changed restart file geosachem to achem in regrid.pl
+- Updated CI to modern v1 orb
 
 ### Fixed