Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
949 |
3563d 11h |
werner |
/branches/port_qt5_64bit/src/core/ |
changed the sanity check on the HD value of the increment (lower bound was 20 which produced tons of log output). |
|
/branches/port_qt5_64bit/src/core/tree.cpp
|
909 |
3710d 10h |
werner |
/branches/port_qt5_64bit/src/ |
more renaming: now it is hopefully done. |
|
/branches/port_qt5_64bit/src/abe/abegrid.cpp /branches/port_qt5_64bit/src/abe/abegrid.h
/branches/port_qt5_64bit/src/abe/amiegrid.cpp /branches/port_qt5_64bit/src/abe/amiegrid.h
/branches/port_qt5_64bit/src/abe/abe_global.h /branches/port_qt5_64bit/src/abe/actgeneral.cpp /branches/port_qt5_64bit/src/abe/activity.cpp /branches/port_qt5_64bit/src/abe/actplanting.cpp /branches/port_qt5_64bit/src/abe/actsalvage.cpp /branches/port_qt5_64bit/src/abe/actscheduled.cpp /branches/port_qt5_64bit/src/abe/agenttype.cpp /branches/port_qt5_64bit/src/abe/fmstand.cpp /branches/port_qt5_64bit/src/abe/fmstp.cpp /branches/port_qt5_64bit/src/abe/fmtreelist.cpp /branches/port_qt5_64bit/src/abe/fmunit.cpp /branches/port_qt5_64bit/src/abe/fomescript.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.h /branches/port_qt5_64bit/src/abe/scheduler.cpp /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/tests.cpp
|
907 |
3710d 10h |
werner |
/branches/port_qt5_64bit/src/ |
amie -> abe transition |
|
/branches/port_qt5_64bit/src/abe/actgeneral.cpp /branches/port_qt5_64bit/src/abe/activity.cpp /branches/port_qt5_64bit/src/abe/activity.h /branches/port_qt5_64bit/src/abe/actplanting.cpp /branches/port_qt5_64bit/src/abe/actplanting.h /branches/port_qt5_64bit/src/abe/actsalvage.cpp /branches/port_qt5_64bit/src/abe/actsalvage.h /branches/port_qt5_64bit/src/abe/actscheduled.cpp /branches/port_qt5_64bit/src/abe/agenttype.cpp /branches/port_qt5_64bit/src/abe/agenttype.h /branches/port_qt5_64bit/src/abe/fmstand.cpp /branches/port_qt5_64bit/src/abe/fmstand.h /branches/port_qt5_64bit/src/abe/fmstp.cpp /branches/port_qt5_64bit/src/abe/fmstp.h /branches/port_qt5_64bit/src/abe/fmtreelist.cpp /branches/port_qt5_64bit/src/abe/fmtreelist.h /branches/port_qt5_64bit/src/abe/fmunit.cpp /branches/port_qt5_64bit/src/abe/fmunit.h /branches/port_qt5_64bit/src/abe/fomescript.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.h /branches/port_qt5_64bit/src/abe/scheduler.cpp /branches/port_qt5_64bit/src/abe/scheduler.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/iland/iland.pro
|
905 |
3710d 10h |
werner |
/branches/port_qt5_64bit/src/ |
working on scheduler and on implementing disturbances.
now again the AMIE/ABE transformation.... |
|
/branches/port_qt5_64bit/src/amie/actsalvage.cpp /branches/port_qt5_64bit/src/amie/actsalvage.h
/branches/port_qt5_64bit/src/amie/actgeneral.h /branches/port_qt5_64bit/src/amie/activity.cpp /branches/port_qt5_64bit/src/amie/activity.h /branches/port_qt5_64bit/src/amie/actscheduled.h /branches/port_qt5_64bit/src/amie/agent.cpp /branches/port_qt5_64bit/src/amie/agent.h /branches/port_qt5_64bit/src/amie/agenttype.h /branches/port_qt5_64bit/src/amie/amiegrid.h /branches/port_qt5_64bit/src/amie/fmstand.cpp /branches/port_qt5_64bit/src/amie/fmstand.h /branches/port_qt5_64bit/src/amie/fmstp.cpp /branches/port_qt5_64bit/src/amie/fmstp.h /branches/port_qt5_64bit/src/amie/fomescript.h /branches/port_qt5_64bit/src/amie/fomewrapper.cpp /branches/port_qt5_64bit/src/amie/fomewrapper.h /branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp /branches/port_qt5_64bit/src/amie/forestmanagementengine.h /branches/port_qt5_64bit/src/amie/scheduler.cpp /branches/port_qt5_64bit/src/amie/scheduler.h /branches/port_qt5_64bit/src/amie/thinning.cpp /branches/port_qt5_64bit/src/amie/thinning.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/iland/tests.cpp
|
904 |
3711d 02h |
werner |
/branches/port_qt5_64bit/src/ |
... working on amie... |
|
/branches/port_qt5_64bit/src/amie/activity.cpp /branches/port_qt5_64bit/src/amie/agenttype.cpp /branches/port_qt5_64bit/src/amie/agenttype.h /branches/port_qt5_64bit/src/amie/fmstand.cpp /branches/port_qt5_64bit/src/amie/fmstand.h /branches/port_qt5_64bit/src/amie/fmunit.cpp /branches/port_qt5_64bit/src/amie/fmunit.h /branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp /branches/port_qt5_64bit/src/amie/forestmanagementengine.h /branches/port_qt5_64bit/src/amie/scheduler.cpp /branches/port_qt5_64bit/src/amie/scheduler.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/standloader.cpp /branches/port_qt5_64bit/src/core/standloader.h /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/core/tree.h /branches/port_qt5_64bit/src/iland/mainwindow.cpp
|
903 |
3714d 05h |
werner |
/branches/port_qt5_64bit/src/ |
working on AMIE - calculation of mean annual increment. |
|
/branches/port_qt5_64bit/src/amie/activity.cpp /branches/port_qt5_64bit/src/amie/amiegrid.cpp /branches/port_qt5_64bit/src/amie/fmstand.cpp /branches/port_qt5_64bit/src/amie/fmstand.h /branches/port_qt5_64bit/src/amie/fmunit.cpp /branches/port_qt5_64bit/src/amie/fmunit.h /branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp /branches/port_qt5_64bit/src/amie/forestmanagementengine.h /branches/port_qt5_64bit/src/amie/scheduler.cpp /branches/port_qt5_64bit/src/amie/scheduler.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/core/tree.h /branches/port_qt5_64bit/src/plugins/fire/firemodule.cpp /branches/port_qt5_64bit/src/tools/mapgrid.cpp /branches/port_qt5_64bit/src/tools/mapgrid.h
|
902 |
3718d 06h |
werner |
/branches/port_qt5_64bit/src/ |
work on AMIE.
introduced new activity: planting.
zillions of other small mods. |
|
/branches/port_qt5_64bit/src/amie/actplanting.cpp /branches/port_qt5_64bit/src/amie/actplanting.h
/branches/port_qt5_64bit/src/amie/actgeneral.cpp /branches/port_qt5_64bit/src/amie/activity.cpp /branches/port_qt5_64bit/src/amie/actscheduled.cpp /branches/port_qt5_64bit/src/amie/amie_global.h /branches/port_qt5_64bit/src/amie/amiegrid.cpp /branches/port_qt5_64bit/src/amie/fmstand.cpp /branches/port_qt5_64bit/src/amie/fmstand.h /branches/port_qt5_64bit/src/amie/fmstp.cpp /branches/port_qt5_64bit/src/amie/fmtreelist.cpp /branches/port_qt5_64bit/src/amie/fmunit.cpp /branches/port_qt5_64bit/src/amie/fomescript.cpp /branches/port_qt5_64bit/src/amie/fomewrapper.cpp /branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp /branches/port_qt5_64bit/src/amie/scheduler.cpp /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/core/sapling.h /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/output/snapshot.cpp /branches/port_qt5_64bit/src/tools/mapgrid.cpp
|
884 |
3754d 01h |
werner |
/branches/port_qt5_64bit/src/ |
working on the AMIE/ABE, whatever... |
|
/branches/port_qt5_64bit/src/amie/fmtreelist.cpp /branches/port_qt5_64bit/src/amie/fmtreelist.h /branches/port_qt5_64bit/src/apidoc/treelist_doc.js
/branches/port_qt5_64bit/src/amie/activity.cpp /branches/port_qt5_64bit/src/amie/amie_global.h /branches/port_qt5_64bit/src/amie/fmstp.cpp /branches/port_qt5_64bit/src/amie/fmstp.h /branches/port_qt5_64bit/src/amie/fomescript.cpp /branches/port_qt5_64bit/src/amie/fomescript.h /branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp /branches/port_qt5_64bit/src/amie/forestmanagementengine.h /branches/port_qt5_64bit/src/apidoc/abe_doc.js /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/tools/mapgrid.cpp /branches/port_qt5_64bit/src/tools/mapgrid.h
|
780 |
4046d 08h |
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 |
4059d 07h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
766 |
4238d 07h |
werner |
/trunk/src/ |
adding the rumple index calculation to iland. missing: script binding, ...
time to move the qtscript engine from management to the main model.... |
|
/trunk/src/tools/spatialanalysis.cpp /trunk/src/tools/spatialanalysis.h
/trunk/src/core/tree.cpp /trunk/src/iland/iland.pro /trunk/src/iland/mainwindow.cpp /trunk/src/iland/tests.cpp /trunk/src/iland/tests.h /trunk/src/plugins/fire/firescript.h /trunk/src/tools/climateconverter.cpp /trunk/src/tools/csvfile.cpp /trunk/src/tools/csvfile.h /trunk/src/tools/scriptglobal.h
|
720 |
4538d 01h |
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
|
718 |
4543d 08h |
werner |
/trunk/src/ |
implemented effect of out-of-project area lif to border regions; however the result is not as expected... (Tree::readLIF() function). |
|
/trunk/src/core/model.cpp /trunk/src/core/model.h /trunk/src/core/tree.cpp /trunk/src/iland/mainwindow.cpp /trunk/src/plugins/wind/windmodule.cpp
|
714 |
4552d 02h |
werner |
/trunk/src/ |
continued to work on the wind module. Moreover, we now have two types of "not in project area" pixels;
There were some tries regarding the performance of the wind module. At first for each 10m pixel all trees were selected within the pixel; this proved to be quite time consuming. In the end, these calculations (i.e. select the tallest tree per 10m pixel, and the species of this tree) are done in the beginning (per resource unit). This is about 10 times faster... |
|
/trunk/src/core/model.cpp /trunk/src/core/model.h /trunk/src/core/tree.cpp /trunk/src/iland/mainwindow.cpp /trunk/src/plugins/wind/windmodule.cpp /trunk/src/plugins/wind/windmodule.h
|
713 |
4552d 12h |
werner |
/trunk/src/ |
implemented a way to split the biomass of a dead tree into several pathways (i.e. to soil, to snags, to atmosphere/removal). |
|
/trunk/src/core/snag.cpp /trunk/src/core/snag.h /trunk/src/core/tree.cpp /trunk/src/core/tree.h /trunk/src/iland/tests.cpp /trunk/src/plugins/wind/windmodule.cpp
|
707 |
4590d 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
|
706 |
4591d 01h |
werner |
/trunk/src/ |
some performance tests with random number generators. Results so far are not too indicative. |
|
/trunk/src/core/global.h /trunk/src/core/tree.cpp /trunk/src/tools/randomwell.h
|
705 |
4591d 04h |
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
|
697 |
4599d 04h |
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 |
4642d 08h |
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
|
668 |
4677d 11h |
werner |
/trunk/src/ |
added additional settings for carbon balance of burned trees.
close to version 0.7.0 |
|
/trunk/src/core/tree.cpp /trunk/src/core/tree.h /trunk/src/iland/version.cpp /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/fire/firemodule.h
|
667 |
4677d 16h |
werner |
/trunk/src/ |
finetuning of fire module (new species parameters, xml file parameters, ...) |
|
/trunk/src/core/species.cpp /trunk/src/core/species.h /trunk/src/core/tree.cpp /trunk/src/core/tree.h /trunk/src/iland/version.cpp /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/fire/firemodule.h
|
664 |
4684d 07h |
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
|
639 |
4803d 05h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable /trunk/src
/executable /src
|
615 |
4862d 08h |
werner |
/src/ |
removed windows specific _isnan() calls |
|
/src/core/global.h /src/core/model.cpp /src/core/sapling.cpp /src/core/soil.cpp /src/core/speciesset.cpp /src/core/standstatistics.cpp /src/core/standstatistics.h /src/core/tree.cpp /src/iland/mainwindow.cpp /src/iland/mainwindow.h /src/iland/mainwindow.ui /src/tools/globalsettings.cpp /src/tools/globalsettings.h
|
608 |
4868d 14h |
werner |
/src/ |
adding carbon cycle output (and some necessary book keeping code) |
|
/src/core/production3pg.h /src/core/sapling.cpp /src/core/sapling.h /src/core/snag.h /src/core/tree.cpp /src/output/carbonflowout.cpp /src/tools/globalsettings.h
|
595 |
4886d 13h |
werner |
/src/core/ |
changed behavior of coarse roots: if biomass exceeds value from allometric relation, the excell biomass is pushed to the soil (avoid piling up of coarse root carbon in the soil)
inlined some biomass functions in species.h. |
|
/src/core/sapling.cpp /src/core/snag.cpp /src/core/snag.h /src/core/species.cpp /src/core/species.h /src/core/tree.cpp
|
588 |
4900d 12h |
werner |
/src/core/ |
added carbon-bookkeeping in the regeneration layer. |
|
/src/core/sapling.cpp /src/core/sapling.h /src/core/snag.cpp /src/core/snag.h /src/core/standstatistics.cpp /src/core/tree.cpp
|
579 |
4903d 03h |
werner |
/src/core/ |
plenty of new/modified functions in the javascript interface of the management class. e.g. randomize(), mean(), sum(), new kill() and manage() functions. |
|
/src/core/management.cpp /src/core/management.h /src/core/tree.cpp
|
564 |
4914d 04h |
werner |
/src/ |
Improvements of the Management API and functionality.
new functionality:
* killSaplings() -> use a "MapGrid" and remove small trees specifically
* properties defining biomass remove fractions during management
Now the tree list of the management object is cleaned up after a management, i.e. successive managements without reloading the tree list are possible. |
|
/src/core/management.cpp /src/core/management.h /src/core/resourceunitspecies.cpp /src/core/sapling.cpp /src/core/sapling.h /src/core/snag.cpp /src/core/tree.cpp /src/core/tree.h /src/tools/mapgrid.cpp /src/tools/mapgrid.h
|
521 |
4963d 09h |
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
|
513 |
4984d 08h |
werner |
/src/core/ |
fixed a nasty bug: if one tree species succeeded to establish on a formerly empty RU, the saplings of other species were killed (well, not directly, but the environment was not recalculated leading to a f_env value of 0). |
|
/src/core/production3pg.cpp /src/core/resourceunit.cpp /src/core/resourceunitspecies.cpp /src/core/tree.cpp
|
505 |
4993d 03h |
werner |
/src/core/ |
fix crash small stamps for Acma. |
|
/src/core/stampcontainer.cpp /src/core/tree.cpp
|
497 |
5010d 08h |
werner |
/src/ |
tried some possibilities to eliminate "strange" crashes when simulating very for a long time. Ended up with adding additional "pause" between every 50 year or so (see modelcontroller.cpp); this helps at least a little.
also updated the expression-linearization |
|
/src/core/modelcontroller.cpp /src/core/modelcontroller.h /src/core/tree.cpp /src/iland/mainwindow.cpp /src/iland/tests.cpp /src/tools/expression.cpp
|
488 |
5013d 00h |
werner |
/ |
new version including several bug fixes and improvements for the regeneration / sapling growth submodule, as well as some performance optimizations. |
|
/executable/iland.exe /src/core/tree.cpp /src/iland/iland.pro /src/iland/version.cpp
|
486 |
5013d 05h |
werner |
/src/ |
Expression: extended linearization range to the upper limit (it is a
typical use to linearize e.g. from 0..1 -> 1 should be included)
removed some warnings that came up when compiling in linux
added a setlocale()-function in main(). This was because otherwise the
"atof"-call when parsing Expressions cut off the fraction part (i.e.
converted "0.285" to "0") (used in Linux german locale) |
|
/src/core/phenology.h /src/core/tree.cpp /src/iland/main.cpp /src/iland/mainwindow.ui /src/tools/expression.cpp /src/tools/floatingaverage.h /src/tools/globalsettings.cpp
|
482 |
5013d 11h |
werner |
/src/core/ |
fixed bug that recruited trees modified the average aging calculation; added some diagnostic code here and there. |
|
/src/core/model.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/tree.cpp /src/core/watercycle.cpp
|
476 |
5014d 09h |
werner |
/src/ |
added snag debug output to the gui
corrected calculation of branch biomass in Tree |
|
/src/core/snag.cpp /src/core/snag.h /src/core/tree.cpp /src/core/tree.h /src/iland/mainwindow.cpp
|
470 |
5018d 14h |
werner |
/src/core/ |
add light response function to sapling growth (rest: constness of lightresponse function calls) |
|
/src/core/sapling.cpp /src/core/species.h /src/core/speciesset.cpp /src/core/speciesset.h /src/core/tree.cpp
|
468 |
5019d 08h |
werner |
/src/ |
starting the implementation of the snag dynamics submodule.
New class: Snag
added Snag to ResourceUnitSpecies
added links to Snag in Tree |
|
/src/core/snag.cpp /src/core/snag.h
/src/core/model.cpp /src/core/modelsettings.h /src/core/resourceunitspecies.cpp /src/core/resourceunitspecies.h /src/core/tree.cpp /src/iland/iland.pro
|