| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 299 |
5440d 20h |
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 |
5466d 01h |
werner |
/src/ |
stressIndex in TreeOut, deactivated DBGMODE makros |
|
/src/core/tree.cpp
/src/output/treeout.cpp
|
| 278 |
5466d 01h |
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 |
5466d 07h |
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 |
5468d 10h |
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 |
5469d 01h |
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 |
5470d 01h |
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 |
5470d 09h |
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 |
5470d 10h |
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 |
5470d 12h |
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 |
5471d 09h |
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 |
5472d 07h |
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 |
5472d 07h |
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 |
5472d 07h |
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 |
5477d 11h |
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 |
5477d 23h |
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 |
5478d 01h |
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 |
5478d 04h |
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 |
5479d 06h |
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 |
5479d 09h |
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 |
5483d 05h |
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 |
5483d 10h |
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 |
5484d 04h |
werner |
/src/ |
added "p5", "p95", etc for dynamic stand outputs. |
|
/src/core/modelcontroller.cpp
/src/output/dynamicstandout.cpp
|
| 207 |
5486d 11h |
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
|
| 200 |
5490d 06h |
werner |
/src/ |
added "ModelSettings", i.e. a high performant storage for model settings, further spelling resource vs ressource, including the "batch" job feature from fonstudio into iland. added a slot for MainWindow to force a repaint. and much more. |
|
/src/core/management.cpp
/src/core/management.h
/src/core/modelsettings.cpp
/src/core/modelsettings.h
/src/iland/management.cpp
/src/iland/management.h
/src/core/model.cpp
/src/core/model.h
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/threadrunner.cpp
/src/core/threadrunner.h
/src/core/tree.cpp
/src/fonstudio/fonstudio.pro
/src/fonstudio/mainwindow.cpp
/src/iland/iland.pro
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/tests.cpp
/src/iland/tests.h
/src/output/outputmanager.cpp
/src/tools/expressionwrapper.h
|
| 189 |
5491d 23h |
iland |
/src/ |
finished ressource vs. resource struggle, some cleanup within xml file
reading. |
|
/src/core/model.cpp
/src/core/model.h
/src/core/production3pg.cpp
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/resourceunitspecies.cpp
/src/core/standloader.cpp
/src/core/tree.cpp
/src/iland/iland.pro
/src/iland/mainwindow.cpp
/src/iland/management.cpp
/src/iland/tests.cpp
/src/output/dynamicstandout.cpp
/src/output/standout.cpp
/src/output/treeout.cpp
/src/tools/expressionwrapper.cpp
/src/tools/globalsettings.cpp
/src/tools/globalsettings.h
/src/tools/xmlhelper.cpp
|
| 184 |
5492d 06h |
werner |
/src/ |
DynamicStandOut: output on stand level based on aggregates (sum, mean, ...) on a set of trees.very neat. stripped column names for tables (no special characters), filter for ressource-units,... |
|
/src/core/model.cpp
/src/output/dynamicstandout.cpp
/src/output/dynamicstandout.h
/src/output/output.cpp
/src/output/outputmanager.cpp
/src/output/standout.h
/src/tools/expressionwrapper.h
|
| 183 |
5492d 10h |
werner |
/src/ |
Added isEmpty() for Expression. Added new output DynamicStandOutput. New wrapper for RessourceUnits. Everything is in its right place ;) |
|
/src/output/dynamicstandout.cpp
/src/output/dynamicstandout.h
/src/core/ressourceunit.h
/src/iland/iland.pro
/src/output/standout.h
/src/output/treeout.cpp
/src/tools/expression.cpp
/src/tools/expression.h
/src/tools/expressionwrapper.cpp
/src/tools/expressionwrapper.h
|
| 182 |
5492d 11h |
werner |
/src/ |
stand statistics - work now, outputs can be enabled/disabled in config file |
|
/src/core/model.cpp
/src/core/ressourceunitspecies.h
/src/core/standstatistics.h
/src/output/outputmanager.cpp
/src/output/standout.cpp
|
| 181 |
5492d 12h |
werner |
/src/ |
outputs |
|
/src/output/output.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/output/outputmanager.h
/src/tools/xmlhelper.cpp
/src/tools/xmlhelper.h
|
| 179 |
5493d 04h |
werner |
/src/ |
added standoutput (accompanied by some changes at other places) |
|
/src/output/standout.cpp
/src/output/standout.h
/src/core/ressourceunit.h
/src/core/species.h
/src/core/speciesset.cpp
/src/core/speciesset.h
/src/iland/iland.pro
/src/output/output.h
/src/output/outputmanager.cpp
|
| 178 |
5493d 05h |
werner |
/src/ |
fonstudio compiles again... |
|
/src/fonstudio/fonstudio.pro
/src/fonstudio/mainwindow.cpp
/src/fonstudio/mainwindow.h
/src/output/outputmanager.cpp
|
| 177 |
5493d 06h |
werner |
/src/output/ |
documentation of outputs |
|
/src/output/output.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/output/treeout.cpp
|
| 176 |
5493d 06h |
werner |
/src/ |
getting database oriented outputs to work |
|
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/iland/mainwindow.cpp
/src/output/output.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/output/outputmanager.h
/src/output/treeout.cpp
/src/tools/globalsettings.cpp
/src/tools/globalsettings.h
|
| 175 |
5495d 10h |
werner |
/src/output/ |
use a QSharedPointer for the filter expression. |
|
/src/output/treeout.cpp
/src/output/treeout.h
|
| 173 |
5496d 01h |
werner |
/src/output/ |
created basic output structure (Output, OutputManager) as well as a test output |
|
/src/output
/src/output/output.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/output/outputmanager.h
/src/output/treeout.cpp
/src/output/treeout.h
|