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.

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

smp and parameter updates #6

Merged
merged 40 commits into from
Jun 28, 2023
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
feaa22c
added adjusted paritioning of stem wood (struct and sapw) to cwd in E…
adamhb Jan 12, 2023
96ef187
added fixes to partitioning of wood to CWD. Model is running.
adamhb Jan 13, 2023
30352b1
cleaned up the cwd adjust subroutine
adamhb Jan 26, 2023
dfa40ec
updated cwd paritioning to send more to the smaller fuel classes
adamhb Feb 3, 2023
530afce
updated the cwd partitioning to keep the proportions the same among t…
adamhb Feb 16, 2023
90bf646
cleaned up fix to cwd change
adamhb Feb 22, 2023
457522b
flag
adamhb Feb 22, 2023
397a574
removed flags
adamhb Feb 23, 2023
5e5a04a
cleaned up comments in cwd_partitioning_adj subroutine
adamhb Mar 28, 2023
b966082
merging main into cwd_paritioning branch before pull request
adamhb Mar 28, 2023
a9cbc62
added testing print statements
adamhb Mar 28, 2023
0f2ec37
deleted diagnostic print statements
adamhb Mar 28, 2023
bb6064b
Merge branch 'main' into cwd_partitioning
adamhb Apr 13, 2023
2786dc3
add parameter check for fates_rad_leaf_xl
Apr 21, 2023
774b699
update indentation to match style
Apr 21, 2023
733c72b
Add termination mortality to the mortality_cflux history variable
JessicaNeedham Apr 21, 2023
fcffb81
fix numbers
Apr 24, 2023
c8b81d2
updated comments in adjust_SF_CWD_frac subroutine in response to revi…
adamhb Apr 24, 2023
83a5140
Fix units on carbonflux variables in EDTypesMod
JessicaNeedham Apr 24, 2023
e46721e
Tidying units on imort_carbonflux. Add logging imort to imort_agb_flux
JessicaNeedham Apr 25, 2023
c77dff1
remove chil check in EDSurfaceAlbedoMod
May 5, 2023
9692da0
Update phi1b calculation to use xl directly
glemieux May 8, 2023
cac9670
Merge pull request #1023 from JessicaNeedham/JFN-IO-termcflux
glemieux May 9, 2023
009e457
remove old chil local variable and commented out code
glemieux May 9, 2023
14b1791
Merge pull request #1022 from adrifoster/check_fates_xl
glemieux May 9, 2023
fce15a9
Merge pull request #1008 from adamhb/cwd_partitioning
glemieux Jun 6, 2023
efde58c
Fix to the restart order issue
rgknox Jun 23, 2023
49f82ab
moved nlevsclass calculation earlier in subroutine
rgknox Jun 23, 2023
180ba13
Moved restart calls for new phen variables to different location
rgknox Jun 26, 2023
fa431f5
removed change of vcmax parameter
rgknox Jun 26, 2023
bd82b5f
updating the default parameter file per fixes in the api update xml t…
rgknox Jun 26, 2023
facbf55
fix to the parameter file
rgknox Jun 27, 2023
6aba10c
Merge resolution
rgknox Jun 27, 2023
59f56ee
reapplied parameter update from xml, something got lost in a merge
rgknox Jun 27, 2023
e4cf214
provisions for frozen/arid conditions on drought deciduous suction tr…
rgknox Jun 28, 2023
6f44d03
Merge branch 'mpaiao-pr-drgt-decid' of github.com:mpaiao/fates into m…
rgknox Jun 28, 2023
8d2d765
Updating parameter file
rgknox Jun 28, 2023
1864070
simple conflict resolution
rgknox Jun 28, 2023
f87ea87
fixed parameter name
rgknox Jun 28, 2023
5830b35
Update EDPhysiologyMod.F90
mpaiao Jun 28, 2023
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
Prev Previous commit
Next Next commit
remove chil check in EDSurfaceAlbedoMod
  • Loading branch information
adrifoster committed May 5, 2023
commit c77dff19e09f7c910f1050999ab0094a938e76ba
3 changes: 0 additions & 3 deletions biogeophys/EDSurfaceAlbedoMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,6 @@ subroutine PatchNormanRadiation (currentPatch, &
cosz = max(0.001_r8, currentPatch%solar_zenith_angle ) !copied from previous radiation code...
do ft = 1,numpft
sb = (90._r8 - (acos(cosz)*180._r8/pi_const)) * (pi_const / 180._r8)
!chil should be between -0.4 and 0.6
! Bonan (2019) doi:10.1017/9781107339217 pg. 238
chil = min(max(xl(ft), -0.4_r8), 0.6_r8 )
! chil being close to zero shouldn't affect things
!if ( abs(chil) <= 0.01_r8) then
! chil = 0.01_r8
Expand Down