| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 697 |
4601d 17h |
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
|
| 680 |
4637d 01h |
werner |
/trunk/ |
Version 0.7.1
Several improvements/fixes in the Fire module, inter alia:
* fire size distribution
* handling of burning snags
* improved scripting support (export spread pattern als ESRI grid)
* fix in watercylce for kbdi-calculation |
|
/trunk/executable/iland.exe
/trunk/executable/ilandc.exe
/trunk/src/core/grid.h
/trunk/src/core/watercycle.cpp
/trunk/src/iland/version.cpp
/trunk/src/plugins/fire/firemodule.cpp
/trunk/src/plugins/fire/firemodule.h
/trunk/src/plugins/fire/fireout.cpp
/trunk/src/plugins/fire/firescript.cpp
/trunk/src/plugins/fire/firescript.h
/trunk/src/tools/scriptglobal.cpp
|
| 671 |
4644d 21h |
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
|
| 646 |
4785d 22h |
werner |
/trunk/src/ |
reorganized the fire module code and other stuff.
* added new interfaces and linked some of them already (setup(), ...)
* separated the plugin from the implementation (fireplugin.h vs. FireModule)
* worked on finding a way to create "layeredgrids" (how to avoid the templates...)- i have a solution now but still not sure if it really works |
|
/trunk/src/core/layeredgrid.h
/trunk/src/plugins/fire/firemodule.cpp
/trunk/src/plugins/fire/firemodule.h
/trunk/src/core/grid.h
/trunk/src/core/model.cpp
/trunk/src/core/model.h
/trunk/src/core/modelcontroller.cpp
/trunk/src/core/modelcontroller.h
/trunk/src/core/plugin_interface.h
/trunk/src/core/watercycle.cpp
/trunk/src/iland/iland.pro
/trunk/src/plugins/fire/fire.pro
/trunk/src/plugins/fire/fireplugin.cpp
/trunk/src/plugins/fire/fireplugin.h
/trunk/src/tools/gisgrid.cpp
/trunk/src/tools/gisgrid.h
/trunk/src/tools/modules.cpp
/trunk/src/tools/modules.h
|
| 639 |
4805d 19h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable
/trunk/src
/executable
/src
|
| 626 |
4857d 15h |
werner |
/src/core/ |
added some debug timers plus completed the executable directory (added the sqlite-plugin) |
|
/src/core/establishment.cpp
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/speciesresponse.cpp
/src/core/watercycle.cpp
|
| 621 |
4862d 01h |
werner |
/src/core/ |
* removed the temperature dependent calculation of e20 for the evapotranspiration,
* added some options to the project file (snow temperature, interception) |
|
/src/core/watercycle.cpp
/src/core/watercycle.h
|
| 620 |
4862d 03h |
werner |
/src/core/ |
Modified canopy evaporation to incorporate Wigmosta et al (switching
from "wet" to "dry" canopy) |
|
/src/core/watercycle.cpp
|
| 605 |
4875d 00h |
werner |
/src/ |
added the "rid" (i.e. a unique id per resource unit) in various debug outputs.
added the "shell" of a new carbonflow output. |
|
/src/output/carbonflowout.cpp
/src/output/carbonflowout.h
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/snag.cpp
/src/core/speciesresponse.cpp
/src/core/watercycle.cpp
/src/iland/iland.pro
/src/output/outputmanager.cpp
/src/tools/globalsettings.cpp
|
| 572 |
4908d 23h |
werner |
/src/ |
* be more generous with the names in the header of ESRI-style gis grids (case sensitivity)
* allow subtle difference for the sum of sand/clay/silt (rounding errors) |
|
/src/core/watercycle.cpp
/src/tools/gisgrid.cpp
|
| 566 |
4913d 02h |
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
|
| 562 |
4919d 22h |
werner |
/src/ |
calculate ET0 (reference evapotranspiration) that is used for snag decay 're'. Another version of penman monteith is used for calculation.
See the excel - based "re_decomp.xlsx" for details |
|
/src/core/snag.cpp
/src/core/watercycle.cpp
/src/core/watercycle.h
/src/iland/tests.cpp
|
| 561 |
4920d 00h |
werner |
/src/core/ |
update of the watercycle:
* changed the calc. of svp-slope (saturated vapor pressure) from homebrewn derivation to FAO code (Allen et al).
* use now "net radiation" instead of global radiation. "net rad" is calculated from a linear estimation with fixed coefficients (source: 3pg)
The results show only very little differences (e.g.: base version: yearly et: 698mm, after updates: 666mm). (see penman-monteith_2011_test.xls) |
|
/src/core/watercycle.cpp
|
| 554 |
4924d 22h |
werner |
/ |
new version - somewhat intermediate.
contains the *next* version of 're' calculation and seems to have still problems with the PET calculation. This version is solely for testing purposes. |
|
/executable/iland.exe
/src/core/watercycle.cpp
/src/core/watercycle.h
/src/iland/version.cpp
|
| 553 |
4924d 22h |
werner |
/src/core/ |
another variant to calculate 're', following Adair et al 2008. Based on monthly sums of precipitation and PET. PET is calculated during the water cycle, monthly precipitation is summed in the climate object itself. |
|
/src/core/climate.cpp
/src/core/climate.h
/src/core/snag.cpp
/src/core/watercycle.cpp
/src/core/watercycle.h
|
| 547 |
4926d 23h |
werner |
/src/core/ |
restructured the topLayerWaterContent setting; it is now RU-specific (and not a global parameter) |
|
/src/core/modelsettings.cpp
/src/core/modelsettings.h
/src/core/snag.cpp
/src/core/watercycle.cpp
/src/core/watercycle.h
|
| 546 |
4927d 01h |
werner |
/src/core/ |
modified calculation of 're' (decay rate for snags), and added new model setting ('topLayerWaterContent') for that purpose. New variable 'waterDeficit' per day in WaterCycle. |
|
/src/core/modelsettings.cpp
/src/core/modelsettings.h
/src/core/snag.cpp
/src/core/watercycle.cpp
/src/core/watercycle.h
|
| 540 |
4951d 22h |
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
|
| 504 |
4995d 18h |
werner |
/src/ |
New output for "saplings" |
|
/src/output/saplingout.cpp
/src/output/saplingout.h
/src/core/model.cpp
/src/core/resourceunitspecies.h
/src/core/sapling.cpp
/src/core/sapling.h
/src/core/standstatistics.cpp
/src/core/watercycle.cpp
/src/iland/iland.pro
/src/output/outputmanager.cpp
|
| 503 |
4995d 19h |
werner |
/src/ |
water cycle: fixed a regression with the calculation of average aging.
added "canopyConductance" as variable for resource units.
added a GUI option to change the current log level. |
|
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/watercycle.cpp
/src/core/watercycle.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/mainwindow.ui
/src/tools/expressionwrapper.cpp
|
| 502 |
4996d 01h |
werner |
/src/core/ |
water cycle for resource units without adult trees; adapted water use for RUs with only few stands by adding "ground cover" up to LAI=1 with default characteristics. |
|
/src/core/resourceunit.cpp
/src/core/watercycle.cpp
/src/core/watercycle.h
|
| 496 |
5013d 01h |
werner |
/src/core/ |
changed the behavior of the water-cycle wrt establishment: now the water cycle is executed even if no adult trees are on a resource unit |
|
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/watercycle.cpp
/src/core/watercycle.h
|
| 484 |
5015d 23h |
werner |
/src/ |
modified release of memory of trees; QVector::resere() does not actually shrink memory; so now "squeeze()" is used. |
|
/src/core/resourceunit.cpp
/src/core/watercycle.cpp
/src/iland/iland.pro
|
| 482 |
5016d 01h |
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
|
| 455 |
5072d 01h |
werner |
/src/ |
changed the layout of the resourceUnitSpecies from a QVector to a QList<ResourceUnitSpecies*>. This seems to be much more appropriate. But caused many small changes throughout the project. |
|
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/watercycle.cpp
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/output/dynamicstandout.cpp
/src/output/managementout.cpp
/src/output/productionout.cpp
/src/output/standdeadout.cpp
/src/output/standout.cpp
|
| 431 |
5151d 15h |
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
|
| 379 |
5190d 03h |
werner |
/src/core/ |
included switch to use either field capacity or water saturation for water calculations. |
|
/src/core/watercycle.cpp
|
| 377 |
5191d 04h |
werner |
/src/core/ |
added aging to g_c calculation (WaterCycle). |
|
/src/core/standstatistics.h
/src/core/watercycle.cpp
|
| 372 |
5198d 16h |
werner |
/src/core/ |
corrected default value for boundary layer conductance (now 0.2) |
|
/src/core/modelsettings.cpp
/src/core/watercycle.cpp
|
| 368 |
5199d 03h |
werner |
/src/ |
new model settings: laiThresholdForClosedStand, boundaryLayerConductance.
dropped the "evapotranspirationBGC" and the related model settings |
|
/src/core/modelsettings.cpp
/src/core/modelsettings.h
/src/core/watercycle.cpp
/src/core/watercycle.h
/src/tools/globalsettings.cpp
|
| 367 |
5199d 03h |
werner |
/src/core/ |
changes in the watercycle.
see http://iland.boku.ac.at/tiki-view_tracker_item.php?itemId=30
the calculation of the effect on the canopy conductance is changed. Now, the combined effects of soil water and vpd response together modify the canopy conductance. In order to do this some structural changes have been necessary. Note: now the response values for vpd and soil water are calculated two times. |
|
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/resourceunitspecies.h
/src/core/species.cpp
/src/core/speciesresponse.cpp
/src/core/speciesresponse.h
/src/core/watercycle.cpp
/src/core/watercycle.h
|
| 364 |
5218d 04h |
werner |
/src/ |
added RU-index to water debug output (and an additional check to test for strange water inputs) |
|
/src/core/watercycle.cpp
/src/tools/globalsettings.cpp
|
| 339 |
5310d 19h |
werner |
/src/ |
sort debug outputs by the first field (usually date). |
|
/src/core/watercycle.cpp
/src/core/watercycle.h
/src/tools/globalsettings.cpp
|
| 338 |
5310d 21h |
werner |
/src/ |
see tracker #18: fixes in watercycle.cpp
(calc. soil properties, depletion below species specific minimum-water potential) |
|
/src/core/watercycle.cpp
/src/core/watercycle.h
/src/tools/globalsettings.cpp
|
| 335 |
5322d 20h |
werner |
/src/core/ |
issues with watercycle: interception from evaporation (see tracker#16) |
|
/src/core/climate.cpp
/src/core/watercycle.cpp
/src/core/watercycle.h
|
| 334 |
5322d 22h |
werner |
/src/core/ |
flow from intercepted water to snow for temps <0° |
|
/src/core/watercycle.cpp
/src/core/watercycle.h
|
| 331 |
5329d 14h |
werner |
/ |
changed order in which statistics are calculated: statistics of species and RUs are now cleared immediately before they are refilled (during the growth of individual trees). Now steps between (e.g. water-cycle) can access valid statistics (that are essentially the state of the end of the last year) |
|
/executable
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/watercycle.cpp
|
| 304 |
5339d 22h |
werner |
/src/core/ |
changed parameter name psiMax to psiMin (tracker#6) |
|
/src/core/species.cpp
/src/core/species.h
/src/core/watercycle.cpp
|
| 299 |
5350d 01h |
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
|
| 281 |
5374d 09h |
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
|