Merge develop into release/MAPL-v3

.github/workflows/ndsl-checks.yml

@@ -1,8 +1,10 @@
 name: NDSL Lint & Translate Tests
 
 on:
-  push:
-    paths: "./GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/**"
+  pull_request:
+    paths:
+      - '.github/workflows/ndsl-checks.yml'
+      - 'GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/**'
   workflow_dispatch:
 
 # cancel running jobs if theres a newer push
@@ -14,49 +16,67 @@ jobs:
   main:
     env:
       DATA_PATH: ./test_data/11.5.2/TBC_C24_L72/moist
-      DATA_URL: "https://portal.nccs.nasa.gov/datashare/astg/smt/geos-fp/translate/11.5.2/x86_GNU/Moist/TBC_C24L72.tar.gz"
+      DATA_URL: "https://portal.nccs.nasa.gov/datashare/astg/smt/geos-fp/translate/11.5.2/x86_GNU/Moist/TBC_C24L72_20251208.tar.gz"
     runs-on: ubuntu-latest
     steps:
-      - name: Step Python 3.11
+      - name: Step Python 3.12
         uses: actions/setup-python@v6
         with:
-          python-version: '3.11'
+          python-version: '3.12'
 
       - name: Install MPI
-        run: pip install mpich
+        run: pip install openmpi
 
       - name: Checkout repository
         uses: actions/checkout@v6
-        with:
-          submodules: 'recursive'
 
       - name: Install Python packages
         run: |
-          pip install ./GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist[develop]
+          cd GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist
+          pip install .[ndsl]
 
       - name: Run lint via pre-commit
         run: |
           cd GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist
-          pre-commit run --all-files
+          pre-commit run --all-files --show-diff-on-failure
 
       - name: Build Documentation
         run: |
           cd GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist
           mkdocs build
 
       - name: Download test_data
+        # TODO re-activate once we know which translate tests to run
+        if: false
         run: |
           cd GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist
           mkdir -p ${{ env.DATA_PATH }} && cd ${{ env.DATA_PATH }}
-          wget ${{ env.DATA_URL }}
-          tar -xzvf TBC_C24L72.tar.gz
+          wget --no-verbose ${{ env.DATA_URL }}
+          tar -xzf TBC_C24L72_20251208.tar.gz
+          # These don't have translate tests
+          rm Constants.MAPL-In.nc
+          rm Constants.ProcessLibrary-In.nc
+          rm GF2020_CumulusParameterization_TriggerFunctionConvection-In.nc
+          rm ComputeUwshcu-In.nc
+          rm GF2020_CumulusParameterization_GetBuoyancy_1-In.nc
+          rm GF2020_CumulusParameterization_UpdraftCIN-In.nc
+          rm GF2020_CumulusParameterization_InCloudTemperature-In.nc
+          rm GF2020_CumulusParameterization_EnvironmentCloudLevels_1-In.nc
+          rm GF2020_CumulusParameterization_UpdraftInitialWorkfunctions-In.nc
+          rm GF2020_CumulusParameterization_MeltingProfile-In.nc
 
-      - name: Run regular unit tests
+      - name: Run numerical unit tests
+        env:
+          EXP_NAME: 'gcm-fp'
         run : |
           cd GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist
-          pytests ./tests/numerical
+          pytest ./tests/numerical
 
       - name: Run translate tests
+        # TODO: re-activate once we know which translate tests to run
+        if: false
+        env:
+          EXP_NAME: 'gcm-fp'
         run: |
           cd GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/pyMoist/tests/scripts/
           ./run_all.sh ../../${{ env.DATA_PATH }} st:dace:cpu:KIJ

.github/workflows/push-to-develop.yml

@@ -17,7 +17,7 @@ jobs:
           fetch-depth: 0
           filter: blob:none
       - name: Run the action
-        uses: devops-infra/action-pull-request@v1.0.2
+        uses: devops-infra/action-pull-request@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           source_branch: develop

.github/workflows/workflow.yml

@@ -21,11 +21,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        #compiler: [ifort, gfortran-14, gfortran-15]
+        #compiler: [ifort, gfortran-15, ifx]
         # We remove ifort because for some reason, MAPL3 + ifort + Github CI
         # is running out of space on the device. For now, CircleCI will
         # continue to test ifort.
-        compiler: [gfortran-14, gfortran-15]
+        compiler: [gfortran-15, ifx]
         build-type: [Debug]
         fixture-repo: [GEOS-ESM/GEOSgcm, GEOS-ESM/GEOSldas]
         include:

GEOS_GcmGridComp.F90

@@ -572,15 +572,15 @@ subroutine SetServices ( GC, RC )
             SRC_ID = AGCM,                                          &
             RC=STATUS  )
        VERIFY_(STATUS)
