Merge pull request #1458 from fvitt/carma_base_update

cam6_4_146: Update carma base tag external

Author: fvitt

.gitmodules

@@ -9,7 +9,7 @@
 	path = src/physics/carma/base
 	url = https://github.com/ESCOMP/CARMA_base.git
         fxrequired = AlwaysRequired
-        fxtag = carma4_09
+        fxtag = carma4_10
         fxDONOTUSEurl = https://github.com/ESCOMP/CARMA_base.git
 
 [submodule "pumas-frozen"]

cime_config/testdefs/testlist_cam.xml

@@ -324,6 +324,17 @@
     </options>
   </test>
 
+  <test compset="FCARMA2000climo" grid="f19_f19_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s" supported="false">
+    <machines>
+      <machine name="derecho" compiler="intel" category="aux_cam"/>
+      <machine name="derecho" compiler="intel" category="carma"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:40:00</option>
+      <option name="comment">CARMA trop_strat model test</option>
+    </options>
+  </test>
+
   <test compset="FHIST_C5" grid="f10_f10_mt232" name="TMC_D_Ln9" testmods="cam/mc_ttrac">
     <machines>
       <machine name="izumi" compiler="nag" category="aux_cam"/>
@@ -803,6 +814,16 @@
       <option name="wallclock">00:30:00</option>
     </options>
   </test>
+<!--             WACCM carma trop_strat model    -->
+  <test compset="FWmaCARMAHIST" grid="f19_f19_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s" supported="false">
+    <machines>
+      <machine name="derecho" compiler="intel" category="carma"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:40:00</option>
+      <option name="comment">CARMA WACCM trop_strat model test</option>
+    </options>
+  </test>
 <!-- TEM diagnostics and zonal-average output -->
   <test compset="QPWmaC4" grid="ne5_ne5_mg37" name="SMS_D_Ln6" testmods="cam/outfrq3s_physgrid_tem">
     <machines>

doc/ChangeLog

@@ -1,5 +1,87 @@
 ===============================================================
 
+Tag name: cam6_4_146
+Originator(s): fvitt
+Date: 23 Jan 2026
+One-line Summary: Update CARMA submodule to tag carma4_10
+
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1458
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+
+ Update CARMA base external submodule to tag carma4_10 -- Issue #1435
+
+Describe any changes made to build system: N/A
+
+Describe any changes made to the namelist: N/A
+
+List any changes to the defaults for the boundary datasets: N/A
+
+Describe any substantial timing or memory changes: N/A
+
+Code reviewed by: cacraigucar
+
+List all files eliminated: N/A
+
+List all files added and what they do: N/A
+
+List all existing files that have been modified, and describe the changes:
+M       .gitmodules
+M       src/physics/carma/base
+ - update carma base tag to carma4_10
+
+M       src/physics/carma/cam/carma_intr.F90
+M       src/physics/carma/models/trop_strat_soa1/carma_model_mod.F90
+M       src/physics/carma/models/trop_strat_soa5/carma_model_mod.F90
+ - getwetr interface change
+
+M       src/physics/cam/aerosol_optics_cam.F90
+ - fix divide by zero issue which occurred for some CARMA configurations
+   -- where aerosol concentrations are quite small dopaer0 array was
+      initialized to zero and not set to the dopaer values
+
+M       cime_config/testdefs/testlist_cam.xml
+ - added CARMA trop_strat tests
+
+If there were any failures reported from running test_driver.sh on any test
+platform, and checkin with these failures has been OK'd by the gatekeeper,
+then copy the lines from the td.*.status files for the failed tests to the
+appropriate machine below.  All failed tests must be justified.
+
+derecho/intel/aux_cam:
+
+  ERI_D_Ln18.ne16pg3_ne16pg3_mt232.FHIST_C4.derecho_intel.cam-outfrq3s_eri (Overall: FAIL) details:
+   - pre-existing failure
+   - ERI test discovered a bug in CICE:  See: https://github.com/ESCOMP/CESM_CICE/issues/34
+
+  SMS_D_Ln9.f19_f19_mg17.FCARMA2000climo.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+   - new test -- no baseline to compare to
+
+derecho/nvhpc/aux_cam:
+  ERS_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_nvhpc.cam-outfrq9s_gpu_default (Overall: FAIL) details:
+   - pre-existing failure -- exceeds wallclock time limit
+       NOTE: Jian has determined this is due to changes on derecho with the the last upgrade.
+        He has reported the issue to CISL.  Note cam6_4_128 is the last CAM tag with
+	baselines to use for comparison but answer changes are expected starting with
+	cam6_4_130.
+
+    End of cesm.log file:
+deg0049.hsn.de.hpc.ucar.edu 0: calcsize j,iq,jac, lsfrm,lstoo  2  5  2  19  20
+deg0049.hsn.de.hpc.ucar.edu 1:  Opened file
+deg0049.hsn.de.hpc.ucar.edu 1:  ERS_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_nvhpc.cam-outfrq9s_gpu_default.G.aux_cam_nvhpc_20260123064354.cam.r.1979-01-01-09000.nc
+deg0049.hsn.de.hpc.ucar.edu 1:   to write          316
+deg0051.hsn.de.hpc.ucar.edu: rank 64 died from signal 15
+
+
+izumi/nag/aux_cam: All PASS
+
+izumi/gnu/aux_cam: All PASS
+
+Summarize any changes to answers: bit-for-bit
+
+===============================================================
+===============================================================
+
 Tag name: cam6_4_145
 Originator(s): PeterHjortLauritzen, jimmielin
 Date: January 20, 2026

