Skip to content
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

Megan fates pr follow up #100

Draft
wants to merge 9 commits into
base: noresm
Choose a base branch
from
+80 −27
Draft

Megan fates pr follow up #100

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
24dcb11
Add default for fates since BGC one can change.
mvdebolskiy Dec 3, 2024
618b838
refactor how pft indeces and intercellular CO2 is passed to VOCemissions
mvdebolskiy Dec 3, 2024
c34ed10
fix ci passing
mvdebolskiy Dec 3, 2024
f4af14e
fix isoprene
mvdebolskiy Dec 3, 2024
56cceed
Fix typos.
mvdebolskiy Dec 3, 2024
7f42386
revert check for sp, add patch type in the endrun.
mvdebolskiy Dec 3, 2024
b9e4b4f
add checks for bareground and fix canopy fluxes
mvdebolskiy Dec 6, 2024
4ec97f2
Add cisun and cisha to history
mvdebolskiy Dec 6, 2024
6b7fdc9
add extra fields to FatesColdMeganSatPhen test
mvdebolskiy Dec 6, 2024
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
17 changes: 12 additions & 5 deletions src/biogeochem/VOCEmissionMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ module VOCEmissionMod
!------------------------------------------------------------------------
subroutine Init(this, bounds)

use clm_varctl, only : use_fates, use_fates_nocomp
use clm_varctl, only : use_fates, use_fates_nocomp, use_fates_sp
class(vocemis_type) :: this
type(bounds_type), intent(in) :: bounds


if ( shr_megan_mechcomps_n > 0) then
if (use_fates) then
if (.not. use_fates_nocomp) then
if (.not. (use_fates_nocomp .or. use_fates_sp)) then
mvdebolskiy marked this conversation as resolved.
Show resolved Hide resolved
call endrun( msg='ERROR: MEGAN currently only works with when FATES is in SP and/or NOCOMP mode '//&
errMsg(sourcefile, __LINE__))
end if
Expand Down Expand Up @@ -417,6 +417,8 @@ subroutine VOCEmission (bounds, num_soilp, filter_soilp, &
! !USES:
use subgridAveMod , only : p2g
use clm_varctl , only : use_fates
use clm_varcon , only : smallValue
use decompMod , only : subgrid_level_patch
!
! !ARGUMENTS:
type(bounds_type) , intent(in) :: bounds
Expand Down Expand Up @@ -615,15 +617,20 @@ subroutine VOCEmission (bounds, num_soilp, filter_soilp, &

! Activity factor for T
gamma_t = get_gamma_T(t_veg240(p), t_veg24(p),t_veg(p), ct1(class_num), ct2(class_num),&
betaT(class_num),LDF(class_num), Ceo(class_num), Eopt, topt, patchpft)
betaT(class_num),LDF(class_num), Ceo(class_num), Eopt, topt, l_pft_itype(p))

! Activity factor for Leaf Age
gamma_a = get_gamma_A(patchpft, elai240(p),elai(p),class_num)
gamma_a = get_gamma_A(l_pft_itype(p), elai240(p),elai(p),class_num)

! Activity factor for CO2 (only for isoprene)
if (trim(meg_cmp%name) == 'isoprene') then
! Check of valid intercellular co2 pressure values.
if (cisha_z(p,nlevcan) < smallValue .or. cisun_z(p,nlevcan) < smallValue) then
write(iulog,*) 'Invalid intercellular co2 pressure (sunlit, shaded): ',cisun_z(p,nlevcan),cisha_z(p,nlevcan)
call endrun(subgrid_index=p, subgrid_level=subgrid_level_patch, msg=errMsg(sourcefile, __LINE__))
endif
co2_ppmv = 1.e6_r8*forc_pco2(g)/forc_pbot(c)
gamma_c = get_gamma_C(cisun_z(p),cisha_z(p),forc_pbot(c),fsun(p), co2_ppmv)
gamma_c = get_gamma_C(cisun_z(p,nlevcan),cisha_z(p,nlevcan),forc_pbot(c),fsun(p), co2_ppmv)

else
gamma_c = 1._r8
Expand Down