Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
1217 |
2881d 02h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/iland_regen
/branches/iland_regen
|
1213 |
2886d 23h |
werner |
/branches/iland_regen/src/ |
implementing the stand-wise snapshot feature (for the advanced dynamic initalization) |
|
/branches/iland_regen/src/abe/actplanting.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/core/version.cpp /branches/iland_regen/src/output/snapshot.cpp /branches/iland_regen/src/output/snapshot.h /branches/iland_regen/src/tools/gisgrid.cpp /branches/iland_regen/src/tools/scriptglobal.cpp /branches/iland_regen/src/tools/scriptglobal.h
|
1211 |
2887d 06h |
werner |
/branches/iland_regen/src/ |
added GPL headers for files that did not contain the header |
|
/branches/iland_regen/src/core/grid.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/output/waterout.cpp /branches/iland_regen/src/output/waterout.h /branches/iland_regen/src/tools/colors.cpp /branches/iland_regen/src/tools/colors.h /branches/iland_regen/src/tools/debugtimer.cpp /branches/iland_regen/src/tools/debugtimer.h /branches/iland_regen/src/tools/scriptgrid.cpp /branches/iland_regen/src/tools/scriptgrid.h /branches/iland_regen/src/tools/statdata.cpp /branches/iland_regen/src/tools/statdata.h /branches/iland_regen/src/tools/viewport.cpp /branches/iland_regen/src/tools/viewport.h
|
1208 |
2889d 00h |
werner |
/branches/iland_regen/src/ |
working on the Spin-up feature (some additions to ABE) |
|
/branches/iland_regen/src/abe/actplanting.cpp /branches/iland_regen/src/abe/agenttype.cpp /branches/iland_regen/src/abe/agenttype.h /branches/iland_regen/src/abe/fmstp.cpp /branches/iland_regen/src/abe/fmtreelist.h /branches/iland_regen/src/abe/fomescript.cpp /branches/iland_regen/src/abe/fomescript.h /branches/iland_regen/src/abe/forestmanagementengine.cpp /branches/iland_regen/src/apidoc/ABE/treelist_doc.js /branches/iland_regen/src/tools/csvfile.cpp /branches/iland_regen/src/tools/csvfile.h
|
1203 |
2911d 03h |
werner |
/branches/iland_regen/src/ |
added the missing "ActPlanting" functions for the "new" regeneration module. |
|
/branches/iland_regen/src/abe/actplanting.cpp /branches/iland_regen/src/abe/actplanting.h /branches/iland_regen/src/core/management.cpp /branches/iland_regen/src/core/resourceunit.cpp /branches/iland_regen/src/core/resourceunit.h /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/core/standloader.cpp /branches/iland_regen/src/core/version.cpp /branches/iland_regen/src/tools/mapgrid.cpp /branches/iland_regen/src/tools/mapgrid.h
|
1196 |
3001d 22h |
werner |
/branches/iland_regen/src/ |
StandGPP debug output (instead of the missing StandNPP) output |
|
/branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/modelcontroller.cpp /branches/iland_regen/src/core/resourceunit.cpp /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/tree.cpp /branches/iland_regen/src/iland/mainwindow.cpp /branches/iland_regen/src/tools/globalsettings.cpp /branches/iland_regen/src/tools/globalsettings.h
|
1182 |
3026d 23h |
werner |
/branches/iland_regen/src/ |
Torus also effective for seed distribution
new output "SaplingDetails" (super high detail level of individual cohorts)
version information also in ilandc [move version.cpp to core]
[due to a sync problem with the SVN server, some revisions where lost: here they are:]
compiling ilandc
some code clean up - removed old code (sapling.cpp) for sapling trees and establishment. |
|
/branches/iland_regen/src/core/climate.cpp /branches/iland_regen/src/core/establishment.cpp /branches/iland_regen/src/core/establishment.h /branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/modelcontroller.cpp /branches/iland_regen/src/core/modelcontroller.h /branches/iland_regen/src/core/modelsettings.cpp /branches/iland_regen/src/core/modelsettings.h /branches/iland_regen/src/core/resourceunitspecies.cpp /branches/iland_regen/src/core/resourceunitspecies.h /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/seeddispersal.cpp /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/core/standstatistics.h /branches/iland_regen/src/iland/iland.pro /branches/iland_regen/src/iland/mainwindow.cpp /branches/iland_regen/src/iland/mainwindow.h /branches/iland_regen/src/ilandc/consoleshell.cpp /branches/iland_regen/src/ilandc/ilandc.pro /branches/iland_regen/src/ilandc/main.cpp /branches/iland_regen/src/output/outputmanager.cpp /branches/iland_regen/src/output/saplingout.cpp /branches/iland_regen/src/output/saplingout.h /branches/iland_regen/src/output/snapshot.cpp /branches/iland_regen/src/tools/helper.cpp
|
1181 |
3044d 00h |
werner |
/branches/iland_regen/src/ |
include LDD packages even for N<1 (choose probabilistically)
visualizing seed input from javascript |
|
/branches/iland_regen/src/core/seeddispersal.cpp /branches/iland_regen/src/tools/scriptglobal.cpp
|
1180 |
3048d 22h |
werner |
/branches/iland_regen/src/ |
major rewrite of the seed distribution module:
* dispersal kernels fixed (using seeds per area, and not per radius)
* seed production now depends on leaf area of species (on source pixels)
* distribution for all source pixels (skipped the shortcut via continuously covered forest)
* probability of establishment calculated as function of available seedlings (sum of all incoming seedlings)
still testing ;)
more automation functions (e.g. to call OS commands, additional JS event handlers) |
|
/branches/iland_regen/src/core/modelcontroller.cpp /branches/iland_regen/src/core/seeddispersal.cpp /branches/iland_regen/src/core/seeddispersal.h /branches/iland_regen/src/core/species.cpp /branches/iland_regen/src/core/species.h /branches/iland_regen/src/core/tree.cpp /branches/iland_regen/src/iland/mainwindow.cpp /branches/iland_regen/src/tools/scriptglobal.cpp /branches/iland_regen/src/tools/scriptglobal.h
|
1179 |
3051d 01h |
werner |
/branches/iland_regen/src/ |
GUI: visualizing seed maps
minor change in seed kernel calculation |
|
/branches/iland_regen/src/core/seeddispersal.cpp /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/iland/version.cpp /branches/iland_regen/src/tools/colors.h
|
1174 |
3069d 00h |
werner |
/branches/iland_regen/src/ |
fixed a bug in the establishment / saplinggrowth debug outputs (bookkeeping) |
|
/branches/iland_regen/src/core/establishment.cpp /branches/iland_regen/src/core/resourceunitspecies.h /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/saplings.h /branches/iland_regen/src/tools/globalsettings.cpp
|
1172 |
3082d 07h |
werner |
/branches/iland_regen/src/ |
fixed nasty bug in fire module that caused crashes in release mode (but interestingly not in debug mode).
Reason: The ILAND_GUI #define is *not* visible when building the modules (fire, wind, barkbeetle); a conditional define in species.h has the effect that the structure (i.e. the memory address of some of the member properties) are different (specifically, the "mSeedDispersal" property). From the fire module, accessing the property resolved to a wrong memory address -> crash. Fix: moved the color-property (that is affected by the ILAND_GUI #define) to the end of the object.... |
|
/branches/iland_regen/src/core/species.cpp /branches/iland_regen/src/core/species.h /branches/iland_regen/src/iland/version.cpp /branches/iland_regen/src/plugins/fire/firemodule.cpp /branches/iland_regen/src/tools/scriptglobal.cpp
|
1168 |
3089d 23h |
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 |
3097d 00h |
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 |
3097d 05h |
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 |
3097d 06h |
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
|
1158 |
3099d 01h |
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 |
3099d 08h |
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
|
1111 |
3160d 23h |
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 |
3169d 06h |
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
|