-    endif
 
-    call MAPL_AddConnectivity ( GC,                                 &
-         SHORT_NAME  = (/'QLTOT', 'QITOT', 'QRTOT',                 &
-         'QSTOT', 'QGTOT'/),                                        &
-         DST_ID = AIAU,                                             &
-         SRC_ID = AGCM,                                             &
-         RC=STATUS  )
-    VERIFY_(STATUS)
+       call MAPL_AddConnectivity ( GC,                                 &
+            SHORT_NAME  = (/'QLTOT', 'QITOT', 'QRTOT',                 &
+            'QSTOT', 'QGTOT'/),                                        &
+            DST_ID = AIAU,                                             &
+            SRC_ID = AGCM,                                             &
+            RC=STATUS  )
+       VERIFY_(STATUS)
+    endif
 
     if (DO_CICE_THERMO == 2) then
        call MAPL_AddConnectivity ( GC,                              &
@@ -2867,7 +2867,7 @@ subroutine DO_A2W(SRC,DST,NAME,RC)
      integer, optional,intent(out)   :: RC
 
      character(len=ESMF_MAXSTR), parameter :: Iam = 'A2W'
-     integer :: status
+     integer :: status, srcTermProcessing
 
      type(ESMF_RouteHandle), pointer :: rh
      type(ESMF_Field) :: srcField, dstField
@@ -2881,9 +2881,11 @@ subroutine DO_A2W(SRC,DST,NAME,RC)
         !ALT: this should be done only once per regridder
         allocate(rh, stat=status)
         VERIFY_(STATUS)
+        srcTermProcessing = 0
         call ESMF_FieldRegridStore(srcField, dstField, &
                                    regridmethod=ESMF_REGRIDMETHOD_BILINEAR, &
                                    lineType=ESMF_LINETYPE_GREAT_CIRCLE, &
+                                   srcTermProcessing=srcTermProcessing, &
                                    routeHandle=rh, rc=status)
         VERIFY_(STATUS)
 
@@ -2897,7 +2899,7 @@ subroutine DO_A2W(SRC,DST,NAME,RC)
      end if
 
      call ESMF_FieldRegrid(srcField=srcField, dstField=dstField, &
-          routeHandle=rh, rc=status)
+          routeHandle=rh, termorderflag=ESMF_TERMORDER_SRCSEQ, rc=status)
      VERIFY_(STATUS)
 
      RETURN_(ESMF_SUCCESS)
@@ -2910,7 +2912,7 @@ subroutine DO_W2A(SRC,DST,NAME,RC)
      integer, optional,intent(out)   :: RC
 
      character(len=ESMF_MAXSTR), parameter :: Iam = 'W2A'
-     integer :: status
+     integer :: status, srcTermProcessing
 
      type(ESMF_RouteHandle), pointer :: rh
      type(ESMF_Field) :: srcField, dstField
@@ -2924,9 +2926,11 @@ subroutine DO_W2A(SRC,DST,NAME,RC)
         !ALT: this should be done only once per regridder
         allocate(rh, stat=status)
         VERIFY_(STATUS)
+        srcTermProcessing = 0
         call ESMF_FieldRegridStore(srcField, dstField, &
                                    regridmethod=ESMF_REGRIDMETHOD_BILINEAR, &
                                    lineType=ESMF_LINETYPE_GREAT_CIRCLE, &
+                                   srcTermProcessing=srcTermProcessing, &
                                    routeHandle=rh, rc=status)
         VERIFY_(STATUS)
 
@@ -2940,7 +2944,7 @@ subroutine DO_W2A(SRC,DST,NAME,RC)
      end if
 
      call ESMF_FieldRegrid(srcField=srcField, dstField=dstField, &
-          routeHandle=rh, rc=status)
+          routeHandle=rh, termorderflag=ESMF_TERMORDER_SRCSEQ, rc=status)
      VERIFY_(STATUS)
 
      RETURN_(ESMF_SUCCESS)
@@ -2953,7 +2957,7 @@ subroutine DO_O2W(SRC,DST,NAME,RC)
      integer, optional,intent(out)   :: RC
 
      character(len=ESMF_MAXSTR), parameter :: Iam = 'O2W'
-     integer :: status
+     integer :: status, srcTermProcessing
 
      type(ESMF_RouteHandle), pointer :: rh
      type(ESMF_Field) :: srcField, dstField
@@ -2967,9 +2971,11 @@ subroutine DO_O2W(SRC,DST,NAME,RC)
         !ALT: this should be done only once per regridder
         allocate(rh, stat=status)
         VERIFY_(STATUS)
