Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
1213 |
2881d 02h |
werner |
/branches/iland_regen/src/ |
implementing the stand-wise snapshot feature (for the advanced dynamic initalization) |
|
/branches/iland_regen/src/abe/actplanting.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/core/version.cpp /branches/iland_regen/src/output/snapshot.cpp /branches/iland_regen/src/output/snapshot.h /branches/iland_regen/src/tools/gisgrid.cpp /branches/iland_regen/src/tools/scriptglobal.cpp /branches/iland_regen/src/tools/scriptglobal.h
|
1211 |
2881d 09h |
werner |
/branches/iland_regen/src/ |
added GPL headers for files that did not contain the header |
|
/branches/iland_regen/src/core/grid.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/output/waterout.cpp /branches/iland_regen/src/output/waterout.h /branches/iland_regen/src/tools/colors.cpp /branches/iland_regen/src/tools/colors.h /branches/iland_regen/src/tools/debugtimer.cpp /branches/iland_regen/src/tools/debugtimer.h /branches/iland_regen/src/tools/scriptgrid.cpp /branches/iland_regen/src/tools/scriptgrid.h /branches/iland_regen/src/tools/statdata.cpp /branches/iland_regen/src/tools/statdata.h /branches/iland_regen/src/tools/viewport.cpp /branches/iland_regen/src/tools/viewport.h
|
1196 |
2996d 02h |
werner |
/branches/iland_regen/src/ |
StandGPP debug output (instead of the missing StandNPP) output |
|
/branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/modelcontroller.cpp /branches/iland_regen/src/core/resourceunit.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/tree.cpp /branches/iland_regen/src/iland/mainwindow.cpp /branches/iland_regen/src/tools/globalsettings.cpp /branches/iland_regen/src/tools/globalsettings.h
|
1182 |
3021d 02h |
werner |
/branches/iland_regen/src/ |
Torus also effective for seed distribution
new output "SaplingDetails" (super high detail level of individual cohorts)
version information also in ilandc [move version.cpp to core]
[due to a sync problem with the SVN server, some revisions where lost: here they are:]
compiling ilandc
some code clean up - removed old code (sapling.cpp) for sapling trees and establishment. |
|
/branches/iland_regen/src/core/climate.cpp /branches/iland_regen/src/core/establishment.cpp /branches/iland_regen/src/core/establishment.h /branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/modelcontroller.cpp /branches/iland_regen/src/core/modelcontroller.h /branches/iland_regen/src/core/modelsettings.cpp /branches/iland_regen/src/core/modelsettings.h /branches/iland_regen/src/core/resourceunitspecies.cpp /branches/iland_regen/src/core/resourceunitspecies.h /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/seeddispersal.cpp /branches/iland_regen/src/core/species.cpp /branches/iland_regen/src/core/species.h /branches/iland_regen/src/core/standloader.cpp /branches/iland_regen/src/core/standstatistics.h /branches/iland_regen/src/iland/iland.pro /branches/iland_regen/src/iland/mainwindow.cpp /branches/iland_regen/src/iland/mainwindow.h /branches/iland_regen/src/ilandc/consoleshell.cpp /branches/iland_regen/src/ilandc/ilandc.pro /branches/iland_regen/src/ilandc/main.cpp /branches/iland_regen/src/output/outputmanager.cpp /branches/iland_regen/src/output/saplingout.cpp /branches/iland_regen/src/output/saplingout.h /branches/iland_regen/src/output/snapshot.cpp /branches/iland_regen/src/tools/helper.cpp
|
1178 |
3050d 02h |
werner |
/branches/iland_regen/src/ |
update the seed dispersal kernel: take the density of a point instead the density at a given radius
new option in the GUI to visualize newly created saplings
update of how sapling numbers are calculated and arrive in the output |
|
/branches/iland_regen/src/core/resourceunit.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/core/seeddispersal.cpp /branches/iland_regen/src/core/seeddispersal.h /branches/iland_regen/src/iland/mainwindow.cpp /branches/iland_regen/src/iland/mainwindow.ui
|
1177 |
3052d 03h |
werner |
/branches/iland_regen/src/ |
updating the sapling growth (calculation of stem numbers) |
|
/branches/iland_regen/src/core/resourceunitspecies.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/core/species.cpp /branches/iland_regen/src/core/species.h /branches/iland_regen/src/core/standstatistics.cpp /branches/iland_regen/src/output/saplingout.cpp
|
1176 |
3055d 03h |
werner |
/branches/iland_regen/src/core/ |
developing the long distance dispersal functionality;
looks as if we have a conceptual problem with how we use the seed kernel functions...
more to come... |
|
/branches/iland_regen/src/core/establishment.cpp /branches/iland_regen/src/core/establishment.h /branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/core/seeddispersal.cpp /branches/iland_regen/src/core/seeddispersal.h
|
1175 |
3062d 04h |
werner |
/branches/iland_regen/src/core/ |
testing change in the way the number of saplings is estimated (when several species reside on the same pixel) |
|
/branches/iland_regen/src/core/resourceunitspecies.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h
|
1174 |
3063d 03h |
werner |
/branches/iland_regen/src/ |
fixed a bug in the establishment / saplinggrowth debug outputs (bookkeeping) |
|
/branches/iland_regen/src/core/establishment.cpp /branches/iland_regen/src/core/resourceunitspecies.h /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/tools/globalsettings.cpp
|
1168 |
3084d 02h |
werner |
/branches/iland_regen/src/ |
working on serotony, establishment etc. updated new establishment module w.r.t. debug outputs. |
|
/branches/iland_regen/src/core/establishment.cpp /branches/iland_regen/src/core/establishment.h /branches/iland_regen/src/core/resourceunitspecies.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/seeddispersal.cpp /branches/iland_regen/src/core/seeddispersal.h /branches/iland_regen/src/iland/mainwindow.cpp /branches/iland_regen/src/iland/mainwindow.h /branches/iland_regen/src/iland/mainwindow.ui /branches/iland_regen/src/tools/globalsettings.cpp /branches/iland_regen/src/tools/globalsettings.h
|
1165 |
3086d 01h |
werner |
/branches/iland_regen/src/ |
implementation of sprouting |
|
/branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/core/species.cpp /branches/iland_regen/src/core/species.h /branches/iland_regen/src/core/tree.cpp /branches/iland_regen/src/plugins/fire/firemodule.cpp
|
1164 |
3091d 03h |
werner |
/branches/iland_regen/src/ |
found unexpected behavior of irandom(): obviously, it return *never* the upper bound.
eg. irandom(0,3) -> values 0,1, or 2, but never 3.
changed calls to irandom() accordingly.
added also a better random selection of species in the establishment routine |
|
/branches/iland_regen/src/abe/scheduler.cpp /branches/iland_regen/src/core/climate.cpp /branches/iland_regen/src/core/grid.h /branches/iland_regen/src/core/management.cpp /branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/speciesset.cpp /branches/iland_regen/src/core/speciesset.h /branches/iland_regen/src/core/standloader.cpp /branches/iland_regen/src/core/tree.cpp /branches/iland_regen/src/iland/tests.cpp /branches/iland_regen/src/plugins/barkbeetle/barkbeetlemodule.cpp /branches/iland_regen/src/plugins/fire/firemodule.cpp /branches/iland_regen/src/tools/randomgenerator.h
|
1162 |
3091d 09h |
werner |
/branches/iland_regen/src/ |
removed the old "mSaplings" from resource unit/model.
Open Issues:
* ActPlanting [init/remove of saplings]
* MapGrid: retrieve list of saplings
* testing of standloader |
|
/branches/iland_regen/src/abe/actplanting.cpp /branches/iland_regen/src/core/establishment.cpp /branches/iland_regen/src/core/management.cpp /branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/resourceunit.cpp /branches/iland_regen/src/core/resourceunit.h /branches/iland_regen/src/core/resourceunitspecies.cpp /branches/iland_regen/src/core/resourceunitspecies.h /branches/iland_regen/src/core/sapling.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/core/species.cpp /branches/iland_regen/src/core/species.h /branches/iland_regen/src/core/standloader.cpp /branches/iland_regen/src/iland/tests.cpp /branches/iland_regen/src/output/saplingout.cpp /branches/iland_regen/src/output/snapshot.cpp /branches/iland_regen/src/plugins/fire/firemodule.cpp /branches/iland_regen/src/plugins/wind/windmodule.cpp /branches/iland_regen/src/tools/mapgrid.cpp /branches/iland_regen/src/tools/mapgrid.h
|
1160 |
3092d 02h |
werner |
/branches/iland_regen/src/core/ |
bug-fixes of the new establishment module (carbon)
first part of the YNP water limitation in establishment. |
|
/branches/iland_regen/src/core/establishment.cpp /branches/iland_regen/src/core/establishment.h /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/core/snag.cpp /branches/iland_regen/src/core/species.cpp /branches/iland_regen/src/core/species.h /branches/iland_regen/src/core/speciesset.cpp
|
1159 |
3092d 23h |
werner |
/branches/iland_regen/src/ |
Changed memory layout of regeneration module.
problems now with invalid (NaN) soil values. Needs further analysis ;) |
|
/branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/resourceunit.cpp /branches/iland_regen/src/core/resourceunit.h /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/core/standloader.cpp /branches/iland_regen/src/iland/mainwindow.cpp
|
1158 |
3093d 05h |
werner |
/branches/iland_regen/src/ |
further performance improvements in regeneration/sapling module.
In total (sim 80 yrs WBT 2km2, from bare ground), iLand is +- 35% faster:
* seed dispersal (not today)
* optimized use of LRI-correction
* better linearization in sapling growth (height growth potential) |
|
/branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/core/species.cpp /branches/iland_regen/src/core/standstatistics.cpp /branches/iland_regen/src/core/standstatistics.h /branches/iland_regen/src/iland/tests.cpp /branches/iland_regen/src/tools/globalsettings.cpp
|
1118 |
3149d 08h |
werner |
/branches/iland_regen/src/core/ |
fixes for the new saplings, now it almost works as expected. |
|
/branches/iland_regen/src/core/grid.h /branches/iland_regen/src/core/resourceunit.cpp /branches/iland_regen/src/core/resourceunit.h /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/core/species.cpp /branches/iland_regen/src/core/tree.cpp
|
1115 |
3154d 02h |
werner |
/branches/iland_regen/src/ |
integrating sapling growth, testing |
|
/branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/iland/tests.cpp
|
1113 |
3154d 05h |
werner |
/branches/iland_regen/src/core/ |
integrating sapling growth... |
|
/branches/iland_regen/src/core/resourceunit.h /branches/iland_regen/src/core/resourceunitspecies.h /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h
|
1112 |
3154d 05h |
werner |
/branches/iland_regen/src/core/ |
integrating the sapling growth (not finished yet) |
|
/branches/iland_regen/src/core/sapling.h /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h
|