Subversion Repositories public iLand

Rev

Go to most recent revision | Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
1010 3415d 21h werner /branches/port_qt5_64bit/src/ bark beetle module...  
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/tree.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.h
975 3454d 01h werner /branches/port_qt5_64bit/src/ Fixed a snapshot issue.
Now the water-content and the snow-pack are also stored in the snapshot.
statistics are forced to be re-created.
 
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/core/tree.h
/branches/port_qt5_64bit/src/core/watercycle.h
/branches/port_qt5_64bit/src/output/snapshot.cpp
951 3553d 16h werner /branches/port_qt5_64bit/src/ many ABE related changes; inter alia:
* syntax checking theme (to detect mis-spelled properties in JS)
* fixed bug in thinning routine (custom-thinning)
* scripting-based approach for initializing regeneration
* thinning routine for selective thinning
...
 
/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/actthinning.cpp
/branches/port_qt5_64bit/src/abe/actthinning.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/fomescript.cpp
/branches/port_qt5_64bit/src/abe/fomescript.h
/branches/port_qt5_64bit/src/abe/output/abestandout.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/abe/scheduler.h
/branches/port_qt5_64bit/src/apidoc/ABE/abe_context_doc.js
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/resourceunitspecies.h
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/core/sapling.h
/branches/port_qt5_64bit/src/core/standloader.cpp
/branches/port_qt5_64bit/src/core/tree.h
/branches/port_qt5_64bit/src/tools/expressionwrapper.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.h
904 3711d 17h 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 20h 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
885 3753d 19h werner /branches/port_qt5_64bit/src/ .... continuing.... ABE  
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmtreelist.cpp
/branches/port_qt5_64bit/src/amie/fmtreelist.h
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/apidoc/abe_doc.js
/branches/port_qt5_64bit/src/apidoc/treelist_doc.js
/branches/port_qt5_64bit/src/core/tree.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/tools/expressionwrapper.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
779 4059d 21h werner /branches/port_qt5_64bit/  
/branches/port_qt5_64bit
733 4474d 21h werner /trunk/src/ trying to find the iland bug??  
/trunk/src/core/standloader.cpp
/trunk/src/core/tree.h
/trunk/src/iland/mainwindow.cpp
713 4553d 03h 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 4642d 02h 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 4642d 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
668 4678d 02h 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 4678d 07h 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
639 4803d 20h werner / move current content to the "trunk"  
/trunk/executable
/trunk/src
/executable
/src
564 4914d 19h 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
544 4948d 01h werner /src/ MapGrid rocks! It is quite easy now to write - for instance - a management based on polygon defined by a grid; (see the "test" for this case).  
/src/core/management.cpp
/src/core/management.h
/src/core/tree.h
/src/iland/tests.cpp
/src/tools/mapgrid.cpp
/src/tools/mapgrid.h
476 5015d 00h 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
449 5071d 03h werner /src/ start of implementation of sapling growth.
setup of the temporal height-map for saplings.
 
/src/core/sapling.cpp
/src/core/sapling.h
/src/core/resourceunit.h
/src/core/resourceunitspecies.h
/src/core/species.cpp
/src/core/species.h
/src/core/tree.h
/src/iland/iland.pro
/src/tools/globalsettings.h
407 5154d 02h werner /src/ modified the painting of trees (use now the crown radius)
tried to fix the database lock error when reloading the model (not solved: but: no problem when model was executed for at least one year...)
 
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/output/output.cpp
/src/tools/globalsettings.cpp
388 5180d 17h werner /src/core/ remodified the age calculation. Now the age is estimated based on the current height relative to h_max. The aging-calculation itself is no longer changed by that.  
/src/core/species.cpp
/src/core/species.h
/src/core/standloader.cpp
/src/core/tree.cpp
/src/core/tree.h
385 5181d 02h werner /src/core/ little update to tree age issues  
/src/core/species.cpp
/src/core/species.h
/src/core/tree.h
381 5181d 04h werner /src/core/ appropriate handling of tree age during initialization.
if no age is provided in the input file only the tree height is used for the aging calculation. The tree "age" in that case reflects only the number of years since initialization.
 
/src/core/species.cpp
/src/core/species.h
/src/core/standloader.cpp
/src/core/tree.cpp
/src/core/tree.h
287 5370d 11h werner /src/ Tree initialization (random variant). works almost...  
/src/core/global.h
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/standloader.cpp
/src/core/standloader.h
/src/core/tree.h
/src/tools/sqlhelper.cpp
/src/tools/sqlhelper.h
278 5373d 08h werner /src/ Management output. Added a statisticsMgmt() for ResourceUnitSpecies. Complicated to get the order right.  
/src/output/managementout.cpp
/src/output/managementout.h
/src/core/management.cpp
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/resourceunitspecies.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland/iland.pro
/src/output/outputmanager.cpp
277 5373d 14h werner /src/ added "Gesamtwuchsleistung" i.e. total growth.  
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/resourceunitspecies.h
/src/core/standstatistics.cpp
/src/core/standstatistics.h
/src/core/tree.cpp
/src/core/tree.h
/src/output/standdeadout.cpp
/src/output/standout.cpp
276 5375d 17h werner /src/ added explicit fine root compartment in tree. Changed partitioning, the calculation of the stress index, follow-up change in several outputs.  
/src/core/species.cpp
/src/core/species.h
/src/core/tree.cpp
/src/core/tree.h
/src/output/treeout.cpp
/src/tools/expressionwrapper.cpp
/src/tools/expressionwrapper.h
/src/tools/globalsettings.cpp
264 5377d 16h werner /src/ TreeOut output (including filtering)  
/src/core/model.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/output/treeout.cpp
/src/output/treeout.h
262 5377d 17h werner /src/ added output for dead trees (StandDeadOut)  
/src/output/standdeadout.cpp
/src/output/standdeadout.h
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland/iland.pro
/src/output/outputmanager.cpp
261 5377d 18h werner /src/ * added NPP aboveground to stats
* some update in comments
 
