Skip to content

Feature/aero opt take 2 #316

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

Draft
tclune wants to merge 6 commits into
base: feature/wmputman/LM_v12rc12_WMP
Choose a base branch
from
Draft

Feature/aero opt take 2 #316

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f6198d
Attempt to reduce memory contention
tclune Apr 11, 2025
69040a3
Missed two changes.
tclune Apr 11, 2025
fe1849b
A few more things missed.
tclune Apr 11, 2025
97f584f
Changes to get the branch to run
aoloso Apr 15, 2025
e75ba95
Make num a 2D array in the call to app_ around line 1898 of GOCART2G_…
aoloso Apr 17, 2025
2ca1d7f
addedd timer for aero
aoloso Apr 18, 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
103 changes: 60 additions & 43 deletions ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1649,6 +1649,7 @@ subroutine aerosol_activation_properties(state, rc)

character(len=ESMF_MAXSTR) :: fld_name

integer :: k, k0, k1
integer :: i2, j2, km
integer :: b, i, j, n, aerosol_bin
integer :: varNameLen
Expand All @@ -1675,11 +1676,16 @@ subroutine aerosol_activation_properties(state, rc)
real, parameter :: k_BR = 0.0001

integer, parameter :: UNKNOWN_AEROSOL_MODE = 2015
logical :: isPresent
class(BaseProfiler), pointer :: t_p

__Iam__('GOCART2G::aerosol_activation_properties')

! Begin...

t_p => get_global_time_profiler()
call t_p%start('inside_aerosol_acti',_RC)

! Get list of child states within state and add to aeroList
! ---------------------------------------------------------
call ESMF_StateGet (state, itemCount=n, __RC__)
Expand Down Expand Up @@ -1727,6 +1733,14 @@ subroutine aerosol_activation_properties(state, rc)
j2 = ubound(temperature, 2)
km = ubound(temperature, 3)

call ESMF_AttributeGet(state, name='at_level', value=k, isPresent=isPresent, __RC__)
k0 = 1
k1 = km
if (isPresent) then
k0 = k
k1= k
end if

! Activation activation properties
! --------------------------------
call ESMF_AttributeGet(state, name='aerosol_number_concentration', value=fld_name, __RC__)
Expand Down Expand Up @@ -1763,7 +1777,7 @@ subroutine aerosol_activation_properties(state, rc)
mode_ = trim(mode)
mode_ = ESMF_UtilStringLowerCase(mode_, __RC__)

allocate(q(i2,j2,km), __STAT__)
allocate(q(i2,j2,k0:k1), __STAT__)
q = 0.0

if (index(mode_, 'du00') > 0) then ! Dust
Expand All @@ -1773,11 +1787,11 @@ subroutine aerosol_activation_properties(state, rc)
read (mode_(3:len(mode_)),*) aerosol_bin
call ESMF_StateGet(state, trim(aeroList(i)), child_state, __RC__)
call MAPL_GetPointer(child_state, ptr_4d, 'DU', __RC__)
q = q + ptr_4d(:,:,:,aerosol_bin)
ptr_3d => ptr_4d(:,:,:,aerosol_bin)
q = q + ptr_4d(:,:,k0:k1,aerosol_bin)
ptr_3d => ptr_4d(:,:,k0:k1,aerosol_bin)

hygroscopicity = k_DU
density = densDU
hygroscopicity(:,:,k0:k1) = k_DU
density(:,:,k0:k1) = densDU
end if
end do

Expand All @@ -1788,26 +1802,26 @@ subroutine aerosol_activation_properties(state, rc)
call ESMF_StateGet(state, trim(aeroList(i)), child_state, __RC__)
call MAPL_GetPointer(child_state, ptr_4d, 'SS', __RC__)
do j = 1, ubound(ptr_4d, 4)
q = q + ptr_4d(:,:,:,j)
ptr_3d => ptr_4d(:,:,:,j)
q = q + ptr_4d(:,:,k0:k1,j)
ptr_3d => ptr_4d(:,:,k0:k1,j)
end do

hygroscopicity = k_SS
density = densSS
hygroscopicity(:,:,k0:k1) = k_SS
density(:,:,k0:k1) = densSS
end if
end do

else if (index(mode_, 'sulforg') > 0) then ! Sulfate
hygroscopicity = 0.0
density = 0.0
hygroscopicity(:,:,k0:k1) = 0.0
density(:,:,k0:k1) = 0.0

do i = 1, size(aeroList)
if (index(aeroList(i), 'SU') > 0) then
call ESMF_StateGet(state, trim(aeroList(i)), child_state, __RC__)
call MAPL_GetPointer(child_state, ptr_3d, 'SO4', __RC__)
q = q + ptr_3d
hygroscopicity = k_SO4 * ptr_3d + hygroscopicity
density = densSO4 * ptr_3d + density
q = q + ptr_3d(:,:,k0:k1)
hygroscopicity(:,:,k0:k1) = k_SO4 * ptr_3d(:,:,k0:k1) + hygroscopicity(:,:,k0:k1)
density(:,:,k0:k1) = densSO4 * ptr_3d(:,:,k0:k1) + density(:,:,k0:k1)
end if