+        srcTermProcessing = 0
         call ESMF_FieldRegridStore(srcField, dstField, &
                                    regridmethod=ESMF_REGRIDMETHOD_BILINEAR, &
                                    lineType=ESMF_LINETYPE_GREAT_CIRCLE, &
+                                   srcTermProcessing=srcTermProcessing, &
                                    routeHandle=rh, rc=status)
         VERIFY_(STATUS)
 
@@ -2983,7 +2989,7 @@ subroutine DO_O2W(SRC,DST,NAME,RC)
      end if
 
      call ESMF_FieldRegrid(srcField=srcField, dstField=dstField, &
-          routeHandle=rh, rc=status)
+          routeHandle=rh, termorderflag=ESMF_TERMORDER_SRCSEQ, rc=status)
      VERIFY_(STATUS)
 
      RETURN_(ESMF_SUCCESS)
@@ -2996,7 +3002,7 @@ subroutine DO_W2O(SRC,DST,NAME,RC)
      integer, optional,intent(out)   :: RC
 
      character(len=ESMF_MAXSTR), parameter :: Iam = 'W2O'
-     integer :: status
+     integer :: status, srcTermProcessing
 
      type(ESMF_RouteHandle), pointer :: rh
      type(ESMF_Field) :: srcField, dstField
@@ -3010,10 +3016,12 @@ subroutine DO_W2O(SRC,DST,NAME,RC)
         !ALT: this should be done only once per regridder
         allocate(rh, stat=status)
         VERIFY_(STATUS)
+        srcTermProcessing = 0
         call ESMF_FieldRegridStore(srcField, dstField, &
                                    regridMethod=ESMF_REGRIDMETHOD_BILINEAR, &
                                    lineType=ESMF_LINETYPE_GREAT_CIRCLE, &
                                    routeHandle=rh, &
+                                   srcTermProcessing=srcTermProcessing, &
                                    unmappedAction=ESMF_UNMAPPEDACTION_IGNORE, rc=status)
         VERIFY_(STATUS)
 
@@ -3028,7 +3036,7 @@ subroutine DO_W2O(SRC,DST,NAME,RC)
      end if
 
      call ESMF_FieldRegrid(srcField=srcField, dstField=dstField, &
-          routeHandle=rh, rc=status)
+          routeHandle=rh, termorderflag=ESMF_TERMORDER_SRCSEQ, rc=status)
      VERIFY_(STATUS)
 
      RETURN_(ESMF_SUCCESS)
@@ -3040,4 +3048,3 @@ end subroutine Run
 ! for example call ESMF_FieldRegridRelease(routeHandle, rc=status)
 
 end module GEOS_GcmGridCompMod
-

GEOSagcm_GridComp/GEOS_AgcmGridComp.F90

@@ -1074,19 +1074,23 @@ subroutine SetServices ( GC, RC )
 ! Set internal connections between the childrens IMPORTS and EXPORTS
 ! ------------------------------------------------------------------
 
