| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 1222 |
3149d 04h |
werner |
/ |
public SVN |
|
/tags/release_1.0
/branches/release_1.0
|
| 1221 |
3149d 04h |
werner |
/branches/ |
public SVN |
|
/branches/release_1.0
/branches/version1.0
|
| 1220 |
3149d 04h |
werner |
/branches/version1.0/ |
Version 1.0 |
|
/branches/version1.0
|
| 1218 |
3149d 06h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/trunk
/iland_regen
|
| 1217 |
3149d 06h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/iland_regen
/branches/iland_regen
|
| 1196 |
3270d 03h |
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
|
| 1174 |
3337d 04h |
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 |
3358d 03h |
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
|
| 1158 |
3367d 06h |
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
|
| 1157 |
3367d 12h |
werner |
/branches/iland_regen/ |
merge of changes in the trunk (up to the version used for the 2016 DICE simulation batch). |
|
/branches/iland_regen/src/output/waterout.cpp
/branches/iland_regen/src/output/waterout.h
/branches/iland_regen
/branches/iland_regen/src/abe/actsalvage.cpp
/branches/iland_regen/src/abe/actsalvage.h
/branches/iland_regen/src/abe/fmstand.cpp
/branches/iland_regen/src/abe/fmstand.h
/branches/iland_regen/src/abe/fmtreelist.cpp
/branches/iland_regen/src/abe/fmunit.cpp
/branches/iland_regen/src/abe/fmunit.h
/branches/iland_regen/src/abe/forestmanagementengine.cpp
/branches/iland_regen/src/abe/forestmanagementengine.h
/branches/iland_regen/src/abe/output/abestandout.cpp
/branches/iland_regen/src/abe/output/abestandremovalout.cpp
/branches/iland_regen/src/abe/scheduler.cpp
/branches/iland_regen/src/abe/scheduler.h
/branches/iland_regen/src/core/climate.h
/branches/iland_regen/src/core/grasscover.h
/branches/iland_regen/src/core/grid.h
/branches/iland_regen/src/core/model.cpp
/branches/iland_regen/src/core/model.h
/branches/iland_regen/src/core/modelcontroller.cpp
/branches/iland_regen/src/core/production3pg.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/sapling.cpp
/branches/iland_regen/src/core/snag.cpp
/branches/iland_regen/src/core/snag.h
/branches/iland_regen/src/core/soil.cpp
/branches/iland_regen/src/core/species.cpp
/branches/iland_regen/src/core/speciesset.cpp
/branches/iland_regen/src/core/standloader.cpp
/branches/iland_regen/src/core/standstatistics.cpp
/branches/iland_regen/src/core/standstatistics.h
/branches/iland_regen/src/core/threadrunner.cpp
/branches/iland_regen/src/core/threadrunner.h
/branches/iland_regen/src/core/tree.cpp
/branches/iland_regen/src/core/tree.h
/branches/iland_regen/src/core/watercycle.cpp
/branches/iland_regen/src/core/watercycle.h
/branches/iland_regen/src/iland/iland.pro
/branches/iland_regen/src/iland/mainwindow.cpp
/branches/iland_regen/src/iland/tests.cpp
/branches/iland_regen/src/iland/version.cpp
/branches/iland_regen/src/ilandc/consoleshell.cpp
/branches/iland_regen/src/ilandc/ilandc.pro
/branches/iland_regen/src/output/carbonflowout.cpp
/branches/iland_regen/src/output/carbonflowout.h
/branches/iland_regen/src/output/carbonout.cpp
/branches/iland_regen/src/output/carbonout.h
/branches/iland_regen/src/output/dynamicstandout.cpp
/branches/iland_regen/src/output/landscapeout.cpp
/branches/iland_regen/src/output/managementout.cpp
/branches/iland_regen/src/output/outputmanager.cpp
/branches/iland_regen/src/output/snapshot.cpp
/branches/iland_regen/src/output/standout.cpp
/branches/iland_regen/src/plugins/barkbeetle/barkbeetle.pro
/branches/iland_regen/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/iland_regen/src/plugins/barkbeetle/barkbeetlemodule.h
/branches/iland_regen/src/plugins/barkbeetle/barkbeetleout.cpp
/branches/iland_regen/src/plugins/barkbeetle/barkbeetlescript.cpp
/branches/iland_regen/src/plugins/barkbeetle/barkbeetlescript.h
/branches/iland_regen/src/plugins/fire/fire.pro
/branches/iland_regen/src/plugins/fire/firemodule.cpp
/branches/iland_regen/src/plugins/wind/wind.pro
/branches/iland_regen/src/plugins/wind/windmodule.cpp
/branches/iland_regen/src/plugins/wind/windmodule.h
/branches/iland_regen/src/plugins/wind/windscript.cpp
/branches/iland_regen/src/plugins/wind/windscript.h
/branches/iland_regen/src/tools/colors.cpp
/branches/iland_regen/src/tools/expressionwrapper.cpp
/branches/iland_regen/src/tools/gisgrid.cpp
/branches/iland_regen/src/tools/gisgrid.h
/branches/iland_regen/src/tools/globalsettings.cpp
/branches/iland_regen/src/tools/globalsettings.h
/branches/iland_regen/src/tools/scriptglobal.cpp
/branches/iland_regen/src/tools/scriptglobal.h
|
| 1104 |
3437d 10h |
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
|
| 928 |
3983d 09h |
werner |
/branches/port_qt5_64bit/src/ |
additional debug outputs for the splitting of N mineralization fluxes (that comprise availableNitrogen). |
|
/branches/port_qt5_64bit/src/core/soil.cpp
/branches/port_qt5_64bit/src/core/soil.h
/branches/port_qt5_64bit/src/tools/globalsettings.cpp
|
| 863 |
4214d 05h |
werner |
/branches/port_qt5_64bit/ |
renaming of the FOME to AMIE.
unfortunately, some partial merge of changes in Qt4-branch. |
|
/branches/port_qt5_64bit/src/amie
/branches/port_qt5_64bit/src/fome
/branches/port_qt5_64bit
/branches/port_qt5_64bit/src/amie/fmunit.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/core/establishment.cpp
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/core/resourceunit.h
/branches/port_qt5_64bit/src/core/resourceunitspecies.cpp
/branches/port_qt5_64bit/src/core/resourceunitspecies.h
/branches/port_qt5_64bit/src/core/sapling.cpp
/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/tools/globalsettings.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
|
| 824 |
4254d 10h |
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
|
| 793 |
4297d 04h |
werner |
/branches/port_qt5_64bit/src/ |
Move from QScriptEngine to QJSEngine (=V8). Most of the stuff was quite smooth, but there are some open issues.
• Global functions (“print”, “include”, “alert”) are commented out (could be solved by moving functions to the “Globals” object and by creating alias JS-functions, i.e. function alert(x) {Globals.alert(x); } )
• Object creation: “new XXX”, XXX=ClimateConverter, CSVFile, … does not work now
possible solution: factory-pattern (i.e. var csv = Globals.newCSV()) |
|
/branches/port_qt5_64bit/src/core/management.cpp
/branches/port_qt5_64bit/src/core/management.h
/branches/port_qt5_64bit/src/core/plugin_interface.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/plugins/fire/fire.pro
/branches/port_qt5_64bit/src/plugins/fire/fireplugin.cpp
/branches/port_qt5_64bit/src/plugins/fire/fireplugin.h
/branches/port_qt5_64bit/src/plugins/wind/wind.pro
/branches/port_qt5_64bit/src/plugins/wind/windplugin.cpp
/branches/port_qt5_64bit/src/plugins/wind/windplugin.h
/branches/port_qt5_64bit/src/tools/climateconverter.cpp
/branches/port_qt5_64bit/src/tools/climateconverter.h
/branches/port_qt5_64bit/src/tools/csvfile.cpp
/branches/port_qt5_64bit/src/tools/csvfile.h
/branches/port_qt5_64bit/src/tools/globalsettings.cpp
/branches/port_qt5_64bit/src/tools/globalsettings.h
/branches/port_qt5_64bit/src/tools/modules.cpp
/branches/port_qt5_64bit/src/tools/modules.h
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.h
/branches/port_qt5_64bit/src/tools/spatialanalysis.cpp
|
| 780 |
4408d 06h |
werner |
/branches/port_qt5_64bit/src/ |
Steps to build iLand with Qt 5 and with MSVC compiler and 64 bit.
http://iland.boku.ac.at/blogpost44
removed also a couple of warnings that were thrown by the MSVC compiler. |
|
/branches/port_qt5_64bit/src/plugins/fire/fireplugin.json
/branches/port_qt5_64bit/src/plugins/wind/windplugin.json
/branches/port_qt5_64bit/src/3rdparty/MersenneTwister.h
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/core/snag.h
/branches/port_qt5_64bit/src/core/species.h
/branches/port_qt5_64bit/src/core/threadrunner.cpp
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/core/watercycle.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/main.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.h
/branches/port_qt5_64bit/src/iland/paintarea.cpp
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/iland/tests.h
/branches/port_qt5_64bit/src/ilandc/consoleshell.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/output/snapshot.cpp
/branches/port_qt5_64bit/src/plugins/fire/fire.pro
/branches/port_qt5_64bit/src/plugins/fire/fireplugin.cpp
/branches/port_qt5_64bit/src/plugins/fire/fireplugin.h
/branches/port_qt5_64bit/src/plugins/wind/wind.pro
/branches/port_qt5_64bit/src/plugins/wind/windplugin.cpp
/branches/port_qt5_64bit/src/plugins/wind/windplugin.h
/branches/port_qt5_64bit/src/tools/expression.cpp
/branches/port_qt5_64bit/src/tools/gisgrid.cpp
/branches/port_qt5_64bit/src/tools/globalsettings.cpp
/branches/port_qt5_64bit/src/tools/helper.cpp
/branches/port_qt5_64bit/src/tools/modules.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/ticktack.cpp
|
| 779 |
4421d 05h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
| 767 |
4599d 23h |
werner |
/trunk/src/ |
larger restructuring of code (moving scripting related parts)
adding a shell for "spatialAnalysis".
In the future, a cleanup of all the "spatial" grids/maps/stuff is necessary... |
|
/trunk/src/core/management.cpp
/trunk/src/core/management.h
/trunk/src/core/model.cpp
/trunk/src/core/model.h
/trunk/src/core/timeevents.cpp
/trunk/src/iland/mainwindow.cpp
/trunk/src/plugins/fire/firemodule.cpp
/trunk/src/tools/globalsettings.cpp
/trunk/src/tools/globalsettings.h
/trunk/src/tools/modules.cpp
/trunk/src/tools/modules.h
/trunk/src/tools/scriptglobal.cpp
/trunk/src/tools/scriptglobal.h
/trunk/src/tools/spatialanalysis.cpp
/trunk/src/tools/spatialanalysis.h
|
| 707 |
4952d 07h |
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
|
| 705 |
4953d 02h |
werner |
/trunk/src/ |
series of performance tests / modifications.
Using "valgrind" on the linux virtual machine, some performance
measurements were made.
Some candidates for optimization were tested. (1) the applyLIP()
function (about 30% of total run time in runYear()): here several
inlining options were tested; testing the value of the stamp before
using it (in order to omit the other steps) prooved to be slower than
unsing all stamp values.
(2) the random number generator; here the random number generation is
about 5% of the total run time; the commit contains two/three other
variants. |
|
/trunk/src/tools/randomwell.h
/trunk/src/core/establishment.cpp
/trunk/src/core/global.h
/trunk/src/core/grid.h
/trunk/src/core/model.cpp
/trunk/src/core/resourceunit.h
/trunk/src/core/species.h
/trunk/src/core/stamp.h
/trunk/src/core/standloader.cpp
/trunk/src/core/tree.cpp
/trunk/src/iland/iland.pro
/trunk/src/plugins/wind/windmodule.h
/trunk/src/tools/expression.cpp
/trunk/src/tools/globalsettings.cpp
/trunk/src/tools/globalsettings.h
|