Merge pull request #49 from GEOS-ESM/feature/mathomp4/sles15

Updates needed to run on SLES15 at NCCS

.circleci/config.yml

@@ -12,7 +12,6 @@ executors:
       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:
@@ -21,7 +20,6 @@ executors:
           username: $DOCKERHUB_USER
           password: $DOCKERHUB_AUTH_TOKEN
     resource_class: large
-    #MEDIUM# resource_class: medium
 
 workflows:
   build-test:
@@ -31,7 +29,7 @@ workflows:
           matrix:
             parameters:
               compiler: [gfortran, ifort]
-          context: 
+          context:
             - docker-hub-creds
 
 jobs:
@@ -76,7 +74,6 @@ jobs:
           command: |
             cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-GEOSctm
             make -j"$(nproc)" install |& tee /logfiles/make.log
-            #MEDIUM# make -j4 install |& tee /logfiles/make.log
       - run:
           name: "Compress artifacts"
           command: |

.editorconfig

@@ -0,0 +1,32 @@
+# Global Editor Config for MAPL
+#
+# This is an ini style configuration. See http://editorconfig.org/ for more information on this file.
+#
+# Top level editor config.
+root = true
+
+# Always use Unix style new lines with new line ending on every file and trim whitespace
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Python: PEP8 defines 4 spaces for indentation
+[*.py]
+indent_style = space
+indent_size = 4
+
+# YAML format, 2 spaces
+[{*.yaml,*.yml}]
+indent_style = space
+indent_size = 2
+
+# CMake (from KitWare: https://github.com/Kitware/CMake/blob/master/.editorconfig)
+[{CMakeLists.txt,*.cmake,*.rst}]
+indent_style = space
+indent_size = 2
+
+# Markdown
+[*.md]
+trim_trailing_whitespace = true
+indent_style = space

.github/workflows/enforce-labels.yml

@@ -8,22 +8,24 @@ jobs:
   require-label:
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@v2
+      - uses: mheap/github-action-required-labels@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           mode: minimum
           count: 1
-          labels: "0 diff,0 diff trivial,Non 0-diff,0 diff structural,0-diff trivial,Not 0-diff,0-diff,automatic,0-diff uncoupled"
+          labels: "0 diff,0 diff trivial,Non 0-diff,0 diff structural,0-diff trivial,Not 0-diff,0-diff,automatic,0-diff uncoupled,github_actions"
           add_comment: true
   blocking-label:
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@v2
+      - uses: mheap/github-action-required-labels@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           mode: exactly
           count: 0
           labels: "Contingent - DNA,Needs Lead Approval,Contingent -- Do Not Approve"
           add_comment: true
+          message: "This PR is being prevented from merging because you have added one of our blocking labels: {{ provided }}. You'll need to remove it before this PR can be merged."
+

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   GEOSctm
-  VERSION 2.0.1
+  VERSION 2.2.3
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
@@ -26,7 +26,7 @@ set (DOING_GEOS5 YES)
 # Should find a better place for this - used in Chem component
 set (ACG_FLAGS -v)
 
-# This flag at R8 means that FV3 is compiled at R8 and *linked* to 
+# This flag at R8 means that FV3 is compiled at R8 and *linked* to
 # FMS built at R8.
 set (FV_PRECISION "R8" CACHE STRING "Precision of FV3 core (R4, R4R8, R8)")
 

components.yaml

@@ -5,13 +5,13 @@ GEOSctm:
 env:
   local: ./@env
   remote: ../ESMA_env.git
-  tag: v3.4.0
+  tag: v3.4.2
   develop: main
 
 cmake:
   local: ./@cmake
   remote: ../ESMA_cmake.git
-  tag: v3.6.2
+  tag: v3.6.7
   develop: develop
 
 ecbuild:
@@ -60,7 +60,7 @@ HEMCO:
   local: ./src/Components/GEOSctm_GridComp/@GEOSchem_GridComp/Shared/HEMCO/@HEMCO
   remote: ../HEMCO.git
   tag: geos/v2.2.1
-  develop: geos/develop 
+  develop: geos/develop
 
 geos-chem:
   local: ./src/Components/GEOSctm_GridComp/@GEOSchem_GridComp/GEOSCHEMchem_GridComp/@geos-chem

src/Applications/GEOSctm_App/CMakeLists.txt

@@ -2,7 +2,7 @@ ecbuild_add_executable (
   TARGET GEOSctm.x
   SOURCES GEOSctm.F90
   LIBS GEOSctm_GridComp
-  )  
+  )
 
 set (CMAKE_Fortran_FLAGS_RELEASE "${GEOS_Fortran_FLAGS_VECT}")
 
@@ -35,7 +35,7 @@ install (
    FILES fvcore_layout.rc logging.yaml
    DESTINATION etc
    )
-   
+
 if(HYDROSTATIC)
    set(CFG_HYDROSTATIC TRUE)
 else()