Merge pull request #632 from GEOS-ESM/develop

Sync develop into main
GEOS-ESM · Sep 8, 2022 · affeb4e · affeb4e
2 parents 20f4b85 + 6fd8a61
commit affeb4e
Show file tree

Hide file tree

Showing 30 changed files with 2,217 additions and 427 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 
 # Anchors to prevent forgetting to update a version
 baselibs_version: &baselibs_version v7.5.0
-bcs_version: &bcs_version v10.22.3
+bcs_version: &bcs_version v10.22.5
 
 orbs:
   ci: geos-esm/circleci-tools@1
@@ -22,4 +22,18 @@ workflows:
           repo: GEOSgcm
           checkout_fixture: true
           mepodevelop: true
-          persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra
+          persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
+      # Run GCM (1 hour, no ExtData)
+      - ci/run_gcm:
+          name: run-GCM-on-<< matrix.compiler >>
+          context:
+            - docker-hub-creds
+          matrix:
+            parameters:
+              compiler: [gfortran, ifort]
+          requires:
+            - build-GEOSgcm-on-<< matrix.compiler >>
+          repo: GEOSgcm
+          baselibs_version: *baselibs_version
+          bcs_version: *bcs_version
+
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -16,7 +16,7 @@ jobs:
     name: Build GEOSgcm
     if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')"
     runs-on: ubuntu-latest
-    container: 
+    container:
       image: gmao/ubuntu20-geos-env-mkl:v7.5.0-openmpi_4.1.2-gcc_11.2.0
       credentials:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -25,7 +25,7 @@ jobs:
       LANGUAGE: en_US.UTF-8
       LC_ALL: en_US.UTF-8
       LANG: en_US.UTF-8
-      LC_TYPE: en_US.UTF-8 
+      LC_TYPE: en_US.UTF-8
       OMPI_ALLOW_RUN_AS_ROOT: 1
       OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
       OMPI_MCA_btl_vader_single_copy_mechanism: none

diff --git a/GEOSagcm_GridComp/GEOS_AgcmGridComp.F90 b/GEOSagcm_GridComp/GEOS_AgcmGridComp.F90
@@ -920,6 +920,15 @@ subroutine SetServices ( GC, RC )
          RC=STATUS  )
      VERIFY_(STATUS)
 
+    call MAPL_AddConnectivity ( GC,                                                        &
+         SRC_NAME  = (/'T            ','PLE          ','ZLE          ','TROPP_BLENDED'/),  &
+         DST_NAME  = (/'T_avg24      ','PLE_avg24    ','ZLE_avg24    ','TROPP_avg24  '/),  &
+         DST_ID = PHYS,                                                                    &
+         SRC_ID = SDYN,                                                                    &
+         RC=STATUS  )
+     VERIFY_(STATUS)
+
+
     call MAPL_AddConnectivity ( GC,              &
          SRC_NAME    = 'PLE',                    &
          DST_NAME    = 'PLEINST',                &
@@ -2414,6 +2423,9 @@ subroutine Run ( GC, IMPORT, EXPORT, CLOCK, RC )
     call ESMF_GridCompRun(GCS(SDYN), importState=GIM(SDYN), exportState=GEX(SDYN), clock=CLOCK, PHASE=2, userRC=STATUS)
     VERIFY_(STATUS)
 
+    call MAPL_GenericRunCouplers( STATE, SDYN, CLOCK, RC=STATUS )
+    VERIFY_(STATUS)
+
     call MAPL_TimerOff(STATE,"SUPERDYNAMICS"  )
 
 ! Get Names Associated with Friendly Advection Bundle for Final Check for Negative Tracers

diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90
@@ -1215,6 +1215,14 @@ subroutine SetServices ( GC, RC )
                                                        RC=STATUS  )
      VERIFY_(STATUS)
 
+     call MAPL_AddConnectivity ( GC,                              &
+        SRC_NAME  = (/ 'Q         ','FCLD      ' /),              &
+        DST_NAME  = (/ 'Q_avg24   ','FCLD_avg24' /),              &
+        DST_ID      = CHEM,                                       &
+        SRC_ID      = MOIST,                                      &
+                                                       RC=STATUS  )
+     VERIFY_(STATUS)
+
      call MAPL_AddConnectivity ( GC,                              &
          SHORT_NAME  = (/'ZPBL','PPBL'/),                         &
          DST_ID      = CHEM,                                      &
@@ -1258,6 +1266,14 @@ subroutine SetServices ( GC, RC )
                                                        RC=STATUS  )
      VERIFY_(STATUS)
 
+     call MAPL_AddConnectivity ( GC,                              &
+        SRC_NAME  = (/ 'TAUCLI      ', 'TAUCLW      '/),          &
+        DST_NAME  = (/ 'TAUCLI_avg24', 'TAUCLW_avg24'/),          &
+        DST_ID      =  CHEM,                                      &
+        SRC_ID      =  RAD,                                       &
+                                                       RC=STATUS  )
+     VERIFY_(STATUS)
+
 ! Moist Imports
 !--------------
 

diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90
@@ -107,7 +107,7 @@ module GEOS_MoistGridCompMod
 !-srf-gf-scheme
 
 !ALT-protection for GF
-  USE ConvectionMod, only: Disable_Convection
+! USE ConvectionMod, only: Disable_Convection
 !ALT-protection for GF
 
 !--kml--------------