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

parameter file updates #862

Merged
merged 35 commits into from
Jun 21, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
eaf52a7
Added hydr_solver and stomatal_assim switches to parameter file
rgknox Apr 27, 2022
1879333
converting parameter crown to crown_depth_frac and forcing its use th…
rgknox Apr 27, 2022
3a7e083
Added new param fields for phenology and damage
rgknox Apr 27, 2022
8e85fb1
Sorted fates default param file
rgknox Apr 27, 2022
5e60f74
Added new maxpatch and harvest production parameters.
rgknox Apr 27, 2022
4d66d49
Updating naming convention of nutrient enabled (CNP) allocation param…
rgknox Apr 27, 2022
f64861e
Added maxpatch to parameter file, updated damage bin widths for history
rgknox Apr 29, 2022
c7d048c
First version of the parameter API updater
rgknox May 5, 2022
7912585
Parameter file API updater script is nearly final, incremental progre…
rgknox May 13, 2022
d321625
tweaks to parameter api change couplet
rgknox May 13, 2022
954e343
minor updates to fates default parameters api24
rgknox May 13, 2022
d14ae29
Removing parameter file api24 default v1
rgknox May 13, 2022
1fbd6d0
Updated some parameter names to be more verbose
rgknox May 18, 2022
d77e7b8
Adding model-side changes to the parameter file parameter names. Cha…
rgknox May 24, 2022
a14a31f
Changing some phen parameters to pft level, adding damage codes
rgknox May 25, 2022
5c8c58b
Reverted pft-scale phen parameters back to scalar because the phenolo…
rgknox May 25, 2022
735b33f
Addition of damage history dimensioning, and module flag
rgknox May 27, 2022
64f6c71
Removing export frac check
rgknox May 27, 2022
14fdfe2
minor conflict resolution
rgknox May 27, 2022
401cb25
Minor syntax updates
rgknox May 27, 2022
dbd00f4
Syntax changes, minor
rgknox May 27, 2022
8c85f90
Removing stoich_p2 variables
rgknox May 31, 2022
ce4821b
Small adjustments to parameter update pr, including setting secondary…
rgknox May 31, 2022
e3972d7
merge resolution
rgknox May 31, 2022
11b393c
Updating the default parameter file to api 24
rgknox Jun 1, 2022
380b298
Update the default parameter file
rgknox Jun 2, 2022
6513ff2
Conflict resolutions between the parameter file updates and syntax ch…
rgknox Jun 3, 2022
808e38f
changed array indices to use names indices
rgknox Jun 6, 2022
8078435
Reverting changes to EDCanopyStructureMod for b4b
rgknox Jun 6, 2022
7182c2c
minor fix, removed old maxcohort declaration
rgknox Jun 6, 2022
a1ec3b2
fixed maxCohorts
rgknox Jun 7, 2022
6c4c060
Merge branch 'params-maxpatch-logfinal' of github.com:rgknox/fates in…
rgknox Jun 7, 2022
d3d5b83
Copied fates_params_default_api24.cdl over to the default file
rgknox Jun 8, 2022
4c01c5a
Removing the api24 temporary default parameter file
rgknox Jun 8, 2022
f054c85
Conflict resolution between the parameter update and parteh loop sele…
rgknox Jun 19, 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
Prev Previous commit
Next Next commit
Small adjustments to parameter update pr, including setting secondary…
… patches to 4 in the xml update file.
  • Loading branch information
rgknox committed May 31, 2022
commit ce4821b362f5db5741b0602064273c8cecaf17b7
4 changes: 2 additions & 2 deletions parameter_files/apichange_23to24.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<di> scalar </di>
<un> count </un>
<ln> maximum number of secondary vegetation patches per site </ln>
<val> 1 </val>
<val> 4 </val>
</mod>

<mod type="variable_add">
Expand Down Expand Up @@ -153,7 +153,7 @@
<di> fates_plant_organs, fates_pft </di>
<un> index </un>
<ln> Priority level for allocation, 1: replaces turnover from storage, 2: same priority as storage use/replacement, 3: ascending in order of least importance </ln>
<val> 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 </val>
<val> 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 </val>
</mod>
<mod type="variable_add">
<na> fates_alloc_organ_name </na>
Expand Down
6 changes: 3 additions & 3 deletions parameter_files/fates_params_default_api24.cdl
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ variables:
fates_hydro_psicap:long_name = "sapwood water potential at which capillary reserves exhausted" ;
double fates_hydro_solver ;
fates_hydro_solver:units = "unitless" ;
fates_hydro_solver:long_name = "switch designating which numerical solver for plant hydraulics, 1 = 1D taylor, 2 = 2D Picard" ;
fates_hydro_solver:long_name = "switch designating which numerical solver for plant hydraulics, 1 = 1D taylor, 2 = 2D Picard, 3 = 2D Newton (deprecated)" ;
double fates_landuse_logging_coll_under_frac ;
fates_landuse_logging_coll_under_frac:units = "fraction" ;
fates_landuse_logging_coll_under_frac:long_name = "Fraction of stems killed in the understory when logging generates disturbance" ;
Expand Down Expand Up @@ -842,7 +842,7 @@ data:

fates_alloc_organ_priority =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ;

Expand Down Expand Up @@ -1496,7 +1496,7 @@ data:

fates_maxpatch_primary = 10 ;

fates_maxpatch_secondary = 1 ;
fates_maxpatch_secondary = 4 ;

fates_mort_disturb_frac = 1 ;

Expand Down
2 changes: 0 additions & 2 deletions parteh/PRTParametersMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ module PRTParametersMod
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

real(r8), allocatable :: nitr_stoich_p1(:,:) ! Parameter 1 for nitrogen stoichiometry (pft x organ)
real(r8), allocatable :: nitr_stoich_p2(:,:) ! Parameter 2 for nitrogen stoichiometry (pft x organ)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I couldn't find this in the issue discussion. What predicated the removal of these parameters?

Copy link
Contributor Author

@rgknox rgknox Jun 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't have a defensible way of having plasticity in nutrient concentrations yet, so this parameter is not useful. @jenniferholm has been investigating such a feature though, so this may change down the line. In the future depending on those findings we could introduce the necessary parameters. My sense is that when we do, the plasticity will not be introduced through this parameter, and may target individual organs that actually experience plasticity, like leaves.

real(r8), allocatable :: phos_stoich_p1(:,:) ! Parameter 1 for phosphorus stoichiometry (pft x organ)
real(r8), allocatable :: phos_stoich_p2(:,:) ! Parameter 2 for phosphorus stoichiometry (pft x organ)

real(r8), allocatable :: nitr_store_ratio(:) ! This is the ratio of the target nitrogen stored per
! target nitrogen that is bound into the tissues
Expand Down