/src/core/grid.h
/src/core/model.cpp
/src/core/standstatistics.cpp
/src/core/standstatistics.h
/src/core/tree.cpp
/src/core/tree.h
/src/output/dynamicstandout.cpp
/src/output/standout.cpp
257 5378d 16h werner /src/ added production based (tree) statistics.
StandOut after tree initialization.
some documentation polishing.
 
/src/core/model.cpp
/src/core/production3pg.h
/src/core/resourceunit.cpp
/src/core/species.h
/src/core/speciesresponse.cpp
/src/core/standstatistics.cpp
/src/core/standstatistics.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/output/output.cpp
/src/output/output.h
/src/output/standout.cpp
/src/tools/globalsettings.h
251 5379d 14h werner /src/ Light-Redistribution: Changed again (12.10.2009). LRI of trees are now modified with a modifier based on stockedarea*beerLambert-fraction (pPar). The modified LRI is then used to calculate a light response. The light response * leafarea eventually acts as the share of GPP assigned to a particular tree.  
/src/core/model.cpp
/src/core/production3pg.cpp
/src/core/production3pg.h
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/speciesresponse.h
/src/core/tree.cpp
/src/core/tree.h
/src/output/productionout.cpp
/src/tools/globalsettings.cpp
247 5382d 11h werner /src/ global script object (ScriptGlobal).
Doxygen documentation refinements.
 
/src/iland/maindoc.cpp
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
/src/core/climate.cpp
/src/core/grid.h
/src/core/management.cpp
/src/core/model.cpp
/src/core/resourceunitspecies.cpp
/src/core/species.cpp
/src/core/speciesresponse.cpp
/src/core/stampcontainer.h
/src/core/standloader.cpp
/src/core/tree.h
/src/iland/iland.pro
/src/tools/climateconverter.cpp
/src/tools/expression.cpp
/src/tools/globalsettings.cpp
234 5384d 10h werner /src/core/ added (during dev. of watercycle) new properties: area() to ResourceUnit, leafArea() to Tree, added LAI-counting to StandStatistics.  
/src/core/climate.h
/src/core/resourceunit.h
/src/core/resourceunitspecies.h
/src/core/standstatistics.cpp
/src/core/standstatistics.h
/src/core/tree.h
212 5392d 15h werner /src/ added LightResponse as a TreeVariable, fixed bug during Light distribution.  
/src/core/climate.cpp
/src/core/resourceunit.h
/src/core/speciesresponse.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/tools/expressionwrapper.cpp
187 5399d 06h iland /src/ wow. Ressource is correctly spelled as Resource. I jerk.  
/src/core/global.h
/src/core/model.cpp
/src/core/production3pg.h
/src/core/ressourceunit.h
/src/core/ressourceunitspecies.cpp
/src/core/ressourceunitspecies.h
/src/core/standloader.cpp
/src/core/standloader.h
/src/core/threadrunner.cpp
/src/core/threadrunner.h
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/iland/management.cpp
/src/iland/tests.cpp
/src/tools/expressionwrapper.cpp
/src/tools/expressionwrapper.h
/src/tools/xmlhelper.h
180 5400d 10h werner /src/ created StandStatistics (similar to the solution in Picus). Each tree adds itself to the statistics object of RU x species. During yearEnd() of RessourceUnit the data is aggregated for the whole stand.  
/src/core/standstatistics.cpp
/src/core/standstatistics.h
/src/core/model.cpp
/src/core/ressourceunit.cpp
/src/core/ressourceunit.h
/src/core/ressourceunitspecies.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland/iland.pro
170 5405d 11h werner /src/ added a "age" to trees (Tree, also Treewrapper, also StandLoader). Used by aging.  
/src/core/modelcontroller.cpp
/src/core/production3pg.cpp
/src/core/standloader.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/tools/expressionwrapper.cpp
169 5405d 16h werner /src/ Aging in Tree growth (Species::aging()), species parameters, ...  
/src/core/species.cpp
/src/core/species.h
/src/core/tree.cpp
/src/core/tree.h
/src/tools/expression.cpp
/src/tools/globalsettings.cpp
159 5407d 19h werner /src/ Mortality of trees (new species parameter, mortality function, ...)  
/src/core/model.cpp
/src/core/species.cpp
/src/core/species.h
/src/core/tree.cpp
/src/core/tree.h
/src/tools/expressionwrapper.cpp
158 5409d 18h werner /src/core/ code cleanup/refactoring on Tree.  
/src/core/model.cpp
/src/core/ressourceunit.cpp
/src/core/tree.cpp
/src/core/tree.h