Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
1158 |
2999d 12h |
werner |
/branches/iland_regen/src/ |
further performance improvements in regeneration/sapling module.
In total (sim 80 yrs WBT 2km2, from bare ground), iLand is +- 35% faster:
* seed dispersal (not today)
* optimized use of LRI-correction
* better linearization in sapling growth (height growth potential) |
|
/branches/iland_regen/src/core/model.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/standstatistics.cpp /branches/iland_regen/src/core/standstatistics.h /branches/iland_regen/src/iland/tests.cpp /branches/iland_regen/src/tools/globalsettings.cpp
|
1157 |
2999d 19h |
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
|
1117 |
3057d 08h |
werner |
/branches/iland_regen/src/ |
including loading of saplings of snapshots.... |
|
/branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/iland/iland.pro /branches/iland_regen/src/iland/mainwindow.cpp /branches/iland_regen/src/output/snapshot.cpp /branches/iland_regen/src/output/snapshot.h
|
1115 |
3060d 09h |
werner |
/branches/iland_regen/src/ |
integrating sapling growth, testing |
|
/branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/iland/tests.cpp
|
1111 |
3061d 10h |
werner |
/branches/iland_regen/src/ |
first draft of the new "establishment"
added the "Saplings", the new container for establishment/sapling growth
some basic functionality is already there... |
|
/branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h
/branches/iland_regen/src/core/establishment.h /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/model.h /branches/iland_regen/src/core/resourceunitspecies.h /branches/iland_regen/src/core/sapling.cpp /branches/iland_regen/src/core/sapling.h /branches/iland_regen/src/iland/iland.pro /branches/iland_regen/src/iland/tests.cpp /branches/iland_regen/src/output/snapshot.cpp /branches/iland_regen/src/tools/mapgrid.cpp /branches/iland_regen/src/tools/mapgrid.h
|
1104 |
3069d 17h |
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
|
1096 |
3090d 15h |
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
|
1081 |
3151d 10h |
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
|
1078 |
3154d 12h |
werner |
/branches/port_qt5_64bit/src/iland/ |
view climate grid cell in visualization of resource units |
|
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
|
1076 |
3161d 11h |
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
|
1074 |
3171d 13h |
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
|
1071 |
3174d 12h |
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
|
1067 |
3180d 05h |
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 |
3180d 17h |
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 |
3181d 06h |
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 |
3182d 11h |
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
|
1062 |
3187d 10h |
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 |
3189d 10h |
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
|
1058 |
3195d 12h |
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 |
3199d 20h |
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
|
1055 |
3202d 14h |
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 |
3203d 11h |
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 |
3215d 19h |
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
|
1049 |
3235d 16h |
werner |
/branches/port_qt5_64bit/src/ |
added counter in snapshot to print initialized AND total number of trees + saplings
added check for validity of CN-Ratios in the species parameters. |
|
/branches/port_qt5_64bit/src/core/species.cpp /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/output/snapshot.cpp
|
1047 |
3238d 11h |
werner |
/branches/port_qt5_64bit/src/ |
fixed errors with snapshots
fixed ordering of extra-grids in main view |
|
/branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/mainwindow.h /branches/port_qt5_64bit/src/output/snapshot.cpp
|
1046 |
3241d 13h |
werner |
/branches/port_qt5_64bit/src/iland/ |
smaller update of the GUI (reorganization of toolwindows, mainly). |
|
/branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/mainwindow.h /branches/port_qt5_64bit/src/iland/mainwindow.ui
|
1043 |
3244d 14h |
valentin |
/branches/port_qt5_64bit/src/iland/ |
Integrated the recent file menu, changes in mainwindow.cpp -> methods: readSettings() ; writeSettings() ; setupModel(),|| new method : recentFileMenu() ; + submenu added to the menuBar under Files |
|
/branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/mainwindow.h /branches/port_qt5_64bit/src/iland/mainwindow.ui
|
1042 |
3250d 14h |
werner |
/branches/port_qt5_64bit/src/ |
working on bark beetle module (antagonists) |
|
/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/mainwindow.ui /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
|
1041 |
3320d 14h |
werner |
/branches/port_qt5_64bit/src/ |
improved visualization and "movie"-support. New JS functions to control the main visualization. |
|
/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/iland/qml/ruler.qml /branches/port_qt5_64bit/src/tools/colors.cpp /branches/port_qt5_64bit/src/tools/colors.h /branches/port_qt5_64bit/src/tools/scriptglobal.cpp /branches/port_qt5_64bit/src/tools/scriptglobal.h
|
1040 |
3321d 11h |
werner |
/branches/port_qt5_64bit/src/ |
working on bark beetle module (continuing on antagonists)
adding species share maps to iLand visualization. |
|
/branches/port_qt5_64bit/src/core/grid.h /branches/port_qt5_64bit/src/core/resourceunit.cpp /branches/port_qt5_64bit/src/core/resourceunit.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/colors.cpp
|
1036 |
3329d 12h |
werner |
/branches/port_qt5_64bit/src/ |
smaller changes related to the bark beetle module.
Added javascript function to save grid files.
added a "minimumDbh" parameter (also accessible via XML)
changed visualization of the "dead" trees which were killed by bark beetle attacks. |
|
/branches/port_qt5_64bit/src/iland/qml/ruler.qml /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/wind/windmodule.h
|
1035 |
3350d 12h |
werner |
/branches/port_qt5_64bit/src/ |
fixed warning with GCC under Linux. |
|
/branches/port_qt5_64bit/src/3rdparty/MersenneTwister.h /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/tools/expression.cpp
|
1034 |
3350d 18h |
werner |
/branches/port_qt5_64bit/src/ |
warnings, version update. |
|
/branches/port_qt5_64bit/src/core/modelcontroller.cpp /branches/port_qt5_64bit/src/iland/version.cpp /branches/port_qt5_64bit/src/tools/spatialanalysis.cpp
|
1033 |
3350d 18h |
werner |
/branches/port_qt5_64bit/src/ |
added GPL headers to files where it was still missing (mainly all ABE and BarkBeetle module files). |
|
/branches/port_qt5_64bit/src/abe/abegrid.cpp /branches/port_qt5_64bit/src/abe/abegrid.h /branches/port_qt5_64bit/src/abe/actgeneral.cpp /branches/port_qt5_64bit/src/abe/actgeneral.h /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/actsalvage.cpp /branches/port_qt5_64bit/src/abe/actsalvage.h /branches/port_qt5_64bit/src/abe/actscheduled.cpp /branches/port_qt5_64bit/src/abe/actscheduled.h /branches/port_qt5_64bit/src/abe/actthinning.cpp /branches/port_qt5_64bit/src/abe/actthinning.h /branches/port_qt5_64bit/src/abe/agent.cpp /branches/port_qt5_64bit/src/abe/agent.h /branches/port_qt5_64bit/src/abe/agenttype.cpp /branches/port_qt5_64bit/src/abe/agenttype.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/fmtreelist.cpp /branches/port_qt5_64bit/src/abe/fmtreelist.h /branches/port_qt5_64bit/src/abe/fmunit.cpp /branches/port_qt5_64bit/src/abe/fmunit.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/fomewrapper.h /branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.h /branches/port_qt5_64bit/src/abe/output/abestandout.cpp /branches/port_qt5_64bit/src/abe/output/abestandout.h /branches/port_qt5_64bit/src/abe/output/abestandremovalout.cpp /branches/port_qt5_64bit/src/abe/output/abestandremovalout.h /branches/port_qt5_64bit/src/abe/output/unitout.cpp /branches/port_qt5_64bit/src/abe/output/unitout.h /branches/port_qt5_64bit/src/abe/scheduler.cpp /branches/port_qt5_64bit/src/abe/scheduler.h /branches/port_qt5_64bit/src/abe/thinning.cpp /branches/port_qt5_64bit/src/abe/thinning.h /branches/port_qt5_64bit/src/core/climate.cpp /branches/port_qt5_64bit/src/core/resourceunitspecies.cpp /branches/port_qt5_64bit/src/core/resourceunitspecies.h /branches/port_qt5_64bit/src/iland/main.cpp /branches/port_qt5_64bit/src/iland/version.cpp /branches/port_qt5_64bit/src/output/landscapeout.cpp /branches/port_qt5_64bit/src/output/landscapeout.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 /branches/port_qt5_64bit/src/plugins/wind/windscript.cpp /branches/port_qt5_64bit/src/plugins/wind/windscript.h
|
1032 |
3350d 19h |
werner |
/branches/port_qt5_64bit/src/ |
fixed compiler warnings (compiled again with GCC), and edited *.pro files for GCC. |
|
/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/agenttype.cpp /branches/port_qt5_64bit/src/abe/fmstand.cpp /branches/port_qt5_64bit/src/abe/fmunit.cpp /branches/port_qt5_64bit/src/abe/scheduler.cpp /branches/port_qt5_64bit/src/core/establishment.cpp /branches/port_qt5_64bit/src/core/grid.cpp /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/modelcontroller.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/plugins/barkbeetle/bbgenerations.cpp /branches/port_qt5_64bit/src/tools/csvfile.cpp /branches/port_qt5_64bit/src/tools/mapgrid.cpp
|
1026 |
3357d 19h |
werner |
/branches/port_qt5_64bit/src/iland/ |
version 0.8.8 |
|
/branches/port_qt5_64bit/src/iland/version.cpp
|
1018 |
3367d 11h |
werner |
/branches/port_qt5_64bit/src/ |
working on the crown-cover-grid |
|
/branches/port_qt5_64bit/src/iland/mainwindow.ui /branches/port_qt5_64bit/src/tools/spatialanalysis.cpp
|
1014 |
3403d 10h |
werner |
/branches/port_qt5_64bit/src/ |
bark beetle module fine tuning (outputs etc)
fixed an issue with always copying the labels (names) of layered grids.
warning: still a compile error ;) |
|
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleout.cpp /branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleout.h
/branches/port_qt5_64bit/src/abe/abegrid.cpp /branches/port_qt5_64bit/src/abe/abegrid.h /branches/port_qt5_64bit/src/core/layeredgrid.h /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetle.pro /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/plugins/barkbeetle/barkbeetlescript.h /branches/port_qt5_64bit/src/plugins/fire/firemodule.cpp /branches/port_qt5_64bit/src/plugins/fire/firemodule.h /branches/port_qt5_64bit/src/plugins/wind/windmodule.cpp /branches/port_qt5_64bit/src/plugins/wind/windmodule.h /branches/port_qt5_64bit/src/tools/spatialanalysis.h
|
1009 |
3410d 10h |
werner |
/branches/port_qt5_64bit/src/ |
bark beetle module
view with shading (i.e. based on DEM) |
|
/branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/mainwindow.ui /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/bbgenerations.cpp /branches/port_qt5_64bit/src/tools/colors.cpp /branches/port_qt5_64bit/src/tools/colors.h /branches/port_qt5_64bit/src/tools/dem.cpp /branches/port_qt5_64bit/src/tools/dem.h
|
1002 |
3419d 06h |
werner |
/branches/port_qt5_64bit/src/ |
new optimized establishment routine.
not finished yet, but looks promising in my first tests. |
|
/branches/port_qt5_64bit/src/core/establishment.cpp /branches/port_qt5_64bit/src/core/establishment.h /branches/port_qt5_64bit/src/core/resourceunit.h /branches/port_qt5_64bit/src/core/sapling.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 /branches/port_qt5_64bit/src/tools/randomgenerator.h
|