Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
1222 |
2872d 18h |
werner |
/ |
public SVN |
|
/tags/release_1.0
/branches/release_1.0
|
1221 |
2872d 18h |
werner |
/branches/ |
public SVN |
|
/branches/release_1.0
/branches/version1.0
|
1220 |
2872d 18h |
werner |
/branches/version1.0/ |
Version 1.0 |
|
/branches/version1.0
|
1218 |
2872d 20h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/trunk
/iland_regen
|
1217 |
2872d 20h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/iland_regen
/branches/iland_regen
|
1180 |
3040d 17h |
werner |
/branches/iland_regen/src/ |
major rewrite of the seed distribution module:
* dispersal kernels fixed (using seeds per area, and not per radius)
* seed production now depends on leaf area of species (on source pixels)
* distribution for all source pixels (skipped the shortcut via continuously covered forest)
* probability of establishment calculated as function of available seedlings (sum of all incoming seedlings)
still testing ;)
more automation functions (e.g. to call OS commands, additional JS event handlers) |
|
/branches/iland_regen/src/core/modelcontroller.cpp /branches/iland_regen/src/core/seeddispersal.cpp /branches/iland_regen/src/core/seeddispersal.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/iland/mainwindow.cpp /branches/iland_regen/src/tools/scriptglobal.cpp /branches/iland_regen/src/tools/scriptglobal.h
|
1178 |
3047d 17h |
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
|
1176 |
3052d 18h |
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
|
1168 |
3081d 17h |
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
|
1167 |
3082d 02h |
werner |
/branches/iland_regen/ |
merged serotiny from trunk |
|
/branches/iland_regen /branches/iland_regen/src/core/seeddispersal.cpp /branches/iland_regen/src/core/seeddispersal.h /branches/iland_regen/src/core/species.cpp /branches/iland_regen/src/core/species.h /branches/iland_regen/src/plugins/fire/firemodule.cpp
|
1104 |
3161d 00h |
werner |
/branches/iland_regen/ |
Branch dedicated to playing around with establishment/regeneration.
Goals are:
(i) speed up
(ii) introduction of new features for Yellowstone |
|
/branches/iland_regen
|
1102 |
3161d 13h |
werner |
/branches/port_qt5_64bit/src/ |
fixed couple of clang warnings.
some debugging/profiling work w.r.t. establishment/regen. |
|
/branches/port_qt5_64bit/src/core/establishment.cpp /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/seeddispersal.cpp /branches/port_qt5_64bit/src/core/seeddispersal.h /branches/port_qt5_64bit/src/core/soil.cpp /branches/port_qt5_64bit/src/core/stamp.cpp /branches/port_qt5_64bit/src/core/stampcontainer.cpp /branches/port_qt5_64bit/src/core/standloader.cpp /branches/port_qt5_64bit/src/core/standstatistics.cpp /branches/port_qt5_64bit/src/core/timeevents.cpp /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/core/tree.h /branches/port_qt5_64bit/src/output/outputmanager.cpp /branches/port_qt5_64bit/src/output/treeout.cpp /branches/port_qt5_64bit/src/output/treeout.h /branches/port_qt5_64bit/src/tools/xmlhelper.cpp /branches/port_qt5_64bit/src/tools/xmlhelper.h
|
1064 |
3273d 18h |
werner |
/branches/port_qt5_64bit/src/ |
many changes. Most notably:
* improvements in the grass-cover sub Modules
* interaction between wind and bark beetle
* javascript function to extract seed-distribution-maps
* fixed a bug when continuous seed input was assumed |
|
/branches/port_qt5_64bit/src/abe/fmstand.cpp /branches/port_qt5_64bit/src/abe/fmstand.h /branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.h /branches/port_qt5_64bit/src/core/environment.cpp /branches/port_qt5_64bit/src/core/grasscover.cpp /branches/port_qt5_64bit/src/core/grasscover.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/modelcontroller.h /branches/port_qt5_64bit/src/core/seeddispersal.cpp /branches/port_qt5_64bit/src/core/seeddispersal.h /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/core/tree.h /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp /branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h /branches/port_qt5_64bit/src/tools/scriptglobal.cpp /branches/port_qt5_64bit/src/tools/scriptglobal.h
|
836 |
3973d 17h |
werner |
/branches/port_qt5_64bit/src/core/ |
implementing external seed on the full project area. |
|
/branches/port_qt5_64bit/src/core/seeddispersal.cpp /branches/port_qt5_64bit/src/core/seeddispersal.h
|
779 |
4144d 19h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
764 |
4334d 15h |
werner |
/trunk/src/ |
implementation of advanced external seed input. Around the project area a "seed belt" is lain. The simulated rectangle is split into sectors which can have a different species composition. At the beginning of the simulation, the external seed maps are populated and then reused each year. |
|
/trunk/src/core/grid.h /trunk/src/core/seeddispersal.cpp /trunk/src/core/seeddispersal.h /trunk/src/core/speciesset.cpp /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/wind/windmodule.cpp
|
704 |
4679d 17h |
werner |
/trunk/ |
Speed-Patch!
fixing the missing "&" in the const Grid<float> seedMap() const { return mSeedMap; } ///< access to the seedMap
function. This dramatically improves the performance of the model. Lots of time was lost in duplicating the seedmaps for each species * resourceunit.
in addition: limited max-size of the logging QPlainTextEdit; this could maybe stop iLand from crashing.... |
|
/trunk/executable/iland.exe /trunk/src/core/seeddispersal.h /trunk/src/iland/iland.pro /trunk/src/iland/mainwindow.cpp /trunk/src/iland/version.cpp /trunk/src/ilandc/consoleshell.cpp /trunk/src/ilandc/ilandc.pro
|
671 |
4727d 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
|
639 |
4888d 18h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable /trunk/src
/executable /src
|
619 |
4945d 02h |
werner |
/src/core/ |
Performance improvements for establishments: I try to decide for a resource-unit (random number) if establishment can happen on that RU; this reduces runtime of establishment sub routine by 60% (total runtime -20%); however, it changes also the behavior... |
|
/src/core/establishment.cpp /src/core/seeddispersal.cpp /src/core/seeddispersal.h
|
491 |
5097d 01h |
werner |
/src/core/ |
added some additional options for specifying external seed input. Now one can define cardinal directions for seed input as well as the distance of external seed source cells from the stand edge. |
|
/src/core/seeddispersal.cpp /src/core/seeddispersal.h
|
472 |
5104d 01h |
werner |
/src/core/ |
external seed input, added switch to enable/disable image creation of seedmaps/seed kernels during model runs |
|
/src/core/seeddispersal.cpp /src/core/seeddispersal.h
|
459 |
5105d 18h |
werner |
/src/core/ |
fixed a bug with wrong alignment of tree positions to seedMap. Detected by Ruperts sharp eye... |
|
/src/core/seeddispersal.cpp /src/core/seeddispersal.h
|
445 |
5205d 02h |
werner |
/src/core/ |
added database species parameters for seed dispersal, fixed a bug with random generator in StandLoader, change maturity criterion for seed production to age instead of height. |
|
/src/core/seeddispersal.cpp /src/core/seeddispersal.h /src/core/species.cpp /src/core/species.h /src/core/standloader.cpp /src/core/tree.cpp
|
415 |
5237d 23h |
werner |
/src/core/ |
seed dispersal:
* defining synchronized seed years for each species
* use different seed kernels depending on seed year state
* create two kernels for each species (1x seed year, 1 x non-seed-year)
* newYear() function also for each Species |
|
/src/core/seeddispersal.cpp /src/core/seeddispersal.h /src/core/species.cpp /src/core/species.h /src/core/speciesset.cpp
|
391 |
5264d 21h |
werner |
/src/ |
a rather large update mainly in course of the implementation of seed dispersal.
* integrating the seed dispersal within the model logic
(new function e.g. SpeciesSet::newYear() or SpeciesSet::regeneration()).
* SeedDispersal: implementation of the Seed-Kernel a la TreeMig (see the R-Script on dispersal by Rupert)
Additionally:
new functions (sum(), multiply() for the Grid-template. |
|
/src/core/grid.h /src/core/model.cpp /src/core/modelsettings.h /src/core/seeddispersal.cpp /src/core/seeddispersal.h /src/core/species.cpp /src/core/species.h /src/core/speciesset.cpp /src/core/speciesset.h /src/iland/mainwindow.cpp
|
387 |
5265d 15h |
werner |
/src/ |
integrating seed dispersal into the model
moved global constants for grid sizes into globalsettings.h |
|
/src/core/model.cpp /src/core/seeddispersal.cpp /src/core/seeddispersal.h /src/core/species.cpp /src/core/species.h /src/core/speciesset.cpp /src/core/speciesset.h /src/core/tree.cpp /src/tools/globalsettings.h
|
375 |
5281d 01h |
werner |
/src/ |
corrected seeddispersal algorithm (I tested with a real image (i.e. photo): errors are then quite clear)
grid::loadFromImage(): automatically setup grid if empty |
|
/src/core/grid.cpp /src/core/seeddispersal.cpp /src/core/seeddispersal.h /src/iland/tests.cpp
|
373 |
5281d 03h |
werner |
/src/ |
Creation of seeddispersal.
this includes some extensions to the grid (e.g. randomPosition()).
The seedDispersal-algorithm is implemented on CPU (but still not linked to tree growth) |
|
/src/core/seeddispersal.cpp /src/core/seeddispersal.h
/src/core/grid.cpp /src/core/grid.h /src/iland/iland.pro /src/iland/tests.cpp /src/iland/tests.h
|