Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
1222 |
2768d 12h |
werner |
/ |
public SVN |
|
/tags/release_1.0
/branches/release_1.0
|
1221 |
2768d 12h |
werner |
/branches/ |
public SVN |
|
/branches/release_1.0
/branches/version1.0
|
1220 |
2768d 12h |
werner |
/branches/version1.0/ |
Version 1.0 |
|
/branches/version1.0
|
1218 |
2768d 14h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/trunk
/iland_regen
|
1217 |
2768d 14h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/iland_regen
/branches/iland_regen
|
1157 |
2986d 20h |
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 |
3056d 18h |
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
|
780 |
4027d 14h |
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 |
4040d 13h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
713 |
4533d 18h |
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
|
675 |
4622d 17h |
werner |
/trunk/src/ |
Snapshot functions to save/load a vegetation snapshot (currently: trees, soil, snags). Some additional javascript functions to access the functionality. |
|
/trunk/src/core/snag.h /trunk/src/core/soil.h /trunk/src/core/tree.h /trunk/src/iland/iland.pro /trunk/src/iland/version.cpp /trunk/src/tools/globalsettings.cpp /trunk/src/tools/scriptglobal.cpp /trunk/src/tools/scriptglobal.h
|
671 |
4623d 14h |
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
|
663 |
4666d 09h |
werner |
/trunk/src/ |
continued implementation of the fire module. fixed an introduced error that crashed the sapling growth. |
|
/trunk/src/core/sapling.cpp /trunk/src/core/sapling.h /trunk/src/core/snag.h /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/fire/firemodule.h
|
662 |
4666d 14h |
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 |
4784d 11h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable /trunk/src
/executable /src
|
609 |
4849d 19h |
werner |
/src/ |
implementing CarbonFlow output and book keeping code. |
|
/src/core/model.cpp /src/core/resourceunit.cpp /src/core/snag.cpp /src/core/snag.h /src/core/soil.cpp /src/core/soil.h /src/output/carbonflowout.cpp
|
608 |
4849d 20h |
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
|
607 |
4850d 11h |
werner |
/src/core/ |
smaller fixes:
* error when exporting ESRI files
* a new JS function "slashSnags()" for managing standing dead trees
* handling of newly burnt tree when removing carbon due to a fire event |
|
/src/core/grid.h /src/core/management.cpp /src/core/management.h /src/core/snag.cpp /src/core/snag.h
|
595 |
4867d 20h |
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 |
4881d 18h |
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
|
587 |
4882d 08h |
werner |
/src/ |
added carbon output.
lots of changes necessary to get this done (especially budgeting of biomass pools) |
|
/src/output/carbonout.cpp /src/output/carbonout.h
/src/core/model.cpp /src/core/snag.cpp /src/core/snag.h /src/core/standstatistics.cpp /src/core/standstatistics.h /src/iland/iland.pro /src/output/outputmanager.cpp
|
582 |
4883d 10h |
werner |
/src/core/ |
changed behavior of disturbance management and snags/soil pools: now a operation affects both C and N, i.e. the CN-ratio is maintained. |
|
/src/core/snag.h /src/core/soil.cpp /src/core/soil.h
|
566 |
4891d 19h |
werner |
/src/ |
extended management: modify carbon content of soil / swd pools.
slightly modifications to the CSVFile JS API (value(row, name)-function). |
|
/src/core/management.cpp /src/core/management.h /src/core/snag.h /src/core/soil.cpp /src/core/soil.h /src/core/watercycle.cpp /src/tools/csvfile.h
|
557 |
4902d 11h |
werner |
/src/ |
added initialization of snags and some new resource unit variables.
Example: model.initialization node:
<snags>
<swdC>12000</swdC>
<swdCN>120</swdCN>
<swdCount>50</swdCount>
<otherC>4000</otherC>
<otherCN>30</otherCN>
<swdDecompRate>0.05</swdDecompRate>
<woodDecompRate>0.05</woodDecompRate>
<swdHalfLife>30</swdHalfLife>
</snags> |
|
/src/core/snag.cpp /src/core/snag.h /src/tools/expressionwrapper.cpp
|
548 |
4905d 14h |
werner |
/ |
new version 0.5 RC2
* modified 're' calculation
* fixed bug reading XML files |
|
/executable/iland.exe /src/core/snag.h /src/iland/version.cpp
|
540 |
4930d 15h |
werner |
/src/ |
removed the storage of rel. water content in water cycle module; changed the way the climate modifier (re) for snag/soil decay is calculated.
Added the coarse wood of died trees to the 5-year decay pattern of branches (and renamed therefore to otherWood). |
|
/src/core/snag.cpp /src/core/snag.h /src/core/watercycle.cpp /src/core/watercycle.h /src/tools/globalsettings.cpp
|
534 |
4939d 15h |
werner |
/src/ |
large(r) update of the soil model. Now, the 'kyl' and 'kyr' parameters (i.e. decomposition rates for the litter/wood-soil pool) are now species parameters and calculated dynamically from the litter inputs. |
|
/src/core/resourceunit.cpp /src/core/snag.cpp /src/core/snag.h /src/core/soil.cpp /src/core/soil.h /src/core/species.cpp /src/core/species.h /src/core/speciesset.cpp /src/iland/mainwindow.ui /src/iland/tests.cpp /src/tools/globalsettings.cpp
|
529 |
4943d 07h |
werner |
/src/core/ |
setup initial values for soil pools (read from XML) |
|
/src/core/resourceunit.cpp /src/core/snag.h /src/core/soil.cpp /src/core/soil.h
|
526 |
4943d 11h |
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
|
522 |
4944d 10h |
werner |
/src/core/ |
updating the snag-concept (to version 5 from RS) |
|
/src/core/snag.cpp /src/core/snag.h
|
521 |
4944d 16h |
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
|
490 |
4992d 19h |
werner |
/src/core/ |
added calculation of the climate indicator "re" used for snag dynamics (decay rate). |
|
/src/core/climate.h /src/core/grid.h /src/core/resourceunitspecies.cpp /src/core/snag.cpp /src/core/snag.h /src/core/watercycle.h
|
477 |
4995d 15h |
werner |
/src/ |
testing and refining snag dynamics (esp. debug outputs) |
|
/src/core/resourceunitspecies.cpp /src/core/snag.cpp /src/core/snag.h /src/iland/mainwindow.cpp /src/iland/mainwindow.h /src/iland/mainwindow.ui /src/tools/globalsettings.cpp
|
476 |
4995d 16h |
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
|
475 |
4995d 16h |
werner |
/src/ |
* Snag dynamics
debug output "SnagDynamics"
life cycle of Snag objects
include Snag Dynamics in newYear / year end routines
* threadrunner.cpp: parallel execution of species related tasks, e.g. the seed dispersal. In the current form, the ThreadRunner is much nicer:
ThreadRunner runner(mActiveSpecies);
runner.run(func_ptr); |
|
/src/core/model.cpp /src/core/resourceunit.cpp /src/core/resourceunitspecies.cpp /src/core/resourceunitspecies.h /src/core/snag.cpp /src/core/snag.h /src/core/species.h /src/core/speciesset.cpp /src/core/threadrunner.cpp /src/core/threadrunner.h /src/tools/globalsettings.cpp /src/tools/globalsettings.h
|
468 |
5000d 14h |
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
|