Subversion Repositories public iLand

Rev

Go to most recent revision | Hide changed files | Directory listing | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
1213 2737d 12h werner /branches/iland_regen/src/ implementing the stand-wise snapshot feature (for the advanced dynamic initalization)  
/branches/iland_regen/src/abe/actplanting.cpp
/branches/iland_regen/src/core/saplings.cpp
/branches/iland_regen/src/core/saplings.h
/branches/iland_regen/src/core/version.cpp
/branches/iland_regen/src/output/snapshot.cpp
/branches/iland_regen/src/output/snapshot.h
/branches/iland_regen/src/tools/gisgrid.cpp
/branches/iland_regen/src/tools/scriptglobal.cpp
/branches/iland_regen/src/tools/scriptglobal.h
1208 2739d 13h werner /branches/iland_regen/src/ working on the Spin-up feature (some additions to ABE)  
/branches/iland_regen/src/abe/actplanting.cpp
/branches/iland_regen/src/abe/agenttype.cpp
/branches/iland_regen/src/abe/agenttype.h
/branches/iland_regen/src/abe/fmstp.cpp
/branches/iland_regen/src/abe/fmtreelist.h
/branches/iland_regen/src/abe/fomescript.cpp
/branches/iland_regen/src/abe/fomescript.h
/branches/iland_regen/src/abe/forestmanagementengine.cpp
/branches/iland_regen/src/apidoc/ABE/treelist_doc.js
/branches/iland_regen/src/tools/csvfile.cpp
/branches/iland_regen/src/tools/csvfile.h
1207 2740d 13h werner /branches/iland_regen/src/abe/ adding of "updateManagement" to rebuild a management program from an (updated) source; no documentation yet  
/branches/iland_regen/src/abe/fmstp.cpp
/branches/iland_regen/src/abe/fomescript.cpp
/branches/iland_regen/src/abe/fomescript.h
1203 2761d 16h werner /branches/iland_regen/src/ added the missing "ActPlanting" functions for the "new" regeneration module.  
/branches/iland_regen/src/abe/actplanting.cpp
/branches/iland_regen/src/abe/actplanting.h
/branches/iland_regen/src/core/management.cpp
/branches/iland_regen/src/core/resourceunit.cpp
/branches/iland_regen/src/core/resourceunit.h
/branches/iland_regen/src/core/saplings.h
/branches/iland_regen/src/core/standloader.cpp
/branches/iland_regen/src/core/version.cpp
/branches/iland_regen/src/tools/mapgrid.cpp
/branches/iland_regen/src/tools/mapgrid.h
1164 2947d 13h werner /branches/iland_regen/src/ found unexpected behavior of irandom(): obviously, it return *never* the upper bound.
eg. irandom(0,3) -> values 0,1, or 2, but never 3.
changed calls to irandom() accordingly.
added also a better random selection of species in the establishment routine
 
/branches/iland_regen/src/abe/scheduler.cpp
/branches/iland_regen/src/core/climate.cpp
/branches/iland_regen/src/core/grid.h
/branches/iland_regen/src/core/management.cpp
/branches/iland_regen/src/core/model.cpp
/branches/iland_regen/src/core/saplings.cpp
/branches/iland_regen/src/core/speciesset.cpp
/branches/iland_regen/src/core/speciesset.h
/branches/iland_regen/src/core/standloader.cpp
/branches/iland_regen/src/core/tree.cpp
/branches/iland_regen/src/iland/tests.cpp
/branches/iland_regen/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/iland_regen/src/plugins/fire/firemodule.cpp
/branches/iland_regen/src/tools/randomgenerator.h
1163 2947d 18h 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
1162 2947d 19h werner /branches/iland_regen/src/ removed the old "mSaplings" from resource unit/model.
Open Issues:
* ActPlanting [init/remove of saplings]
* MapGrid: retrieve list of saplings
* testing of standloader
 
/branches/iland_regen/src/abe/actplanting.cpp
/branches/iland_regen/src/core/establishment.cpp
/branches/iland_regen/src/core/management.cpp
/branches/iland_regen/src/core/model.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/resourceunitspecies.h
/branches/iland_regen/src/core/sapling.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/standloader.cpp
/branches/iland_regen/src/iland/tests.cpp
/branches/iland_regen/src/output/saplingout.cpp
/branches/iland_regen/src/output/snapshot.cpp
/branches/iland_regen/src/plugins/fire/firemodule.cpp
/branches/iland_regen/src/plugins/wind/windmodule.cpp
/branches/iland_regen/src/tools/mapgrid.cpp
/branches/iland_regen/src/tools/mapgrid.h
1157 2949d 21h 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 3019d 19h 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
1101 3027d 19h werner /branches/port_qt5_64bit/src/ changes the names of some ABE JS function to run with Qt5.5
e.g.: basalArea(i) -> speciesBasalArea(i)
 
