GitFlow: Merge develop into v12 - 2026Jan07

.circleci/config.yml

@@ -1,11 +1,11 @@
 version: 2.1
 
 # Anchors in case we need to override the defaults from the orb
-#baselibs_version: &baselibs_version v7.27.0
-#bcs_version: &bcs_version v11.6.0
+#baselibs_version: &baselibs_version v8.24.0
+#bcs_version: &bcs_version v12.0.0
 
 orbs:
-  ci: geos-esm/circleci-tools@4
+  ci: geos-esm/circleci-tools@5
 
 workflows:
   build-test:
@@ -21,7 +21,10 @@ workflows:
           #baselibs_version: *baselibs_version
           repo: GEOSgcm
           checkout_fixture: true
-          mepodevelop: true
+          # V12 code uses a special branch for now.
+          fixture_branch: feature/sdrabenh/gcm_v12
+          # We comment out this as it will "undo" the fixture_branch
+          #mepodevelop: true
           persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
 
       # Run AMIP GCM (1 hour, no ExtData)
@@ -45,7 +48,7 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [gfortran, ifort]
+              compiler: [ifort]
           requires:
             - build-GEOSgcm-on-<< matrix.compiler >>
           repo: GEOSgcm

.github/workflows/enforce-labels.yml

@@ -14,7 +14,7 @@ jobs:
         with:
           mode: minimum
           count: 1
-          labels: "0 diff,0 diff trivial,Non 0-diff,0 diff structural,0-diff trivial,Not 0-diff,0-diff,automatic,0-diff uncoupled"
+          labels: "0 diff,0 diff trivial,Non 0-diff,0 diff structural,0-diff trivial,Not 0-diff,0-diff,automatic,0-diff uncoupled,github_actions"
           add_comment: true
           message: "This PR is being prevented from merging because you have not added one of our required labels: {{ provided }}. Please add one so that the PR can be merged."
 

.github/workflows/validate_yaml_files.yml

@@ -15,7 +15,11 @@ jobs:
   validate-YAML:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repo
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          filter: blob:none
       - id: yaml-lint
         name: yaml-lint
         uses: ibiqlik/action-yamllint@v3
@@ -24,7 +28,7 @@ jobs:
           format: colored
           config_file: .yamllint.yml
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         if: always()
         with:
           name: yamllint-logfile

.github/workflows/workflow.yml

@@ -0,0 +1,40 @@
+name: Build Tests
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    # Do not run if the only files changed cannot affect the build
+    paths-ignore:
+      - "**.md"
+      - "**.pro"
+      - "**.sh"
+      - "**.perl"
+      - ".github/CODEOWNERS"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  build_gcm:
+    strategy:
+      matrix:
+        compiler: [ifort, gfortran-14, gfortran-15]
+        build-type: [Debug]
+      fail-fast: false
+    uses: GEOS-ESM/CI-workflows/.github/workflows/geosgcm_build_tests.yml@project/geosgcm
+    with:
+      compiler: ${{ matrix.compiler }}
+      cmake-build-type: ${{ matrix.build-type }}
+      fixture-repo: GEOS-ESM/GEOSgcm
+      fixture-ref: feature/sdrabenh/gcm_v12
+
+  spack_build:
+    uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm
+    secrets:
+      BUILDCACHE_USERNAME: ${{ secrets.BUILDCACHE_USERNAME }}
+      BUILDCACHE_TOKEN: ${{ secrets.BUILDCACHE_TOKEN }}
+    with:
+      fixture-repo: GEOS-ESM/GEOSgcm
+      fixture-ref: feature/sdrabenh/gcm_v12
+

CHANGELOG.md

@@ -13,6 +13,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Deprecated
 
