Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'qzhu-lbl/lnd/leaf-cn-phys' (PR #393)
Adds soil nutrient competition in ALM - soil nitrogen phosphorus competition, with relative demand approach, ECA approach and MIC outcompete plant approach - root nutrient uptake is based on uptake kinetics - leaf level N/P control GPP - prognostic plant CNP stoichiometry - add option to use dynamic carbon allocation under different nutrient stress - add option to use energy based N2 fixation - add option to use new phosphatase activity - add namelist capacity for ECA - ECA mode compatible with BGC cascade mode - ECA mode compatible with nitrification/denitrification enabled mode - ECA mode mineral surface P adsorption is treated a potential competitor [BFB] [FCC] [NML] LG-45 Conflicts: components/clm/src/biogeochem/CNAllocationMod.F90 components/clm/src/biogeochem/CNCarbonFluxType.F90 components/clm/src/biogeochem/CNDecompCascadeBGCMod.F90 components/clm/src/biogeochem/CNDecompMod.F90 components/clm/src/biogeochem/CNEcosystemDynMod.F90 components/clm/src/biogeochem/CNNitrogenFluxType.F90 components/clm/src/biogeochem/CNNitrogenStateType.F90 components/clm/src/biogeochem/CNStateType.F90 components/clm/src/biogeochem/PStateUpdate1Mod.F90 components/clm/src/biogeochem/PStateUpdate3Mod.F90 components/clm/src/biogeochem/PhosphorusFluxType.F90 components/clm/src/main/controlMod.F90
- Loading branch information
Showing
25 changed files
with
3,935 additions
and
1,171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2,934 changes: 2,190 additions & 744 deletions
2,934
components/clm/src/biogeochem/CNAllocationMod.F90
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.