src/physics/cam/aerosol_optics_cam.F90

@@ -1129,22 +1129,21 @@ subroutine update_diags( is_coarse_dust )
             end if
             ! dmleung --
 
+            ! dmleung 20 Oct 2025 ++
+            ! Then, all these diagnostics are outputted based on the modified dust AOD.
+            ! We simply apply dopaer/dopaer0 (>1 for coarse mode) to the absorption diagnostics.
+            aodvis(icol) = aodvis(icol) + dopaer(icol)
+            aodabs(icol) = aodabs(icol) + mass(icol,ilev) * pabs(icol) * dopaer(icol)/dopaer0(icol) ! dmleung
+            extinct(icol,ilev) = extinct(icol,ilev) + dopaer(icol)*air_density(icol,ilev)/mass(icol,ilev)
+            absorb(icol,ilev)  = absorb(icol,ilev) + air_density(icol,ilev) * pabs(icol) * dopaer(icol)/dopaer0(icol) ! dmleung
+            ssavis(icol)       = ssavis(icol) + dopaer(icol)*palb(icol)
+            asymvis(icol)      = asymvis(icol) + dopaer(icol)*pasm(icol)
+            asymext(icol,ilev) = asymext(icol,ilev) + dopaer(icol)*pasm(icol)*air_density(icol,ilev)/mass(icol,ilev)
+
+            aodbin(icol) = aodbin(icol) + dopaer(icol)
 
          end if
 
-         ! dmleung 20 Oct 2025 ++
-         ! Then, all these diagnostics are outputted based on the modified dust AOD.
-         ! We simply apply dopaer/dopaer0 (>1 for coarse mode) to the absorption diagnostics.
-         aodvis(icol) = aodvis(icol) + dopaer(icol)
-         aodabs(icol) = aodabs(icol) + mass(icol,ilev) * pabs(icol) * dopaer(icol)/dopaer0(icol) ! dmleung
-         extinct(icol,ilev) = extinct(icol,ilev) + dopaer(icol)*air_density(icol,ilev)/mass(icol,ilev)
-         absorb(icol,ilev)  = absorb(icol,ilev) + air_density(icol,ilev) * pabs(icol) * dopaer(icol)/dopaer0(icol) ! dmleung
-         ssavis(icol)       = ssavis(icol) + dopaer(icol)*palb(icol)
-         asymvis(icol)      = asymvis(icol) + dopaer(icol)*pasm(icol)
-         asymext(icol,ilev) = asymext(icol,ilev) + dopaer(icol)*pasm(icol)*air_density(icol,ilev)/mass(icol,ilev)
-
-         aodbin(icol) = aodbin(icol) + dopaer(icol)
-
          if (ilev<=troplev(icol)) then
             aodvisst(icol) = aodvisst(icol) + dopaer(icol)
          end if

