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

{WIP} LPJ-GUESS SDA Couplers #2660

Draft
wants to merge 68 commits into
base: develop
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
84f3c25
started new read state function
istfer Jun 8, 2019
1c96f7d
add helper function that locates function
istfer Jun 8, 2019
2747330
add helper function that finds closing paranthesis
istfer Jun 8, 2019
0518d2c
add function that finds stream
istfer Jun 10, 2019
c8fc996
start reading
istfer Jun 13, 2019
4ac6530
first read
istfer Jun 13, 2019
6e92048
extract typedef enums
istfer Jun 13, 2019
6d2bac5
read typedef enum
istfer Jun 13, 2019
4221e09
read Historic
istfer Jun 13, 2019
d477ca7
read vector
istfer Jun 13, 2019
b1bf79e
read vector with const int
istfer Jun 14, 2019
7faffa8
read in parameters header too
istfer Jun 14, 2019
3921cc3
case fo seed
istfer Jun 14, 2019
2f8bbda
ready to loop over stands
istfer Jun 15, 2019
b3b0025
start looping over patches
istfer Jun 15, 2019
45970e5
reading individual class
istfer Jun 15, 2019
d6ef1ec
first pass at read individual
istfer Jun 16, 2019
d58848d
finish individual
istfer Jun 17, 2019
3ab63d9
few more flexibility
istfer Jun 17, 2019
83b996b
read matrix
istfer Jun 17, 2019
f66c54a
getting ready to read sompool
istfer Jun 17, 2019
4a6ea5a
catch one more case
istfer Jun 18, 2019
1bb8b87
finished soil
istfer Jun 18, 2019
d84f80f
adding more hardcoded constants for now
istfer Jun 18, 2019
f9899dd
getting ready to read fluxes
istfer Jun 18, 2019
af59c40
finished patch
istfer Jun 18, 2019
4e42c6c
finished reading all - first pass
istfer Jun 18, 2019
94d304c
Added allometry and allocation functions from LPJ-GUESS. Also summin…
MagicForrest Jun 18, 2019
cc3cceb
read meta.bin
istfer Jun 19, 2019
b88b529
allocation() function now correctly included
MagicForrest Jun 19, 2019
64fbdeb
k_latosa is sapwood_ratio in pecan
istfer Jun 19, 2019
bbb97a6
Merge branch 'develop' of github.com:PecanProject/pecan into LPJGUESS…
istfer Jun 19, 2019
58709a6
small rearrangement for compilation
istfer Jun 19, 2019
c27d10f
add new par minmoist_est
istfer Jun 19, 2019
645bb7d
Allocation of biomass now also works. It seems to fail when scaling…
MagicForrest Jun 19, 2019
50170e2
using phenology and leafphysiognomy
istfer Jun 20, 2019
e479b8d
Added allometry() call. Gives the target results for a biomass chang…
MagicForrest Jun 20, 2019
05dcadb
Factorised the adjustDensity and adjustBiomass code.
MagicForrest Jun 20, 2019
a601256
few modifications for PalEON model version
istfer Jun 21, 2019
0c6f624
parsing files some more
istfer Jun 21, 2019
3293a0d
Also scale and adjust N pools.
MagicForrest Jun 21, 2019
aae14e6
Mostly code tidying/documentation ahead of merging.
MagicForrest Jun 21, 2019
2b4e6b9
Merge branch 'LPJGUESS_SDA' into LPJGUESS_SDA
istfer Jun 21, 2019
09ea06e
Merge pull request #2 from MagicForrest/LPJGUESS_SDA
istfer Jun 21, 2019
6fdb02b
modifying function for PalEON version
istfer Jun 21, 2019
e34ea19
Merge branch 'LPJGUESS_SDA' of https://github.com/istfer/pecan into L…
istfer Jun 21, 2019
c86b1a3
read new PhotosynthesisResults
istfer Jun 22, 2019
ecc6faf
updates for the new model version, first pass finished
istfer Jun 24, 2019
cb206bf
Documented adjustBiomass() and cleaned the fucntion a little.
MagicForrest Jun 24, 2019
3df3ec0
start read_restart.LPJGUESS
istfer Jun 24, 2019
a0d938e
LPJGUESS uses exact days and will require split inputs function
istfer Jun 24, 2019
9f8e777
backbone of read_restart
istfer Jun 24, 2019
aa3acf5
Added HEIGHT_MAX as an argument to over-ride the LPJ-GUESS 150m max h…
MagicForrest Jun 24, 2019
85c4a1f
Merge branch 'LPJGUESS_SDA' of github.com:MagicForrest/pecan into LPJ…
MagicForrest Jun 24, 2019
49085a5
start split inputs for LPJGUESS
istfer Jun 25, 2019
90c4c07
number of individuals are back
istfer Jun 26, 2019
a0572c0
Just coding style
MagicForrest Jun 27, 2019
fa628db
Merge branch 'LPJGUESS_SDA' into LPJGUESS_SDA
istfer Jun 27, 2019
4f60bce
Merge pull request #3 from MagicForrest/LPJGUESS_SDA
istfer Jun 27, 2019
3adac8e
define state year
istfer Jun 27, 2019
94da6de
Merge branch 'LPJGUESS_SDA' of https://github.com/istfer/pecan into L…
istfer Jun 27, 2019
14d05f6
add doc tags
istfer Jun 28, 2019
47a7c05
LPJGUESS package build
istfer Jun 28, 2019
e6d5138
no need for single quote
istfer Jun 28, 2019
2273bbd
Merge branch 'develop' of github.com:PecanProject/pecan into LPJGUESS…
istfer Jun 28, 2019
0f94f65
Merge branch 'develop' of github.com:PecanProject/pecan into LPJGUESS…
istfer Jul 17, 2020
4c5530a
Merge branch 'develop' into LPJGUESS_SDA
infotroph May 4, 2023
82dd326
Merge branch 'develop' into LPJGUESS_SDA
mdietze Nov 8, 2024
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
Merge branch 'develop' of github.com:PecanProject/pecan into LPJGUESS…
…_SDA
istfer committed Jun 28, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 2273bbda85a9bab11ffec0568de40aafaafe0c80

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.