Merge pull request #441 from GEOS-ESM/develop

Sync develop into main
GEOS-ESM · Jun 11, 2021 · 9c07432 · 9c07432
2 parents b770948 + b3176bc
commit 9c07432
Show file tree

Hide file tree

Showing 9 changed files with 1,171 additions and 283 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2.1
 executors:
   gcc-build-env:
     docker:
-      - image: gmao/ubuntu20-geos-env-mkl:v6.1.0-openmpi_4.0.5-gcc_10.2.0
+      - image: gmao/ubuntu20-geos-env-mkl:v6.2.4-openmpi_4.0.5-gcc_10.3.0
         auth:
           username: $DOCKERHUB_USER
           password: $DOCKERHUB_AUTH_TOKEN

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -17,7 +17,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')"
     runs-on: ubuntu-latest
     container: 
-      image: gmao/ubuntu20-geos-env-mkl:v6.1.0-openmpi_4.0.5-gcc_10.2.0
+      image: gmao/ubuntu20-geos-env-mkl:v6.2.4-openmpi_4.0.5-gcc_10.3.0
       credentials:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}

diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90
@@ -8503,6 +8503,7 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC)
 
       else   ! if UW shallow scheme not called
 
+        UMF_SC    = 0.
         MFD_SC    = 0.
         SHLW_PRC3 = 0.
         SHLW_SNO3 = 0.      

diff --git a/GEOSogcm_GridComp/CMakeLists.txt b/GEOSogcm_GridComp/CMakeLists.txt
@@ -7,7 +7,7 @@ set (alldirs
   GEOS_OradBioGridComp
   )
 
-set (dependencies GEOSdatasea_GridComp  GEOSdataseaice_GridComp GuestOcean_GridComp GEOSCICEDyna_GridComp MAPL CICE4)
+set (dependencies GuestOcean_GridComp GEOS_Seaice_GridComp MAPL CICE4)
 
 esma_add_library (${this}
   SRCS GEOS_OgcmGridComp.F90