| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 462 |
5020d 18h |
werner |
/src/core/ |
if a sapling of a species is already present at a specific location (i.e.: pixel), than no other cohort of that species can regenerate on that pixel.
new function: hasSaplingAt(). |
|
/src/core/establishment.cpp
/src/core/resourceunitspecies.cpp
/src/core/resourceunitspecies.h
/src/core/sapling.cpp
/src/core/sapling.h
|
| 454 |
5070d 04h |
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 |
5070d 17h |
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
|
| 451 |
5071d 01h |
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 |
5071d 04h |
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
|
| 449 |
5071d 05h |
werner |
/src/ |
start of implementation of sapling growth.
setup of the temporal height-map for saplings. |
|
/src/core/sapling.cpp
/src/core/sapling.h
/src/core/resourceunit.h
/src/core/resourceunitspecies.h
/src/core/species.cpp
/src/core/species.h
/src/core/tree.h
/src/iland/iland.pro
/src/tools/globalsettings.h
|
| 440 |
5124d 02h |
werner |
/src/core/ |
climate: added a pre-calculated value for the 10.5hrs day
including establishment calculation in the normal execution path. |
|
/src/core/climate.cpp
/src/core/climate.h
/src/core/establishment.cpp
/src/core/establishment.h
/src/core/model.cpp
/src/core/model.h
/src/core/phenology.cpp
/src/core/production3pg.cpp
/src/core/resourceunitspecies.cpp
/src/core/resourceunitspecies.h
/src/core/threadrunner.cpp
/src/core/threadrunner.h
|
| 438 |
5124d 23h |
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
|
| 376 |
5190d 04h |
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 |
5197d 02h |
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 |
5197d 05h |
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 |
5197d 06h |
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
|
| 278 |
5373d 10h |
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 |
5373d 15h |
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
|
| 262 |
5377d 18h |
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
|
| 234 |
5384d 12h |
werner |
/src/core/ |
added (during dev. of watercycle) new properties: area() to ResourceUnit, leafArea() to Tree, added LAI-counting to StandStatistics. |
|
/src/core/climate.h
/src/core/resourceunit.h
/src/core/resourceunitspecies.h
/src/core/standstatistics.cpp
/src/core/standstatistics.h
/src/core/tree.h
|
| 230 |
5385d 10h |
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 |
5385d 12h |
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 |
5386d 14h |
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
|
| 226 |
5386d 15h |
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
|
| 209 |
5393d 13h |
werner |
/src/ |
Environmental responses:
VPD, Temperature, CO2, Nitrogen |
|
/src/core/climate.cpp
/src/core/climate.h
/src/core/resourceunitspecies.h
/src/core/species.cpp
/src/core/species.h
/src/core/speciesresponse.cpp
/src/core/speciesresponse.h
/src/core/speciesset.cpp
/src/core/speciesset.h
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/iland/tests.h
|
| 208 |
5393d 18h |
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
|
| 193 |
5398d 15h |
werner |
/src/ |
started species responses (vpd, etc.) and subsequently the climate database loading stuff. |
|
/src/core/climate.cpp
/src/core/climate.h
/src/core/speciesresponse.cpp
/src/core/speciesresponse.h
/src/core/model.cpp
/src/core/production3pg.h
/src/core/resourceunitspecies.h
/src/iland/iland.pro
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/iland/tests.h
/src/tools/globalsettings.h
|
| 188 |
5399d 08h |
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
|
| 187 |
5399d 08h |
iland |
/src/ |
wow. Ressource is correctly spelled as Resource. I jerk. |
|
/src/core/global.h
/src/core/model.cpp
/src/core/production3pg.h
/src/core/ressourceunit.h
/src/core/ressourceunitspecies.cpp
/src/core/ressourceunitspecies.h
/src/core/standloader.cpp
/src/core/standloader.h
/src/core/threadrunner.cpp
/src/core/threadrunner.h
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/iland/management.cpp
/src/iland/tests.cpp
/src/tools/expressionwrapper.cpp
/src/tools/expressionwrapper.h
/src/tools/xmlhelper.h
|
| 182 |
5399d 19h |
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
|
| 180 |
5400d 12h |
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
|
| 115 |
5421d 14h |
Werner |
/src/core/ |
moved 3PG class to RessourceUnitSpecies. |
|
/src/core/production3pg.cpp
/src/core/production3pg.h
/src/core/ressourceunit.cpp
/src/core/ressourceunitspecies.h
/src/core/tree.cpp
/src/core/tree.h
|
| 113 |
5421d 16h |
Werner |
/src/ |
started Production3PG-class which couples the (stand-level) production.
implemented zooming and panning in Viewport (this is always a hell of a job) |
|
/src/core/production3pg.cpp
/src/core/production3pg.h
/src/core/model.cpp
/src/core/ressourceunit.cpp
/src/core/ressourceunit.h
/src/core/ressourceunitspecies.h
/src/core/standloader.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/fonstudio/fonstudio.pro
/src/fonstudio/mainwindow.cpp
/src/fonstudio/mainwindow.h
/src/fonstudio/paintarea.cpp
/src/fonstudio/paintarea.h
/src/tools/helper.cpp
/src/tools/helper.h
|
| 111 |
5422d 16h |
Werner |
/src/ |
added "RessourceUnitSpecies" (included setup and access functions). Each species has now a numeric index which is used to construct vectors of RessourceUnitSpecies per RessourceUnit. |
|
/src/core/ressourceunitspecies.cpp
/src/core/ressourceunitspecies.h
/src/core/ressourceunit.cpp
/src/core/ressourceunit.h
/src/core/species.h
/src/core/speciesset.cpp
/src/core/speciesset.h
/src/core/tree.cpp
/src/core/tree.h
/src/fonstudio/fonstudio.pro
|