Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
265 |
5378d 21h |
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
|
262 |
5379d 06h |
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
|
257 |
5380d 05h |
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
|
251 |
5381d 04h |
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
|
241 |
5385d 02h |
werner |
/src/core/ |
watercycle within the model sequence. |
|
/src/core/climate.cpp /src/core/model.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/watercycle.cpp
|
240 |
5385d 05h |
werner |
/src/ |
water cycle yields first results.
implemented a "createStandStatistics()" function, that calculates stocked areas, and statistics after initialization and before the actual model run. |
|
/src/core/climate.h /src/core/model.cpp /src/core/model.h /src/core/modelsettings.cpp /src/core/modelsettings.h /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/standstatistics.cpp /src/core/standstatistics.h /src/core/watercycle.cpp /src/core/watercycle.h /src/iland/mainwindow.cpp /src/iland/tests.cpp /src/iland/tests.h /src/tools/globalsettings.cpp
|
231 |
5386d 19h |
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 |
5386d 22h |
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 |
5387d 00h |
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
|
226 |
5388d 03h |
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
|
215 |
5393d 20h |
werner |
/src/core/ |
distribution of GPP - what a mess... |
|
/src/core/production3pg.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/tree.cpp
|
208 |
5395d 06h |
werner |
/src/core/ |
included "Climate" in the model (i.e. list of climates in Model, climate ptr in resource unit, call of response calculation in production(). |
|
/src/core/climate.cpp /src/core/climate.h /src/core/model.cpp /src/core/model.h /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/resourceunitspecies.h /src/core/speciesresponse.cpp
|
205 |
5395d 09h |
werner |
/src/ |
added LightResponse function (modelsettings) to allow examination of various options for the distribution of NPP. |
|
/src/core/modelsettings.cpp /src/core/modelsettings.h /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/tree.cpp /src/tools/expression.h
|
200 |
5399d 02h |
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 |
5400d 19h |
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
|
188 |
5400d 20h |
werner |
/src/core/ |
rename ressoure files. |
|
/src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/resourceunitspecies.cpp /src/core/resourceunitspecies.h
/src/core/ressourceunit.cpp /src/core/ressourceunit.h /src/core/ressourceunitspecies.cpp /src/core/ressourceunitspecies.h
|
180 |
5402d 00h |
werner |
/src/ |
created StandStatistics (similar to the solution in Picus). Each tree adds itself to the statistics object of RU x species. During yearEnd() of RessourceUnit the data is aggregated for the whole stand. |
|
/src/core/standstatistics.cpp /src/core/standstatistics.h
/src/core/model.cpp /src/core/ressourceunit.cpp /src/core/ressourceunit.h /src/core/ressourceunitspecies.h /src/core/tree.cpp /src/core/tree.h /src/iland/iland.pro
|
158 |
5411d 07h |
werner |
/src/core/ |
code cleanup/refactoring on Tree. |
|
/src/core/model.cpp /src/core/ressourceunit.cpp /src/core/tree.cpp /src/core/tree.h
|
157 |
5412d 02h |
werner |
/src/ |
cleaning of memory after trees died; this had some impacts on AllTreeIterator and some other places.
added a "Tests" class to combine some simple tests. |
|
/src/iland/tests.cpp /src/iland/tests.h
/src/core/global.h /src/core/model.cpp /src/core/model.h /src/core/ressourceunit.cpp /src/core/ressourceunit.h /src/core/tree.cpp /src/core/tree.h /src/iland/iland.pro /src/iland/mainwindow.cpp /src/tools/expression.cpp /src/tools/expressionwrapper.cpp
|
153 |
5413d 02h |
werner |
/src/ |
partitioning - corrected error w.r.t. units of diameter (rather tricky)
- now everything is calculated using meters.
wipe() of Grid does *not* work correctly with values != 0 (so returned
to initialize() for the grid itself). |
|
/src/core/grid.h /src/core/model.cpp /src/core/ressourceunit.cpp /src/core/species.cpp /src/core/threadrunner.cpp /src/core/tree.cpp /src/iland/mainwindow.cpp
|