Auto PR - develop → MAPL-v3 - turn off GOSWIM via N_constit=0

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM40_GridComp/GEOS_CatchCNCLM40GridComp.F90

@@ -5986,11 +5986,13 @@ subroutine Driver ( RC )
 
         !--------------- GOSWIM IMPORTS FROM GOCART ---------------
         ! Initialization 
-        RCONSTIT(:,:,:)  = 0.0
-        TOTDEPOS(:,:) = 0.0
-        RMELT(:,:)  = 0.0
+        if (N_constit>0) then
+           RCONSTIT(:,:,:)  = 0.0
+           TOTDEPOS(:,:) = 0.0
+           RMELT(:,:)  = 0.0
+        end if
         !------------------------------------------------------------------
-
+           
         ! Zero the light-absorbing aerosol (LAA) deposition rates from  GOCART:
 
         select case (catchcn_internal%AEROSOL_DEPOSITION)
@@ -6027,6 +6029,8 @@ subroutine Driver ( RC )
            OCSD(:,:)=0.
 
         end select
+
+        if (catchcn_internal%N_CONST_LAND4SNWALB /= 0) then
 
 ! Convert the dimentions for LAAs from GEOS_SurfGridComp.F90 to GEOS_LandIceGridComp.F90
 ! Note: Explanations of each variable
@@ -6066,8 +6070,6 @@ subroutine Driver ( RC )
 
 ! --------------- GOSWIM PROGRNOSTICS ---------------------------
 
-        if (catchcn_internal%N_CONST_LAND4SNWALB /= 0) then
-
            ! Conversion of the masses of the snow impurities
            ! Note: Explanations of each variable
            ! Number of snow layer is 15: N = 1-15
@@ -7519,15 +7521,18 @@ subroutine Driver ( RC )
         if(associated(FICE2 )) FICE2  = max( min( FICESOUT(2,:),1.0 ), 0.0 )
         if(associated(FICE3 )) FICE3  = max( min( FICESOUT(3,:),1.0 ), 0.0 )
 
-        if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1) 
-        if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2) 
-        if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3) 
-        if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4) 
-        if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5) 
-        if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6) 
-        if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7) 
-        if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8) 
-        if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9) 
+        if (N_constit>0) then
+           if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1) 
+           if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2) 
+           if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3) 
+           if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4) 
+           if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5) 
+           if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6) 
+           if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7) 
+           if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8) 
+           if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9)
+        end if
+
         if(associated(PEATCLSM_FSWCHANGE))  then
            where (POROS >= PEATCLSM_POROS_THRESHOLD)
               PEATCLSM_FSWCHANGE = FSW_CHANGE

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM45_GridComp/GEOS_CatchCNCLM45GridComp.F90

@@ -6015,9 +6015,11 @@ subroutine Driver ( RC )
 
         !--------------- GOSWIM IMPORTS FROM GOCART ---------------
         ! Initialization 
-        RCONSTIT(:,:,:)  = 0.0
-        TOTDEPOS(:,:) = 0.0
-        RMELT(:,:)  = 0.0
+        if (N_constit>0) then
+           RCONSTIT(:,:,:)  = 0.0
+           TOTDEPOS(:,:) = 0.0
+           RMELT(:,:)  = 0.0
+        end if
         !------------------------------------------------------------------
 
         ! Zero the light-absorbing aerosol (LAA) deposition rates from  GOCART:
@@ -6057,6 +6059,8 @@ subroutine Driver ( RC )
 
         end select
 
+        if (catchcn_internal%N_CONST_LAND4SNWALB /= 0) then
+
 ! Convert the dimentions for LAAs from GEOS_SurfGridComp.F90 to GEOS_LandIceGridComp.F90
 ! Note: Explanations of each variable
 ! TOTDEPOS(:,1): Combined dust deposition from size bin 1 (dry, conv-scav, ls-scav, sed)
@@ -6095,8 +6099,6 @@ subroutine Driver ( RC )
 
 ! --------------- GOSWIM PROGRNOSTICS ---------------------------
 
-        if (catchcn_internal%N_CONST_LAND4SNWALB /= 0) then
-
            ! Conversion of the masses of the snow impurities
            ! Note: Explanations of each variable
            ! Number of snow layer is 15: N = 1-15
@@ -7800,15 +7802,18 @@ subroutine Driver ( RC )
         if(associated(FICE2 )) FICE2  = max( min( FICESOUT(2,:),1.0 ), 0.0 )
         if(associated(FICE3 )) FICE3  = max( min( FICESOUT(3,:),1.0 ), 0.0 )
 
