| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 521 |
5053d 08h |
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 10h |
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 03h |
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 08h |
werner |
/src/ |
|
|
/src/core/species.cpp
/src/output/standout.cpp
|
| 455 |
5159d 10h |
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 08h |
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 10h |
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 |
5266d 01h |
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 11h |
werner |
/src/output/ |
description of dynamic outputs |
|
/src/output/dynamicstandout.cpp
|
| 353 |
5328d 12h |
werner |
/src/output/ |
simplification of the parsing of dynamic stand expressions |
|
/src/output/dynamicstandout.cpp
|
| 351 |
5328d 13h |
werner |
/src/ |
removed "la" as tree variable
added "LAI" to Stand Output. |
|
/src/output/standout.cpp
/src/tools/expressionwrapper.cpp
|
| 343 |
5378d 12h |
werner |
/src/ |
code cleanup, small change in ProductionOut |
|
/src/core/speciesresponse.cpp
/src/iland/version.cpp
/src/output/productionout.cpp
|
| 328 |
5417d 05h |
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 05h |
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 08h |
werner |
/src/ |
tree output (tracker#7) added position |
|
/src/core/tree.cpp
/src/output/treeout.cpp
|
| 300 |
5433d 12h |
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 11h |
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 16h |
werner |
/src/ |
stressIndex in TreeOut, deactivated DBGMODE makros |
|
/src/core/tree.cpp
/src/output/treeout.cpp
|
| 278 |
5462d 16h |
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 22h |
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 |
5465d 01h |
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 16h |
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 15h |
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 |
5467d 00h |
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 |
5467d 01h |
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 02h |
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
|
| 257 |
5468d 00h |
werner |
/src/ |
added production based (tree) statistics.
StandOut after tree initialization.
some documentation polishing. |
|
/src/core/model.cpp
/src/core/production3pg.h
/src/core/resourceunit.cpp
/src/core/species.h
/src/core/speciesresponse.cpp
/src/core/standstatistics.cpp
/src/core/standstatistics.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/output/output.cpp
/src/output/output.h
/src/output/standout.cpp
/src/tools/globalsettings.h
|
| 254 |
5468d 22h |
werner |
/src/ |
menu entry in apps main menu to copy the wiki-style description of output tables to the clipboard. |
|
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/mainwindow.ui
/src/output/output.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/output/outputmanager.h
|
| 253 |
5468d 22h |
werner |
/src/output/ |
added a "toWiki"-function that create a wiki-style-format string from output table descriptions. |
|
/src/output/output.cpp
/src/output/output.h
|
| 251 |
5468d 22h |
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
|
| 232 |
5474d 02h |
werner |
/src/output/ |
Outputs: strange insert performance behavior and locks when re-running the model. finally, old inserter-statements are finish()-ed to clear all locks. |
|
/src/output/output.cpp
/src/output/outputmanager.cpp
/src/output/outputmanager.h
|
| 231 |
5474d 14h |
werner |
/src/ |
3pg model, strange behavior of database. Modified the transaction logic (really important for SQLite), but still shows odd behavior. |
|
/src/core/resourceunit.cpp
/src/iland/iland.pro
/src/output/output.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/output/outputmanager.h
/src/output/productionout.cpp
/src/tools/expressionwrapper.cpp
/src/tools/globalsettings.cpp
|
| 230 |
5474d 16h |
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
|
| 229 |
5474d 19h |
werner |
/src/ |
3pg model. fixed a problem with the setup of ResourceUnitSpecies (a classic: a pointer to a vector, which is still growing... grrrrr.... it took hours to find) |
|
/src/core/climate.cpp
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/resourceunitspecies.h
/src/core/speciesresponse.cpp
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/output/output.cpp
|
| 228 |
5475d 21h |
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
|
| 225 |
5476d 00h |
werner |
/src/ |
Run/Pause/Stop, etc. in ModelController. |
|
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/mainwindow.ui
/src/output/outputmanager.cpp
|
| 223 |
5479d 20h |
werner |
/src/ |
Model Pause, Model restart,etc. (wamod little hack) |
|
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/tests.cpp
/src/output/outputmanager.cpp
/src/tools/helper.h
|
| 222 |
5480d 01h |
werner |
/src/ |
* outputs: delayed commits of transactions. transactions are commited (and thus written to disk) at the end of run
* improved the "remotecontrol", added signals and slots to indicate progress... |
|
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/output/output.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/output/outputmanager.h
|
| 218 |
5480d 19h |
werner |
/src/ |
added "p5", "p95", etc for dynamic stand outputs. |
|
/src/core/modelcontroller.cpp
/src/output/dynamicstandout.cpp
|
| 207 |
5483d 02h |
werner |
/src/ |
nasty bug, if expressions contain(ed) newline characters. now fixed (newline considered as whitespace and removed).
changed output so it is always checked, if outputs are valid w.r.t. the mIndex position. |
|
/src/core/model.h
/src/core/tree.cpp
/src/iland/tests.cpp
/src/output/dynamicstandout.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/tools/expression.cpp
|