Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
605 |
4872d 06h |
werner |
/src/ |
added the "rid" (i.e. a unique id per resource unit) in various debug outputs.
added the "shell" of a new carbonflow output. |
|
/src/output/carbonflowout.cpp /src/output/carbonflowout.h
/src/core/resourceunit.cpp /src/core/resourceunitspecies.cpp /src/core/snag.cpp /src/core/speciesresponse.cpp /src/core/watercycle.cpp /src/iland/iland.pro /src/output/outputmanager.cpp /src/tools/globalsettings.cpp
|
564 |
4914d 00h |
werner |
/src/ |
Improvements of the Management API and functionality.
new functionality:
* killSaplings() -> use a "MapGrid" and remove small trees specifically
* properties defining biomass remove fractions during management
Now the tree list of the management object is cleaned up after a management, i.e. successive managements without reloading the tree list are possible. |
|
/src/core/management.cpp /src/core/management.h /src/core/resourceunitspecies.cpp /src/core/sapling.cpp /src/core/sapling.h /src/core/snag.cpp /src/core/tree.cpp /src/core/tree.h /src/tools/mapgrid.cpp /src/tools/mapgrid.h
|
521 |
4963d 05h |
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
|
518 |
4982d 00h |
werner |
/src/core/ |
while fixing #513 a bug slipped in that reduced stand outputs. |
|
/src/core/model.cpp /src/core/resourceunitspecies.cpp
|
513 |
4984d 04h |
werner |
/src/core/ |
fixed a nasty bug: if one tree species succeeded to establish on a formerly empty RU, the saplings of other species were killed (well, not directly, but the environment was not recalculated leading to a f_env value of 0). |
|
/src/core/production3pg.cpp /src/core/resourceunit.cpp /src/core/resourceunitspecies.cpp /src/core/tree.cpp
|
496 |
5010d 07h |
werner |
/src/core/ |
changed the behavior of the water-cycle wrt establishment: now the water cycle is executed even if no adult trees are on a resource unit |
|
/src/core/resourceunit.cpp /src/core/resourceunitspecies.cpp /src/core/watercycle.cpp /src/core/watercycle.h
|
490 |
5011d 08h |
werner |
/src/core/ |
added calculation of the climate indicator "re" used for snag dynamics (decay rate). |
|
/src/core/climate.h /src/core/grid.h /src/core/resourceunitspecies.cpp /src/core/snag.cpp /src/core/snag.h /src/core/watercycle.h
|
477 |
5014d 05h |
werner |
/src/ |
testing and refining snag dynamics (esp. debug outputs) |
|
/src/core/resourceunitspecies.cpp /src/core/snag.cpp /src/core/snag.h /src/iland/mainwindow.cpp /src/iland/mainwindow.h /src/iland/mainwindow.ui /src/tools/globalsettings.cpp
|
475 |
5014d 06h |
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
|
471 |
5018d 10h |
werner |
/src/ |
added "refRatio" to debug output for establishment. |
|
/src/core/resourceunitspecies.cpp /src/tools/globalsettings.cpp
|
468 |
5019d 04h |
werner |
/src/ |
starting the implementation of the snag dynamics submodule.
New class: Snag
added Snag to ResourceUnitSpecies
added links to Snag in Tree |
|
/src/core/snag.cpp /src/core/snag.h
/src/core/model.cpp /src/core/modelsettings.h /src/core/resourceunitspecies.cpp /src/core/resourceunitspecies.h /src/core/tree.cpp /src/iland/iland.pro
|
466 |
5019d 10h |
werner |
/src/ |
added fields to establishment debug output. |
|
/src/core/resourceunitspecies.cpp /src/core/sapling.cpp /src/core/sapling.h /src/core/standstatistics.cpp /src/core/standstatistics.h /src/tools/globalsettings.cpp
|
462 |
5019d 22h |
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
|
458 |
5034d 23h |
werner |
/src/ |
some minor documentation things. |
|
/src/core/resourceunitspecies.cpp /src/core/sapling.cpp /src/core/sapling.h /src/iland/version.cpp /src/tools/globalsettings.cpp
|
453 |
5069d 20h |
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 |
5070d 02h |
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 |
5070d 05h |
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 |
5070d 07h |
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
|
442 |
5122d 01h |
werner |
/src/ |
Debug output for establishment. |
|
/src/core/establishment.cpp /src/core/establishment.h /src/core/model.cpp /src/core/resourceunitspecies.cpp /src/iland/mainwindow.cpp /src/iland/mainwindow.h /src/iland/mainwindow.ui /src/tools/globalsettings.cpp /src/tools/globalsettings.h
|
440 |
5123d 05h |
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 02h |
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 |
5189d 08h |
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
|
369 |
5196d 09h |
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
|
278 |
5372d 13h |
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 |
5372d 19h |
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
|
247 |
5381d 17h |
werner |
/src/ |
global script object (ScriptGlobal).
Doxygen documentation refinements. |
|
/src/iland/maindoc.cpp /src/tools/scriptglobal.cpp /src/tools/scriptglobal.h
/src/core/climate.cpp /src/core/grid.h /src/core/management.cpp /src/core/model.cpp /src/core/resourceunitspecies.cpp /src/core/species.cpp /src/core/speciesresponse.cpp /src/core/stampcontainer.h /src/core/standloader.cpp /src/core/tree.h /src/iland/iland.pro /src/tools/climateconverter.cpp /src/tools/expression.cpp /src/tools/globalsettings.cpp
|
235 |
5383d 15h |
werner |
/src/core/ |
setup function |
|
/src/core/resourceunitspecies.cpp
|
230 |
5384d 13h |
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 |
5384d 16h |
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 |
5385d 19h |
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
|
189 |
5398d 10h |
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 |
5398d 11h |
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 |
5398d 11h |
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
|
111 |
5421d 19h |
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
|