Merge branch 'develop' into feature/pnorris/#422-#443-RRTMG-LW-SW-com…

…bo-generator
GEOS-ESM · Dec 17, 2021 · 6ac17ae · 6ac17ae
2 parents 9ac68fb + 916d5eb
commit 6ac17ae
Show file tree

Hide file tree

Showing 43 changed files with 7,825 additions and 2,983 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -42,54 +42,64 @@ commands:
       compiler:
         type: string
     steps:
-      - run: mpirun --version && << parameters.compiler >> --version && echo $BASEDIR && pwd && ls && echo "$(nproc)"
+      - run:
+          name: "Versions, etc."
+          command: mpirun --version && << parameters.compiler >> --version && echo $BASEDIR && pwd && ls && echo "$(nproc)"
 
   checkout_fixture:
     description: "Checkout fixture"
     parameters:
       repo:
         type: string
     steps:
-      - run: |
-          cd ${CIRCLE_WORKING_DIRECTORY}
-          git clone https://github.com/GEOS-ESM/<< parameters.repo >>.git
+      - run:
+          name: "Checkout fixture"
+          command: |
+            cd ${CIRCLE_WORKING_DIRECTORY}
+            git clone https://github.com/GEOS-ESM/<< parameters.repo >>.git
 
   mepoclone:
     description: "Mepo clone external repos"
     parameters:
       repo:
         type: string
     steps:
-      - run: |
-          cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
-          mepo clone
-          mepo status
+      - run:
+          name: "Mepo clone external repos"
+          command: |
+            cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
+            mepo clone
+            mepo status
 
   mepodevelop:
     description: "Mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared"
     parameters:
       repo:
         type: string
     steps:
-      - run: |
-          cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
-          mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared
-          mepo status
+      - run:
+          name: "Mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared"
+          command: |
+            cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
+            mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared
+            mepo status
 
   checkout_feature_branch:
     description: "Mepo checkout-if-exists feature branch"
     parameters:
       repo:
         type: string
     steps:
-      - run: |
-          cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
-          echo "${CIRCLE_BRANCH}"
-          if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ]
-          then
-              mepo checkout-if-exists ${CIRCLE_BRANCH}
-          fi
-          mepo status
+      - run:
+          name: "Mepo checkout-if-exists feature branch"
+          command: |
+            cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
+            echo "${CIRCLE_BRANCH}"
+            if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ]
+            then
+                mepo checkout-if-exists ${CIRCLE_BRANCH}
+            fi
+            mepo status
 
   cmake:
     description: "Run CMake"
@@ -99,23 +109,27 @@ commands:
       compiler:
         type: string
     steps:
-      - run: |
-          mkdir -p /logfiles
-          cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
-          mkdir -p ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
-          cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
-          cmake ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >> -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=<< parameters.compiler >> -DCMAKE_BUILD_TYPE=Debug -DUSE_F2PY=OFF -DMPIEXEC_PREFLAGS=${MPIEXEC_PREFLAGS} -DCMAKE_INSTALL_PREFIX=${CIRCLE_WORKING_DIRECTORY}/workspace/install-<< parameters.repo >> |& tee /logfiles/cmake.log
+      - run:
+          name: "Build and install"
+          command: |
+            mkdir -p /logfiles
+            cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
+            mkdir -p ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
+            cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
+            cmake ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >> -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=<< parameters.compiler >> -DCMAKE_BUILD_TYPE=Debug -DUSE_F2PY=OFF -DMPIEXEC_PREFLAGS=${MPIEXEC_PREFLAGS} -DCMAKE_INSTALL_PREFIX=${CIRCLE_WORKING_DIRECTORY}/workspace/install-<< parameters.repo >> |& tee /logfiles/cmake.log
 
   buildinstall:
     description: "Build and install"
     parameters:
       repo:
         type: string
     steps:
-      - run: |
-          cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
-          make -j"$(nproc)" install |& tee /logfiles/make.log
-          #MEDIUM# make -j4 install |& tee /logfiles/make.log
+      - run:
+          name: "Build and install"
+          command: |
+            cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
+            make -j"$(nproc)" install |& tee /logfiles/make.log
+            #MEDIUM# make -j4 install |& tee /logfiles/make.log
 
 jobs:
   build-GEOSgcm:

diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90
@@ -1203,11 +1203,11 @@ subroutine SetServices ( GC, RC )
                          'FCLD    ',  'LS_PRCP ', 'CNV_MFC ',     &
                          'CNV_MFD ',  'QL      ', 'PFL_CN  ',     &
                          'PFL_LSAN',  'PFI_CN  ', 'PFI_LSAN',     &
-                         'QCTOT   ',  'CNV_QC  ', 'LFR     ',     &
+                         'QCTOT   ',  'CNV_QC  ',                 &
                          'QLTOT   ',  'QLCN    ', 'QICN    ',     &
                          'DQLDT   ',  'QITOT   ', 'REV_CN  ',     &
                          'REV_LS  ',  'REV_AN  ', 'LFR_GCC ',     &
-                         'BYNCY   ',  'DQIDT   ', 'QI      ',     &
+                                      'DQIDT   ', 'QI      ',     &
                          'DQRC    ',  'CNV_CVW ', 'QLLS    ',     &
                          'QILS    ',  'DQRL    ', 'CNV_FRC ',     &
                          'RI      ',  'RL      '            /),   &