Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
734 |
4469d 23h |
werner |
/trunk/src/ |
small "fixes" (or tries to fix) as iLand is still crashing... |
|
/trunk/src/core/model.cpp /trunk/src/core/model.h /trunk/src/core/resourceunit.cpp /trunk/src/core/standloader.cpp /trunk/src/iland/mainwindow.cpp /trunk/src/output/carbonout.cpp
|
720 |
4535d 13h |
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
|
697 |
4596d 16h |
werner |
/trunk/ |
Doxygen documentation revisited.
After re-establishing doxygen documentation (last update: 2009) a lot of smaller/medium documentation fixes.
Documentation is something that could definitely be always improved ;) |
|
/trunk/doc /trunk/doc/iland_doxyfile.doxy
/trunk/src/core/environment.cpp /trunk/src/core/grid.h /trunk/src/core/layeredgrid.h /trunk/src/core/management.cpp /trunk/src/core/model.cpp /trunk/src/core/modelcontroller.cpp /trunk/src/core/phenology.cpp /trunk/src/core/production3pg.cpp /trunk/src/core/resourceunit.cpp /trunk/src/core/resourceunitspecies.cpp /trunk/src/core/sapling.cpp /trunk/src/core/seeddispersal.cpp /trunk/src/core/snag.cpp /trunk/src/core/soil.cpp /trunk/src/core/species.cpp /trunk/src/core/speciesresponse.cpp /trunk/src/core/speciesset.cpp /trunk/src/core/stamp.h /trunk/src/core/stampcontainer.h /trunk/src/core/standloader.cpp /trunk/src/core/standstatistics.cpp /trunk/src/core/tree.cpp /trunk/src/core/watercycle.cpp /trunk/src/core/watercycle.h /trunk/src/iland/maindoc.cpp /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/fire/firemodule.h /trunk/src/plugins/fire/firescript.cpp /trunk/src/tools/csvfile.cpp /trunk/src/tools/dem.h /trunk/src/tools/expressionwrapper.cpp /trunk/src/tools/gisgrid.cpp /trunk/src/tools/mapgrid.cpp /trunk/src/tools/scriptglobal.cpp /trunk/src/tools/sqlhelper.cpp
|
671 |
4639d 20h |
werner |
/trunk/src/ |
Necessary changes for GPL licence (i.e. headers in all source files) |
|
/trunk/src/core/climate.cpp /trunk/src/core/climate.h /trunk/src/core/environment.cpp /trunk/src/core/environment.h /trunk/src/core/establishment.cpp /trunk/src/core/establishment.h /trunk/src/core/exception.h /trunk/src/core/global.h /trunk/src/core/grid.h /trunk/src/core/layeredgrid.h /trunk/src/core/management.cpp /trunk/src/core/management.h /trunk/src/core/model.cpp /trunk/src/core/model.h /trunk/src/core/modelcontroller.cpp /trunk/src/core/modelcontroller.h /trunk/src/core/modelsettings.cpp /trunk/src/core/modelsettings.h /trunk/src/core/phenology.cpp /trunk/src/core/phenology.h /trunk/src/core/plugin_interface.h /trunk/src/core/production3pg.cpp /trunk/src/core/production3pg.h /trunk/src/core/resourceunit.cpp /trunk/src/core/resourceunit.h /trunk/src/core/sapling.cpp /trunk/src/core/sapling.h /trunk/src/core/seeddispersal.cpp /trunk/src/core/seeddispersal.h /trunk/src/core/snag.cpp /trunk/src/core/snag.h /trunk/src/core/soil.cpp /trunk/src/core/soil.h /trunk/src/core/species.cpp /trunk/src/core/species.h /trunk/src/core/speciesresponse.cpp /trunk/src/core/speciesresponse.h /trunk/src/core/speciesset.cpp /trunk/src/core/speciesset.h /trunk/src/core/stamp.cpp /trunk/src/core/stamp.h /trunk/src/core/stampcontainer.cpp /trunk/src/core/stampcontainer.h /trunk/src/core/standloader.cpp /trunk/src/core/standloader.h /trunk/src/core/standstatistics.cpp /trunk/src/core/standstatistics.h /trunk/src/core/threadrunner.cpp /trunk/src/core/threadrunner.h /trunk/src/core/timeevents.cpp /trunk/src/core/timeevents.h /trunk/src/core/tree.cpp /trunk/src/core/tree.h /trunk/src/core/watercycle.cpp /trunk/src/core/watercycle.h /trunk/src/iland/aboutdialog.cpp /trunk/src/iland/aboutdialog.h /trunk/src/iland/aboutdialog.ui /trunk/src/iland/mainwindow.cpp /trunk/src/iland/mainwindow.h /trunk/src/iland/paintarea.cpp /trunk/src/iland/paintarea.h /trunk/src/iland/stable.h /trunk/src/iland/tests.cpp /trunk/src/iland/tests.h /trunk/src/iland/version.h /trunk/src/output/carbonflowout.cpp /trunk/src/output/carbonflowout.h /trunk/src/output/carbonout.cpp /trunk/src/output/carbonout.h /trunk/src/output/dynamicstandout.cpp /trunk/src/output/dynamicstandout.h /trunk/src/output/managementout.cpp /trunk/src/output/managementout.h /trunk/src/output/output.cpp /trunk/src/output/output.h /trunk/src/output/outputmanager.cpp /trunk/src/output/outputmanager.h /trunk/src/output/productionout.cpp /trunk/src/output/productionout.h /trunk/src/output/saplingout.cpp /trunk/src/output/saplingout.h /trunk/src/output/standdeadout.cpp /trunk/src/output/standdeadout.h /trunk/src/output/standout.cpp /trunk/src/output/standout.h /trunk/src/output/treeout.cpp /trunk/src/output/treeout.h /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/fire/firemodule.h /trunk/src/plugins/fire/fireout.cpp /trunk/src/plugins/fire/fireout.h /trunk/src/plugins/fire/fireplugin.cpp /trunk/src/plugins/fire/fireplugin.h /trunk/src/tools/climateconverter.cpp /trunk/src/tools/climateconverter.h /trunk/src/tools/csvfile.cpp /trunk/src/tools/csvfile.h /trunk/src/tools/dem.cpp /trunk/src/tools/dem.h /trunk/src/tools/expression.cpp /trunk/src/tools/expression.h /trunk/src/tools/expressionwrapper.cpp /trunk/src/tools/expressionwrapper.h /trunk/src/tools/floatingaverage.cpp /trunk/src/tools/floatingaverage.h /trunk/src/tools/gisgrid.cpp /trunk/src/tools/gisgrid.h /trunk/src/tools/globalsettings.cpp /trunk/src/tools/globalsettings.h /trunk/src/tools/helper.cpp /trunk/src/tools/helper.h /trunk/src/tools/mapgrid.cpp /trunk/src/tools/mapgrid.h /trunk/src/tools/modules.cpp /trunk/src/tools/modules.h /trunk/src/tools/random.cpp /trunk/src/tools/random.h /trunk/src/tools/scriptglobal.cpp /trunk/src/tools/scriptglobal.h /trunk/src/tools/settingmetadata.cpp /trunk/src/tools/settingmetadata.h /trunk/src/tools/sqlhelper.cpp /trunk/src/tools/sqlhelper.h /trunk/src/tools/ticktack.cpp /trunk/src/tools/ticktack.h /trunk/src/tools/xmlhelper.cpp /trunk/src/tools/xmlhelper.h
|
664 |
4681d 19h |
werner |
/trunk/src/ |
fixes in the fire module |
|
/trunk/src/core/model.cpp /trunk/src/core/resourceunit.cpp /trunk/src/core/resourceunit.h /trunk/src/core/soil.cpp /trunk/src/core/tree.cpp /trunk/src/plugins/fire/firemodule.cpp /trunk/src/tools/modules.cpp
|
662 |
4682d 20h |
werner |
/trunk/src/ |
continued to work on the fire module. Include the fire severity (i.e. mortality due to fire). This had various other impacts, e.g., on the carbon cycle of saplings. |
|
/trunk/src/core/grid.h /trunk/src/core/management.cpp /trunk/src/core/resourceunit.cpp /trunk/src/core/resourceunit.h /trunk/src/core/sapling.cpp /trunk/src/core/sapling.h /trunk/src/core/snag.h /trunk/src/core/soil.cpp /trunk/src/core/soil.h /trunk/src/output/managementout.cpp /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/fire/firemodule.h
|
639 |
4800d 17h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable /trunk/src
/executable /src
|
626 |
4852d 14h |
werner |
/src/core/ |
added some debug timers plus completed the executable directory (added the sqlite-plugin) |
|
/src/core/establishment.cpp /src/core/resourceunit.cpp /src/core/resourceunitspecies.cpp /src/core/speciesresponse.cpp /src/core/watercycle.cpp
|
611 |
4864d 13h |
werner |
/ |
new version fixing some bugs with multi-threading and the case of the full HJA simulation. |
|
/executable/iland.exe /src/core/model.cpp /src/core/phenology.cpp /src/core/resourceunit.cpp /src/core/sapling.cpp /src/core/soil.cpp /src/iland/mainwindow.cpp /src/iland/version.cpp /src/tools/globalsettings.cpp
|
609 |
4866d 00h |
werner |
/src/ |
implementing CarbonFlow output and book keeping code. |
|
/src/core/model.cpp /src/core/resourceunit.cpp /src/core/snag.cpp /src/core/snag.h /src/core/soil.cpp /src/core/soil.h /src/output/carbonflowout.cpp
|
605 |
4869d 23h |
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
|
600 |
4870d 14h |
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
|
591 |
4897d 20h |
werner |
/src/core/ |
scaled soil inputs to a 1ha size of the soil -> the soil engine always calculates with a full 1ha resource unit.
No additional scaling occures; i.e. outputs from the soil carbon in the Carbon-output need to be re-scaled! |
|
/src/core/resourceunit.cpp /src/core/soil.cpp /src/core/soil.h
|
575 |
4900d 22h |
werner |
/src/ |
* renamed toString() from IException to message() (several occurences).
* added a "name" property to the MapGridWrapper |
|
/src/core/environment.cpp /src/core/exception.h /src/core/management.cpp /src/core/model.cpp /src/core/modelcontroller.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/speciesset.cpp /src/core/standstatistics.cpp /src/iland/mainwindow.cpp /src/iland/tests.cpp /src/tools/mapgrid.cpp /src/tools/mapgrid.h /src/tools/scriptglobal.cpp /src/tools/scriptglobal.h
|
574 |
4901d 01h |
werner |
/src/ |
* modified outputs to write only rows for valid resource units
* dropped setting "woodDecompRate" (snag.cpp)
* calculate the "stockableArea" of a resource unit based on the stand grid
* use the stockableArea for calculation of LAI |
|
/src/core/grid.h /src/core/model.cpp /src/core/model.h /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/snag.cpp /src/output/dynamicstandout.cpp /src/output/managementout.cpp /src/output/productionout.cpp /src/output/saplingout.cpp /src/output/standdeadout.cpp /src/output/standout.cpp /src/tools/expressionwrapper.cpp /src/tools/globalsettings.h
|
569 |
4906d 01h |
werner |
/src/ |
added a "id" for resource units (which comes from initialization grids).
fixed a bug that ru-grids only worked well on second creation of the model. |
|
/src/core/environment.cpp /src/core/environment.h /src/core/model.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/tools/expressionwrapper.cpp
|
534 |
4955d 21h |
werner |
/src/ |
large(r) update of the soil model. Now, the 'kyl' and 'kyr' parameters (i.e. decomposition rates for the litter/wood-soil pool) are now species parameters and calculated dynamically from the litter inputs. |
|
/src/core/resourceunit.cpp /src/core/snag.cpp /src/core/snag.h /src/core/soil.cpp /src/core/soil.h /src/core/species.cpp /src/core/species.h /src/core/speciesset.cpp /src/iland/mainwindow.ui /src/iland/tests.cpp /src/tools/globalsettings.cpp
|
531 |
4959d 12h |
werner |
/src/core/ |
if dynamic availableNitrogen is enabled, a first value for Nav is calculated during setup (i.e.: one year of soil dynamics without input(!) is simulated). For this, a value of '1.0' for the pre-calculation a value for the climate-modifier 're' is assumed. |
|
/src/core/resourceunit.cpp
|
530 |
4959d 12h |
werner |
/src/ |
enabled the dynamic coupling of available nitrogen from the soil module with the "available nitrogen" (fertility rating) used for calculations of species responses. |
|
/src/core/modelsettings.cpp /src/core/modelsettings.h /src/core/resourceunit.cpp /src/core/soil.cpp /src/tools/xmlhelper.cpp
|
529 |
4959d 13h |
werner |
/src/core/ |
setup initial values for soil pools (read from XML) |
|
/src/core/resourceunit.cpp /src/core/snag.h /src/core/soil.cpp /src/core/soil.h
|
526 |
4959d 17h |
werner |
/src/ |
embedding the soil model into iLand. renamed the snag decay debug output. |
|
/src/core/model.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/snag.cpp /src/core/snag.h /src/core/soil.cpp /src/core/soil.h /src/iland/mainwindow.cpp /src/iland/tests.cpp /src/tools/globalsettings.cpp /src/tools/globalsettings.h
|
521 |
4960d 22h |
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
|
513 |
4981d 20h |
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
|
503 |
4990d 18h |
werner |
/src/ |
water cycle: fixed a regression with the calculation of average aging.
added "canopyConductance" as variable for resource units.
added a GUI option to change the current log level. |
|
/src/core/model.cpp /src/core/resourceunit.cpp /src/core/watercycle.cpp /src/core/watercycle.h /src/iland/mainwindow.cpp /src/iland/mainwindow.h /src/iland/mainwindow.ui /src/tools/expressionwrapper.cpp
|
502 |
4990d 23h |
werner |
/src/core/ |
water cycle for resource units without adult trees; adapted water use for RUs with only few stands by adding "ground cover" up to LAI=1 with default characteristics. |
|
/src/core/resourceunit.cpp /src/core/watercycle.cpp /src/core/watercycle.h
|
496 |
5007d 23h |
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
|
484 |
5010d 22h |
werner |
/src/ |
modified release of memory of trees; QVector::resere() does not actually shrink memory; so now "squeeze()" is used. |
|
/src/core/resourceunit.cpp /src/core/watercycle.cpp /src/iland/iland.pro
|
482 |
5010d 23h |
werner |
/src/core/ |
fixed bug that recruited trees modified the average aging calculation; added some diagnostic code here and there. |
|
/src/core/model.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/tree.cpp /src/core/watercycle.cpp
|
475 |
5011d 22h |
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 |
5017d 17h |
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 |
5066d 23h |
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 |
5067d 00h |
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 |
5067d 13h |
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 |
5067d 18h |
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 |
5067d 21h |
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 |
5068d 00h |
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 |
5121d 18h |
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 |
5121d 21h |
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 |
5146d 14h |
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 |
5187d 00h |
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
|