if (index(aeroList(i), 'CA.oc') > 0) then
Expand All @@ -1816,22 +1830,22 @@ subroutine aerosol_activation_properties(state, rc)
! the '5' refers to '_AERO', which we want to remove to get the CA component name (e.g. CA.oc, or CA.oc.data)
varNameLen = varNameLen - 5
call MAPL_GetPointer(child_state, ptr_3d, aeroList(i)(1:varNameLen)//'philic', __RC__)
q = q + ptr_3d
hygroscopicity = k_ORG * ptr_3d + hygroscopicity
density = densORG * ptr_3d + density
q = q + ptr_3d(:,:,k0:k1)
hygroscopicity(:,:,k0:k1) = k_ORG * ptr_3d(:,:,k0:k1) + hygroscopicity(:,:,k0:k1)
density(:,:,k0:k1) = densORG * ptr_3d(:,:,k0:k1) + density(:,:,k0:k1)
end if

end do

where (q > 2.0e-12 .and. hygroscopicity > tiny(0.0))
hygroscopicity = hygroscopicity / q
hygroscopicity = max(0.001, hygroscopicity)
hygroscopicity(:,:,k0:k1) = hygroscopicity(:,:,k0:k1) / q
hygroscopicity(:,:,k0:k1) = max(0.001, hygroscopicity(:,:,k0:k1))

density = density / q
density = min(max(density, densORG), densSO4)
density(:,:,k0:k1) = density(:,:,k0:k1) / q
density(:,:,k0:k1) = min(max(density(:,:,k0:k1), densORG), densSO4)
elsewhere
hygroscopicity = k_SO4
density = densSO4
hygroscopicity(:,:,k0:k1) = k_SO4
density(:,:,k0:k1) = densSO4
end where

else if (index(mode_, 'bcphilic') > 0) then ! Black Carbon
Expand All @@ -1842,9 +1856,9 @@ subroutine aerosol_activation_properties(state, rc)
! the '5' refers to '_AERO', which we want to remove to get the CA component name (e.g. CA.bc, or CA.bc.data)
varNameLen = varNameLen - 5
call MAPL_GetPointer(child_state, ptr_3d, aeroList(i)(1:varNameLen)//'philic', __RC__)
q = q + ptr_3d
hygroscopicity = k_BC
density = densBC
q = q + ptr_3d(:,:,k0:k1)
hygroscopicity(:,:,k0:k1) = k_BC
density(:,:,k0:k1) = densBC
end if
end do

Expand All @@ -1856,9 +1870,9 @@ subroutine aerosol_activation_properties(state, rc)
! the '5' refers to '_AERO', which we want to remove to get the CA component name (e.g. CA.oc, or CA.oc.data)
varNameLen = varNameLen - 5
call MAPL_GetPointer(child_state, ptr_3d, aeroList(i)(1:varNameLen)//'philic', __RC__)
q = q + ptr_3d
hygroscopicity = k_OC
density = densOC
q = q + ptr_3d(:,:,k0:k1)
hygroscopicity(:,:,k0:k1) = k_OC
density(:,:,k0:k1) = densOC
end if
end do

Expand All @@ -1870,31 +1884,34 @@ subroutine aerosol_activation_properties(state, rc)
! the '5' refers to '_AERO', which we want to remove to get the CA component name (e.g. CA.bc, or CA.bc.data)
varNameLen = varNameLen - 5
call MAPL_GetPointer(child_state, ptr_3d, aeroList(i)(1:varNameLen)//'philic', __RC__)
q = q + ptr_3d
hygroscopicity = k_BR
density = densBR
q = q + ptr_3d(:,:,k0:k1)
hygroscopicity(:,:,k0:k1) = k_BR
density(:,:,k0:k1) = densBR
end if
end do

end if !(index(mode_, 'du00') > 0) then

! Obtain aerosol activation properties of this aerosol mode
! ---------------------------------------------------------
call aap_(mode, &
q, &
num, &
diameter, &
sigma, &
f_dust, &
f_soot, &
f_organic, &
density, &
ptr_3d, &
1, i2, 1, j2, km, &
call aap_(mode, &
!# q, &
q, &
num(:,:,k0:k1), &
diameter(:,:,k0:k1), &
sigma(:,:,k0:k1), &
f_dust(:,:,k0:k1), &
f_soot(:,:,k0:k1), &
f_organic(:,:,k0:k1), &
density(:,:,k0:k1), &
ptr_3d(:,:,k0:k1), &
1, i2, 1, j2, (k1-k0+1), &
__RC__)

deallocate(q, __STAT__)

call t_p%stop('inside_aerosol_acti',_RC)

RETURN_(ESMF_SUCCESS)

contains
Expand Down
Loading