From fb414b1e476a6146535065a5aa5c433adcf4050b Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Mon, 21 Mar 2022 15:17:40 -0400
Subject: [PATCH 1/2] Updates for Spack Support, Round 2

Due to insufficient grepping on my part, some remnants of the
"not-canonical" CMake still remain. Apparently these were not necessary
changes for Spack, but they are changes that unify the CMake style of
GEOS to be more like "correct" CMake.

In this go-around, it is mainly finding `INC_ESMF` which I apparently
forgot to grep for last time (I was focused on NetCDF), and some
non-canonical OpenMP calls.

See https://github.com/GEOS-ESM/GEOSgcm/issues/387 for the meta-issue.
---
 CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de66e25..83b5d25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,5 +3,4 @@ esma_set_this ()
 esma_add_library (${this}
   SRCS GEOS_OceanGridComp.F90
   SUBCOMPONENTS MOM6_GEOSPlug MOM_GEOS5PlugMod GEOSdatasea_GridComp
-  DEPENDENCIES GEOSdatasea_GridComp MAPL
-  INCLUDES ${INC_ESMF})
+  DEPENDENCIES GEOSdatasea_GridComp MAPL esmf)

From 78805db9b0381abaf095c60687c34e2f3c61e69e Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Mon, 21 Mar 2022 15:21:52 -0400
Subject: [PATCH 2/2] Add CI

---
 .circleci/config.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..ce182cb
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,35 @@
+version: 2.1
+
+orbs:
+  circleci-tools: geos-esm/circleci-tools@0.11.0
+
+workflows:
+  build-test:
+    jobs:
+      - build-GEOSgcm:
+          name: build-GEOSgcm-on-<< matrix.compiler >>
+          matrix:
+            parameters:
+              compiler: [gfortran, ifort]
+          context: 
+            - docker-hub-creds
+
+jobs:
+  build-GEOSgcm:
+    parameters:
+      compiler:
+        type: string
+    executor: circleci-tools/<< parameters.compiler >>
+    working_directory: /root/project
+    steps:
+      - 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
+