-    call MAPL_AddConnectivity ( GC,                                                        &
-         SRC_NAME  = (/'U            ','V            ','TH           ','T            ',    &
-                       'ZLE          ','PS           ','TA           ','QA           ',    &
-                       'US           ','VS           ',                                    &
-                       'SPEED        ','DZ           ','PLE          ','W            ',    &
-                       'PREF         ','TROPP_BLENDED','S            ','PLK          ',    &
-                       'PV           ','TROPK_BLENDED','OMEGA        ','PKE          '/),  &
-         DST_NAME  = (/'U     ','V     ','TH    ','T     ',                                &
-                       'ZLE   ','PS    ','TA    ','QA    ',                                &
-                       'UA    ','VA    ',                                                  &
-                       'SPEED ','DZ    ','PLE   ','W     ',                                &
-                       'PREF  ','TROPP ','S     ','PLK   ',                                &
-                       'PV    ','TROPK ','OMEGA ','PKE   '/),                              &
+    ! Set the length of the character array constructor to
+    ! the length of the longest string in the array
+    call MAPL_AddConnectivity ( GC, &
+         SRC_NAME  = [character(len=15) :: &
+            'U',     'V',             'TH',              'T',    &
+            'ZLE',   'PS',            'TA',              'QA',   &
+            'US',    'VS',            'WSPD_STABLE300M',         &
+            'SPEED', 'DZ',            'PLE',             'W',    &
+            'PREF',  'TROPP_BLENDED', 'S',               'PLK',  &
+            'PV',    'TROPK_BLENDED', 'OMEGA',           'PKE'], &
+         DST_NAME  = [character(len=15) :: &
+             'U',     'V',     'TH',              'T',    &
+             'ZLE',   'PS',    'TA',              'QA',   &
+             'UA',    'VA',    'WSPD_STABLE300M',         &
+             'SPEED', 'DZ',    'PLE',             'W',    &
+             'PREF',  'TROPP', 'S',               'PLK',  &
+             'PV',    'TROPK', 'OMEGA',           'PKE'], &
          DST_ID = PHYS,                                                                    &
          SRC_ID = SDYN,                                                                    &
          RC=STATUS  )
@@ -1623,9 +1627,9 @@ subroutine Run ( GC, IMPORT, EXPORT, CLOCK, RC )
    real, pointer, dimension(:,:)       :: TQV    => null()
    real, pointer, dimension(:,:)       :: TQI    => null()
    real, pointer, dimension(:,:)       :: TQL    => null()
-   real, pointer, dimension(:,:)       :: TQR    => null()                
-   real, pointer, dimension(:,:)       :: TQS    => null()                
-   real, pointer, dimension(:,:)       :: TQG    => null()                
+   real, pointer, dimension(:,:)       :: TQR    => null()
+   real, pointer, dimension(:,:)       :: TQS    => null()
+   real, pointer, dimension(:,:)       :: TQG    => null()
    real, pointer, dimension(:,:)       :: TOX    => null()
    real, pointer, dimension(:,:)       :: TROPP1 => null()
    real, pointer, dimension(:,:)       :: TROPP2 => null()
@@ -2668,11 +2672,11 @@ subroutine Run ( GC, IMPORT, EXPORT, CLOCK, RC )
     VERIFY_(STATUS)
     call MAPL_GetPointer ( EXPORT, TQL   , 'TQL'   , rc=STATUS )
     VERIFY_(STATUS)
-    call MAPL_GetPointer ( EXPORT, TQR   , 'TQR'   , rc=STATUS )          
+    call MAPL_GetPointer ( EXPORT, TQR   , 'TQR'   , rc=STATUS )
     VERIFY_(STATUS)
-    call MAPL_GetPointer ( EXPORT, TQS   , 'TQS'   , rc=STATUS )          
+    call MAPL_GetPointer ( EXPORT, TQS   , 'TQS'   , rc=STATUS )
     VERIFY_(STATUS)
-    call MAPL_GetPointer ( EXPORT, TQG   , 'TQG'   , rc=STATUS )          
+    call MAPL_GetPointer ( EXPORT, TQG   , 'TQG'   , rc=STATUS )
     VERIFY_(STATUS)
     call MAPL_GetPointer ( EXPORT, QLTOT , 'QLTOT' , rc=STATUS )
     VERIFY_(STATUS)
@@ -2828,7 +2832,7 @@ subroutine Run ( GC, IMPORT, EXPORT, CLOCK, RC )
 ! Rain
 ! ------------
        if(NAMES(K)=='QRAIN') then
-          call FILL_Friendly   ( Q,DP,QFILL,QINT ) 
+          call FILL_Friendly   ( Q,DP,QFILL,QINT )
           if(associated(QRFILL))           QRFILL = QRFILL      + QFILL
           if(associated(QTFILL))           QTFILL = QTFILL      + QFILL
           if(associated(DQRDTPHYINT)) DQRDTPHYINT = DQRDTPHYINT + QFILL

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90

@@ -1690,21 +1690,21 @@ subroutine SetServices ( GC, RC )
 ! Imports for GWD
 !----------------
     call MAPL_AddConnectivity ( GC,                                    &
-         SHORT_NAME  = [character(len=7) :: 'Q', 'DTDT_DC', 'CNV_FRC' ], &
+         SHORT_NAME  = [character(len=7) :: 'Q', 'CNV_FRC' ],          &
          DST_ID      = GWD,                                            &
          SRC_ID      = MOIST,                                          &
                                                         RC=STATUS      )
     VERIFY_(STATUS)
     call MAPL_AddConnectivity ( GC,                                      &
-         SRC_NAME    = 'DQIDT_micro',                                    &
-         DST_NAME    = 'DQIDT',                                          &
+         SRC_NAME    = 'DTDT_micro',                                     &
+         DST_NAME    = 'HT_mi',                                          &
          DST_ID      = GWD,                                              &
          SRC_ID      = MOIST,                                            &
                                                        RC=STATUS  )
     VERIFY_(STATUS)
     call MAPL_AddConnectivity ( GC,                                      &
-         SRC_NAME    = 'DQLDT_micro',                                    &
-         DST_NAME    = 'DQLDT',                                          &
+         SRC_NAME    = 'DTDT_DC',                                        &
+         DST_NAME    = 'HT_dc',                                          &
          DST_ID      = GWD,                                              &
          SRC_ID      = MOIST,                                            &
                                                        RC=STATUS  )