Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
1040 |
3362d 04h |
werner |
/branches/port_qt5_64bit/src/ |
working on bark beetle module (continuing on antagonists)
adding species share maps to iLand visualization. |
|
/branches/port_qt5_64bit/src/core/grid.h /branches/port_qt5_64bit/src/core/resourceunit.cpp /branches/port_qt5_64bit/src/core/resourceunit.h /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp /branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h /branches/port_qt5_64bit/src/tools/colors.cpp
|
1017 |
3409d 04h |
werner |
/branches/port_qt5_64bit/src/ |
calculate crown cover maps |
|
/branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/resourceunit.h /branches/port_qt5_64bit/src/tools/spatialanalysis.cpp /branches/port_qt5_64bit/src/tools/spatialanalysis.h
|
1002 |
3460d 00h |
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
|
863 |
3887d 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 |
3927d 11h |
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 |
4094d 06h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
720 |
4573d 00h |
werner |
/trunk/src/ |
fixed a problem when trees died in disturbance and the (unupdated) statistics were used (e.g. the LAI for calculating the water cycle). Now for affected resource units, not only the treelists but also the RU-statistics are updated.
implemented a "radiating" mechanism of border cells. If stand-grid-cells (i.e. 10m height grid resolution) are marked as "outside and forest", then the cells "radiate" some influence on the LIF into the project area. Thus, trees on the edge of the project do *not* have properties of trees standing on a stand edge. Currently, the form/amount of this edge-effect is hard coded. |
|
/trunk/src/core/climate.cpp /trunk/src/core/climate.h /trunk/src/core/model.cpp /trunk/src/core/model.h /trunk/src/core/phenology.cpp /trunk/src/core/resourceunit.cpp /trunk/src/core/resourceunit.h /trunk/src/core/resourceunitspecies.h /trunk/src/core/tree.cpp /trunk/src/core/watercycle.cpp /trunk/src/iland/mainwindow.cpp /trunk/src/iland/version.cpp
|
707 |
4625d 08h |
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 |
4626d 03h |
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
|
671 |
4677d 07h |
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
|
664 |
4719d 06h |
werner |
/trunk/src/ |
fixes in the fire module |
|
/trunk/src/core/model.cpp /trunk/src/core/resourceunit.cpp /trunk/src/core/resourceunit.h /trunk/src/core/soil.cpp /trunk/src/core/tree.cpp /trunk/src/plugins/fire/firemodule.cpp /trunk/src/tools/modules.cpp
|
662 |
4720d 07h |
werner |
/trunk/src/ |
continued to work on the fire module. Include the fire severity (i.e. mortality due to fire). This had various other impacts, e.g., on the carbon cycle of saplings. |
|
/trunk/src/core/grid.h /trunk/src/core/management.cpp /trunk/src/core/resourceunit.cpp /trunk/src/core/resourceunit.h /trunk/src/core/sapling.cpp /trunk/src/core/sapling.h /trunk/src/core/snag.h /trunk/src/core/soil.cpp /trunk/src/core/soil.h /trunk/src/output/managementout.cpp /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/fire/firemodule.h
|
639 |
4838d 04h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable /trunk/src
/executable /src
|
600 |
4908d 01h |
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
|
575 |
4938d 09h |
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
|
574 |
4938d 12h |
werner |
/src/ |
* modified outputs to write only rows for valid resource units
* dropped setting "woodDecompRate" (snag.cpp)
* calculate the "stockableArea" of a resource unit based on the stand grid
* use the stockableArea for calculation of LAI |
|
/src/core/grid.h /src/core/model.cpp /src/core/model.h /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/snag.cpp /src/output/dynamicstandout.cpp /src/output/managementout.cpp /src/output/productionout.cpp /src/output/saplingout.cpp /src/output/standdeadout.cpp /src/output/standout.cpp /src/tools/expressionwrapper.cpp /src/tools/globalsettings.h
|
569 |
4943d 12h |
werner |
/src/ |
added a "id" for resource units (which comes from initialization grids).
fixed a bug that ru-grids only worked well on second creation of the model. |
|
/src/core/environment.cpp /src/core/environment.h /src/core/model.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/tools/expressionwrapper.cpp
|
526 |
4997d 04h |
werner |
/src/ |
embedding the soil model into iLand. renamed the snag decay debug output. |
|
/src/core/model.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/snag.cpp /src/core/snag.h /src/core/soil.cpp /src/core/soil.h /src/iland/mainwindow.cpp /src/iland/tests.cpp /src/tools/globalsettings.cpp /src/tools/globalsettings.h
|
521 |
4998d 08h |
werner |
/src/ |
moved snag dynamics from rus-level to ru-level |
|
/src/core/model.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/resourceunitspecies.cpp /src/core/resourceunitspecies.h /src/core/snag.h /src/core/tree.cpp /src/output/dynamicstandout.cpp /src/tools/globalsettings.cpp
|
487 |
5048d 01h |
werner |
/src/core/ |
some performance optimizations done on Linux with valgrind /
KCacheGrind.
stamp: did inlining of "distanceToCenter" (is still relatively expensive
due to heavy usage in e.g. applyLip)
Saplings: removed the very exensive way to check if a sapling of a
species is already on a given pixel; we now use a std::bitmap for that
purpose.
grid: optimized the "indexOf(float*)"-method; this method is used very
often. |
|
/src/core/establishment.cpp /src/core/grid.h /src/core/resourceunit.h /src/core/sapling.cpp /src/core/sapling.h /src/core/stamp.cpp /src/core/stamp.h
|