Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
1164 |
3090d 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 |
3090d 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 |
3090d 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
|
1161 |
3090d 21h |
werner |
/branches/iland_regen/src/core/ |
water limitation of establishment |
|
/branches/iland_regen/src/core/establishment.cpp /branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/resourceunitspecies.h /branches/iland_regen/src/core/species.cpp
|
1160 |
3091d 12h |
werner |
/branches/iland_regen/src/core/ |
bug-fixes of the new establishment module (carbon)
first part of the YNP water limitation in establishment. |
|
/branches/iland_regen/src/core/establishment.cpp /branches/iland_regen/src/core/establishment.h /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/core/snag.cpp /branches/iland_regen/src/core/species.cpp /branches/iland_regen/src/core/species.h /branches/iland_regen/src/core/speciesset.cpp
|
1159 |
3092d 08h |
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 |
3092d 14h |
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 |
3092d 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
|
1118 |
3148d 17h |
werner |
/branches/iland_regen/src/core/ |
fixes for the new saplings, now it almost works as expected. |
|
/branches/iland_regen/src/core/grid.h /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/species.cpp /branches/iland_regen/src/core/tree.cpp
|
1117 |
3150d 10h |
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 |
3153d 11h |
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
|
1114 |
3153d 12h |
werner |
/branches/iland_regen/src/ |
new output for tree removals ("landscape_removed"). |
|
/branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/model.h /branches/iland_regen/src/core/tree.cpp /branches/iland_regen/src/core/tree.h /branches/iland_regen/src/output/landscapeout.cpp /branches/iland_regen/src/output/landscapeout.h /branches/iland_regen/src/output/outputmanager.cpp /branches/iland_regen/src/output/standdeadout.cpp
|
1113 |
3153d 15h |
werner |
/branches/iland_regen/src/core/ |
integrating sapling growth... |
|
/branches/iland_regen/src/core/resourceunit.h /branches/iland_regen/src/core/resourceunitspecies.h /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h
|
1112 |
3153d 15h |
werner |
/branches/iland_regen/src/core/ |
integrating the sapling growth (not finished yet) |
|
/branches/iland_regen/src/core/sapling.h /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h
|
1111 |
3154d 12h |
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
|
1107 |
3159d 17h |
werner |
/branches/iland_regen/src/core/ |
changed the way the stocked area is calculated for not fully stocked stands. Test case was the YNP simulations of pinus contorta. It was the case that at low stocking levels (e.g. LAI=0.01, 20 trees/ha) too much light was intercepted thus boosting tree growth. We devised a more precise way of calculating stocked area based on tree crowns of individual trees. See also the test conducted for the site. |
|
/branches/iland_regen/src/core/resourceunit.cpp
|
1106 |
3161d 15h |
werner |
/branches/iland_regen/src/core/ |
change in seed-dispersal:
(i) add a third pass that aims to remove very small holes from the seed-maps (in order to decrease the number of "edges")
(ii) fixed a bug that caused having a large number of edges (always a problem, when modifying a grid while iterating over it...).
This reduces run-time (WBT) of seed-dispersal by 66%. |
|
/branches/iland_regen/src/core/seeddispersal.cpp
|
1104 |
3162d 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
|
1103 |
3162d 19h |
werner |
/branches/port_qt5_64bit/src/core/ |
fix phenology error message for very cold climates (Alaska). Now the effective vegetation period is of 0 length in such cases. |
|
/branches/port_qt5_64bit/src/core/phenology.cpp /branches/port_qt5_64bit/src/core/phenology.h
|
1102 |
3163d 08h |
werner |
/branches/port_qt5_64bit/src/ |
fixed couple of clang warnings.
some debugging/profiling work w.r.t. establishment/regen. |
|
/branches/port_qt5_64bit/src/core/establishment.cpp /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/seeddispersal.cpp /branches/port_qt5_64bit/src/core/seeddispersal.h /branches/port_qt5_64bit/src/core/soil.cpp /branches/port_qt5_64bit/src/core/stamp.cpp /branches/port_qt5_64bit/src/core/stampcontainer.cpp /branches/port_qt5_64bit/src/core/standloader.cpp /branches/port_qt5_64bit/src/core/standstatistics.cpp /branches/port_qt5_64bit/src/core/timeevents.cpp /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/core/tree.h /branches/port_qt5_64bit/src/output/outputmanager.cpp /branches/port_qt5_64bit/src/output/treeout.cpp /branches/port_qt5_64bit/src/output/treeout.h /branches/port_qt5_64bit/src/tools/xmlhelper.cpp /branches/port_qt5_64bit/src/tools/xmlhelper.h
|