src/physics/carma/base

@@ -2645,7 +2645,7 @@ subroutine CARMA_CreateOpticsFile_Fixed(carma, igroup, rc)
         do irh = 1, nrh
 
           ! Determine the wet radius.
-          call getwetr(carma, igroup, mie_rh(irh), r(ibin), rwet, rho(ibin), rhopwet, rc)
+          call getwetr(carma, igroup, ibin, mie_rh(irh), r(ibin), rwet, rho(ibin), rhopwet, rc)
           if (rc < 0) call endrun('carma_CreateOpticsFile::wetr failed.')
 
           ! Calculate at each wavelength.
@@ -2992,7 +2992,7 @@ subroutine CARMA_CreateOpticsFile_Sulfate(carma, igroup, rc)
           ! NOTE: Weight percent is normal a result of the getwetr calculation. To build the
           ! table based upon weight percent, we need to pass in the desired value and a
           ! reference temperature. In that case, the RH is ignored.
-          call getwetr(carma, igroup, mie_rh(1), r(ibin), rwet, rho(ibin), rhopwet, rc, wgtpct=mie_wtp(iwtp)*100._f, temp=270._f)
+          call getwetr(carma, igroup, ibin, mie_rh(1), r(ibin), rwet, rho(ibin), rhopwet, rc, wgtpct=mie_wtp(iwtp)*100._f, temp=270._f)
           if (rc < 0) call endrun('carma_CreateOpticsFile::wetr failed.')
 
           ! This is not in Yu (2015), but rather than using the refractive
@@ -3922,7 +3922,7 @@ subroutine carma_get_wet_radius(state, igroup, ibin, rwet, rhopwet, rc)
              !
              if (irhswell == I_WTPCT_H2SO4) then
 
