Sync develop into main

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 # Anchors in case we need to override the defaults from the orb
-#baselibs_version: &baselibs_version v8.14.0
+#baselibs_version: &baselibs_version v8.32.0
 #bcs_version: &bcs_version v12.0.0
 
 orbs:
@@ -21,10 +21,7 @@ workflows:
           #baselibs_version: *baselibs_version
           repo: GEOSgcm
           checkout_fixture: 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
+          mepodevelop: true
           persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
 
       # Run AMIP GCM (1 hour, no ExtData)

.github/workflows/workflow.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        compiler: [ifort, gfortran-14, gfortran-15]
+        compiler: [ifort, gfortran-15, ifx]
         build-type: [Debug]
         fixture-repo: [GEOS-ESM/GEOSgcm, GEOS-ESM/GEOSldas]
         include:
@@ -37,7 +37,6 @@ jobs:
       compiler: ${{ matrix.compiler }}
       cmake-build-type: ${{ matrix.build-type }}
       fixture-repo: GEOS-ESM/GEOSgcm
-      fixture-ref: feature/sdrabenh/gcm_v12
 
   spack_build:
     strategy:
@@ -54,6 +53,5 @@ jobs:
       BUILDCACHE_TOKEN: ${{ secrets.BUILDCACHE_TOKEN }}
     with:
       fixture-repo: GEOS-ESM/GEOSgcm
-      fixture-ref: feature/sdrabenh/gcm_v12
       load-fms: true
 

GEOS_GcmGridComp.F90

@@ -575,15 +575,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,                              &

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/GEOSgwd_GridComp/GEOS_GwdGridComp.F90

@@ -260,6 +260,7 @@ subroutine Initialize ( GC, IMPORT, EXPORT, CLOCK, RC )
     real    :: NCAR_ET_EFF     ! Frontal region efficiency factor
     real    :: NCAR_ET_TAUBGND ! Extratropical background frontal forcing
     logical :: NCAR_ET_USE_DQCDT
+    logical :: NCAR_ET_USE_SPEED
     logical :: NCAR_DC_BERES
     integer :: GEOS_PGWV
     real :: NCAR_EFFGWBKG
@@ -381,8 +382,16 @@ subroutine Initialize ( GC, IMPORT, EXPORT, CLOCK, RC )
       call MAPL_GetResource( MAPL, NCAR_BKG_WAVELENGTH, Label="NCAR_BKG_WAVELENGTH:", default=1.e5,   _RC)
       call MAPL_GetResource( MAPL, NCAR_TR_EFF,         Label="NCAR_TR_EFF:",         default=1.0,    _RC)
       call MAPL_GetResource( MAPL, NCAR_ET_EFF,         Label="NCAR_ET_EFF:",         default=1.0,    _RC)
-      call MAPL_GetResource( MAPL, NCAR_ET_TAUBGND,     Label="NCAR_ET_TAUBGND:",     default=6.4,    _RC)
-      call MAPL_GetResource( MAPL, NCAR_ET_USE_DQCDT,   Label="NCAR_ET_USE_DQCDT:",   default=.FALSE., _RC)
+
+      call MAPL_GetResource( MAPL, NCAR_ET_USE_DQCDT,   Label="NCAR_ET_USE_DQCDT:",   default=.TRUE., _RC)
+      call MAPL_GetResource( MAPL, NCAR_ET_USE_SPEED,   Label="NCAR_ET_USE_SPEED:",   default=.FALSE.,_RC)
+
+      ! 1. Default to classic rigid latitude tuning
+      NCAR_ET_TAUBGND = 6.4 
+      ! 2. Set baselines for independent runs
+      if (NCAR_ET_USE_DQCDT .or. NCAR_ET_USE_SPEED) NCAR_ET_TAUBGND = 10.0
+      call MAPL_GetResource( MAPL, NCAR_ET_TAUBGND,     Label="NCAR_ET_TAUBGND:",     default=NCAR_ET_TAUBGND, _RC)
+
       call MAPL_GetResource( MAPL, NCAR_BKG_TNDMAX,     Label="NCAR_BKG_TNDMAX:",     default=250.0,  _RC)
       NCAR_BKG_TNDMAX = NCAR_BKG_TNDMAX/86400.0
       ! Beres DeepCu
@@ -397,7 +406,7 @@ subroutine Initialize ( GC, IMPORT, EXPORT, CLOCK, RC )
                                     self%workspaces(thread)%beres_dc_desc, &
                                     NCAR_BKG_PGWV, NCAR_BKG_GW_DC, NCAR_BKG_FCRIT2, &
                                     NCAR_BKG_WAVELENGTH, NCAR_DC_BERES_SRC_LEVEL, &
-                                    1000.0, .TRUE., NCAR_TR_EFF, NCAR_ET_EFF, NCAR_ET_TAUBGND, NCAR_ET_USE_DQCDT, &
+                                    1000.0, .TRUE., NCAR_TR_EFF, NCAR_ET_EFF, NCAR_ET_TAUBGND, NCAR_ET_USE_DQCDT, NCAR_ET_USE_SPEED, &
                                     NCAR_BKG_TNDMAX, NCAR_DC_BERES, &
                                     IM*JM_thread, LATS(:,bounds(thread+1)%min:bounds(thread+1)%max))
           end do
@@ -407,7 +416,7 @@ subroutine Initialize ( GC, IMPORT, EXPORT, CLOCK, RC )
                               self%workspaces(0)%beres_dc_desc, &
                               NCAR_BKG_PGWV, NCAR_BKG_GW_DC, NCAR_BKG_FCRIT2, &
                               NCAR_BKG_WAVELENGTH, NCAR_DC_BERES_SRC_LEVEL, &
