| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 723 |
4530d 22h |
werner |
/trunk/src/ |
included a switch to determine the handling of freezing/frozen soil. |
|
/trunk/src/core/watercycle.cpp
/trunk/src/plugins/wind/windmodule.cpp
|
| 720 |
4540d 15h |
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
|
| 697 |
4601d 18h |
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 22h |
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 23h |
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 16h |
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 02h |
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 01h |
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 01h |
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 23h |
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 |
4927d 00h |
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 02h |
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 23h |
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
|