+## [1.16.1] - 2025-12-16
+
+### Added
+
+- Added the capability to compute LFC in Lightning module, needed for CTM
+
+### Changed
+
+- Slight refactoring of LOPEZ lightning scheme, minor numerical difference
+- Renamed lightning option 'usePreconCape' to 'useImportedCape' in order to cover both GCM and CTM
+- Moved from `f2py2` to `f2py3` to enable removal of Python 2 support
+- Updated CI
+
+### Fixed
+
+- ChemEnv now updates the precip exports (total, conv, non-conv) as part of Run1 (not just Run2).
+
 
 ## [1.16.0 - 2025-02-18]
 

ChemEnv.rc

@@ -37,4 +37,10 @@ lightNOampFactor: 1.07
 numberNOperFlash: 1.50e+26
 minDeepCloudTop: 7.0
 
-usePreconCape: TRUE
+#  originally called usePreconCape
+# IF TRUE:  CHEM should use the IMPORT state for CAPE, INHB, BYNCY, LFC
+#           for GMI, imports come from MOIST and reflect the state prior to convective transport
+#           for CTM, imports come from ExtData or CTMenv (currently these fields are not supported)
+# IF FALSE: compute CAPE, INHB, BYNCY, LFC in the CHEM module
+            use the FALSE setting for CTM
+useImportedCape: TRUE

GEOS_ChemEnvGridComp.F90

@@ -49,7 +49,7 @@ module GEOS_ChemEnvGridCompMod
   real                       :: FIT_flashFactor
   real                       :: HEMCO_flashFactor
   real                       :: LOPEZ_flashFactor
-  logical                    :: usePreconCape       ! use CAPE, INHB and BYNCY from MOIST
+  logical                    :: useImportedCape     ! use CAPE, INHB and BYNCY from Import State
 
   ! May change during the course of the run:
   integer                    :: year_for_ratio = 0
@@ -777,7 +777,7 @@ subroutine Initialize_ ( GC, impChem, expChem, clock, RC )
                                  numberNOperFlash,                     &
                                  MOIST_flashFactor, FIT_flashFactor,   &
                                  HEMCO_flashFactor, LOPEZ_flashFactor, &
-                                 usePreconCape,                        &
+                                 useImportedCape,                      &
                                  __RC__ )
 
     IF(MAPL_AM_I_ROOT()) THEN
@@ -786,7 +786,7 @@ subroutine Initialize_ ( GC, impChem, expChem, clock, RC )
       if ( flash_source_enum == FLASH_SOURCE_HEMCO ) PRINT*,'HEMCO_flashFactor is ', HEMCO_flashFactor
       if ( flash_source_enum == FLASH_SOURCE_LOPEZ ) PRINT*,'LOPEZ_flashFactor is ', LOPEZ_flashFactor
 
-                                                     PRINT*,'usePreconCape = ', usePreconCape
+                                                     PRINT*,'useImportedCape = ', useImportedCape
     ENDIF
 
     RETURN_(ESMF_SUCCESS)
@@ -849,16 +849,18 @@ subroutine Run1 ( GC, IMPORT, EXPORT, CLOCK, RC )
   real, pointer, dimension(:,:)   ::          TS => null()
   real, pointer, dimension(:,:)   ::     FROCEAN => null()
   real, pointer, dimension(:,:)   ::      FRLAND => null()
-  real, pointer, dimension(:,:)   ::     CN_PRCP => null()
   real, pointer, dimension(:,:)   ::        PHIS => null()
   real, pointer, dimension(:,:,:) ::     CNV_MFC => null()
   real, pointer, dimension(:,:,:) ::     CNV_MFD => null()
   real, pointer, dimension(:,:,:) ::      PFI_CN => null()
   real, pointer, dimension(:,:,:) ::      CNV_QC => null()
 
-  real, pointer, dimension(:,:)   ::       CAPE_PRECON => null()
-  real, pointer, dimension(:,:)   ::       INHB_PRECON => null()
-  real, pointer, dimension(:,:,:) ::      BYNCY_PRECON => null()
+  real, pointer, dimension(:,:)   ::       CAPE_IMPORT => null()
+  real, pointer, dimension(:,:)   ::       INHB_IMPORT => null()
+  real, pointer, dimension(:,:,:) ::      BYNCY_IMPORT => null()
+
+  real, pointer, dimension(:,:)   ::          pr_total => null()
+  real, pointer, dimension(:,:)   ::          pr_conv  => null()
 
 ! Exports
   real,   pointer, dimension(:,:,:)  ::           delp => null()