-        if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1) 
-        if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2) 
-        if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3) 
-        if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4) 
-        if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5) 
-        if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6) 
-        if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7) 
-        if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8) 
-        if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9) 
+        if (N_constit>0) then
+           if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1) 
+           if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2) 
+           if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3) 
+           if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4) 
+           if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5) 
+           if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6) 
+           if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7) 
+           if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8) 
+           if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9)
+        end if
+
         if(associated(PEATCLSM_FSWCHANGE )) then
            where (POROS >= PEATCLSM_POROS_THRESHOLD)
               PEATCLSM_FSWCHANGE = FSW_CHANGE

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/GEOS_CatchGridComp.F90

@@ -4904,9 +4904,11 @@ subroutine Driver ( RC )
 
      !--------------- GOSWIM IMPORTS FROM GOCART ---------------
      ! Initialization 
-     RCONSTIT(:,:,:)  = 0.0
-     TOTDEPOS(:,:) = 0.0
-     RMELT(:,:)  = 0.0
+     if (N_constit>0) then
+        RCONSTIT(:,:,:)  = 0.0
+        TOTDEPOS(:,:) = 0.0
+        RMELT(:,:)  = 0.0
+     end if
      !------------------------------------------------------------------
 
      ! Zero the light-absorbing aerosol (LAA) deposition rates from  GOCART:
@@ -4946,6 +4948,8 @@ subroutine Driver ( RC )
 
      end select
 
+     if (CATCH_INTERNAL_STATE%N_CONST_LAND4SNWALB /= 0) then
+
 ! Convert the dimentions for LAAs from GEOS_SurfGridComp.F90 to GEOS_LandIceGridComp.F90
 ! Note: Explanations of each variable
 ! TOTDEPOS(:,1): Combined dust deposition from size bin 1 (dry, conv-scav, ls-scav, sed)
@@ -5005,7 +5009,6 @@ subroutine Driver ( RC )
 ! RCONSTIT(NTILES,N,14): Sea salt mass from size bin 4 in layer N
 ! RCONSTIT(NTILES,N,15): Sea salt mass from size bin 5 in layer N
 
-        if (CATCH_INTERNAL_STATE%N_CONST_LAND4SNWALB /= 0) then
            RCONSTIT(:,:,1) = RDU001(:,:)
            RCONSTIT(:,:,2) = RDU002(:,:)
            RCONSTIT(:,:,3) = RDU003(:,:)
@@ -5933,15 +5936,18 @@ subroutine Driver ( RC )
         if(associated(FICE2 )) FICE2  = max( min( FICESOUT(2,:),1.0 ), 0.0 )
         if(associated(FICE3 )) FICE3  = max( min( FICESOUT(3,:),1.0 ), 0.0 )
 
-        if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1) 
-        if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2) 
-        if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3) 
-        if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4) 
-        if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5) 
-        if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6) 
-        if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7) 
-        if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8) 
-        if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9) 
+
+        if (N_constit>0) then
+           if(associated(RMELTDU001)) RMELTDU001 = RMELT(:,1) 
+           if(associated(RMELTDU002)) RMELTDU002 = RMELT(:,2) 
+           if(associated(RMELTDU003)) RMELTDU003 = RMELT(:,3) 
+           if(associated(RMELTDU004)) RMELTDU004 = RMELT(:,4) 
+           if(associated(RMELTDU005)) RMELTDU005 = RMELT(:,5) 
+           if(associated(RMELTBC001)) RMELTBC001 = RMELT(:,6) 
+           if(associated(RMELTBC002)) RMELTBC002 = RMELT(:,7) 
+           if(associated(RMELTOC001)) RMELTOC001 = RMELT(:,8) 
+           if(associated(RMELTOC002)) RMELTOC002 = RMELT(:,9) 
+        end if
 
         if(associated(DZGT1 )) DZGT1  = DZGT(1)                               ! [m]
         if(associated(DZGT2 )) DZGT2  = DZGT(2)                               ! [m]

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlandice_GridComp/GEOS_LandIceGridComp.F90

@@ -2770,10 +2770,12 @@ subroutine LANDICECORE(RC)
     if(associated(TICE0   ))  TICE0    = 0.0
     if(associated(ACCUM   ))  ACCUM    = 0.0 
     if(associated(MELTWTR ))  MELTWTR  = 0.0
-
-    TOTDEPOS  = 0.0
-    RCONSTIT  = 0.0
-    RMELT     = 0.0
+
+    if (N_constit>0) then
+       TOTDEPOS  = 0.0
+       RCONSTIT  = 0.0
+       RMELT     = 0.0
+    end if
 
     ! Zero the light-absorbing aerosol (LAA) deposition rates from  GOCART:
 
@@ -2812,6 +2814,9 @@ subroutine LANDICECORE(RC)
 
     end select
 
+
+    if (N_CONST_LANDICE4SNWALB /=0) then
+
 ! Convert the dimentions for LAAs from GEOS_SurfGridComp.F90 to GEOS_LandIceGridComp.F90
 ! Note: Explanations of each variable
 ! TOTDEPOS(:,1): Combined dust deposition from size bin 1 (dry, conv-scav, ls-scav, sed)
