Skip to content

Update carma base tag external #1458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fvitt wants to merge 2 commits into
base: cam_development
Choose a base branch
from
Open

Update carma base tag external #1458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2449125
update carma base tag and adjust for getwetr interface change
fvitt Dec 10, 2025
d5ee483
updata regression tests
fvitt Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
19 changes: 19 additions & 0 deletions cime_config/testdefs/testlist_cam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1787,6 +1787,25 @@
<option name="comment">FCSD CAM-chem f09 with HEMCO exact restart/PE tests</option>
</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="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>

<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@ -->
<!-- FV3CAM COMPSETS for testing only -->
Expand Down
2 changes: 1 addition & 1 deletion src/physics/carma/base
Open in desktop
Submodule base updated 10 files
+28 −0 ChangeLog
+201 −0 LICENSE
+1 −0 carma_globaer.h
+2 −0 carma_types_mod.F90
+10 −3 carmagroup_mod.F90
+19 −11 newstate.F90
+9 −9 rhopart.F90
+31 −27 setupbins.F90
+2 −2 setupckern.F90
+10 −2 wetr.F90
10 changes: 5 additions & 5 deletions src/physics/carma/cam/carma_intr.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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) ! <======
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/physics/carma/models/trop_strat_soa1/carma_model_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions src/physics/carma/models/trop_strat_soa5/carma_model_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down