Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
1104 |
3078d 05h |
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
|
1001 |
3428d 00h |
werner |
/branches/port_qt5_64bit/src/ |
removed some of the "DebugTimer" --- they tend to cause problems especially when multi-threading is enabled. |
|
/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/speciesset.cpp /branches/port_qt5_64bit/src/iland/iland.pro
|
802 |
3929d 06h |
werner |
/branches/port_qt5_64bit/ |
merge from trunk up to revision 801 |
|
/branches/port_qt5_64bit/R_analysis
/branches/port_qt5_64bit /branches/port_qt5_64bit/executable/iland.exe /branches/port_qt5_64bit/src/core/climate.cpp /branches/port_qt5_64bit/src/core/climate.h /branches/port_qt5_64bit/src/core/global.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/modelcontroller.cpp /branches/port_qt5_64bit/src/core/modelcontroller.h /branches/port_qt5_64bit/src/core/production3pg.cpp /branches/port_qt5_64bit/src/core/sapling.cpp /branches/port_qt5_64bit/src/core/seeddispersal.cpp /branches/port_qt5_64bit/src/core/speciesresponse.cpp /branches/port_qt5_64bit/src/core/speciesresponse.h /branches/port_qt5_64bit/src/core/speciesset.cpp /branches/port_qt5_64bit/src/core/speciesset.h /branches/port_qt5_64bit/src/core/stampcontainer.cpp /branches/port_qt5_64bit/src/core/watercycle.cpp /branches/port_qt5_64bit/src/core/watercycle.h /branches/port_qt5_64bit/src/fonstudio/mainwindow.cpp /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/version.cpp /branches/port_qt5_64bit/src/output/dynamicstandout.cpp /branches/port_qt5_64bit/src/output/dynamicstandout.h /branches/port_qt5_64bit/src/output/productionout.cpp /branches/port_qt5_64bit/src/output/snapshot.cpp /branches/port_qt5_64bit/src/output/standdeadout.cpp /branches/port_qt5_64bit/src/plugins/fire/firemodule.cpp /branches/port_qt5_64bit/src/plugins/fire/firescript.cpp /branches/port_qt5_64bit/src/plugins/fire/firescript.h /branches/port_qt5_64bit/src/plugins/wind/windmodule.cpp /branches/port_qt5_64bit/src/tools/expression.cpp /branches/port_qt5_64bit/src/tools/expression.h /branches/port_qt5_64bit/src/tools/scriptglobal.cpp
|
779 |
4062d 00h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
764 |
4251d 19h |
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
|
707 |
4593d 02h |
werner |
/trunk/src/ |
rework of the random numbers in iland.
Now, many (200000) random numbers are precalculated using a given algorithm (there are three or four choices), then the drandom() etc functions read from this array. After some rotations, the numbers are renewed. The point is: this is now reentrant, so the per-thread storage of MTRand objects is obsolete. |
|
/trunk/src/tools/randomgenerator.cpp /trunk/src/tools/randomgenerator.h
/trunk/src/tools/randomwell.h
/trunk/src/core/global.h /trunk/src/core/model.cpp /trunk/src/core/resourceunit.h /trunk/src/core/sapling.cpp /trunk/src/core/species.h /trunk/src/core/speciesset.cpp /trunk/src/core/standloader.cpp /trunk/src/core/tree.cpp /trunk/src/iland/iland.pro /trunk/src/iland/tests.cpp /trunk/src/tools/expression.cpp /trunk/src/tools/globalsettings.cpp /trunk/src/tools/globalsettings.h
|
697 |
4601d 21h |
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 |
4645d 01h |
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 |
4805d 22h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable /trunk/src
/executable /src
|
615 |
4865d 02h |
werner |
/src/ |
removed windows specific _isnan() calls |
|
/src/core/global.h /src/core/model.cpp /src/core/sapling.cpp /src/core/soil.cpp /src/core/speciesset.cpp /src/core/standstatistics.cpp /src/core/standstatistics.h /src/core/tree.cpp /src/iland/mainwindow.cpp /src/iland/mainwindow.h /src/iland/mainwindow.ui /src/tools/globalsettings.cpp /src/tools/globalsettings.h
|
577 |
4905d 21h |
werner |
/src/ |
add 'basalarea' variable to Tree; rename 'speciesindex' to 'species'.
add species names as constants |
|
/src/core/speciesset.cpp /src/tools/expression.h /src/tools/expressionwrapper.cpp
|
575 |
4906d 03h |
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
|
534 |
4961d 02h |
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
|
479 |
5016d 19h |
werner |
/src/ |
pro-file: found a way to use debug symbols in release mode: one has to also alter the link-flags to disable stripping of symbols during linking.
fixed a bug in seed dispersal. |
|
/src/core/speciesset.cpp /src/iland/iland.pro
|
475 |
5017d 03h |
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
|
470 |
5021d 07h |
werner |
/src/core/ |
add light response function to sapling growth (rest: constness of lightresponse function calls) |
|
/src/core/sapling.cpp /src/core/species.h /src/core/speciesset.cpp /src/core/speciesset.h /src/core/tree.cpp
|
428 |
5153d 04h |
werner |
/src/ |
added linearization for some expressions (e.g. light response), and a global switch to enabled/disable the linerization using one static boolean (triggered by a iland setting) |
|
/src/core/model.cpp /src/core/speciesset.cpp /src/core/tree.cpp /src/tools/expression.cpp /src/tools/expression.h
|
425 |
5154d 04h |
werner |
/src/ |
made the calculate() and execute() function of Expression const (using a trick), so there is no more need for un-const functions which should be const (e.g. in Species). |
|
/src/core/species.cpp /src/core/species.h /src/core/speciesset.cpp /src/core/speciesset.h /src/tools/expression.cpp /src/tools/expression.h
|
420 |
5154d 19h |
werner |
/src/core/ |
removed the QMutex and the QMutexLocker for serializing the execution of expression evaluations. This is no longer necessary, because Expression::calculate() now is reentrant.
The performance effect of this change is awesome: the time used to grow individual trees drops by ca. 40% (the total runtime is maybe 5-10% faster) (tested with iLandSpeed.xml -> 2x2km) |
|
/src/core/management.cpp /src/core/species.cpp /src/core/species.h /src/core/speciesset.cpp /src/core/speciesset.h
|
415 |
5155d 04h |
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
|