Merge branch 'develop' into bugfix/tclune/#199-hflux-fix-3rd-try

GEOS-ESM · Jul 18, 2023 · 5728555 · 5728555
2 parents 80473d5 + 1f483b9
commit 5728555
Show file tree

Hide file tree

Showing 163 changed files with 12,692 additions and 7,766 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,8 +16,8 @@ parameters:
 
 # Anchors to prevent forgetting to update a version
 os_version: &os_version ubuntu20
-baselibs_version: &baselibs_version v7.7.0
-bcs_version: &bcs_version v11.00.0
+baselibs_version: &baselibs_version v7.13.0
+bcs_version: &bcs_version v11.1.0
 tag_build_arg_name: &tag_build_arg_name maplversion
 
 orbs:
@@ -82,6 +82,8 @@ workflows:
           baselibs_version: *baselibs_version
           repo: MAPL
           mepodevelop: false
+          remove_flap: true
+          remove_pflogger: true
           extra_cmake_options: "-DBUILD_WITH_FLAP=OFF -DBUILD_WITH_PFLOGGER=OFF -DBUILD_WITH_FARGPARSE=OFF -DUSE_EXTDATA2G=OFF -DBUILD_SHARED_MAPL=OFF"
           run_unit_tests: true
           ctest_options: "-LE 'PERFORMANCE|EXTDATA1G_BIG_TESTS|EXTDATA2G_BIG_TESTS' --output-on-failure"
@@ -101,12 +103,8 @@ workflows:
           checkout_mapl_branch: true
           persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra, retained for one day
 
-      # Build GEOSgcm -- GCC -- only to main
+      # Build GEOSgcm -- GCC
       - ci/build:
-          filters:
-            branches:
-              only:
-                - main
           name: build-GEOSgcm-on-<< matrix.compiler >>
           context:
             - docker-hub-creds
@@ -135,12 +133,8 @@ workflows:
           fixture_branch: develop
           checkout_mapl_branch: true
 
-      # Build GEOSldas on gfortran -- only to main
+      # Build GEOSldas on gfortran
       - ci/build:
-          filters:
-            branches:
-              only:
-                - main
           name: build-GEOSldas-on-<< matrix.compiler >>
           context:
             - docker-hub-creds
@@ -154,35 +148,8 @@ workflows:
           fixture_branch: develop
           checkout_mapl_branch: true
 
-      # Build GEOSadas (ifort only, needs a couple develop branches) -- only to main
-      - ci/build:
-          filters:
-            branches:
-              only:
-                - main
-          name: build-GEOSadas-on-<< matrix.compiler >>
-          context:
-            - docker-hub-creds
-          matrix:
-            parameters:
-              compiler: [ifort]
-          resource_class: xlarge
-          baselibs_version: *baselibs_version
-          repo: GEOSadas
-          checkout_fixture: true
-          # This branch on GEOSadas will be used to track subrepos needed
-          # for GEOSadas + MAPL develop much like how we do with MAPL 3
-          fixture_branch: feature/mathomp4/mapldevelop
-          checkout_mapl_branch: true
-          mepodevelop: false
-          rebuild_procs: 1
-
-      # Run GCM (1 hour, no ExtData) -- only to main
+      # Run GCM (1 hour, no ExtData)
       - ci/run_gcm:
-          filters:
-            branches:
-              only:
-                - main
           name: run-GCM-on-<< matrix.compiler >>
           context:
             - docker-hub-creds
@@ -195,18 +162,14 @@ workflows:
           baselibs_version: *baselibs_version
           bcs_version: *bcs_version
 
-      # Run Coupled GCM (1 hour, no ExtData) -- only to main
+      # Run Coupled GCM (1 hour, no ExtData)
       - ci/run_gcm:
-          filters:
-            branches:
-              only:
-                - main
           name: run-coupled-GCM-on-<< matrix.compiler >>
           context:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [ifort]
+              compiler: [gfortran, ifort]
           requires:
             - build-GEOSgcm-on-<< matrix.compiler >>
           repo: GEOSgcm
@@ -215,12 +178,8 @@ workflows:
           gcm_ocean_type: MOM6
           change_layout: false
 
-      # Run MAPL Tutorials -- only to main
+      # Run MAPL Tutorials
       - ci/run_mapl_tutorial:
-          filters:
-            branches:
-              only:
-                - main
           name: run-<< matrix.tutorial_name >>-Tutorial-with-<< matrix.compiler >>
           context:
             - docker-hub-creds
@@ -240,6 +199,25 @@ workflows:
             - build-and-test-MAPL-on-<< matrix.compiler >>-using-Unix Makefiles
           baselibs_version: *baselibs_version
 
+  build-GEOSadas:
+    jobs:
+      # Build GEOSadas (ifort only, needs a couple develop branches)
+      - ci/build:
+          name: build-GEOSadas-on-<< matrix.compiler >>
+          context:
+            - docker-hub-creds
+          matrix:
+            parameters:
+              compiler: [ifort]
+          resource_class: xlarge
+          baselibs_version: *baselibs_version
+          repo: GEOSadas
+          checkout_fixture: true
+          #fixture_branch: feature/mathomp4/ignore-heldsuarez
+          checkout_mapl_branch: true
+          mepodevelop: false
+          rebuild_procs: 1
+
   build-and-publish-docker:
     when:
       equal: [ "release", << pipeline.parameters.GHA_Event >> ]

diff --git a/.github/workflows/enforce-labels.yml b/.github/workflows/enforce-labels.yml
@@ -8,7 +8,7 @@ jobs:
   require-label:
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@v4
+      - uses: mheap/github-action-required-labels@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -21,7 +21,7 @@ jobs:
   blocking-label:
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@v4
+      - uses: mheap/github-action-required-labels@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