/branches/port_qt5_64bit/src/abe/fomescript.h
/branches/port_qt5_64bit/src/apidoc/ABE/abe_context_doc.js
/branches/port_qt5_64bit/src/core/production3pg.cpp
1099 3040d 16h werner /branches/port_qt5_64bit/src/ cleaning gcc warnings, trying to compile on VSC.  
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/core/grasscover.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/output/snapshot.cpp
/branches/port_qt5_64bit/src/tools/helper.cpp
1095 3044d 12h werner /branches/port_qt5_64bit/ Adding basic C++ level documentation for ABE classes.  
/branches/port_qt5_64bit/doc/iland_doxyfile.doxy
/branches/port_qt5_64bit/src/abe/abegrid.cpp
/branches/port_qt5_64bit/src/abe/actgeneral.cpp
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/actplanting.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/actscheduled.cpp
/branches/port_qt5_64bit/src/abe/actthinning.cpp
/branches/port_qt5_64bit/src/abe/agent.cpp
/branches/port_qt5_64bit/src/abe/agenttype.cpp
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstp.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/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/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleout.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.cpp
1090 3081d 11h werner /branches/port_qt5_64bit/src/ abe udpates (scheduler problem when stand age is 0)  
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/tools/scriptgrid.cpp
/branches/port_qt5_64bit/src/tools/scriptgrid.h
1089 3086d 13h werner /branches/port_qt5_64bit/src/ ABE learned some new tricks ....  
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/fomescript.h
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.h
/branches/port_qt5_64bit/src/core/model.cpp
1088 3088d 13h werner /branches/port_qt5_64bit/src/ salavage management bark beetle damages
some fixes w.r.t. the correct extent of grids.
added "year" as stand varaible (abe).
 
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fomewrapper.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/layeredgrid.h
/branches/port_qt5_64bit/src/core/snag.cpp
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.h
/branches/port_qt5_64bit/src/plugins/wind/windscript.cpp
/branches/port_qt5_64bit/src/tools/spatialanalysis.cpp
1074 3121d 15h werner /branches/port_qt5_64bit/src/ added output for abe-Stand-Details (basal area and basal area share).  
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/output/abestandout.cpp
/branches/port_qt5_64bit/src/abe/output/abestandout.h
/branches/port_qt5_64bit/src/iland/mainwindow.ui
1070 3129d 13h werner /branches/port_qt5_64bit/src/ bark-beetle wind interaction, now working ...  
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/activity.h
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.h
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.h
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/species.cpp
/branches/port_qt5_64bit/src/core/standloader.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h
/branches/port_qt5_64bit/src/tools/expression.h
/branches/port_qt5_64bit/src/tools/statdata.cpp
1065 3131d 09h werner /branches/port_qt5_64bit/src/ interaction of bark beetle and wind disturbances.  
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fomescript.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h
/branches/port_qt5_64bit/src/tools/modules.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
1064 3132d 13h werner /branches/port_qt5_64bit/src/ many changes. Most notably:
* improvements in the grass-cover sub Modules
* interaction between wind and bark beetle
* javascript function to extract seed-distribution-maps
* fixed a bug when continuous seed input was assumed
 
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.h
/branches/port_qt5_64bit/src/core/environment.cpp
/branches/port_qt5_64bit/src/core/grasscover.cpp
/branches/port_qt5_64bit/src/core/grasscover.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.h
/branches/port_qt5_64bit/src/core/seeddispersal.cpp
/branches/port_qt5_64bit/src/core/seeddispersal.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
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.h
1063 3135d 14h werner /branches/port_qt5_64bit/src/ implementing a first version of the browsing submodule.

many small improvements for ABE.
 
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/actplanting.cpp
/branches/port_qt5_64bit/src/abe/actscheduled.cpp
/branches/port_qt5_64bit/src/abe/fmstp.cpp
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/fomescript.h
/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/apidoc/ABE/abe_doc.js
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/core/sapling.h
/branches/port_qt5_64bit/src/core/species.cpp
/branches/port_qt5_64bit/src/core/species.h

Show All