Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
1170 |
2989d 08h |
werner |
/branches/iland_regen/src/ |
testing the grid-runners (etc) -- they seem to work fine, whew!
fixed a problem in the fire spread (never reached the right and bottom edge of a landscape). |
|
/branches/iland_regen/src/iland/tests.cpp /branches/iland_regen/src/plugins/fire/firemodule.cpp
|
1169 |
2993d 09h |
werner |
/branches/iland_regen/src/ |
debugging the crash in the firemodule... nasty. |
|
/branches/iland_regen/src/iland/iland.pro /branches/iland_regen/src/plugins/fire/firemodule.cpp
|
1168 |
2994d 07h |
werner |
/branches/iland_regen/src/ |
working on serotony, establishment etc. updated new establishment module w.r.t. debug outputs. |
|
/branches/iland_regen/src/core/establishment.cpp /branches/iland_regen/src/core/establishment.h /branches/iland_regen/src/core/resourceunitspecies.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/seeddispersal.cpp /branches/iland_regen/src/core/seeddispersal.h /branches/iland_regen/src/iland/mainwindow.cpp /branches/iland_regen/src/iland/mainwindow.h /branches/iland_regen/src/iland/mainwindow.ui /branches/iland_regen/src/tools/globalsettings.cpp /branches/iland_regen/src/tools/globalsettings.h
|
1164 |
3001d 09h |
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
|
1162 |
3001d 15h |
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
|
1159 |
3003d 04h |
werner |
/branches/iland_regen/src/ |
Changed memory layout of regeneration module.
problems now with invalid (NaN) soil values. Needs further analysis ;) |
|
/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/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/core/standloader.cpp /branches/iland_regen/src/iland/mainwindow.cpp
|
1158 |
3003d 10h |
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 |
3003d 17h |
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 |
3061d 05h |
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 |
3064d 07h |
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 |
3065d 07h |
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 |
3073d 14h |
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 |
3094d 13h |
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 |
3155d 07h |
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 |
3158d 09h |
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 |
3165d 08h |
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 |
3175d 10h |
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 |
3178d 09h |
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 |
3184d 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 |
3184d 14h |
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
|