From 1e0affae284c74d87c2b5e108e427a4f5d997d37 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Thu, 16 Dec 2021 13:46:08 -0500
Subject: [PATCH] Update to ESMA_env 3.8.0 and ESMA_cmake 3.8.0

This PR updates the `components.yaml` in MAPL to match what the GEOSgcm
soon will use (in v10.20.0). The changes are:

- ESMA_env v3.8.0 (Use Intel 2021.3)
- ESMA_cmake v3.8.0 (Use `-march=core-avx2` for Intel Fortran)

These changes are non-zero-diff for the GEOSgcm but for MAPL...not sure
what to say. I'm labeling both ways since it depends on how you look at
it.

This also updates the CI to use Intel 2021.3.
---
 .circleci/config.yml           | 24 ++++++++++++------------
 .github/workflows/workflow.yml |  2 +-
 CHANGELOG.md                   |  6 ++++++
 components.yaml                |  4 ++--
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index af9a54f5496b..b93495e75ee7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,7 +17,7 @@ executors:
 
   ifort:
     docker:
-      - image: gmao/ubuntu20-geos-env:v6.2.8-intelmpi_2021.2.0-intel_2021.2.0
+      - image: gmao/ubuntu20-geos-env:v6.2.8-intelmpi_2021.3.0-intel_2021.3.0
         auth:
           username: $DOCKERHUB_USER
           password: $DOCKERHUB_AUTH_TOKEN
@@ -32,14 +32,14 @@ workflows:
           matrix:
             parameters:
               compiler: [gfortran, ifort]
-          context: 
+          context:
             - docker-hub-creds
       - build-GEOSgcm:
           name: build-GEOSgcm-on-<< matrix.compiler >>
           matrix:
             parameters:
               compiler: [gfortran, ifort]
-          context: 
+          context:
             - docker-hub-creds
       ###################################################
       # - make-FV3-exp:                                 #
@@ -66,7 +66,7 @@ workflows:
           matrix:
             parameters:
               compiler: [gfortran, ifort]
-          context: 
+          context:
             - docker-hub-creds
       #####################################################
       # - build-GEOSadas:                                 #
@@ -86,7 +86,7 @@ commands:
         type: string
         default: ""
     steps:
-      - run: 
+      - run:
           name: "Versions, etc."
           command: |
             mpirun --version && << parameters.compiler >> --version && echo $BASEDIR && pwd && ls && echo "$(nproc)"
@@ -98,7 +98,7 @@ commands:
         type: string
         default: ""
     steps:
-      - run: 
+      - run:
           name: "Checkout fixture"
           command: |
             cd ${CIRCLE_WORKING_DIRECTORY}
@@ -114,7 +114,7 @@ commands:
         type: string
         default: ""
     steps:
-      - run: 
+      - run:
           name: "Checkout branch on fixture"
           command: |
             cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
@@ -127,7 +127,7 @@ commands:
         type: string
         default: ""
     steps:
-      - run: 
+      - run:
           name: "Mepo clone external repos"
           command: |
             cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
@@ -141,7 +141,7 @@ commands:
         type: string
         default: ""
     steps:
-      - run: 
+      - run:
           name: "Mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared"
           command: |
             cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
@@ -158,7 +158,7 @@ commands:
         type: string
         default: ""
     steps:
-      - run: 
+      - run:
           name: "Run CMake"
           command: |
             mkdir -p /logfiles
@@ -174,7 +174,7 @@ commands:
         type: string
         default: ""
     steps:
-      - run: 
+      - run:
           name: "Build and install"
           command: |
             cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
@@ -188,7 +188,7 @@ commands:
         type: string
         default: ""
     steps:
-      - run: 
+      - run:
           name: "Mepo checkout MAPL branch"
           command: |
             cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>/src/Shared/@MAPL
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 5eb56166e9be..b86cbbc3aa35 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -139,7 +139,7 @@ jobs:
     name: Build and Test MAPL Intel
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu20-geos-env:v6.2.8-intelmpi_2021.2.0-intel_2021.2.0
+      image: gmao/ubuntu20-geos-env:v6.2.8-intelmpi_2021.3.0-intel_2021.3.0
       # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495
       # It seems like we might not need secrets on GitHub Actions which is good for forked
       # pull requests
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09ef2757598b..c1641916f7ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Updated `components.yaml`
+  - ESMA_env v3.8.0 (Use Intel 2021.3)
+  - ESMA_cmake v3.8.0 (Use `-march=core-avx2` for Intel Fortran)
+  - These are non-zero-diff for GEOS
+- Updated the Intel CI image to Intel 2021.3
+
 ### Removed
 
 ### Deprecated
diff --git a/components.yaml b/components.yaml
index ed439f0144ed..c16c54538d28 100644
--- a/components.yaml
+++ b/components.yaml
@@ -5,13 +5,13 @@ MAPL:
 ESMA_env:
   local: ./ESMA_env
   remote: ../ESMA_env.git
-  tag: v3.7.0
+  tag: v3.8.0
   develop: main
 
 ESMA_cmake:
   local: ./ESMA_cmake
   remote: ../ESMA_cmake.git
-  tag: v3.7.2
+  tag: v3.8.0
   develop: develop
 
 ecbuild: