| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 1222 |
3037d 17h |
werner |
/ |
public SVN |
|
/tags/release_1.0
/branches/release_1.0
|
| 1221 |
3037d 17h |
werner |
/branches/ |
public SVN |
|
/branches/release_1.0
/branches/version1.0
|
| 1220 |
3037d 17h |
werner |
/branches/version1.0/ |
Version 1.0 |
|
/branches/version1.0
|
| 1218 |
3037d 19h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/trunk
/iland_regen
|
| 1217 |
3037d 19h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/iland_regen
/branches/iland_regen
|
| 1182 |
3183d 17h |
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
|
| 1176 |
3217d 17h |
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 |
3246d 16h |
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
|
| 1160 |
3254d 16h |
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
|
| 1111 |
3317d 16h |
werner |
/branches/iland_regen/src/ |
first draft of the new "establishment"
added the "Saplings", the new container for establishment/sapling growth
some basic functionality is already there... |
|
/branches/iland_regen/src/core/saplings.cpp
/branches/iland_regen/src/core/saplings.h
/branches/iland_regen/src/core/establishment.h
/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/model.h
/branches/iland_regen/src/core/resourceunitspecies.h
/branches/iland_regen/src/core/sapling.cpp
/branches/iland_regen/src/core/sapling.h
/branches/iland_regen/src/iland/iland.pro
/branches/iland_regen/src/iland/tests.cpp
/branches/iland_regen/src/output/snapshot.cpp
/branches/iland_regen/src/tools/mapgrid.cpp
/branches/iland_regen/src/tools/mapgrid.h
|
| 1104 |
3326d 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
|
| 1068 |
3436d 01h |
werner |
/branches/port_qt5_64bit/src/ |
some optimizations for grass / establishment
START |
|
/branches/port_qt5_64bit/src/core/establishment.cpp
/branches/port_qt5_64bit/src/core/establishment.h
/branches/port_qt5_64bit/src/core/grasscover.cpp
/branches/port_qt5_64bit/src/core/grasscover.h
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
|
| 1002 |
3675d 13h |
werner |
/branches/port_qt5_64bit/src/ |
new optimized establishment routine.
not finished yet, but looks promising in my first tests. |
|
/branches/port_qt5_64bit/src/core/establishment.cpp
/branches/port_qt5_64bit/src/core/establishment.h
/branches/port_qt5_64bit/src/core/resourceunit.h
/branches/port_qt5_64bit/src/core/sapling.h
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/iland/tests.h
/branches/port_qt5_64bit/src/tools/randomgenerator.h
|
| 824 |
4142d 23h |
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 |
4309d 19h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
| 685 |
4871d 19h |
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 |
4892d 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 |
5053d 17h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable
/trunk/src
/executable
/src
|
| 624 |
5107d 23h |
werner |
/src/core/ |
performance improvements / modifications. |
|
/src/core/establishment.cpp
/src/core/establishment.h
/src/core/sapling.cpp
|
| 444 |
5371d 21h |
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
|