-                call getwetr(carma, igroup, relhum, dryrad, rwet(icol, iz), dryden, rhopwet(icol,iz), rc, &
+                call getwetr(carma, igroup, ibin, relhum, dryrad, rwet(icol, iz), dryden, rhopwet(icol,iz), rc, &
                              h2o_mass=watcon, h2o_vp=wvpres, temp=state%t(icol,iz))
                 if (rc/=RC_OK) then
                    call endrun('carma_get_wet_radius ERROR5: rc = ',rc) ! <======
@@ -3935,15 +3935,15 @@ subroutine carma_get_wet_radius(state, igroup, ibin, rwet, rhopwet, rc)
                    call endrun('carma_get_wet_radius carma_get_kappa ERROR: rc = ',rc)
                 end if
 
-                call getwetr(carma, igroup, relhum, dryrad, rwet(icol, iz), dryden, rhopwet(icol,iz), rc, &
+                call getwetr(carma, igroup, ibin, relhum, dryrad, rwet(icol, iz), dryden, rhopwet(icol,iz), rc, &
                              h2o_mass=watcon, h2o_vp=wvpres, temp=state%t(icol,iz), kappa=kappa(icol,iz))
                 if (rc/=RC_OK) then
                    call endrun('carma_get_wet_radius ERROR6: rc = ',rc)
                 end if
 
              else ! I_GERBER and I_FITZGERALD
 
-                call getwetr(carma, igroup, relhum, dryrad, rwet(icol, iz), dryden, rhopwet(icol,iz), rc )
+                call getwetr(carma, igroup, ibin, relhum, dryrad, rwet(icol, iz), dryden, rhopwet(icol,iz), rc )
                 if (rc/=RC_OK) then
                    call endrun('carma_get_wet_radius ERROR7: rc = ',rc)
                 end if

src/physics/carma/cam/carma_intr.F90

@@ -1650,7 +1650,7 @@ subroutine CARMAMODEL_CreateOpticsFile_MixedYu(carma, igroup, rc)
           do ikap = 1, nkap
 
             ! Determine the wet radius.
-            call getwetr(carma, igroup, mie_rh(irh), r(ibin), rwet, rho(ibin), rhopwet, rc, kappa=kap(ikap), temp=270._f)
+            call getwetr(carma, igroup, ibin, mie_rh(irh), r(ibin), rwet, rho(ibin), rhopwet, rc, kappa=kap(ikap), temp=270._f)
             rwetbin(irh) = rwet
 
             ! Calculate at each wavelength.
@@ -2102,7 +2102,7 @@ subroutine CARMAMODEL_CreateOpticsFile_MixedYuH2o(carma, igroup, rc)
           do ikap = 1, nkap
 
             ! Determine the wet radius.
-            call getwetr(carma, igroup, mie_rh(irh), r(ibin), rwet, rho(ibin), rhopwet, rc, kappa=kap(ikap), temp=270._f)
+            call getwetr(carma, igroup, ibin, mie_rh(irh), r(ibin), rwet, rho(ibin), rhopwet, rc, kappa=kap(ikap), temp=270._f)
             rwetbin(irh) = rwet
 
             ! Calculate at each wavelength.
@@ -2493,7 +2493,7 @@ subroutine CARMAMODEL_CreateOpticsFile_SulfateYu(carma, igroup, rc)
           ! NOTE: Weight percent is normal a result of the getwetr calculation. To build the
           ! table based upon weight percent, we need to pass in the desired value and a
           ! reference temperature. In that case, the RH is ignored.
-          call getwetr(carma, igroup, mie_rh(1), r(ibin), rwet, rho(ibin), rhopwet, rc, wgtpct=mie_wtp(iwtp)*100._f, temp=270._f)
+          call getwetr(carma, igroup, ibin, mie_rh(1), r(ibin), rwet, rho(ibin), rhopwet, rc, wgtpct=mie_wtp(iwtp)*100._f, temp=270._f)
           if (rc < 0) call endrun('carma_CreateOpticsFile::wetr failed.')
 
           ! Calculate at each wavelength.

src/physics/carma/models/trop_strat_soa1/carma_model_mod.F90

@@ -1852,7 +1852,7 @@ subroutine CARMAMODEL_CreateOpticsFile_MixedYu(carma, igroup, rc)
           do ikap = 1, nkap
 
             ! Determine the wet radius.
-            call getwetr(carma, igroup, mie_rh(irh), r(ibin), rwet, rho(ibin), rhopwet, rc, kappa=kap(ikap), temp=270._f)
+            call getwetr(carma, igroup, ibin, mie_rh(irh), r(ibin), rwet, rho(ibin), rhopwet, rc, kappa=kap(ikap), temp=270._f)
             rwetbin(irh) = rwet
 
             ! Calculate at each wavelength.
@@ -2304,7 +2304,7 @@ subroutine CARMAMODEL_CreateOpticsFile_MixedYuH2o(carma, igroup, rc)
           do ikap = 1, nkap
 
             ! Determine the wet radius.
-            call getwetr(carma, igroup, mie_rh(irh), r(ibin), rwet, rho(ibin), rhopwet, rc, kappa=kap(ikap), temp=270._f)
+            call getwetr(carma, igroup, ibin, mie_rh(irh), r(ibin), rwet, rho(ibin), rhopwet, rc, kappa=kap(ikap), temp=270._f)
             rwetbin(irh) = rwet
 
             ! Calculate at each wavelength.
@@ -2695,7 +2695,7 @@ subroutine CARMAMODEL_CreateOpticsFile_SulfateYu(carma, igroup, rc)
           ! NOTE: Weight percent is normal a result of the getwetr calculation. To build the
           ! table based upon weight percent, we need to pass in the desired value and a
           ! reference temperature. In that case, the RH is ignored.
-          call getwetr(carma, igroup, mie_rh(1), r(ibin), rwet, rho(ibin), rhopwet, rc, wgtpct=mie_wtp(iwtp)*100._f, temp=270._f)
+          call getwetr(carma, igroup, ibin, mie_rh(1), r(ibin), rwet, rho(ibin), rhopwet, rc, wgtpct=mie_wtp(iwtp)*100._f, temp=270._f)
           if (rc < 0) call endrun('carma_CreateOpticsFile::wetr failed.')
 
           ! Calculate at each wavelength.