| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 802 |
3908d 04h |
werner |
/branches/port_qt5_64bit/ |
merge from trunk up to revision 801 |
|
/branches/port_qt5_64bit/R_analysis
/branches/port_qt5_64bit
/branches/port_qt5_64bit/executable/iland.exe
/branches/port_qt5_64bit/src/core/climate.cpp
/branches/port_qt5_64bit/src/core/climate.h
/branches/port_qt5_64bit/src/core/global.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.h
/branches/port_qt5_64bit/src/core/production3pg.cpp
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/core/seeddispersal.cpp
/branches/port_qt5_64bit/src/core/speciesresponse.cpp
/branches/port_qt5_64bit/src/core/speciesresponse.h
/branches/port_qt5_64bit/src/core/speciesset.cpp
/branches/port_qt5_64bit/src/core/speciesset.h
/branches/port_qt5_64bit/src/core/stampcontainer.cpp
/branches/port_qt5_64bit/src/core/watercycle.cpp
/branches/port_qt5_64bit/src/core/watercycle.h
/branches/port_qt5_64bit/src/fonstudio/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/version.cpp
/branches/port_qt5_64bit/src/output/dynamicstandout.cpp
/branches/port_qt5_64bit/src/output/dynamicstandout.h
/branches/port_qt5_64bit/src/output/productionout.cpp
/branches/port_qt5_64bit/src/output/snapshot.cpp
/branches/port_qt5_64bit/src/output/standdeadout.cpp
/branches/port_qt5_64bit/src/plugins/fire/firemodule.cpp
/branches/port_qt5_64bit/src/plugins/fire/firescript.cpp
/branches/port_qt5_64bit/src/plugins/fire/firescript.h
/branches/port_qt5_64bit/src/plugins/wind/windmodule.cpp
/branches/port_qt5_64bit/src/tools/expression.cpp
/branches/port_qt5_64bit/src/tools/expression.h
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
|
| 779 |
4040d 22h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
| 671 |
4623d 23h |
werner |
/trunk/src/ |
Necessary changes for GPL licence (i.e. headers in all source files) |
|
/trunk/src/core/climate.cpp
/trunk/src/core/climate.h
/trunk/src/core/environment.cpp
/trunk/src/core/environment.h
/trunk/src/core/establishment.cpp
/trunk/src/core/establishment.h
/trunk/src/core/exception.h
/trunk/src/core/global.h
/trunk/src/core/grid.h
/trunk/src/core/layeredgrid.h
/trunk/src/core/management.cpp
/trunk/src/core/management.h
/trunk/src/core/model.cpp
/trunk/src/core/model.h
/trunk/src/core/modelcontroller.cpp
/trunk/src/core/modelcontroller.h
/trunk/src/core/modelsettings.cpp
/trunk/src/core/modelsettings.h
/trunk/src/core/phenology.cpp
/trunk/src/core/phenology.h
/trunk/src/core/plugin_interface.h
/trunk/src/core/production3pg.cpp
/trunk/src/core/production3pg.h
/trunk/src/core/resourceunit.cpp
/trunk/src/core/resourceunit.h
/trunk/src/core/sapling.cpp
/trunk/src/core/sapling.h
/trunk/src/core/seeddispersal.cpp
/trunk/src/core/seeddispersal.h
/trunk/src/core/snag.cpp
/trunk/src/core/snag.h
/trunk/src/core/soil.cpp
/trunk/src/core/soil.h
/trunk/src/core/species.cpp
/trunk/src/core/species.h
/trunk/src/core/speciesresponse.cpp
/trunk/src/core/speciesresponse.h
/trunk/src/core/speciesset.cpp
/trunk/src/core/speciesset.h
/trunk/src/core/stamp.cpp
/trunk/src/core/stamp.h
/trunk/src/core/stampcontainer.cpp
/trunk/src/core/stampcontainer.h
/trunk/src/core/standloader.cpp
/trunk/src/core/standloader.h
/trunk/src/core/standstatistics.cpp
/trunk/src/core/standstatistics.h
/trunk/src/core/threadrunner.cpp
/trunk/src/core/threadrunner.h
/trunk/src/core/timeevents.cpp
/trunk/src/core/timeevents.h
/trunk/src/core/tree.cpp
/trunk/src/core/tree.h
/trunk/src/core/watercycle.cpp
/trunk/src/core/watercycle.h
/trunk/src/iland/aboutdialog.cpp
/trunk/src/iland/aboutdialog.h
/trunk/src/iland/aboutdialog.ui
/trunk/src/iland/mainwindow.cpp
/trunk/src/iland/mainwindow.h
/trunk/src/iland/paintarea.cpp
/trunk/src/iland/paintarea.h
/trunk/src/iland/stable.h
/trunk/src/iland/tests.cpp
/trunk/src/iland/tests.h
/trunk/src/iland/version.h
/trunk/src/output/carbonflowout.cpp
/trunk/src/output/carbonflowout.h
/trunk/src/output/carbonout.cpp
/trunk/src/output/carbonout.h
/trunk/src/output/dynamicstandout.cpp
/trunk/src/output/dynamicstandout.h
/trunk/src/output/managementout.cpp
/trunk/src/output/managementout.h
/trunk/src/output/output.cpp
/trunk/src/output/output.h
/trunk/src/output/outputmanager.cpp
/trunk/src/output/outputmanager.h
/trunk/src/output/productionout.cpp
/trunk/src/output/productionout.h
/trunk/src/output/saplingout.cpp
/trunk/src/output/saplingout.h
/trunk/src/output/standdeadout.cpp
/trunk/src/output/standdeadout.h
/trunk/src/output/standout.cpp
/trunk/src/output/standout.h
/trunk/src/output/treeout.cpp
/trunk/src/output/treeout.h
/trunk/src/plugins/fire/firemodule.cpp
/trunk/src/plugins/fire/firemodule.h
/trunk/src/plugins/fire/fireout.cpp
/trunk/src/plugins/fire/fireout.h
/trunk/src/plugins/fire/fireplugin.cpp
/trunk/src/plugins/fire/fireplugin.h
/trunk/src/tools/climateconverter.cpp
/trunk/src/tools/climateconverter.h
/trunk/src/tools/csvfile.cpp
/trunk/src/tools/csvfile.h
/trunk/src/tools/dem.cpp
/trunk/src/tools/dem.h
/trunk/src/tools/expression.cpp
/trunk/src/tools/expression.h
/trunk/src/tools/expressionwrapper.cpp
/trunk/src/tools/expressionwrapper.h
/trunk/src/tools/floatingaverage.cpp
/trunk/src/tools/floatingaverage.h
/trunk/src/tools/gisgrid.cpp
/trunk/src/tools/gisgrid.h
/trunk/src/tools/globalsettings.cpp
/trunk/src/tools/globalsettings.h
/trunk/src/tools/helper.cpp
/trunk/src/tools/helper.h
/trunk/src/tools/mapgrid.cpp
/trunk/src/tools/mapgrid.h
/trunk/src/tools/modules.cpp
/trunk/src/tools/modules.h
/trunk/src/tools/random.cpp
/trunk/src/tools/random.h
/trunk/src/tools/scriptglobal.cpp
/trunk/src/tools/scriptglobal.h
/trunk/src/tools/settingmetadata.cpp
/trunk/src/tools/settingmetadata.h
/trunk/src/tools/sqlhelper.cpp
/trunk/src/tools/sqlhelper.h
/trunk/src/tools/ticktack.cpp
/trunk/src/tools/ticktack.h
/trunk/src/tools/xmlhelper.cpp
/trunk/src/tools/xmlhelper.h
|
| 639 |
4784d 20h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable
/trunk/src
/executable
/src
|
| 536 |
4939d 20h |
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
|
| 485 |
4995d 00h |
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
|
| 467 |
5001d 05h |
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
|
| 436 |
5106d 00h |
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 |
5178d 04h |
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
|
| 367 |
5178d 05h |
werner |
/src/core/ |
changes in the watercycle.
see http://iland.boku.ac.at/tiki-view_tracker_item.php?itemId=30
the calculation of the effect on the canopy conductance is changed. Now, the combined effects of soil water and vpd response together modify the canopy conductance. In order to do this some structural changes have been necessary. Note: now the response values for vpd and soil water are calculated two times. |
|
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/resourceunitspecies.h
/src/core/species.cpp
/src/core/speciesresponse.cpp
/src/core/speciesresponse.h
/src/core/watercycle.cpp
/src/core/watercycle.h
|
| 328 |
5308d 21h |
werner |
/src/ |
daily aggregation of responses; looks good now. |
|
/src/core/speciesresponse.cpp
/src/core/speciesresponse.h
/src/core/threadrunner.cpp
/src/iland/tests.cpp
/src/output/productionout.cpp
|
| 327 |
5308d 22h |
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 |
5325d 04h |
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
|
| 273 |
5357d 08h |
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 |
5360d 15h |
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
|
| 226 |
5367d 14h |
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
|
| 209 |
5374d 11h |
werner |
/src/ |
Environmental responses:
VPD, Temperature, CO2, Nitrogen |
|
/src/core/climate.cpp
/src/core/climate.h
/src/core/resourceunitspecies.h
/src/core/species.cpp
/src/core/species.h
/src/core/speciesresponse.cpp
/src/core/speciesresponse.h
/src/core/speciesset.cpp
/src/core/speciesset.h
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/iland/tests.h
|
| 193 |
5379d 13h |
werner |
/src/ |
started species responses (vpd, etc.) and subsequently the climate database loading stuff. |
|
/src/core/climate.cpp
/src/core/climate.h
/src/core/speciesresponse.cpp
/src/core/speciesresponse.h
/src/core/model.cpp
/src/core/production3pg.h
/src/core/resourceunitspecies.h
/src/iland/iland.pro
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/iland/tests.h
/src/tools/globalsettings.h
|