@@ -867,6 +869,10 @@ subroutine Run1 ( GC, IMPORT, EXPORT, CLOCK, RC )
   real,   pointer, dimension(:,:)    ::           CAPE => null()
   real*4, pointer, dimension(:,:,:)  ::  LIGHT_NO_PROD => null()
 
+  real,   pointer, dimension(:,:)      ::    tprec => null()
+  real,   pointer, dimension(:,:)      ::  cn_prcp => null()
+  real,   pointer, dimension(:,:)      :: ncn_prcp => null()
+
 !=============================================================================
 
     integer                            :: k, k0
@@ -941,6 +947,21 @@ subroutine Run1 ( GC, IMPORT, EXPORT, CLOCK, RC )
        end do
     end if
 
+!   Import total precip from SURFACE (either model or observed precip)
+!     When running CTM, use fields such that (total - convective) >= 0.0
+!   Export total, convective and non-convective precipitation.
+!   --------------------------------------------------------------------
+    call MAPL_GetPointer ( EXPORT,    tprec,    'TPREC',  __RC__ )
+    call MAPL_GetPointer ( EXPORT,  cn_prcp,  'CN_PRCP',  __RC__ )
+    call MAPL_GetPointer ( EXPORT, ncn_prcp, 'NCN_PRCP',  __RC__ )
+
+    call MAPL_GetPointer ( IMPORT, pr_total,  'PRECTOT',  __RC__ )
+    call MAPL_GetPointer ( IMPORT, pr_conv,   'CN_PRCP',  __RC__ )
+
+    if (associated(   tprec))    tprec =  pr_total
+    if (associated( cn_prcp))  cn_prcp =  pr_conv
+    if (associated(ncn_prcp)) ncn_prcp = (pr_total - pr_conv)
+
 
     !------------------------------------------------
     ! Flash Rate (LFR) for Lighting Parameterization
@@ -959,7 +980,6 @@ subroutine Run1 ( GC, IMPORT, EXPORT, CLOCK, RC )
 
     call MAPL_GetPointer ( IMPORT, CNV_MFC,     'CNV_MFC',  __RC__ )
     call MAPL_GetPointer ( IMPORT, CNV_MFD,     'CNV_MFD',  __RC__ )
-    call MAPL_GetPointer ( IMPORT, CN_PRCP,     'CN_PRCP',  __RC__ )
     call MAPL_GetPointer ( IMPORT, PHIS,        'PHIS',     __RC__ )
     call MAPL_GetPointer ( IMPORT, PFI_CN,      'PFI_CN',   __RC__ )
 
@@ -975,9 +995,9 @@ subroutine Run1 ( GC, IMPORT, EXPORT, CLOCK, RC )
     call MAPL_GetPointer ( IMPORT, CNV_QC,      'CNV_QC',   __RC__ )
     call MAPL_GetPointer ( IMPORT, cellArea,    'AREA',     __RC__ )
 
-    call MAPL_GetPointer ( IMPORT,  CAPE_PRECON, 'CAPE',    __RC__ )
-    call MAPL_GetPointer ( IMPORT,  INHB_PRECON, 'INHB',    __RC__ )
-    call MAPL_GetPointer ( IMPORT, BYNCY_PRECON, 'BYNCY',   __RC__ )
+    call MAPL_GetPointer ( IMPORT,  CAPE_IMPORT, 'CAPE',    __RC__ )
+    call MAPL_GetPointer ( IMPORT,  INHB_IMPORT, 'INHB',    __RC__ )
+    call MAPL_GetPointer ( IMPORT, BYNCY_IMPORT, 'BYNCY',   __RC__ )
 
     call MAPL_GetPointer ( IMPORT, ZLFC, 'ZLFC',   __RC__ )
     call MAPL_GetPointer ( IMPORT, ZLCL, 'ZLCL',   __RC__ )
