Merge pull request #588 from GEOS-ESM/develop

Pull Develop into Main for Release
GEOS-ESM · Oct 20, 2020 · 91716b4 · 91716b4
2 parents dd1c99a + e806b8f
commit 91716b4
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 20 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,12 +4,36 @@ executors:
   gcc-build-env:
     docker:
       - image: gmao/ubuntu20-geos-env-mkl:6.0.16-openmpi_4.0.5-gcc_10.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: xlarge
 
+workflows:
+  version: 2.1
+  build-and-test:
+    jobs:
+      - build-and-test-MAPL:
+          context: 
+            - docker-hub-creds
+      - build-GEOSgcm:
+          context: 
+            - docker-hub-creds
+      - make-FV3-experiment:
+          context: 
+            - docker-hub-creds
+          requires:
+            - build-GEOSgcm
+      - run-FV3-standalone:
+          context: 
+            - docker-hub-creds
+          requires:
+            - make-FV3-experiment
+
 jobs:
   build-and-test-MAPL:
     executor: gcc-build-env
@@ -163,16 +187,3 @@ jobs:
 
             cat *.log
 
-workflows:
-  version: 2.1
-  build-and-test:
-    jobs:
-      - build-and-test-MAPL
-      - build-GEOSgcm
-      - make-FV3-experiment:
-          requires:
-            - build-GEOSgcm
-      - run-FV3-standalone:
-          requires:
-            - make-FV3-experiment
-
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -8,7 +8,11 @@ jobs:
   build_test_mapl:
     name: Build and Test MAPL
     runs-on: ubuntu-latest
-    container: gmao/ubuntu20-geos-env-mkl:6.0.16-openmpi_4.0.5-gcc_10.2.0
+    container: 
+      image: gmao/ubuntu20-geos-env-mkl:6.0.16-openmpi_4.0.5-gcc_10.2.0
+      credentials:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
     env:
       LANGUAGE: en_US.UTF-8
       LC_ALL: en_US.UTF-8

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,10 +10,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 ### Changed
 ### Fixed
+### Removed
 
-- Fixed bug with reading in cubed-sphere files that have the corners
+## [2.3.4] - 2020-10-20
 
-### Removed
+### Changed
+
+- Increased the width of the `#-cycles` column in profiler output
+- Added Docker authentication to CI
+- Updated mepo components to match GEOSgcm
+
+### Fixed
+
+- Fixed bug with reading in cubed-sphere files that have the corners
 
 ## [2.3.3] - 2020-10-14
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   MAPL
-  VERSION 2.3.0
+  VERSION 2.3.4
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/ESMA_cmake)

diff --git a/base/ApplicationSupport.F90 b/base/ApplicationSupport.F90
@@ -189,7 +189,7 @@ subroutine report_global_profiler(unusable,comm,rc)
 
       reporter = ProfileReporter(empty)
       call reporter%add_column(NameColumn(50, separator= " "))
-      call reporter%add_column(FormattedTextColumn('#-cycles','(i5.0)', 5, NumCyclesColumn(),separator='-'))
+      call reporter%add_column(FormattedTextColumn('#-cycles','(i8.0)', 8, NumCyclesColumn(),separator='-'))
 
       inclusive = MultiColumn(['Inclusive'], separator='=')
       call inclusive%add_column(FormattedTextColumn(' T (sec) ','(f9.3)', 9, InclusiveColumn(), separator='-'))

diff --git a/base/MAPL_Generic.F90 b/base/MAPL_Generic.F90
@@ -2227,7 +2227,7 @@ subroutine report_generic_profile( rc )
 
           reporter = ProfileReporter(empty)
           call reporter%add_column(NameColumn(50 , separator=" "))
-          call reporter%add_column(FormattedTextColumn('#-cycles','(i5.0)', 5, NumCyclesColumn(),separator='-'))
+          call reporter%add_column(FormattedTextColumn('#-cycles','(i8.0)', 8, NumCyclesColumn(),separator='-'))
           inclusive = MultiColumn(['Inclusive'], separator='=')
           call inclusive%add_column(FormattedTextColumn(' T (sec) ','(f9.3)', 9, InclusiveColumn(), separator='-'))
           call inclusive%add_column(FormattedTextColumn('   %  ','(f6.2)', 6, PercentageColumn(InclusiveColumn(),'MAX'),separator='-'))

diff --git a/components.yaml b/components.yaml
@@ -1,7 +1,7 @@
 ESMA_env:
   local: ./ESMA_env
   remote: ../ESMA_env.git
-  tag: v3.0.0
+  tag: v3.0.1
   develop: main
 
 ESMA_cmake: