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
1101 3087d 09h 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
1100 3100d 05h werner /branches/port_qt5_64bit/src/ trying declaring the GRASSCOVERSTEPS in the cpp file.
some additional cleanups.
 
/branches/port_qt5_64bit/src/core/grasscover.cpp
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/output/snapshot.cpp
1099 3100d 05h 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
1098 3100d 07h werner /branches/port_qt5_64bit/src/ilandc/ compile on VSC...  
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
1097 3100d 07h werner /branches/port_qt5_64bit/src/core/ try compile on cluster  
/branches/port_qt5_64bit/src/core/grasscover.cpp
1096 3100d 07h werner /branches/port_qt5_64bit/src/ new version, compiling problems at VSC  
/branches/port_qt5_64bit/src/core/grasscover.cpp
/branches/port_qt5_64bit/src/iland/version.cpp
1095 3104d 02h 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
1093 3125d 02h werner /branches/port_qt5_64bit/src/ toying around with yuidoc, some clang-related cleaning.  
/branches/port_qt5_64bit/src/apidoc/ABE/abe_doc.js
/branches/port_qt5_64bit/src/apidoc/yuidoc.json
/branches/port_qt5_64bit/src/tools/expression.cpp
1092 3128d 09h werner /branches/port_qt5_64bit/src/plugins/barkbeetle/ improved comments during final checkup of the model against the paper appendix.  
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h
1091 3129d 01h werner /branches/port_qt5_64bit/src/tools/ additional JS functions for retrieving grids from iLand. fancy....  
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.h
/branches/port_qt5_64bit/src/tools/scriptgrid.cpp
1090 3141d 01h 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 3146d 03h 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 3148d 02h 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
1087 3150d 02h werner /branches/port_qt5_64bit/src/ added "flushing" of log messages.
fixed a bug when some resource units were 0 in setting up the wind module.
 
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/ilandc/consoleshell.cpp
/branches/port_qt5_64bit/src/ilandc/consoleshell.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleplugin.cpp
1086 3153d 01h werner /branches/port_qt5_64bit/src/plugins/barkbeetle/ added new "killed" grid to the BB module.  
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
1085 3154d 02h werner /branches/port_qt5_64bit/src/ working on barkbeetle module (fixing problems, some small modifications, ...)
improving the JS-based spatial analysis toolkit.
 
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/layeredgrid.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.cpp
/branches/port_qt5_64bit/src/plugins/wind/windscript.cpp
/branches/port_qt5_64bit/src/plugins/wind/windscript.h
/branches/port_qt5_64bit/src/tools/scriptgrid.cpp
/branches/port_qt5_64bit/src/tools/scriptgrid.h
/branches/port_qt5_64bit/src/tools/spatialanalysis.cpp
/branches/port_qt5_64bit/src/tools/spatialanalysis.h
1084 3156d 01h werner /branches/port_qt5_64bit/src/tools/ removed API change  
/branches/port_qt5_64bit/src/tools/scriptgrid.h
1083 3156d 03h werner /branches/port_qt5_64bit/src/ improve API for spatial analysis - now patch creation works also with js.  
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.cpp
/branches/port_qt5_64bit/src/plugins/wind/windscript.cpp
/branches/port_qt5_64bit/src/tools/spatialanalysis.cpp
/branches/port_qt5_64bit/src/tools/spatialanalysis.h
1082 3157d 01h werner /branches/port_qt5_64bit/src/ remove out-of-project area from GrassCover
fixed error in calculating the number of bark beetle generations (and changed the handling of sister broods)
 
/branches/port_qt5_64bit/src/core/grasscover.cpp
/branches/port_qt5_64bit/src/core/grasscover.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.h
/branches/port_qt5_64bit/src/tools/scriptgrid.h
1081 3161d 01h werner /branches/port_qt5_64bit/src/ created a new javascript wrapper for the iLand "grid" class. This includes some processing (e.g. calculate using expressions), and some function to retrieve grids from iLand (e.g. damage data from disturbance modules, height grid).
fancy!
 
