Update components.yaml to match GEOSgcm v10.22.1 (and update CI)

.circleci/config.yml

@@ -1,27 +1,7 @@
 version: 2.1
 
-executors:
-  gfortran-large:
-    docker:
-      - image: gmao/ubuntu20-geos-env-mkl:v6.2.8-openmpi_4.0.6-gcc_11.2.0
-        auth:
-          username: $DOCKERHUB_USER
-          password: $DOCKERHUB_AUTH_TOKEN
-    environment:
-      OMPI_ALLOW_RUN_AS_ROOT: 1
-      OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
-      OMPI_MCA_btl_vader_single_copy_mechanism: none
-    resource_class: large
-    #MEDIUM# resource_class: medium
-
-  ifort-large:
-    docker:
-      - image: gmao/ubuntu20-geos-env:v6.2.8-intelmpi_2021.3.0-intel_2021.3.0
-        auth:
-          username: $DOCKERHUB_USER
-          password: $DOCKERHUB_AUTH_TOKEN
-    resource_class: large
-    #MEDIUM# resource_class: medium
+orbs:
+  circleci-tools: geos-esm/circleci-tools@0.13.0
 
 workflows:
   build-test:
@@ -39,47 +19,24 @@ jobs:
     parameters:
       compiler:
         type: string
-    executor: << parameters.compiler >>-large
+    executor:
+      name: circleci-tools/<< parameters.compiler >>
+      resource_class: large
     working_directory: /root/project
     steps:
       - checkout:
           path: GEOSldas
-      - run:
-          name: "Versions etc"
-          command: mpirun --version && << parameters.compiler>> --version && echo $BASEDIR && pwd && ls
-      - run:
-          name: "Mepo clone external repos"
-          command: |
-            cd ${CIRCLE_WORKING_DIRECTORY}/GEOSldas
-            mepo clone
-            mepo status
-      - run:
-          name: "Mepo checkout-if-exists"
-          command: |
-            cd ${CIRCLE_WORKING_DIRECTORY}/GEOSldas
-            echo "${CIRCLE_BRANCH}"
-            if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ]
-            then
-               mepo checkout-if-exists ${CIRCLE_BRANCH}
-            fi
-            mepo status
-      - run:
-          name: "CMake"
-          command: |
-            mkdir -p /logfiles
-            cd ${CIRCLE_WORKING_DIRECTORY}/GEOSldas
-            mkdir -p  ${CIRCLE_WORKING_DIRECTORY}/workspace/build-GEOSldas
-            cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-GEOSldas
-            cmake ${CIRCLE_WORKING_DIRECTORY}/GEOSldas -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=<< parameters.compiler >> -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${CIRCLE_WORKING_DIRECTORY}/workspace/install-GEOSldas -DUSE_F2PY=OFF |& tee /logfiles/cmake.log
-      - run:
-          name: "Build and install"
-          command: |
-            cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-GEOSldas
-            make -j"$(nproc)" install |& tee /logfiles/make.log
-            #MEDIUM# make -j4 install |& tee /logfiles/make.log
-      - run:
-          name: "Compress artifacts"
-          command: |
-            gzip -9 /logfiles/*
+      - circleci-tools/versions:
+          compiler: << parameters.compiler >>
+      - circleci-tools/mepoclone:
+          repo: GEOSldas
+      - circleci-tools/checkout_if_exists:
+          repo: GEOSldas
+      - circleci-tools/cmake:
+          repo: GEOSldas
+          compiler: << parameters.compiler >>
+      - circleci-tools/buildinstall:
+          repo: GEOSldas
+      - circleci-tools/compress_artifacts
       - store_artifacts:
           path: /logfiles

components.yaml

@@ -5,13 +5,13 @@ GEOSldas:
 env:
   local: ./@env
   remote: ../ESMA_env.git
-  tag: v3.11.0
+  tag: v3.13.0
   develop: main
 
 cmake:
   local: ./@cmake
   remote: ../ESMA_cmake.git
-  tag: v3.10.0
+  tag: v3.12.0
   develop: develop
 
 ecbuild:
@@ -29,7 +29,7 @@ GMAO_Shared:
 MAPL:
   local: ./src/Shared/@MAPL
   remote: ../MAPL.git
-  tag: v2.18.0
+  tag: v2.19.0
   develop: develop
 
 GEOSgcm_GridComp: