Skip to content

Commit 4a5d626

Browse files
authored
Merge pull request #382 from rgknox/rgknox-laicheck
remove lai check
2 parents 0c3e161 + e0a0d08 commit 4a5d626

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

biogeophys/FatesPlantRespPhotosynthMod.F90

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -629,21 +629,12 @@ subroutine FatesPlantRespPhotosynthDrive (nsites, sites,bc_in,bc_out,dtime)
629629

630630
check_elai = check_elai / currentPatch%total_canopy_area
631631
elai = calc_areaindex(currentPatch,'elai')
632-
633-
! Perform a check on the effective leaf area normalization
634-
635-
if ( abs(elai - check_elai ) > 1.0e-10 ) then
636-
write(fates_log(),*) 'The patch level ELAI does not match the integrated value'
637-
write(fates_log(),*) ' passed back from ScaleLeafLayerFluxtoCohort'
638-
call endrun(msg=errMsg(sourcefile, __LINE__))
639-
end if
640-
641632

642633
! Normalize canopy total conductance by the effective LAI
643634
! The value here was integrated over each cohort x leaf layer
644635
! and was weighted by m2 of effective leaf area for each layer
645636

646-
if(elai>tiny(elai)) then
637+
if(check_elai>tiny(check_elai)) then
647638

648639
! Normalize the leaf-area weighted canopy conductance
649640
! The denominator is the total effective leaf area in the canopy,
@@ -653,8 +644,6 @@ subroutine FatesPlantRespPhotosynthDrive (nsites, sites,bc_in,bc_out,dtime)
653644
if( g_sb_leaves > (1._r8/rsmax0) ) then
654645

655646
! Combined mean leaf resistance is the inverse of mean leaf conductance
656-
657-
658647
r_sb_leaves = 1.0_r8/g_sb_leaves
659648

660649
if (r_sb_leaves<bc_in(s)%rb_pa(ifp)) then
@@ -687,7 +676,6 @@ subroutine FatesPlantRespPhotosynthDrive (nsites, sites,bc_in,bc_out,dtime)
687676

688677
else
689678

690-
691679
! But this will prevent it from using an unintialized value
692680
bc_out(s)%rssun_pa(ifp) = rsmax0
693681
bc_out(s)%rssha_pa(ifp) = rsmax0

0 commit comments

Comments
 (0)