| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 720 |
4532d 00h |
werner |
/trunk/src/ |
fixed a problem when trees died in disturbance and the (unupdated) statistics were used (e.g. the LAI for calculating the water cycle). Now for affected resource units, not only the treelists but also the RU-statistics are updated.
implemented a "radiating" mechanism of border cells. If stand-grid-cells (i.e. 10m height grid resolution) are marked as "outside and forest", then the cells "radiate" some influence on the LIF into the project area. Thus, trees on the edge of the project do *not* have properties of trees standing on a stand edge. Currently, the form/amount of this edge-effect is hard coded. |
|
/trunk/src/core/climate.cpp
/trunk/src/core/climate.h
/trunk/src/core/model.cpp
/trunk/src/core/model.h
/trunk/src/core/phenology.cpp
/trunk/src/core/resourceunit.cpp
/trunk/src/core/resourceunit.h
/trunk/src/core/resourceunitspecies.h
/trunk/src/core/tree.cpp
/trunk/src/core/watercycle.cpp
/trunk/src/iland/mainwindow.cpp
/trunk/src/iland/version.cpp
|
| 639 |
4797d 04h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable
/trunk/src
/executable
/src
|
| 600 |
4867d 00h |
werner |
/src/ |
corrected grid export (flipping of y-axis)
added initialization of saplings; StandLoader contains now a routine similar to the one for larger trees to distribute saplings; additionally, a script function (Globals.addSaplingsOnStand()) can be used to use this functionality. |
|
/src/core/grid.h
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/resourceunitspecies.h
/src/core/sapling.cpp
/src/core/sapling.h
/src/core/speciesset.h
/src/core/standloader.cpp
/src/core/standloader.h
/src/tools/mapgrid.cpp
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
|
| 521 |
4957d 08h |
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
|
| 504 |
4987d 03h |
werner |
/src/ |
New output for "saplings" |
|
/src/output/saplingout.cpp
/src/output/saplingout.h
/src/core/model.cpp
/src/core/resourceunitspecies.h
/src/core/sapling.cpp
/src/core/sapling.h
/src/core/standstatistics.cpp
/src/core/watercycle.cpp
/src/iland/iland.pro
/src/output/outputmanager.cpp
|
| 475 |
5008d 09h |
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
|
| 469 |
5013d 00h |
werner |
/ |
update contains some fixes in regeneration/sapling growth model.
contains also a beta-version of the snag dynamics sub module. |
|
/executable/iland.exe
/src/core/resourceunitspecies.h
/src/iland/version.cpp
|
| 468 |
5013d 07h |
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
|
| 462 |
5014d 00h |
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 |
5063d 10h |
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 |
5063d 23h |
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 |
5064d 08h |
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 |
5064d 10h |
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 |
5064d 11h |
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 |
5117d 08h |
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 |
5118d 05h |
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 |
5183d 11h |
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 |
5190d 08h |
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 |
5190d 11h |
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 |
5190d 13h |
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
|