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
1072 3184d 03h 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 10h 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 09h 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 16h werner /branches/port_qt5_64bit/src/core/ linearization of saplingheightgrowth function enabled  
/branches/port_qt5_64bit/src/core/species.cpp
1068 3189d 17h 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 3190d 03h 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 15h 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 3191d 04h 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 09h 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 10h 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 08h 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 08h 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
1060 3202d 09h werner /branches/port_qt5_64bit/src/plugins/wind/ experimental changes to the edge-detection algorithm for the wind module
added volume in the wind output.
 
/branches/port_qt5_64bit/src/plugins/wind/windmodule.cpp
/branches/port_qt5_64bit/src/plugins/wind/windmodule.h
/branches/port_qt5_64bit/src/plugins/wind/windout.cpp
1059 3204d 10h werner /branches/port_qt5_64bit/src/ added topheight in ABE
additional things like standIds(), ...
 
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/fomescript.h
/branches/port_qt5_64bit/src/abe/fomewrapper.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.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/tools/statdata.cpp
/branches/port_qt5_64bit/src/tools/statdata.h
1058 3205d 10h werner /branches/port_qt5_64bit/src/ Changes in ABE:
new grid (stand treatment program), and now STP is shown when clicking on a standGrid
additional warnings when STPs are not properly defined

other changes:
more recent files, recent files are saved before creating the model
fixed splash screenshot
fixed potential bug in setting up saplings
new JS-function Globals.reloadABE() --> force the reload of the agent based forest engine module
 
/branches/port_qt5_64bit/src/abe/abegrid.cpp
/branches/port_qt5_64bit/src/abe/abegrid.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.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/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.h
/branches/port_qt5_64bit/src/iland/res/iland_splash.png
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.h
1057 3209d 18h werner /branches/port_qt5_64bit/src/ added outbreak duration in bark beetle module  
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/core/phenology.cpp
/branches/port_qt5_64bit/src/core/phenology.h
/branches/port_qt5_64bit/src/core/standloader.cpp
/branches/port_qt5_64bit/src/iland/version.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h
1056 3210d 08h werner /branches/port_qt5_64bit/src/plugins/barkbeetle/ starting implementing the outbreakDuration (xml switches)  
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleout.cpp
1055 3212d 12h werner /branches/port_qt5_64bit/src/ working on new iteration of the bark beetle module.
adding a kind of splash screen to iland.
 
/branches/port_qt5_64bit/src/iland/res/iland_splash.png
/branches/port_qt5_64bit/src/iland/version.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/barkbeetlescript.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.h
1054 3213d 09h werner /branches/port_qt5_64bit/ next iteration of the barkbeetle Modules
added background image to the iland viewer
some update of the wind-module as well (new wind output, for example)
 
/branches/port_qt5_64bit/src/iland/res/iland_splash.png
/branches/port_qt5_64bit/src/plugins/wind/windout.cpp
/branches/port_qt5_64bit/src/plugins/wind/windout.h
/branches/port_qt5_64bit/R_analysis/stacked.timeseries.R
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.ui
/branches/port_qt5_64bit/src/iland/qml/ruler.qml
/branches/port_qt5_64bit/src/iland/res/iland.qrc
/branches/port_qt5_64bit/src/output/outputmanager.cpp
/branches/port_qt5_64bit/src/output/outputmanager.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/barkbeetleout.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleplugin.cpp
/branches/port_qt5_64bit/src/plugins/fire/fireplugin.cpp
/branches/port_qt5_64bit/src/plugins/wind/wind.pro
/branches/port_qt5_64bit/src/plugins/wind/windmodule.cpp
/branches/port_qt5_64bit/src/plugins/wind/windmodule.h
/branches/port_qt5_64bit/src/plugins/wind/windplugin.cpp
/branches/port_qt5_64bit/src/plugins/wind/windplugin.h
/branches/port_qt5_64bit/src/tools/colors.cpp
1053 3225d 17h werner /branches/port_qt5_64bit/src/ updates for Qt 5.5 and GCC (Linux).  
/branches/port_qt5_64bit/src/core/management.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/output/snapshot.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/helper.cpp
/branches/port_qt5_64bit/src/tools/helper.h
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp

Show All