/branches/port_qt5_64bit/src/tools/scriptgrid.cpp
/branches/port_qt5_64bit/src/tools/scriptgrid.h
/branches/port_qt5_64bit/src/core/climate.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/ilandc/consoleshell.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/barkbeetlescript.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.h
/branches/port_qt5_64bit/src/plugins/wind/windmodule.cpp
/branches/port_qt5_64bit/src/plugins/wind/windscript.cpp
/branches/port_qt5_64bit/src/plugins/wind/windscript.h
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.h
/branches/port_qt5_64bit/src/tools/spatialanalysis.cpp
1080 3162d 06h werner /branches/port_qt5_64bit/src/ spatial analysis: add patch analysis (clump sizes), add to wind module (scriptable)  
/branches/port_qt5_64bit/src/core/layeredgrid.h
/branches/port_qt5_64bit/src/plugins/wind/windmodule.h
/branches/port_qt5_64bit/src/plugins/wind/windscript.cpp
/branches/port_qt5_64bit/src/plugins/wind/windscript.h
/branches/port_qt5_64bit/src/tools/spatialanalysis.cpp
/branches/port_qt5_64bit/src/tools/spatialanalysis.h
1079 3163d 03h werner /branches/port_qt5_64bit/src/core/ grassmodel: modification of the Pixel-based approach (kind of a hybrid). Dominik is still testing - will need some cleanup after decision...  
/branches/port_qt5_64bit/src/core/grasscover.cpp
/branches/port_qt5_64bit/src/core/grasscover.h
/branches/port_qt5_64bit/src/core/timeevents.cpp
1078 3164d 03h werner /branches/port_qt5_64bit/src/iland/ view climate grid cell in visualization of resource units  
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
1077 3170d 07h werner /branches/port_qt5_64bit/src/ implemented stormInfestationProbability in bark beetle module.
added path() function in Globals JS object.
 
/branches/port_qt5_64bit/src/core/tree.cpp
/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/barkbeetleplugin.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.h
1076 3171d 03h werner /branches/port_qt5_64bit/src/ avoid loading regeneration if regeneration module is not enabled.  
/branches/port_qt5_64bit/src/iland/mainwindow.ui
/branches/port_qt5_64bit/src/output/snapshot.cpp
1075 3171d 04h werner /branches/port_qt5_64bit/src/ilandc/ allowed changing log-directory in ilandc.  
/branches/port_qt5_64bit/src/ilandc/consoleshell.cpp
1074 3181d 05h 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
1073 3183d 02h werner /branches/port_qt5_64bit/src/core/ spelling of layer caption  
/branches/port_qt5_64bit/src/core/grasscover.cpp
1072 3183d 20h werner /branches/port_qt5_64bit/src/core/ mortality exercise for PROFOUND COST action.  
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/core/tree.h
1071 3184d 03h werner /branches/port_qt5_64bit/src/ alternative mortality formulation
COST PROFOUND exercise (H. Bugmann)
 
/branches/port_qt5_64bit/src/core/model.cpp
/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/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.h
1070 3189d 02h 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
1069 3189d 10h werner /branches/port_qt5_64bit/src/core/ linearization of saplingheightgrowth function enabled  
/branches/port_qt5_64bit/src/core/species.cpp
1068 3189d 10h werner /branches/port_qt5_64bit/src/ some optimizations for grass / establishment
START
 
/branches/port_qt5_64bit/src/core/establishment.cpp
/branches/port_qt5_64bit/src/core/establishment.h
/branches/port_qt5_64bit/src/core/grasscover.cpp
/branches/port_qt5_64bit/src/core/grasscover.h
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
1067 3189d 21h werner /branches/port_qt5_64bit/src/ added new efficient grid access functions index2 and index5.
They are >2 times faster than using double conversion to grid coordinates.
 
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/iland/tests.h
1066 3190d 09h werner /branches/port_qt5_64bit/src/ wind-bark-beetle interaction, now functional
fixed this annoyance of the mixed-up species order in the UI.
 
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.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/plugins/barkbeetle/barkbeetleout.cpp
/branches/port_qt5_64bit/src/plugins/wind/windout.cpp
1065 3190d 22h 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 3192d 03h 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 3195d 04h 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
1062 3197d 02h werner /branches/port_qt5_64bit/src/ small fixes for ABE,

implementation of v1 of the "grass"-model (herbs and grasses on the ground).
 
/branches/port_qt5_64bit/src/core/grasscover.cpp
/branches/port_qt5_64bit/src/core/grasscover.h
/branches/port_qt5_64bit/src/abe/actthinning.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fomescript.h
/branches/port_qt5_64bit/src/core/establishment.cpp
/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/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/version.cpp
1061 3199d 02h werner /branches/port_qt5_64bit/src/ developinig ABE.
groundwork: creating STP options (i.e. pure JS-options of STPs that can be used in activities)
working on species specific targets for thinnings (involves a lot of thinking and fiddling with javascript)
added an option to include "shortcuts" to often-used functions (i.e. links in the GUI that directly call JS-functions).
 
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/activity.h
/branches/port_qt5_64bit/src/abe/actscheduled.cpp
/branches/port_qt5_64bit/src/abe/actthinning.cpp
/branches/port_qt5_64bit/src/abe/actthinning.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fmstp.cpp
/branches/port_qt5_64bit/src/abe/fmstp.h
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/fomescript.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/apidoc/iLand/globals_doc.js
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.h
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.h
/branches/port_qt5_64bit/src/iland/mainwindow.ui
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.h