Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
824 |
3889d 18h |
werner |
/branches/port_qt5_64bit/src/ |
fixed *big* regeneration bug. The map with the height of saplings on a resource unit was used in the establishment subroutine although it was *invalid*. Now the establishment and the regeneration are (again?) in one function and use the same valid map.
this removed the strange stripes in the regeneration pattern (there should have been crashes, but weren't). Consequently, the performance debug output was modified.
added better formatting to debugtimer.cpp for large times (in hours, minutes, seconds). |
|
/branches/port_qt5_64bit/src/core/establishment.cpp /branches/port_qt5_64bit/src/core/establishment.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/resourceunit.cpp /branches/port_qt5_64bit/src/core/resourceunit.h /branches/port_qt5_64bit/src/core/standstatistics.cpp /branches/port_qt5_64bit/src/core/standstatistics.h /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/tests.cpp /branches/port_qt5_64bit/src/tools/debugtimer.cpp /branches/port_qt5_64bit/src/tools/debugtimer.h /branches/port_qt5_64bit/src/tools/globalsettings.cpp
|
779 |
4056d 13h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
685 |
4618d 14h |
werner |
/trunk/src/core/ |
changed establishment: now (after some discussion), we use two random numbers and "emulate" the multiplication ( seed x biotic x abiotic ). First we select choose for 20m seed pixels a random number for abiotic environment (abiotic), and if ok for every 2x2m pixel (biotic x seed). This split is a huge performance improvement, but leads probably to more "pixels" in the 20m resolution. First tests do not show those effects, though. |
|
/trunk/src/core/establishment.cpp /trunk/src/core/establishment.h
|
671 |
4639d 14h |
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 |
4800d 11h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable /trunk/src
/executable /src
|
624 |
4854d 17h |
werner |
/src/core/ |
performance improvements / modifications. |
|
/src/core/establishment.cpp /src/core/establishment.h /src/core/sapling.cpp
|
444 |
5118d 15h |
werner |
/src/core/ |
added a "randomGenerator" - function to the resource unit -> this should be used when fetching random numbers from within functions that are executed in a multi-threaded way. You could also use GlobalSettings::instance()->randomGenerator(). |
|
/src/core/establishment.cpp /src/core/establishment.h /src/core/model.cpp /src/core/resourceunit.h /src/core/standloader.cpp /src/core/tree.cpp
|
443 |
5118d 18h |
werner |
/src/ |
problems with multihtreading and the random generator. Crashes revealed that the MersenneTwister class is not multithreadable; The solution now is to have for each Thread in the thread pool one random number generator. This removes the crashes, but makes changes to the code necessary. |
|
/src/core/establishment.cpp /src/core/establishment.h /src/core/global.h /src/core/model.cpp /src/tools/globalsettings.cpp /src/tools/globalsettings.h
|
442 |
5119d 11h |
werner |
/src/ |
Debug output for establishment. |
|
/src/core/establishment.cpp /src/core/establishment.h /src/core/model.cpp /src/core/resourceunitspecies.cpp /src/iland/mainwindow.cpp /src/iland/mainwindow.h /src/iland/mainwindow.ui /src/tools/globalsettings.cpp /src/tools/globalsettings.h
|
440 |
5120d 16h |
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
|
439 |
5121d 12h |
werner |
/src/core/ |
coded the establishment core routine (without testing yet)
adapted the GridRunner |
|
/src/core/establishment.cpp /src/core/establishment.h /src/core/grid.h
|
434 |
5122d 14h |
werner |
/src/ |
creation of the Establishment class.
added calculation of chilling requirements to Phenology (not good enough, though)
added also a little test routine for Establishment |
|
/src/core/establishment.cpp /src/core/establishment.h
/src/core/phenology.cpp /src/core/phenology.h /src/iland/aboutdialog.cpp /src/iland/iland.pro /src/iland/mainwindow.cpp /src/iland/tests.cpp /src/iland/tests.h /src/tools/csvfile.cpp
|