-                              1000.0, .TRUE., NCAR_TR_EFF, NCAR_ET_EFF, NCAR_ET_TAUBGND, NCAR_ET_USE_DQCDT, &
+                              1000.0, .TRUE., NCAR_TR_EFF, NCAR_ET_EFF, NCAR_ET_TAUBGND, NCAR_ET_USE_DQCDT, NCAR_ET_USE_SPEED, &
                               NCAR_BKG_TNDMAX, NCAR_DC_BERES, &
                               IM*JM, LATS )
       endif
@@ -685,7 +694,9 @@ subroutine Gwd_Driver(RC)
          !call MAPL_TimerOn(MAPL,"-INTR_NCAR")
          if ( (self%NCAR_EFFGWORO /= 0.0) .OR. (self%NCAR_EFFGWBKG /= 0.0) ) then
             DO L=1, LM
-               TMP3D(:,:,L) = (1.0-CNV_FRC)*(DQLDT(:,:,L)+DQIDT(:,:,L))
+               ! Raising the mask to the 4th power aggressively suppresses 
+               ! tendencies in regions with even modest CNV_FRC values
+               TMP3D(:,:,L) = ((1.0-CNV_FRC)**4) * (DQLDT(:,:,L)+DQIDT(:,:,L))
             END DO
             if(associated(DQCDT_LS)) DQCDT_LS = TMP3D
             thread = MAPL_get_current_thread()
@@ -694,7 +705,7 @@ subroutine Gwd_Driver(RC)
                  workspace%beres_dc_desc, &
                  workspace%beres_band, workspace%oro_band, workspace%rdg_band, &
                  PLE,       T,          U,          V,                   &
-                 HT_dc,                 TMP3D,                           &
+                 HT_dc,     TMP3D,      WSPD_STABLE300M,                 &
                  SGH,       MXDIS,      HWDTH,      CLNGT,  ANGLL,       &
                  ANIXY,     GBXAR_TMP,  KWVRDG,     EFFRDG, PREF,        &
                  PMID,      PDEL,       RPDEL,      PILN,   ZM,    LATS, &

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/GWD_StateSpecs.rc

@@ -20,23 +20,24 @@ category: IMPORT
 #-------------------------------------------------------------------------------------------------------
 #  VARIABLE    | DIMENSIONS  |          Additional Metadata
 #-------------------------------------------------------------------------------------------------------
- NAME    | ALIAS | UNITS   | DIMS | VLOC | RESTART | LONG NAME
+ NAME      | ALIAS | UNITS   | DIMS | VLOC | RESTART | LONG NAME
 #-------------------------------------------------------------------------------------------------------
- PLE     |       | Pa          | xyz  | E    | SKIP    | air_pressure
- T       |       | K           | xyz  | C    | SKIP    | air_temperature
- Q       |       | kg kg-1     | xyz  | C    | SKIP    | specific_humidity
- U       |       | m s-1       | xyz  | C    | SKIP    | eastward_wind
- V       |       | m s-1       | xyz  | C    | SKIP    | northward_wind
- PHIS    |       | m+2 s-2     | xy   | N    | SKIP    | surface geopotential height
- SGH     |       | m           | xy   | N    | SKIP    | standard_deviation_of_topography
- VARFLT  |       | m+2         | xy   | N    | SKIP    | variance_of_the_filtered_topography
- PREF    |       | Pa          |   z  | E    | SKIP    | reference_air_pressure
- AREA    |       | m^2         | xy   | N    | SKIP    | grid_box_area
+ PLE       |       | Pa          | xyz  | E    | SKIP    | air_pressure
+ T         |       | K           | xyz  | C    | SKIP    | air_temperature
+ Q         |       | kg kg-1     | xyz  | C    | SKIP    | specific_humidity
+ U         |       | m s-1       | xyz  | C    | SKIP    | eastward_wind
+ V         |       | m s-1       | xyz  | C    | SKIP    | northward_wind
+ PHIS      |       | m+2 s-2     | xy   | N    | SKIP    | surface geopotential height
+ SGH       |       | m           | xy   | N    | SKIP    | standard_deviation_of_topography
+ VARFLT    |       | m+2         | xy   | N    | SKIP    | variance_of_the_filtered_topography
+ PREF      |       | Pa          |   z  | E    | SKIP    | reference_air_pressure
+ AREA      |       | m^2         | xy   | N    | SKIP    | grid_box_area
+ WSPD_STABLE300M | | m s-1       | xy   | N    | SKIP    | max_wind_speed_in_stable_cold_surface_layer
 #-from-moist-
- DTDT_DC | HT_dc | K s-1       | xyz  | C    |         | T tendency due to deep convection
- DQLDT   |       | kg kg-1 s-1 | xyz  | C    |         | total_liq_water_tendency_due_to_moist
- DQIDT   |       | kg kg-1 s-1 | xyz  | C    |         | total_ice_water_tendency_due_to_moist
- CNV_FRC |       | 1           | xy   | N    |         | convective_fraction
+ DTDT_DC   | HT_dc | K s-1       | xyz  | C    |         | T tendency due to deep convection
+ DQLDT     |       | kg kg-1 s-1 | xyz  | C    |         | total_liq_water_tendency_due_to_moist
+ DQIDT     |       | kg kg-1 s-1 | xyz  | C    |         | total_ice_water_tendency_due_to_moist
+ CNV_FRC   |       | 1           | xy   | N    |         | convective_fraction
 
 category: EXPORT
 #-------------------------------------------------------------------------------------------------------