| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 1222 |
2970d 04h |
werner |
/ |
public SVN |
|
/tags/release_1.0
/branches/release_1.0
|
| 1221 |
2970d 04h |
werner |
/branches/ |
public SVN |
|
/branches/release_1.0
/branches/version1.0
|
| 1220 |
2970d 04h |
werner |
/branches/version1.0/ |
Version 1.0 |
|
/branches/version1.0
|
| 1218 |
2970d 06h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/trunk
/iland_regen
|
| 1217 |
2970d 06h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/iland_regen
/branches/iland_regen
|
| 1202 |
3021d 04h |
werner |
/branches/iland_regen/src/ |
searching/fixing issues with carbon cycle: NEP as provided by carbonflow output (NPP-Rh-Mgmt) is different from NEP as derived by the delta of the carbon stocks.
As usual, very hard to track down these issues, but:
* bark beetle module: foliage loss from BB-trees now correctly routed to soil
* order of modules in model: switched disturbances and carbon cylcle (in order to correctly track all carbon changes due to disturbances)
* fixed a problem with the calculation of NPP: after disturbances stand level NPP was set to 0 (since statistics were recalculated after disturbaces, but NPP values are not available then). Introduced: StandStatistics::clearOnlyTrees()
* flow from branches to the atmosphere (decay of branches) now tracked correctly (changes the NEP calulation). |
|
/branches/iland_regen/src/core/model.cpp
/branches/iland_regen/src/core/resourceunit.cpp
/branches/iland_regen/src/core/snag.cpp
/branches/iland_regen/src/core/standstatistics.cpp
/branches/iland_regen/src/core/standstatistics.h
/branches/iland_regen/src/output/carbonflowout.cpp
/branches/iland_regen/src/plugins/barkbeetle/barkbeetlemodule.cpp
|
| 1177 |
3147d 04h |
werner |
/branches/iland_regen/src/ |
updating the sapling growth (calculation of stem numbers) |
|
/branches/iland_regen/src/core/resourceunitspecies.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/species.h
/branches/iland_regen/src/core/standstatistics.cpp
/branches/iland_regen/src/output/saplingout.cpp
|
| 1163 |
3186d 09h |
werner |
/branches/iland_regen/src/ |
removed the "sapling.h" everywhere.
open:
* establishment: use better random order of species (e.g. by providing N random lists in speciesSet) |
|
/branches/iland_regen/src/abe/actplanting.cpp
/branches/iland_regen/src/core/management.cpp
/branches/iland_regen/src/core/model.cpp
/branches/iland_regen/src/core/resourceunitspecies.h
/branches/iland_regen/src/core/sapling.cpp
/branches/iland_regen/src/core/standstatistics.cpp
/branches/iland_regen/src/core/standstatistics.h
/branches/iland_regen/src/tools/mapgrid.cpp
|
| 1158 |
3188d 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 |
3188d 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 |
3258d 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
|
| 1102 |
3258d 23h |
werner |
/branches/port_qt5_64bit/src/ |
fixed couple of clang warnings.
some debugging/profiling work w.r.t. establishment/regen. |
|
/branches/port_qt5_64bit/src/core/establishment.cpp
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/seeddispersal.cpp
/branches/port_qt5_64bit/src/core/seeddispersal.h
/branches/port_qt5_64bit/src/core/soil.cpp
/branches/port_qt5_64bit/src/core/stamp.cpp
/branches/port_qt5_64bit/src/core/stampcontainer.cpp
/branches/port_qt5_64bit/src/core/standloader.cpp
/branches/port_qt5_64bit/src/core/standstatistics.cpp
/branches/port_qt5_64bit/src/core/timeevents.cpp
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/core/tree.h
/branches/port_qt5_64bit/src/output/outputmanager.cpp
/branches/port_qt5_64bit/src/output/treeout.cpp
/branches/port_qt5_64bit/src/output/treeout.h
/branches/port_qt5_64bit/src/tools/xmlhelper.cpp
/branches/port_qt5_64bit/src/tools/xmlhelper.h
|
| 936 |
3776d 04h |
werner |
/branches/port_qt5_64bit/src/ |
searching for bugs in the bookkeeping of increments, volumes.
very cumbersome.... |
|
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/core/management.cpp
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/core/resourceunit.cpp
/branches/port_qt5_64bit/src/core/resourceunitspecies.cpp
/branches/port_qt5_64bit/src/core/resourceunitspecies.h
/branches/port_qt5_64bit/src/core/standstatistics.cpp
|
| 863 |
4035d 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
|
| 855 |
4063d 05h |
werner |
/branches/port_qt5_64bit/src/ |
fixed bug in landscape output
added (not already included) mode for dynamicstand output to aggregate to ru level (without species level)
now newly recruited trees are also included in the stand statistics (ru-level). |
|
/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/version.cpp
/branches/port_qt5_64bit/src/output/dynamicstandout.cpp
/branches/port_qt5_64bit/src/output/dynamicstandout.h
|
| 837 |
4070d 07h |
werner |
/branches/port_qt5_64bit/src/ |
* added total carbon to stand output
* created a new output "landscape" for stand aggregates on landscape level (per species)
* improved error handling ModelController
* improved ilandc: now model settings can be changed via command line (and javascript function can be called)
* finalized "background external seeds" |
|
/branches/port_qt5_64bit/src/output/landscapeout.cpp
/branches/port_qt5_64bit/src/output/landscapeout.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.h
/branches/port_qt5_64bit/src/core/seeddispersal.cpp
/branches/port_qt5_64bit/src/core/species.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/ilandc/consoleshell.cpp
/branches/port_qt5_64bit/src/ilandc/consoleshell.h
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/ilandc/main.cpp
/branches/port_qt5_64bit/src/output/carbonout.cpp
/branches/port_qt5_64bit/src/output/carbonout.h
/branches/port_qt5_64bit/src/output/outputmanager.cpp
/branches/port_qt5_64bit/src/output/standout.cpp
/branches/port_qt5_64bit/src/output/standout.h
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
|
| 824 |
4075d 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
|
| 779 |
4242d 05h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
| 697 |
4782d 03h |
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 |
4825d 06h |
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
|