@@ -2870,7 +2875,6 @@ subroutine LANDICECORE(RC)
 ! RCONSTIT(NT,N,14): Sea salt mass from size bin 4 in layer N
 ! RCONSTIT(NT,N,15): Sea salt mass from size bin 5 in layer N
 
-    if (N_CONST_LANDICE4SNWALB /=0) then
         RCONSTIT(:,:,1) = IRDU001(:,:)
         RCONSTIT(:,:,2) = IRDU002(:,:)
         RCONSTIT(:,:,3) = IRDU003(:,:)
@@ -3134,6 +3138,7 @@ subroutine LANDICECORE(RC)
                  if(associated(IROC001)) IROC001(k,:) = RCONSTIT(k,:,8) 
                  if(associated(IROC002)) IROC002(k,:) = RCONSTIT(k,:,9) 
               end if
+           if (N_constit>0) then
               if(associated(RMELTDU001)) RMELTDU001(k) = RMELT(k,1) 
               if(associated(RMELTDU002)) RMELTDU002(k) = RMELT(k,2) 
               if(associated(RMELTDU003)) RMELTDU003(k) = RMELT(k,3) 
@@ -3142,7 +3147,8 @@ subroutine LANDICECORE(RC)
               if(associated(RMELTBC001)) RMELTBC001(k) = RMELT(k,6) 
               if(associated(RMELTBC002)) RMELTBC002(k) = RMELT(k,7) 
               if(associated(RMELTOC001)) RMELTOC001(k) = RMELT(k,8) 
-              if(associated(RMELTOC002)) RMELTOC002(k) = RMELT(k,9) 
+              if(associated(RMELTOC002)) RMELTOC002(k) = RMELT(k,9)
+           end if
 
              if(associated(LWC ))then
                   ZDEP = sum(SNDZ(k,:))

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/GEOS_SurfaceGridComp.rc

@@ -129,13 +129,15 @@
 #    GOSWIM aerosol deposition on surface snow           #
 #--------------------------------------------------------#
 
+# *** NOTE: GOSWIM is DISABLED via hardcoded N_constit=0 in StieglitzSnow.F90 *** 
+
 # ---- Aerosol deposition on snow (available only with MERRA-2 forcings)
 #
 #    0 : GOCART aerosol are NOT used (default)
-#    1 : Use all GOCART aerosol data 
-#    2 : Use GOCART aerosols *except* dust 
-#    3 : Use GOCART aerosols *except* black carbon 
-#    4 : Use GOCART aerosols *except* organic carbon
+#    DISABLED: 1 : Use all GOCART aerosol data 
+#    DISABLED: 2 : Use GOCART aerosols *except* dust 
+#    DISABLED: 3 : Use GOCART aerosols *except* black carbon 
+#    DISABLED: 4 : Use GOCART aerosols *except* organic carbon
 #
 # GEOSagcm=>AEROSOL_DEPOSITION: 0
 # GEOSldas=>AEROSOL_DEPOSITION: 0
@@ -145,7 +147,7 @@
 # NOTE: There are separate parameters for LAND and LANDICE
 #
 #    0 : Default, GOSWIM snow albedo scheme is turned OFF for land/landice
-#    9 : GOSWIM snow albedo scheme is turned ON for land/landice
+#    DISABLED: 9 : GOSWIM snow albedo scheme is turned ON for land/landice
 #
 # GEOSagcm=>N_CONST_LAND4SNWALB: 0
 # GEOSldas=>N_CONST_LAND4SNWALB: 0

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/StieglitzSnow.F90

@@ -95,7 +95,24 @@ module StieglitzSnow
   integer, parameter, public :: NUM_SUDP = 1, NUM_SUSV = 1, NUM_SUWT = 1, NUM_SUSD = 1
   integer, parameter, public :: NUM_SSDP = 5, NUM_SSSV = 5, NUM_SSWT = 5, NUM_SSSD = 5 
 
-  integer, public, parameter :: N_constit = 9         ! Number of constituents in snow
+  ! +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  !
+  ! Turn off GOSWIM by setting N_constit=0
+  !
+  integer, parameter, public  :: N_constit        = 0   ! number of constituents *used* below
+  integer, parameter, private :: N_constit_GOSWIM = 9   ! number of constituents in GOSWIM
+  !
+  ! Previously, N_constit=9 was hardwired even though GOSWIM was never used.  
+  ! The GCM's rc parameter AEROSOL_DEPOSITION was set to 0, which forced 
+  ! the constituent mass and the deposition rates to remain zero, but the many 
+  ! do loops through the 9 constituents were still executed, thus multiplying and adding lots
+  ! zeros many times.
+  !
+  ! If needed, recover original behavior by setting N_constit=N_constit_GOSWIM=9
+  !
+  ! - reichle, 31 Jan 2025
+  !
+  ! +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++  
 
   ! (for riv, rin,aicev, aicen, and denice, instead use Teppei-defined 
   !  values below)
