| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 744 |
4458d 05h |
werner |
/trunk/src/ |
minor layout-improvement for the about-dialog
started to toy around with the graphics-stack |
|
/trunk/src/core/standloader.cpp
/trunk/src/iland/aboutdialog.ui
/trunk/src/iland/mainwindow.h
/trunk/src/iland/paintarea.cpp
|
| 743 |
4458d 16h |
werner |
/trunk/ |
new version 0.8.2
includes topo modifier for wind module on 10m grid. |
|
/trunk/executable/iland.exe
/trunk/src/core/standloader.cpp
/trunk/src/iland/version.cpp
|
| 739 |
4466d 11h |
werner |
/trunk/src/core/ |
removed some warnings, added a ASSERT to stamp-selection (problem with
old stamps) |
|
/trunk/src/core/model.cpp
/trunk/src/core/stamp.h
/trunk/src/core/standloader.cpp
|
| 736 |
4470d 12h |
werner |
/trunk/src/core/ |
fixed the crashes (I hope).
The problem was either:
(a) if you load just one year of climate and have a leapyear, then the store for climate-days can is too short (it was: years*366, now: years*366 + 1
(b) The value of "mHeightGridTries" (in standloader) was not initialized with disabled "heightGrid". |
|
/trunk/src/core/stamp.cpp
/trunk/src/core/standloader.cpp
|
| 734 |
4470d 14h |
werner |
/trunk/src/ |
small "fixes" (or tries to fix) as iLand is still crashing... |
|
/trunk/src/core/model.cpp
/trunk/src/core/model.h
/trunk/src/core/resourceunit.cpp
/trunk/src/core/standloader.cpp
/trunk/src/iland/mainwindow.cpp
/trunk/src/output/carbonout.cpp
|
| 733 |
4472d 09h |
werner |
/trunk/src/ |
trying to find the iland bug?? |
|
/trunk/src/core/standloader.cpp
/trunk/src/core/tree.h
/trunk/src/iland/mainwindow.cpp
|
| 732 |
4503d 11h |
werner |
/trunk/src/ |
initialization of trees with given tree heights. The tree height data (e.g. Lidar data) is loaded from a GIS grid file.
some additional changes with painting different grids.
added also an option to use mapgrids without the 'spatial index' (e.g. for float grids on height grid resolution). |
|
/trunk/src/core/climate.cpp
/trunk/src/core/standloader.cpp
/trunk/src/core/standloader.h
/trunk/src/iland/mainwindow.cpp
/trunk/src/iland/mainwindow.h
/trunk/src/iland/mainwindow.ui
/trunk/src/tools/mapgrid.cpp
/trunk/src/tools/mapgrid.h
|
| 707 |
4588d 11h |
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 |
4589d 06h |
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
|
| 699 |
4596d 09h |
werner |
/trunk/ |
standloader now can also initialize from vegetation snapshot databases;
fire-module: fire extinction probability works only after reaching the minimum fire size parameter. |
|
/trunk/doc
/trunk/src/core/standloader.cpp
/trunk/src/output/snapshot.cpp
/trunk/src/plugins/fire/firemodule.cpp
|
| 697 |
4597d 07h |
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 |
4640d 10h |
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 |
4801d 08h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable
/trunk/src
/executable
/src
|
| 603 |
4870d 15h |
werner |
/src/ |
added the target "Map" to functions of the StandLoader; also changed some functions in scriptglobal.cpp (addTreesOnMap).
Interesting: you can easily pass (scripted) object to slots as Pointer - but not so easy as references (for refs you would need to qScriptRegisterMetaType()) - it took me a while find this out... |
|
/src/core/standloader.cpp
/src/core/standloader.h
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
|
| 600 |
4871d 04h |
werner |
/src/ |
corrected grid export (flipping of y-axis)
added initialization of saplings; StandLoader contains now a routine similar to the one for larger trees to distribute saplings; additionally, a script function (Globals.addSaplingsOnStand()) can be used to use this functionality. |
|
/src/core/grid.h
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/resourceunitspecies.h
/src/core/sapling.cpp
/src/core/sapling.h
/src/core/speciesset.h
/src/core/standloader.cpp
/src/core/standloader.h
/src/tools/mapgrid.cpp
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
|
| 550 |
4921d 13h |
werner |
/src/ |
some fixes with landscape initialization, made some debug messages conditional on various places. |
|
/src/core/environment.cpp
/src/core/seeddispersal.cpp
/src/core/species.cpp
/src/core/stampcontainer.cpp
/src/core/standloader.cpp
/src/iland/paintarea.cpp
/src/tools/gisgrid.h
/src/tools/globalsettings.cpp
/src/tools/mapgrid.cpp
|
| 549 |
4921d 14h |
werner |
/src/ |
initialization based on stand grids.
added new functionality for that in StandLoader plus minor changes in Model or MapGrid. |
|
/src/core/grid.h
/src/core/model.cpp
/src/core/model.h
/src/core/standloader.cpp
/src/core/standloader.h
/src/tools/mapgrid.cpp
/src/tools/mapgrid.h
/src/tools/scriptglobal.cpp
|
| 445 |
5117d 16h |
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
|
| 444 |
5119d 12h |
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
|
| 431 |
5147d 04h |
werner |
/src/ |
included the logLevel-Functions at several locations in the source code.
added a option to only display debug messages in the DebugTimer destructor when elapsed time is longer than one millisecond. |
|
/src/core/global.h
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/modelsettings.cpp
/src/core/resourceunit.cpp
/src/core/standloader.cpp
/src/core/watercycle.cpp
/src/iland/tests.cpp
/src/tools/globalsettings.cpp
/src/tools/helper.cpp
/src/tools/helper.h
|
| 393 |
5175d 15h |
werner |
/src/ |
fixed a bug in StampContainer when loading trees with invalid hd-ratio (too low trees).
fixed a bug that caused a crash when seed dispersal was disabled.
added return values for stand init routines (also those that accessed by scripting) and cleaned up the documentation. |
|
/src/core/speciesset.cpp
/src/core/stampcontainer.cpp
/src/core/standloader.cpp
/src/core/standloader.h
/src/core/tree.cpp
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
|
| 389 |
5178d 03h |
werner |
/src/ |
fixed small glitches with single tree initialization (species name at last position); changes to management routines. |
|
/src/core/management.cpp
/src/core/standloader.cpp
/src/core/standloader.h
/src/core/tree.cpp
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
|
| 388 |
5178d 05h |
werner |
/src/core/ |
remodified the age calculation. Now the age is estimated based on the current height relative to h_max. The aging-calculation itself is no longer changed by that. |
|
/src/core/species.cpp
/src/core/species.h
/src/core/standloader.cpp
/src/core/tree.cpp
/src/core/tree.h
|
| 384 |
5178d 14h |
werner |
/src/core/ |
various changes in load of initialization |
|
/src/core/standloader.cpp
|
| 381 |
5178d 16h |
werner |
/src/core/ |
appropriate handling of tree age during initialization.
if no age is provided in the input file only the tree height is used for the aging calculation. The tree "age" in that case reflects only the number of years since initialization. |
|
/src/core/species.cpp
/src/core/species.h
/src/core/standloader.cpp
/src/core/tree.cpp
/src/core/tree.h
|
| 319 |
5325d 15h |
werner |
/src/ |
loading of the environment |
|
/src/core/climate.cpp
/src/core/environment.cpp
/src/core/standloader.cpp
/src/iland/iland.pro
|
| 312 |
5332d 13h |
werner |
/src/core/ |
increased freq. of sorting for low stem numbers |
|
/src/core/standloader.cpp
|
| 311 |
5332d 13h |
werner |
/src/core/ |
improve loading of tree distributions (density per line) |
|
/src/core/standloader.cpp
/src/core/standloader.h
|
| 299 |
5345d 15h |
werner |
/src/ |
fixed bug with disabled debug outputs
added modified LRI to NPP-debug output
new species parameter "probStressYears".
documentation (wiki-links) |
|
/src/core/species.cpp
/src/core/standloader.cpp
/src/core/tree.cpp
/src/core/watercycle.cpp
/src/output/treeout.cpp
/src/tools/globalsettings.cpp
|
| 294 |
5365d 20h |
werner |
/src/ |
lots of scripting stuff: new global functions (include, alert)
new methods of the "Globals" javascript object (set, setting, addTrees, ...) |
|
/src/core/management.cpp
/src/core/management.h
/src/core/model.h
/src/core/modelcontroller.cpp
/src/core/resourceunit.h
/src/core/standloader.cpp
/src/core/standloader.h
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
|
| 290 |
5366d 03h |
werner |
/src/ |
using now the CustomRandomPDF class (from Picus) for the custom probabilty density function used in the standloader. |
|
/src/core/standloader.cpp
/src/core/standloader.h
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/tools/random.cpp
/src/tools/random.h
|
| 289 |
5367d 00h |
werner |
/src/ |
random - things: added the Picus random-helper-classes (RandomIndex, CustomRandomPDF, ...).
added a 3rd party Mersenne-Twister-Random-Generator (added a 3rdparty) directory. |
|
/src/3rdparty
/src/3rdparty/MersenneTwister.h
/src/tools/random.cpp
/src/tools/random.h
/src/core/global.h
/src/core/standloader.cpp
/src/iland/iland.pro
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/iland/tests.h
/src/tools/csvfile.cpp
/src/tools/globalsettings.cpp
/src/tools/helper.h
|
| 288 |
5367d 21h |
werner |
/src/ |
more stand loading |
|
/src/core/standloader.cpp
/src/tools/csvfile.cpp
|
| 287 |
5367d 23h |
werner |
/src/ |
Tree initialization (random variant). works almost... |
|
/src/core/global.h
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/standloader.cpp
/src/core/standloader.h
/src/core/tree.h
/src/tools/sqlhelper.cpp
/src/tools/sqlhelper.h
|
| 285 |
5369d 18h |
werner |
/src/core/ |
loading of the landscape. added "areaMask.imageFile" to "world" in xml file. This loads a image mask that establishes area that are inside and outside the project area respectively. |
|
/src/core/global.h
/src/core/grid.cpp
/src/core/grid.h
/src/core/model.cpp
/src/core/model.h
/src/core/modelcontroller.cpp
/src/core/standloader.cpp
/src/core/tree.cpp
|
| 284 |
5369d 22h |
werner |
/src/ |
loading of different ini-files on the worlds landscape. |
|
/src/core/environment.cpp
/src/core/model.h
/src/core/standloader.cpp
/src/core/standloader.h
/src/tools/globalsettings.cpp
|
| 281 |
5369d 22h |
werner |
/src/ |
setup of the world - remodeled the init-routine in Model, changed the init of stands (also some xml-keys). added a storage for variables local to rseource units (e.g. nitrogenAvailable). |
|
/src/core/environment.cpp
/src/core/environment.h
/src/core/exception.h
/src/core/model.cpp
/src/core/model.h
/src/core/modelsettings.cpp
/src/core/modelsettings.h
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/speciesresponse.cpp
/src/core/standloader.cpp
/src/core/standloader.h
/src/core/watercycle.cpp
/src/iland/tests.cpp
|
| 270 |
5373d 21h |
werner |
/src/core/ |
added warning if species table not found |
|
/src/core/speciesset.cpp
/src/core/standloader.cpp
|
| 247 |
5379d 23h |
werner |
/src/ |
global script object (ScriptGlobal).
Doxygen documentation refinements. |
|
/src/iland/maindoc.cpp
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
/src/core/climate.cpp
/src/core/grid.h
/src/core/management.cpp
/src/core/model.cpp
/src/core/resourceunitspecies.cpp
/src/core/species.cpp
/src/core/speciesresponse.cpp
/src/core/stampcontainer.h
/src/core/standloader.cpp
/src/core/tree.h
/src/iland/iland.pro
/src/tools/climateconverter.cpp
/src/tools/expression.cpp
/src/tools/globalsettings.cpp
|
| 204 |
5394d 02h |
werner |
/src/core/ |
|
|
/src/core/modelsettings.cpp
/src/core/standloader.cpp
|