diff --git a/.github/workflows/push-to-develop.yml b/.github/workflows/push-to-develop.yml
@@ -22,7 +22,10 @@ jobs:
           target_branch: release/MAPL-v3
           label: automatic,MAPL3,Skip Changelog
           template: .github/PULL_REQUEST_TEMPLATE/auto_pr_to_mapl3.md
-          get_diff: true
+          # Turning this to false until the action can get a fix for
+          # https://github.com/devops-infra/action-pull-request/issues/126
+          #get_diff: true
+          get_diff: false
           assignee: ${{ github.actor }}
           old_string: "<!-- Write your description here -->"
           new_string: ${{ github.event.commits[0].message }}

diff --git a/.github/workflows/trigger-circleci-pipeline-on-release.yml b/.github/workflows/trigger-circleci-pipeline-on-release.yml
@@ -7,6 +7,6 @@ jobs:
     steps:
       - name: CircleCI Trigger on Release
         id: docker-build
-        uses: CircleCI-Public/trigger-circleci-pipeline-action@v1.0.7
+        uses: CircleCI-Public/trigger-circleci-pipeline-action@v1.1.0
         env:
           CCI_TOKEN: ${{ secrets.CCI_TOKEN }}
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -17,7 +17,7 @@ jobs:
     name: Build and Test MAPL GNU
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu20-geos-env-mkl:v7.7.0-openmpi_4.1.4-gcc_12.1.0
+      image: gmao/ubuntu20-geos-env-mkl:v7.13.0-openmpi_4.1.4-gcc_12.1.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
@@ -77,7 +77,7 @@ jobs:
     name: Build and Test MAPL Intel
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu20-geos-env:v7.7.0-intelmpi_2021.6.0-intel_2022.1.0
+      image: gmao/ubuntu20-geos-env:v7.13.0-intelmpi_2021.6.0-intel_2022.1.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/Apps/CMakeLists.txt b/Apps/CMakeLists.txt
@@ -30,3 +30,11 @@ target_include_directories (time_ave_util.x PRIVATE $<BUILD_INTERFACE:${MAPL_SOU
 if (NOT CMAKE_Fortran_COMPILER_ID MATCHES "NAG")
   target_link_libraries(time_ave_util.x PRIVATE OpenMP::OpenMP_Fortran)
 endif ()
+
+ecbuild_add_executable (TARGET Comp_Testing_Driver.x SOURCES Comp_Testing_Driver.F90)
+target_link_libraries (Comp_Testing_Driver.x PRIVATE MAPL MPI::MPI_Fortran esmf)
+target_include_directories (Comp_Testing_Driver.x PRIVATE $<BUILD_INTERFACE:${MAPL_SOURCE_DIR}/include>)
+# CMake has an OpenMP issue with NAG Fortran: https://gitlab.kitware.com/cmake/cmake/-/issues/21280
+if (NOT CMAKE_Fortran_COMPILER_ID MATCHES "NAG")
+  target_link_libraries(Comp_Testing_Driver.x PRIVATE OpenMP::OpenMP_Fortran)
+endif ()
diff --git a/Apps/COMP.rc b/Apps/COMP.rc
@@ -0,0 +1,57 @@
+COMPONENT_TO_RECORD: NI
+LIBRARY_FILE: libNI2G_GridComp.so
+RESTART_FILE: subset_import
+PHASE: 2
+
+# Grid information:
+# -----------------
+GRID_TYPE: LatLon
+GRIDNAME: DC12x24-PC
+LM: 72
+IM_WORLD: 12
+JM_WORLD: 24
+POLE: 'PC'
+DATELINE: 'DC'
+X_1: 0
+X_2: 12
+Y_1: 24
+Y_2: 48
+
+NX: 1
+NY: 1
+
+RUN_DT: 900
+
+TEST_FRAMEWORK_DRIVER: .TRUE.
+SUBSET: .TRUE.
+GRID_CAPTURE: .TRUE.
+RESTORE_EXPORT_STATE: .TRUE.
+
+# File information:
+# -----------------
+NI_IMPORT_RESTART_FILE: 	      subset_import
+NI_INTERNAL_RESTART_FILE:	      subset_internal
+NI_EXPORT_RESTART_FILE:		      subset_export		  
+
+NI_IMPORT_CHECKPOINT_FILE:	      ni_import_checkpoint_runPhase2
+NI_IMPORT_CHECKPOINT_TYPE: 	      default
+
+NI_EXPORT_CHECKPOINT_FILE:	      ni_export_checkpoint_runPhase2
+NI_EXPORT_CHECKPOINT_TYPE:	      default
+
+NI_INTERNAL_CHECKPOINT_FILE:          ni_internal_checkpoint_runPhase2
+NI_INTERNAL_CHECKPOINT_TYPE:          default
+
+IMPORT_CAPTURE_BEFORE_FILE: scratch/NI_import_before_runPhase2
+IMPORT_CAPTURE_AFTER_FILE: scratch/NI_import_after_runPhase2
+EXPORT_CAPTURE_BEFORE_FILE: scratch/NI_export_before_runPhase2
+EXPORT_CAPTURE_AFTER_FILE: scratch/NI_export_after_runPhase2
+INTERNAL_CAPTURE_BEFORE_FILE: scratch/NI_internal_before_runPhase2
+INTERNAL_CAPTURE_AFTER_FILE: scratch/NI_internal_after_runPhase2
+
+# Set optics parameters:
+# ----------------------
+aerosol_monochromatic_optics_wavelength_in_nm_from_LUT: 470 550 670 870
+
+wavelengths_for_profile_aop_in_nm: 550               # must be included in LUT
+wavelengths_for_vertically_integrated_aop_in_nm: 550 # must be included in LUT