Skip to content

CARMA with RRTMGP #1508

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 7 commits into
base: cam_development
Choose a base branch
from
Open

CARMA with RRTMGP #1508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
750a1d6
merged from rrtmgp_carma
fvitt Mar 2, 2026
888f61a
redo rrtmgp reorganization; fix loop typo
peverwhee Mar 3, 2026
a28d11b
Merge pull request #8 from peverwhee/cam-carma
fvitt Mar 3, 2026
be02366
enable generation of optics props files
fvitt Mar 3, 2026
d1e9825
adjust thresholds
fvitt Mar 11, 2026
90def35
revert threshold changes
fvitt Mar 18, 2026
f6751a2
add regression test
fvitt Mar 18, 2026
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
7 changes: 0 additions & 7 deletions bld/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,13 +989,6 @@ if ($rad_pkg eq 'camrt') {
" with aerosol package $chem_pkg\n";
}
}
elsif ($rad_pkg =~ m/rrtmg/) {

# RRTMGP not currently working with CARMA
if ($rad_pkg eq 'rrtmgp' and $carma_pkg ne 'none') {
die "configure ERROR: The CARMA microphysics package does not currently work with RRTMGP\n";
}
}

$cfg_ref->set('rad', $rad_pkg);

Expand Down
29 changes: 29 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 @@ -324,6 +324,16 @@
</options>
</test>

