Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
475 |
5016d 19h |
werner |
/src/ |
* Snag dynamics
debug output "SnagDynamics"
life cycle of Snag objects
include Snag Dynamics in newYear / year end routines
* threadrunner.cpp: parallel execution of species related tasks, e.g. the seed dispersal. In the current form, the ThreadRunner is much nicer:
ThreadRunner runner(mActiveSpecies);
runner.run(func_ptr); |
|
/src/core/model.cpp /src/core/resourceunit.cpp /src/core/resourceunitspecies.cpp /src/core/resourceunitspecies.h /src/core/snag.cpp /src/core/snag.h /src/core/species.h /src/core/speciesset.cpp /src/core/threadrunner.cpp /src/core/threadrunner.h /src/tools/globalsettings.cpp /src/tools/globalsettings.h
|
461 |
5022d 14h |
werner |
/src/core/ |
fixed a bug in bookkeeping values from saplings per ru (average height/average age). little refactoring and improvement of code that deals with "SaplingMaps". |
|
/src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/sapling.cpp
|
455 |
5071d 20h |
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
|
454 |
5071d 20h |
werner |
/src/ |
improvements of regeneration/establishment. Looking for bug that stems obviously from copy-constructor problems (resourceUnitSpecies). |
|
/src/core/establishment.cpp /src/core/model.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/resourceunitspecies.h /src/core/sapling.cpp /src/core/sapling.h /src/core/species.cpp /src/core/standstatistics.cpp /src/core/standstatistics.h /src/tools/expressionwrapper.cpp
|
453 |
5072d 09h |
werner |
/src/ |
sapling growth now in a basic working state. started to implement recruitment. One bug with the "maximum-establishment-height-grid" known.
added also visualization of regeneration layer. Once I have time, I should restructure the drawing/visualization code as it gets quirky (and a paper-concept is available...) |
|
/src/core/grid.h /src/core/resourceunit.cpp /src/core/resourceunitspecies.cpp /src/core/resourceunitspecies.h /src/core/sapling.cpp /src/core/sapling.h /src/core/species.cpp /src/core/species.h /src/core/standstatistics.cpp /src/core/standstatistics.h /src/iland/mainwindow.cpp /src/iland/mainwindow.h /src/tools/expressionwrapper.cpp
|
452 |
5072d 15h |
werner |
/src/ |
searching for a bug in the sapling growth.... |
|
/src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/resourceunitspecies.cpp /src/core/sapling.cpp /src/core/species.cpp /src/iland/mainwindow.cpp /src/iland/mainwindow.ui
|
451 |
5072d 18h |
werner |
/src/ |
further development of sapling growth |
|
/src/core/establishment.cpp /src/core/model.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/resourceunitspecies.cpp /src/core/resourceunitspecies.h /src/core/sapling.cpp /src/core/sapling.h /src/tools/globalsettings.cpp
|
450 |
5072d 20h |
werner |
/src/core/ |
implementing sapling growth... |
|
/src/core/model.cpp /src/core/resourceunit.cpp /src/core/resourceunitspecies.cpp /src/core/resourceunitspecies.h /src/core/sapling.cpp /src/core/sapling.h /src/core/species.h
|
438 |
5126d 15h |
werner |
/src/ |
new GridRunner class to iterate nicely over grids with different sizes.
establishment.cpp: started to integrate the whole regeneration process (including "lazy" calculation of 3pg (only if necessary)). |
|
/src/core/establishment.cpp /src/core/grid.h /src/core/model.h /src/core/resourceunit.cpp /src/core/resourceunitspecies.cpp /src/core/resourceunitspecies.h /src/iland/mainwindow.cpp /src/iland/tests.cpp /src/iland/tests.h
|
436 |
5126d 18h |
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
|
431 |
5151d 10h |
werner |
/src/ |
included the logLevel-Functions at several locations in the source code.
added a option to only display debug messages in the DebugTimer destructor when elapsed time is longer than one millisecond. |
|
/src/core/global.h /src/core/model.cpp /src/core/modelcontroller.cpp /src/core/modelsettings.cpp /src/core/resourceunit.cpp /src/core/standloader.cpp /src/core/watercycle.cpp /src/iland/tests.cpp /src/tools/globalsettings.cpp /src/tools/helper.cpp /src/tools/helper.h
|
376 |
5191d 21h |
werner |
/src/ |
calculation of an average value for aging at resource unit level.
added variable 'aging' for resource units.
changed comments. |
|
/src/core/model.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/resourceunitspecies.cpp /src/core/resourceunitspecies.h /src/core/species.cpp /src/core/tree.cpp /src/tools/expression.cpp /src/tools/expressionwrapper.cpp
|
370 |
5198d 19h |
werner |
/src/ |
* expansion of the logwindow on the mainwindow
* bug with multi threading: serialization using QMutexLocker when attempting to write/print the debug outputs.
* enabled painting of the visuals in modelcontroller.cpp (re-enabled??)
* changed the threshold for multi threading to 6 resource-units
* optimized StatData-class to avoid unnecessary calculations of percentiles
* several comments |
|
/src/core/model.cpp /src/core/modelcontroller.cpp /src/core/resourceunit.cpp /src/core/resourceunitspecies.h /src/core/threadrunner.cpp /src/iland/mainwindow.cpp /src/iland/mainwindow.ui /src/tools/globalsettings.h /src/tools/helper.cpp /src/tools/helper.h
|
369 |
5198d 22h |
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 |
5198d 23h |
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
|
331 |
5329d 09h |
werner |
/ |
changed order in which statistics are calculated: statistics of species and RUs are now cleared immediately before they are refilled (during the growth of individual trees). Now steps between (e.g. water-cycle) can access valid statistics (that are essentially the state of the end of the last year) |
|
/executable /src/core/model.cpp /src/core/resourceunit.cpp /src/core/watercycle.cpp
|
298 |
5351d 14h |
werner |
/src/core/ |
comments |
|
/src/core/resourceunit.cpp /src/core/speciesset.cpp /src/core/tree.cpp
|
287 |
5372d 05h |
werner |
/src/ |
Tree initialization (random variant). works almost... |
|
/src/core/global.h /src/core/model.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/standloader.cpp /src/core/standloader.h /src/core/tree.h /src/tools/sqlhelper.cpp /src/tools/sqlhelper.h
|
281 |
5374d 05h |
werner |
/src/ |
setup of the world - remodeled the init-routine in Model, changed the init of stands (also some xml-keys). added a storage for variables local to rseource units (e.g. nitrogenAvailable). |
|
/src/core/environment.cpp /src/core/environment.h /src/core/exception.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/speciesresponse.cpp /src/core/standloader.cpp /src/core/standloader.h /src/core/watercycle.cpp /src/iland/tests.cpp
|
280 |
5374d 11h |
werner |
/src/ |
Creation of the "Environment" class (loading of the "world" into iLand).
- added setter-functions to XmlHelper
- added auxiliary functions to CSVFile
- smaller changes to a bunch of other files. |
|
/src/core/climate.cpp /src/core/climate.h /src/core/environment.cpp /src/core/environment.h /src/core/model.cpp /src/core/production3pg.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/iland/mainwindow.cpp /src/iland/tests.cpp /src/iland/tests.h /src/tools/csvfile.cpp /src/tools/csvfile.h /src/tools/xmlhelper.cpp /src/tools/xmlhelper.h
|
278 |
5375d 02h |
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 |
5375d 08h |
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
|
265 |
5379d 02h |
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 11h |
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 10h |
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 08h |
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 07h |
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 09h |
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 |
5387d 00h |
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 |
5387d 02h |
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 05h |
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 08h |
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 |
5394d 01h |
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 11h |
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 14h |
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 07h |
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 |
5401d 00h |
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 |
5401d 00h |
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 04h |
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 12h |
werner |
/src/core/ |
code cleanup/refactoring on Tree. |
|
/src/core/model.cpp /src/core/ressourceunit.cpp /src/core/tree.cpp /src/core/tree.h
|