@@ -991,7 +1011,7 @@ subroutine Run1 ( GC, IMPORT, EXPORT, CLOCK, RC )
       LIGHT_NO_PROD(:,:,:) = REAL(0)
     end if
 
-! print*,'ENV MOIST CN_PRCP ', MINVAL(CN_PRCP), MAXVAL(CN_PRCP)
+! print*,'ENV MOIST CN_PRCP ', MINVAL(pr_conv), MAXVAL(pr_conv)
 ! print*,'ENV MOIST FROCEAN ', MINVAL(FROCEAN), MAXVAL(FROCEAN)
 ! print*,'ENV MOIST TS      ', MINVAL(TS     ), MAXVAL(TS     )
 ! print*,'ENV MOIST CNV_MFC ', MINVAL(CNV_MFC), MAXVAL(CNV_MFC)
@@ -1005,12 +1025,12 @@ subroutine Run1 ( GC, IMPORT, EXPORT, CLOCK, RC )
 
     call getLightning ( GC, ggState, CLOCK, &
                 flash_source_enum, ratioGlobalLight, DT, &
-                LONSLOCAL, LATSLOCAL, CN_PRCP, FRLAND, FROCEAN, LWI,   &
+                LONSLOCAL, LATSLOCAL, pr_conv, FRLAND, FROCEAN, LWI,   &
                 PBLH, mcor, cellArea, MIDLAT_ADJ, RATIO_LOCAL,   &
                 TS, CNV_MFC, CNV_QC, T, TH, PFI_CN, PLE, Q, ZLE,   &
                 minDeepCloudTop, lightNOampFactor, numberNOperFlash, &
                 MOIST_flashFactor, FIT_flashFactor, HEMCO_flashFactor, LOPEZ_flashFactor, &
-                CNV_MFD, usePreconCape, CAPE_PRECON, INHB_PRECON, BYNCY_PRECON, &
+                CNV_MFD, useImportedCape, CAPE_IMPORT, INHB_IMPORT, BYNCY_IMPORT, &
                 CAPE, BYNCY, ZLFC, ZLCL, LFR, LIGHT_NO_PROD, PHIS, &
                 __RC__)
 
@@ -1133,18 +1153,17 @@ subroutine Run2 ( GC, IMPORT, EXPORT, CLOCK, RC )
        end do
     end if
 
-! Import total precip from SURFACE (either model or observed precip)
-! Export total, convective and non-convective precipitation.
-!--------------------------------------------------------------
+!   Import total precip from SURFACE (either model or observed precip)
+!     When running CTM, use fields such that (total - convective) >= 0.0
+!   Export total, convective and non-convective precipitation.
+!   --------------------------------------------------------------------
     call MAPL_GetPointer ( EXPORT,    tprec,    'TPREC',  __RC__ )
     call MAPL_GetPointer ( EXPORT,  cn_prcp,  'CN_PRCP',  __RC__ )
     call MAPL_GetPointer ( EXPORT, ncn_prcp, 'NCN_PRCP',  __RC__ )
 
-
-    call MAPL_GetPointer ( IMPORT, pr_total, 'PRECTOT', __RC__ )
-    call MAPL_GetPointer ( IMPORT, pr_conv,  'CN_PRCP', __RC__ )
+    call MAPL_GetPointer ( IMPORT, pr_total,  'PRECTOT',  __RC__ )
+    call MAPL_GetPointer ( IMPORT, pr_conv,   'CN_PRCP',  __RC__ )
 
-
     if (associated(   tprec))    tprec =  pr_total
     if (associated( cn_prcp))  cn_prcp =  pr_conv
     if (associated(ncn_prcp)) ncn_prcp = (pr_total - pr_conv)