<test compset="QPC7" grid="ne3pg3_ne3pg3_mt232" name="SMS_D_Ln9" testmods="cam/carma_test_tracers">
<machines>
<machine name="izumi" compiler="nag" category="aux_cam"/>
</machines>
<options>
<option name="comment" >CAM7, CARMA test tracers</option>
<option name="wallclock">00:30:00</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"/>
Expand Down Expand Up @@ -1808,6 +1818,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
20 changes: 10 additions & 10 deletions src/chemistry/aerosol/aero_convproc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1711,8 +1711,8 @@ subroutine activate_convproc( aero_props, &
character(len=32) :: spec_type

real(r8) :: tmpa, tmpb, tmpc ! working variable
real(r8) :: naerosol_a(1) ! number conc (1/m3)
real(r8) :: vaerosol_a(1) ! volume conc (m3/m3)
real(r8) :: naerosol_a(1,1) ! number conc (1/m3)
real(r8) :: vaerosol_a(1,1) ! volume conc (m3/m3)

!-----------------------------------------------------------------------

Expand Down Expand Up @@ -1779,12 +1779,12 @@ subroutine activate_convproc( aero_props, &
tmpa = tmpa + max( conent(2,mm), 0.0_r8 )
naerosol(m) = tmpa * rhoair

naerosol_a(1) = naerosol(m)
vaerosol_a(1) = vaerosol(m)
naerosol_a(1,1) = naerosol(m)
vaerosol_a(1,1) = vaerosol(m)

call aero_props%apply_number_limits( naerosol_a, vaerosol_a, 1, 1, m )

naerosol(m) = naerosol_a(1)
naerosol(m) = naerosol_a(1,1)
end do

! call Razzak-Ghan activation routine with single updraft
Expand Down Expand Up @@ -1918,8 +1918,8 @@ subroutine activate_convproc_method2( aero_props, &
character(len=32) :: spec_type

real(r8) :: tmpa, tmpb, tmpc ! working variable
real(r8) :: naerosol_a(1) ! number conc (1/m3)
real(r8) :: vaerosol_a(1) ! volume conc (m3/m3)
real(r8) :: naerosol_a(1,1) ! number conc (1/m3)
real(r8) :: vaerosol_a(1,1) ! volume conc (m3/m3)

!-----------------------------------------------------------------------

Expand Down Expand Up @@ -1999,12 +1999,12 @@ subroutine activate_convproc_method2( aero_props, &
tmpa = tmpa + max( conu(2,mm), 0.0_r8 )
naerosol(m) = tmpa * rhoair

naerosol_a(1) = naerosol(m)
vaerosol_a(1) = vaerosol(m)
naerosol_a(1,1) = naerosol(m)
vaerosol_a(1,1) = vaerosol(m)

call aero_props%apply_number_limits( naerosol_a, vaerosol_a, 1, 1, m )

naerosol(m) = naerosol_a(1)
naerosol(m) = naerosol_a(1,1)

end do

Expand Down
10 changes: 5 additions & 5 deletions src/chemistry/aerosol/aerosol_properties_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,13 +307,13 @@ end function aero_icenuc_updates_mmr
!------------------------------------------------------------------------------
! apply max / min to number concentration
!------------------------------------------------------------------------------
subroutine aero_apply_num_limits( self, naerosol, vaerosol, istart, istop, m )
subroutine aero_apply_num_limits( self, naerosol, vaerosol, ncol, nlev, m )
import :: aerosol_properties, r8
class(aerosol_properties), intent(in) :: self
real(r8), intent(inout) :: naerosol(:) ! number conc (1/m3)
real(r8), intent(in) :: vaerosol(:) ! volume conc (m3/m3)
integer, intent(in) :: istart ! start column index (1 <= istart <= istop <= pcols)
integer, intent(in) :: istop ! stop column index
real(r8), intent(inout) :: naerosol(:,:) ! number conc (1/m3)
real(r8), intent(in) :: vaerosol(:,:) ! volume conc (m3/m3)
integer, intent(in) :: ncol ! number of columns
integer, intent(in) :: nlev ! number of vert levels
integer, intent(in) :: m ! mode or bin index

end subroutine aero_apply_num_limits
Expand Down
71 changes: 25 additions & 46 deletions src/chemistry/aerosol/aerosol_state_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ end function aero_wet_diam
!------------------------------------------------------------------------------
! returns aerosol number, volume concentrations, and bulk hygroscopicity
!------------------------------------------------------------------------------
subroutine loadaer( self, aero_props, istart, istop, k, m, cs, phase, &
subroutine loadaer( self, aero_props, ncol, nlev, m, cs, phase, &
naerosol, vaerosol, hygro, errnum, errstr, pom_hygro)

use aerosol_properties_mod, only: aerosol_properties
Expand All @@ -310,17 +310,15 @@ subroutine loadaer( self, aero_props, istart, istop, k, m, cs, phase, &
class(aerosol_state), intent(in) :: self
class(aerosol_properties), intent(in) :: aero_props

integer, intent(in) :: istart ! start column index (1 <= istart <= istop <= pcols)
integer, intent(in) :: istop ! stop column index
integer, intent(in) :: k ! level index
integer, intent(in) :: ncol, nlev
integer, intent(in) :: m ! mode or bin index
real(r8), intent(in) :: cs(:,:) ! air density (kg/m3)
integer, intent(in) :: phase ! phase of aerosol: 1 for interstitial, 2 for cloud-borne, 3 for sum

! output arguments
real(r8), intent(out) :: naerosol(:) ! number conc (1/m3)
real(r8), intent(out) :: vaerosol(:) ! volume conc (m3/m3)
real(r8), intent(out) :: hygro(:) ! bulk hygroscopicity of mode
real(r8), intent(out) :: naerosol(:,:) ! number conc (1/m3)
real(r8), intent(out) :: vaerosol(:,:) ! volume conc (m3/m3)
real(r8), intent(out) :: hygro(:,:) ! bulk hygroscopicity of mode

integer , intent(out) :: errnum
character(len=*), intent(out) :: errstr
Expand All @@ -333,15 +331,13 @@ subroutine loadaer( self, aero_props, istart, istop, k, m, cs, phase, &
real(r8) :: specdens, spechygro
character(len=aero_name_len) :: spectype

real(r8) :: vol(istart:istop) ! aerosol volume mixing ratio
integer :: i, l
real(r8) :: vol(ncol,nlev) ! aerosol volume mixing ratio
integer :: i, k, l
!-------------------------------------------------------------------------------
errnum = 0

do i = istart, istop
vaerosol(i) = 0._r8
hygro(i) = 0._r8
end do
vaerosol(:,:) = 0._r8
hygro(:,:) = 0._r8

do l = 1, aero_props%nspecies(m)

Expand All @@ -355,59 +351,42 @@ subroutine loadaer( self, aero_props, istart, istop, k, m, cs, phase, &
endif

if (phase == 3) then
do i = istart, istop
vol(i) = max(raer(i,k) + qqcw(i,k), 0._r8)/specdens
end do
vol(:ncol,:) = max(raer(:ncol,:) + qqcw(:ncol,:), 0._r8)/specdens
else if (phase == 2) then
do i = istart, istop
vol(i) = max(qqcw(i,k), 0._r8)/specdens
end do
vol(:ncol,:) = max(qqcw(:ncol,:), 0._r8)/specdens
else if (phase == 1) then
do i = istart, istop
vol(i) = max(raer(i,k), 0._r8)/specdens
end do
vol(:ncol,:) = max(raer(:ncol,:), 0._r8)/specdens
else
errnum = -1
write(errstr,*)'phase = ',phase,' in aerosol_state::loadaer not recognized'
return
end if

do i = istart, istop
vaerosol(i) = vaerosol(i) + vol(i)
hygro(i) = hygro(i) + vol(i)*spechygro
end do

vaerosol(:ncol,:) = vaerosol(:ncol,:) + vol(:ncol,:)
hygro(:ncol,:) = hygro(:ncol,:) + vol(:ncol,:)*spechygro
end do

do i = istart, istop
if (vaerosol(i) > 1.0e-30_r8) then
hygro(i) = hygro(i)/(vaerosol(i))
vaerosol(i) = vaerosol(i)*cs(i,k)
else
hygro(i) = 0.0_r8
vaerosol(i) = 0.0_r8
end if
end do
where(vaerosol(:ncol,:) > 1.0e-30_r8)
hygro(:ncol,:) = hygro(:ncol,:)/(vaerosol(:ncol,:))
vaerosol(:ncol,:) = vaerosol(:ncol,:)*cs(:ncol,:)
elsewhere
hygro(:ncol,:) = 0._r8
vaerosol(:ncol,:) = 0._r8
end where

! aerosol number mixing ratios (#/kg)
call self%get_ambient_num(m, raer)
call self%get_cldbrne_num(m, qqcw)
if (phase == 3) then
do i = istart, istop
naerosol(i) = (raer(i,k) + qqcw(i,k))*cs(i,k) ! #/kg -> #/m3
end do
naerosol(:ncol,:) = (raer(:ncol,:) + qqcw(:ncol,:))*cs(:ncol,:) ! #/kg -> #/m3
else if (phase == 2) then
do i = istart, istop
naerosol(i) = qqcw(i,k)*cs(i,k)
end do
naerosol(:ncol,:) = qqcw(:ncol,:)*cs(:ncol,:)
else
do i = istart, istop
naerosol(i) = raer(i,k)*cs(i,k)
end do
naerosol(:ncol,:) = raer(:ncol,:)*cs(:ncol,:)
end if

! adjust number
call aero_props%apply_number_limits( naerosol, vaerosol, istart, istop, m )
call aero_props%apply_number_limits( naerosol, vaerosol, ncol, nlev, m )

end subroutine loadaer

Expand Down
10 changes: 5 additions & 5 deletions src/chemistry/aerosol/bulk_aerosol_properties_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,12 +522,12 @@ end function icenuc_updates_mmr
!------------------------------------------------------------------------------
! apply max / min to number concentration
!------------------------------------------------------------------------------
subroutine apply_number_limits( self, naerosol, vaerosol, istart, istop, m )
subroutine apply_number_limits( self, naerosol, vaerosol, ncol, nlev, m )
class(bulk_aerosol_properties), intent(in) :: self
real(r8), intent(inout) :: naerosol(:) ! number conc (1/m3)
real(r8), intent(in) :: vaerosol(:) ! volume conc (m3/m3)
integer, intent(in) :: istart ! start column index (1 <= istart <= istop <= pcols)
integer, intent(in) :: istop ! stop column index
real(r8), intent(inout) :: naerosol(:,:) ! number conc (1/m3)
real(r8), intent(in) :: vaerosol(:,:) ! volume conc (m3/m3)
integer, intent(in) :: ncol ! number of columns
integer, intent(in) :: nlev ! number of vert levels
integer, intent(in) :: m ! mode or bin index

call endrun('ERROR: bulk_aerosol_properties_mod%apply_number_limits not yet implemented')
Expand Down
10 changes: 5 additions & 5 deletions src/chemistry/aerosol/carma_aerosol_properties_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,12 +644,12 @@ end function icenuc_updates_mmr
!------------------------------------------------------------------------------
! apply max / min to number concentration
!------------------------------------------------------------------------------
subroutine apply_number_limits( self, naerosol, vaerosol, istart, istop, m )
subroutine apply_number_limits( self, naerosol, vaerosol, ncol, nlev, m )
class(carma_aerosol_properties), intent(in) :: self
real(r8), intent(inout) :: naerosol(:) ! number conc (1/m3)
real(r8), intent(in) :: vaerosol(:) ! volume conc (m3/m3)
integer, intent(in) :: istart ! start column index (1 <= istart <= istop <= pcols)
integer, intent(in) :: istop ! stop column index
real(r8), intent(inout) :: naerosol(:,:) ! number conc (1/m3)
real(r8), intent(in) :: vaerosol(:,:) ! volume conc (m3/m3)
integer, intent(in) :: ncol ! number of columns
integer, intent(in) :: nlev ! number of vert levels
integer, intent(in) :: m ! mode or bin index

end subroutine apply_number_limits
Expand Down
20 changes: 11 additions & 9 deletions src/chemistry/aerosol/modal_aerosol_properties_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,22 +743,24 @@ end function icenuc_updates_mmr
!------------------------------------------------------------------------------
! apply max / min to number concentration
!------------------------------------------------------------------------------
subroutine apply_number_limits( self, naerosol, vaerosol, istart, istop, m )
subroutine apply_number_limits( self, naerosol, vaerosol, ncol, nlev, m )
class(modal_aerosol_properties), intent(in) :: self
real(r8), intent(inout) :: naerosol(:) ! number conc (1/m3)
real(r8), intent(in) :: vaerosol(:) ! volume conc (m3/m3)
integer, intent(in) :: istart ! start column index (1 <= istart <= istop <= pcols)
integer, intent(in) :: istop ! stop column index
real(r8), intent(inout) :: naerosol(:,:) ! number conc (1/m3)
real(r8), intent(in) :: vaerosol(:,:) ! volume conc (m3/m3)
integer, intent(in) :: ncol ! number of columns
integer, intent(in) :: nlev ! number of vert levels
integer, intent(in) :: m ! mode or bin index

integer :: i
integer :: i,k

! adjust number so that dgnumlo < dgnum < dgnumhi
! -- the diameter falls within the lower and upper limits which are
! represented by voltonumhi and voltonumblo values, respectively
do i = istart, istop
naerosol(i) = max(naerosol(i), vaerosol(i)*self%voltonumbhi_(m))
naerosol(i) = min(naerosol(i), vaerosol(i)*self%voltonumblo_(m))
do k = 1,nlev
do i = 1,ncol
naerosol(i,k) = max(naerosol(i,k), vaerosol(i,k)*self%voltonumbhi_(m))
naerosol(i,k) = min(naerosol(i,k), vaerosol(i,k)*self%voltonumblo_(m))
end do
end do

end subroutine apply_number_limits
Expand Down
Loading
Loading