| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 639 |
4802d 17h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable
/trunk/src
/executable
/src
|
| 536 |
4957d 17h |
werner |
/src/core/ |
update the calculation of belowground allocation. Due to a mishap an error was in there (a difference in implementation and concept). In short, the fraction of utilizable and global radiaton was not in the formula.
german info:
Eq. S13: ok, gut das wir da noch einmal gecheckt haben. Sollte so sein wie urspruenglich im Supplement (und auch im Wiki), also mit dem uAPAR/APAR ratio und fN. In fact, wenn die Pflanze Trockenstress hat, sollte mehr in die Wurzeln gehen, das ist die Logik dahinter. Ich nehm mal an das das einiges aendert, wir sollten es aber bereinigen. Kannst es mir ev. im project file als switch anlegen? Dann kann ich den Effekt besser testen. Thx und sorry fuer ev. Unklarheiten in der Kommunikation.
--> ok. da gibt es ein neues setting: "usePARFractionBelowGroundAllocation" (in "model.settings") . Wenn true (das ist auch default), dann wird das so gerechnet wie im paper, mit false ist es die "alte" und falsche variante. Und wahrscheinlich hab ich das versemmelt und irgendwie übersehen - es tut eher mir leid, wenn du jetzt deswegen noch recht viel arbeit hast... sorry. |
|
/src/core/modelsettings.cpp
/src/core/modelsettings.h
/src/core/production3pg.cpp
/src/core/speciesresponse.cpp
/src/core/speciesresponse.h
|
| 513 |
4983d 20h |
werner |
/src/core/ |
fixed a nasty bug: if one tree species succeeded to establish on a formerly empty RU, the saplings of other species were killed (well, not directly, but the environment was not recalculated leading to a f_env value of 0). |
|
/src/core/production3pg.cpp
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/tree.cpp
|
| 485 |
5012d 21h |
werner |
/src/ |
multithreading-bug during calculation of yearly radiation sum |
|
/src/core/climate.cpp
/src/core/climate.h
/src/core/production3pg.cpp
/src/core/speciesresponse.h
/src/iland/iland.pro
|
| 483 |
5012d 22h |
werner |
/src/core/ |
recruitment: recruit the number of individuals provided by the Reineke equation.
(correct spelling error: reinecke -> reineke) |
|
/src/core/model.cpp
/src/core/production3pg.cpp
/src/core/sapling.cpp
/src/core/species.cpp
/src/core/species.h
/src/core/standstatistics.cpp
/src/core/standstatistics.h
|
| 480 |
5013d 03h |
werner |
/src/ |
debug message for fenvyr>1,
open file convenience |
|
/src/core/production3pg.cpp
/src/iland/mainwindow.cpp
/src/iland/mainwindow.ui
/src/tools/helper.cpp
/src/tools/helper.h
|
| 467 |
5019d 02h |
werner |
/src/core/ |
added species-parameter "sapReferenceFactor" (for calculation of f_env,yr for sapling growth). |
|
/src/core/production3pg.cpp
/src/core/species.cpp
/src/core/species.h
/src/core/speciesresponse.h
|
| 440 |
5122d 22h |
werner |
/src/core/ |
climate: added a pre-calculated value for the 10.5hrs day
including establishment calculation in the normal execution path. |
|
/src/core/climate.cpp
/src/core/climate.h
/src/core/establishment.cpp
/src/core/establishment.h
/src/core/model.cpp
/src/core/model.h
/src/core/phenology.cpp
/src/core/production3pg.cpp
/src/core/resourceunitspecies.cpp
/src/core/resourceunitspecies.h
/src/core/threadrunner.cpp
/src/core/threadrunner.h
|
| 437 |
5123d 21h |
werner |
/src/core/ |
corrected f_env,yr calculation |
|
/src/core/climate.cpp
/src/core/production3pg.cpp
|
| 436 |
5123d 22h |
werner |
/src/ |
climate: added totalRadiation() function
production3pg.cpp: added the calculation of the f_env,yr (total environmental performance of a species) |
|
/src/core/climate.cpp
/src/core/climate.h
/src/core/establishment.cpp
/src/core/phenology.cpp
/src/core/phenology.h
/src/core/production3pg.cpp
/src/core/production3pg.h
/src/core/resourceunit.cpp
/src/core/speciesresponse.cpp
/src/core/speciesresponse.h
/src/iland
/src/output/productionout.cpp
|
| 369 |
5196d 01h |
werner |
/src/ |
* multithreading for 3pg production (crashes)
* do 3PG calculation only if this RU has some leafarea of a species (added clear() functions)
* added GUI-accessible speciesindex-variable for trees |
|
/src/core/model.cpp
/src/core/production3pg.cpp
/src/core/production3pg.h
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/resourceunitspecies.h
/src/core/speciesresponse.h
/src/core/threadrunner.cpp
/src/tools/expressionwrapper.cpp
|
| 327 |
5326d 19h |
werner |
/src/ |
changed mode of radiation calculation |
|
/src/core/climate.h
/src/core/production3pg.cpp
/src/core/speciesresponse.cpp
/src/core/speciesresponse.h
/src/output/productionout.cpp
|
| 300 |
5343d 02h |
werner |
/src/ |
changed CO2 response from yearly to monthly resolution |
|
/src/core/production3pg.cpp
/src/core/speciesresponse.cpp
/src/core/speciesresponse.h
/src/output/productionout.cpp
|
| 280 |
5371d 14h |
werner |
/src/ |
Creation of the "Environment" class (loading of the "world" into iLand).
- added setter-functions to XmlHelper
- added auxiliary functions to CSVFile
- smaller changes to a bunch of other files. |
|
/src/core/climate.cpp
/src/core/climate.h
/src/core/environment.cpp
/src/core/environment.h
/src/core/model.cpp
/src/core/production3pg.cpp
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/iland/tests.h
/src/tools/csvfile.cpp
/src/tools/csvfile.h
/src/tools/xmlhelper.cpp
/src/tools/xmlhelper.h
|
| 273 |
5375d 05h |
werner |
/src/ |
changed the way of aggregating the daily environmental responses. Now, the minimum of the response values for vpd, temperature and soil water is calculated daily and aggregated for each month. the utilizable radiation then is simply rad*avg_min_response. Brief tests showed, that the difference to the "old" multiplicative approach is not very large. |
|
/src/core/production3pg.cpp
/src/core/speciesresponse.cpp
/src/core/speciesresponse.h
/src/output/productionout.cpp
|
| 251 |
5378d 12h |
werner |
/src/ |
Light-Redistribution: Changed again (12.10.2009). LRI of trees are now modified with a modifier based on stockedarea*beerLambert-fraction (pPar). The modified LRI is then used to calculate a light response. The light response * leafarea eventually acts as the share of GPP assigned to a particular tree. |
|
/src/core/model.cpp
/src/core/production3pg.cpp
/src/core/production3pg.h
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/speciesresponse.h
/src/core/tree.cpp
/src/core/tree.h
/src/output/productionout.cpp
/src/tools/globalsettings.cpp
|
| 230 |
5384d 06h |
werner |
/src/ |
3PG work out |
|
/src/core/production3pg.cpp
/src/core/production3pg.h
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/resourceunitspecies.cpp
/src/core/resourceunitspecies.h
/src/core/speciesresponse.cpp
/src/core/tree.cpp
/src/output/output.cpp
/src/tools/globalsettings.cpp
|
| 228 |
5385d 10h |
werner |
/src/ |
created output for production details. |
|
/src/output/productionout.cpp
/src/output/productionout.h
/src/core/production3pg.cpp
/src/core/production3pg.h
/src/core/resourceunitspecies.h
/src/iland/iland.pro
/src/output/outputmanager.cpp
|
| 227 |
5385d 11h |
werner |
/src/core/ |
3pg production, documentation polish |
|
/src/core/production3pg.cpp
/src/core/production3pg.h
/src/core/tree.cpp
|
| 226 |
5385d 11h |
werner |
/src/core/ |
working on 3pg, the species specific responses and linking it all together. |
|
/src/core/climate.cpp
/src/core/climate.h
/src/core/modelsettings.cpp
/src/core/modelsettings.h
/src/core/phenology.cpp
/src/core/phenology.h
/src/core/production3pg.cpp
/src/core/production3pg.h
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/resourceunitspecies.h
/src/core/species.h
/src/core/speciesresponse.cpp
/src/core/speciesresponse.h
|