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

Develop #16

Merged
merged 5 commits into from
Jul 25, 2022
Merged

Develop #16

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cddf682
Updated integer option for PAI values or calc in canopy wind
drnimbusrain Jul 25, 2022
945ee4f
Updated namelist for default pai_opt=0
drnimbusrain Jul 25, 2022
1dc22d1
Restored default namelist to 2D file inputs.
drnimbusrain Jul 25, 2022
cdc4fdc
Fixed else conditions for PAI_OPT
drnimbusrain Jul 25, 2022
e2414ca
Changed call exit status.
drnimbusrain Jul 25, 2022
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
9 changes: 6 additions & 3 deletions canopy_parm_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ SUBROUTINE CANOPY_PARM( VTYPE, FCH, FFRAC, LAI, &
else if (PAI_OPT .eq. 2) then !need PAI function of model LAI
PAI=LAI
else
write(*,*) 'No PAI_OPT Selected...Defaulting to option 0'
write(*,*) 'Wrong PAI_OPT choice in namelist...exiting'
call exit(123)
drnimbusrain marked this conversation as resolved.
Show resolved Hide resolved
end if
ZCANMAX=(0.60_rk + 0.36_rk + 0.60_rk + 0.58_rk + 0.60_rk)/5.0_rk
SIGMAU=(0.38_rk + 0.60_rk + 0.30_rk + 0.20_rk + 0.10_rk)/5.0_rk
Expand All @@ -92,7 +93,8 @@ SUBROUTINE CANOPY_PARM( VTYPE, FCH, FFRAC, LAI, &
else if (PAI_OPT .eq. 2) then !need PAI function of model LAI
PAI=LAI
else
write(*,*) 'No PAI_OPT Selected...Defaulting to option 0'
write(*,*) 'Wrong PAI_OPT choice in namelist...exiting'
call exit(123)
end if
ZCANMAX=0.84_rk
SIGMAU=0.13_rk
Expand All @@ -110,7 +112,8 @@ SUBROUTINE CANOPY_PARM( VTYPE, FCH, FFRAC, LAI, &
else if (PAI_OPT .eq. 2) then !need PAI function of model LAI
PAI=LAI
else
write(*,*) 'No PAI_OPT Selected...Defaulting to option 0'
write(*,*) 'Wrong PAI_OPT choice in namelist...exiting'
call exit(123)
end if
ZCANMAX=(0.94_rk + 0.62_rk)/2.0_rk
SIGMAU=(0.03_rk + 0.50_rk)/2.0_rk
Expand Down