| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 662 |
4775d 05h |
werner |
/trunk/src/ |
continued to work on the fire module. Include the fire severity (i.e. mortality due to fire). This had various other impacts, e.g., on the carbon cycle of saplings. |
|
/trunk/src/core/grid.h
/trunk/src/core/management.cpp
/trunk/src/core/resourceunit.cpp
/trunk/src/core/resourceunit.h
/trunk/src/core/sapling.cpp
/trunk/src/core/sapling.h
/trunk/src/core/snag.h
/trunk/src/core/soil.cpp
/trunk/src/core/soil.h
/trunk/src/output/managementout.cpp
/trunk/src/plugins/fire/firemodule.cpp
/trunk/src/plugins/fire/firemodule.h
|
| 639 |
4893d 02h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable
/trunk/src
/executable
/src
|
| 628 |
4944d 11h |
werner |
/src/output/ |
|
|
/src/output/carbonflowout.cpp
|
| 610 |
4958d 09h |
werner |
/ |
new bug fix version 0.6.2
include ecosystem carbon flux output |
|
/executable/iland.exe
/src/iland/version.cpp
/src/output/carbonflowout.cpp
|
| 609 |
4958d 10h |
werner |
/src/ |
implementing CarbonFlow output and book keeping code. |
|
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/snag.cpp
/src/core/snag.h
/src/core/soil.cpp
/src/core/soil.h
/src/output/carbonflowout.cpp
|
| 608 |
4958d 11h |
werner |
/src/ |
adding carbon cycle output (and some necessary book keeping code) |
|
/src/core/production3pg.h
/src/core/sapling.cpp
/src/core/sapling.h
/src/core/snag.h
/src/core/tree.cpp
/src/output/carbonflowout.cpp
/src/tools/globalsettings.h
|
| 605 |
4962d 08h |
werner |
/src/ |
added the "rid" (i.e. a unique id per resource unit) in various debug outputs.
added the "shell" of a new carbonflow output. |
|
/src/output/carbonflowout.cpp
/src/output/carbonflowout.h
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/snag.cpp
/src/core/speciesresponse.cpp
/src/core/watercycle.cpp
/src/iland/iland.pro
/src/output/outputmanager.cpp
/src/tools/globalsettings.cpp
|
| 598 |
4963d 06h |
werner |
/src/ |
extending the dynamic stand output; added calculating standard deviation. |
|
/src/output/dynamicstandout.cpp
/src/tools/helper.cpp
/src/tools/helper.h
|
| 592 |
4990d 05h |
werner |
/ |
new version 0.6 alpha 6
* scripting enhancements
* carbon cycle in regeneration layer
* scaling of soil inputs for non fully stockable resource units |
|
/executable/iland.exe
/src/iland/version.cpp
/src/output/carbonout.cpp
|
| 589 |
4990d 08h |
werner |
/src/ |
added new script functions to start/stop outputs. |
|
/src/output/output.h
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
|
| 587 |
4990d 23h |
werner |
/src/ |
added carbon output.
lots of changes necessary to get this done (especially budgeting of biomass pools) |
|
/src/output/carbonout.cpp
/src/output/carbonout.h
/src/core/model.cpp
/src/core/snag.cpp
/src/core/snag.h
/src/core/standstatistics.cpp
/src/core/standstatistics.h
/src/iland/iland.pro
/src/output/outputmanager.cpp
|
| 574 |
4993d 10h |
werner |
/src/ |
* modified outputs to write only rows for valid resource units
* dropped setting "woodDecompRate" (snag.cpp)
* calculate the "stockableArea" of a resource unit based on the stand grid
* use the stockableArea for calculation of LAI |
|
/src/core/grid.h
/src/core/model.cpp
/src/core/model.h
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/snag.cpp
/src/output/dynamicstandout.cpp
/src/output/managementout.cpp
/src/output/productionout.cpp
/src/output/saplingout.cpp
/src/output/standdeadout.cpp
/src/output/standout.cpp
/src/tools/expressionwrapper.cpp
/src/tools/globalsettings.h
|
| 570 |
4998d 10h |
werner |
/src/output/ |
added resource unit id (provided by input grid) to almost any output in iLand. |
|
/src/output/dynamicstandout.cpp
/src/output/managementout.cpp
/src/output/output.h
/src/output/productionout.cpp
/src/output/saplingout.cpp
/src/output/standdeadout.cpp
/src/output/standout.cpp
/src/output/treeout.cpp
|
| 539 |
5040d 04h |
werner |
/src/ |
continue implementing grid functionality (yeah! a simple grid input already works)
removing the bug that caused db locks when reloaded model without actually simulating. |
|
/src/core/model.cpp
/src/core/model.h
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/iland/tests.h
/src/output/output.cpp
/src/output/outputmanager.cpp
/src/tools/gisgrid.cpp
/src/tools/gisgrid.h
|
| 521 |
5053d 07h |
werner |
/src/ |
moved snag dynamics from rus-level to ru-level |
|
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/resourceunitspecies.cpp
/src/core/resourceunitspecies.h
/src/core/snag.h
/src/core/tree.cpp
/src/output/dynamicstandout.cpp
/src/tools/globalsettings.cpp
|
| 520 |
5053d 08h |
werner |
/src/ |
fixed crash in Expression that occurred with dynamic stand outputs without any trees.
Extended the dynamic stand output so that a treefilter can be applied. |
|
/src/output/dynamicstandout.cpp
/src/output/dynamicstandout.h
/src/output/output.h
/src/output/outputmanager.cpp
/src/tools/expression.cpp
/src/tools/expression.h
|
| 504 |
5083d 02h |
werner |
/src/ |
New output for "saplings" |
|
/src/output/saplingout.cpp
/src/output/saplingout.h
/src/core/model.cpp
/src/core/resourceunitspecies.h
/src/core/sapling.cpp
/src/core/sapling.h
/src/core/standstatistics.cpp
/src/core/watercycle.cpp
/src/iland/iland.pro
/src/output/outputmanager.cpp
|
| 456 |
5159d 06h |
werner |
/src/ |
|
|
/src/core/species.cpp
/src/output/standout.cpp
|
| 455 |
5159d 08h |
werner |
/src/ |
changed the layout of the resourceUnitSpecies from a QVector to a QList<ResourceUnitSpecies*>. This seems to be much more appropriate. But caused many small changes throughout the project. |
|
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/watercycle.cpp
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/output/dynamicstandout.cpp
/src/output/managementout.cpp
/src/output/productionout.cpp
/src/output/standdeadout.cpp
/src/output/standout.cpp
|
| 436 |
5214d 07h |
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
|
| 407 |
5243d 09h |
werner |
/src/ |
modified the painting of trees (use now the crown radius)
tried to fix the database lock error when reloading the model (not solved: but: no problem when model was executed for at least one year...) |
|
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/output/output.cpp
/src/tools/globalsettings.cpp
|
| 395 |
5265d 23h |
werner |
/src/ |
fixed the "output on startup" which was broken due to changes in the execution sequence. |
|
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/output/output.h
/src/output/outputmanager.cpp
|
| 354 |
5328d 09h |
werner |
/src/output/ |
description of dynamic outputs |
|
/src/output/dynamicstandout.cpp
|
| 353 |
5328d 10h |
werner |
/src/output/ |
simplification of the parsing of dynamic stand expressions |
|
/src/output/dynamicstandout.cpp
|
| 351 |
5328d 12h |
werner |
/src/ |
removed "la" as tree variable
added "LAI" to Stand Output. |
|
/src/output/standout.cpp
/src/tools/expressionwrapper.cpp
|
| 343 |
5378d 10h |
werner |
/src/ |
code cleanup, small change in ProductionOut |
|
/src/core/speciesresponse.cpp
/src/iland/version.cpp
/src/output/productionout.cpp
|
| 328 |
5417d 03h |
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 |
5417d 04h |
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
|
| 303 |
5427d 06h |
werner |
/src/ |
tree output (tracker#7) added position |
|
/src/core/tree.cpp
/src/output/treeout.cpp
|
| 300 |
5433d 11h |
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
|
| 299 |
5437d 09h |
werner |
/src/ |
fixed bug with disabled debug outputs
added modified LRI to NPP-debug output
new species parameter "probStressYears".
documentation (wiki-links) |
|
/src/core/species.cpp
/src/core/standloader.cpp
/src/core/tree.cpp
/src/core/watercycle.cpp
/src/output/treeout.cpp
/src/tools/globalsettings.cpp
|
| 279 |
5462d 15h |
werner |
/src/ |
stressIndex in TreeOut, deactivated DBGMODE makros |
|
/src/core/tree.cpp
/src/output/treeout.cpp
|
| 278 |
5462d 15h |
werner |
/src/ |
Management output. Added a statisticsMgmt() for ResourceUnitSpecies. Complicated to get the order right. |
|
/src/output/managementout.cpp
/src/output/managementout.h
/src/core/management.cpp
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/resourceunitspecies.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland/iland.pro
/src/output/outputmanager.cpp
|
| 277 |
5462d 20h |
werner |
/src/ |
added "Gesamtwuchsleistung" i.e. total growth. |
|
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/resourceunitspecies.h
/src/core/standstatistics.cpp
/src/core/standstatistics.h
/src/core/tree.cpp
/src/core/tree.h
/src/output/standdeadout.cpp
/src/output/standout.cpp
|
| 276 |
5464d 23h |
werner |
/src/ |
added explicit fine root compartment in tree. Changed partitioning, the calculation of the stress index, follow-up change in several outputs. |
|
/src/core/species.cpp
/src/core/species.h
/src/core/tree.cpp
/src/core/tree.h
/src/output/treeout.cpp
/src/tools/expressionwrapper.cpp
/src/tools/expressionwrapper.h
/src/tools/globalsettings.cpp
|
| 273 |
5465d 14h |
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
|
| 265 |
5466d 14h |
werner |
/src/ |
tried to run iLand again for larger area, and got into concurrency-issues. Reasons:
* debug-messages: are now buffered in a string list and not instantly sent to the QTextEdit
* Expressions: lightResponse-formula: accessed concurrently by several threads; now there are thread-safe versions (executeLocked() and calculateLocked()) that use a QMutexLocker to properly serialize the execution flow. |
|
/src/core/resourceunit.cpp
/src/core/species.h
/src/core/tree.cpp
/src/iland/mainwindow.cpp
/src/output/output.cpp
/src/tools/expression.h
/src/tools/globalsettings.cpp
|
| 264 |
5466d 23h |
werner |
/src/ |
TreeOut output (including filtering) |
|
/src/core/model.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/output/treeout.cpp
/src/output/treeout.h
|
| 262 |
5466d 23h |
werner |
/src/ |
added output for dead trees (StandDeadOut) |
|
/src/output/standdeadout.cpp
/src/output/standdeadout.h
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland/iland.pro
/src/output/outputmanager.cpp
|
| 261 |
5467d 01h |
werner |
/src/ |
* added NPP aboveground to stats
* some update in comments |
|
/src/core/grid.h
/src/core/model.cpp
/src/core/standstatistics.cpp
/src/core/standstatistics.h
/src/core/tree.cpp
/src/core/tree.h
/src/output/dynamicstandout.cpp
/src/output/standout.cpp
|