@@ -128,7 +145,7 @@ module StieglitzSnow
   ! constants for snow constituents (dust, carbon, etc.)
 
   ! MAC, visible (VIS)
-  real, private, parameter, dimension(N_constit) :: ABVIS = (/                              & 
+  real, private, parameter, dimension(N_constit_GOSWIM) :: ABVIS = (/                              & 
        0.148,      &   ! Dust1 
        0.106,      &   ! Dust2
        0.076,      &   ! Dust3
@@ -140,7 +157,7 @@ module StieglitzSnow
        0.114   /)      ! Organic carbon hydrophic
 
   ! MAC, near-infrared (NIR)
-  real, private, parameter, dimension(N_constit) :: ABNIR = (/                              &
+  real, private, parameter, dimension(N_constit_GOSWIM) :: ABNIR = (/                              &
        0.095,      &   ! Dust1   	
        0.080,      &   ! Dust2
        0.062,      &   ! Dust3
@@ -158,7 +175,7 @@ module StieglitzSnow
   !     Tuning parameters so as to satisfy NCAR/CLM based scavenging efficiencies;
   !     See more in Yasunari et al. (SOLA, 2014)
 
-  real, private, parameter, dimension(N_constit) :: SCAV = (/                               &
+  real, private, parameter, dimension(N_constit_GOSWIM) :: SCAV = (/                               &
        0.065442,  &   ! Dust 1
        0.077829,  &   ! Dust 2
        0.306841,  &   ! Dust 3
@@ -172,7 +189,7 @@ module StieglitzSnow
   !  Representative particle size in diameter 
   !  based on effective radius GOCART/GEOS-5 (dust 1-5 bins, BC, and OC) [um]
 
-  real, private, parameter, dimension(N_constit) :: PSIZE = (/                              &
+  real, private, parameter, dimension(N_constit_GOSWIM) :: PSIZE = (/                              &
        1.272,     &   ! Dust 1
        2.649,     &   ! Dust 2
        4.602,     &   ! Dust 3
@@ -240,7 +257,7 @@ subroutine StieglitzSnow_snowrt(tile_lon, tile_lat,                            &
     !  wesn        : Layer water contents per unit area of catchment [kg/m^2]
     !  htsnn       : Layer heat contents relative to liquid water at 0 C [J/m^2]
     !  sndz        : Layer depths [m]
-    !  rconstit    :  Mass of constituents in snow layer [kg] (i.e., [kg m-2])
+    !  rconstit    : Mass of constituents in snow layer [kg] (i.e., [kg m-2])
     !  rmelt       : Flushed mass amount of constituents from the bottom snow layer [kg m-2 s-1 (kg/m^2/s)]
     !*********
     ! OUTPUTS: 
@@ -403,7 +420,8 @@ subroutine StieglitzSnow_snowrt(tile_lon, tile_lat,                            &
     dtss      = 0. 
     excswe    = 0.
 
-    rmelt  = 0.0
+    if (N_constit>0) rmelt  = 0.0
+
     mltwtr = 0.0
     drho0  = 0.0
     tksno  = 0.0
@@ -424,7 +442,7 @@ subroutine StieglitzSnow_snowrt(tile_lon, tile_lat,                            &
        do k=1,N_constit
           rmelt(k)=sum(rconstit(:,k))/dts
        enddo
-       rconstit(:,:) = 0.
+       if (N_constit>0) rconstit(:,:) = 0.
 
        if(snowf > 0.) then  ! only initialize with non-liquid part of precip
                             ! liquid precip (rainf) is part of outflow from snow base (see "pre" above)
@@ -742,9 +760,9 @@ subroutine StieglitzSnow_snowrt(tile_lon, tile_lat,                            &
     !**** Updated by Koster, August 27, 2002.
 
     pre = 0.
-    rmelt(:) = 0.
+    if (N_constit>0) rmelt(:) = 0.
     flow = 0.
-    flow_r(:) = 0.
+    if (N_constit>0) flow_r(:) = 0.
 
     wesnperc = wesn
 
@@ -762,8 +780,11 @@ subroutine StieglitzSnow_snowrt(tile_lon, tile_lat,                            &
 
        pre  = max((1.-fices(i))*wesn(i), 0.)
        flow = 0.
-       flow_r(:) = 0.
-       rconc(:) = 0.
+
+       if (N_constit>0) then
+          flow_r(:) = 0.
+          rconc(:) = 0.
+       end if
 
        if(snowd > wemin) then