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
1197 2898d 04h werner /branches/iland_regen/src/ilandc/ trying to compile on valinor server  
/branches/iland_regen/src/ilandc/ilandc.pro
1196 2899d 21h 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
1195 2910d 00h werner /branches/iland_regen/src/ more documentaiton...  
/branches/iland_regen/src/apidoc/iLand/iLand_doc.js
/branches/iland_regen/src/iland/iland.pro
1194 2910d 00h werner /branches/iland_regen/src/ more documentation....  
/branches/iland_regen/src/apidoc/iLand/management_doc.js
/branches/iland_regen/src/apidoc/iLand/spatialAnalysis_doc.js
/branches/iland_regen/src/apidoc/iLand/globals_doc.js
/branches/iland_regen/src/apidoc/iLand/grid_doc.js
/branches/iland_regen/src/core/model.cpp
/branches/iland_regen/src/iland/iland.pro
1193 2912d 06h werner /branches/iland_regen/src/ update version  
/branches/iland_regen/src/core/version.cpp
/branches/iland_regen/src/iland/aboutdialog.ui
1192 2913d 16h werner /branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/ update doc  
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/css/custom.css
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/bootstrap/css/bootstrap.css
1191 2913d 22h werner /branches/iland_regen/src/ more documentation .... phew  
/branches/iland_regen/src/apidoc/iLand/factory_doc.js
/branches/iland_regen/src/apidoc/iLand/map_doc.js
/branches/iland_regen/src/apidoc/iLand/globals_doc.js
/branches/iland_regen/src/apidoc/iLand/grid_doc.js
/branches/iland_regen/src/iland/iland.pro
1190 2916d 20h werner /branches/iland_regen/src/ api documentation....  
/branches/iland_regen/src/apidoc/iLand/grid_doc.js
/branches/iland_regen/src/apidoc/ABE/abe_context_doc.js
/branches/iland_regen/src/apidoc/ABE/abe_doc.js
/branches/iland_regen/src/apidoc/iLand/globals_doc.js
/branches/iland_regen/src/core/standloader.cpp
/branches/iland_regen/src/iland/iland.pro
1189 2918d 03h werner /branches/iland_regen/src/apidoc/ documentation API iLand  
/branches/iland_regen/src/apidoc/ABE/abe_context_doc.js
/branches/iland_regen/src/apidoc/iLand/globals_doc.js
1188 2918d 22h werner /branches/iland_regen/src/apidoc/ apidoc style, and apidoc content  
/branches/iland_regen/src/apidoc/ABE/abe_context_doc.js
/branches/iland_regen/src/apidoc/ABE/abe_doc.js
/branches/iland_regen/src/apidoc/iLand/globals_doc.js
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/css/custom.css
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/css/main.css
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/bootstrap/css/bootstrap.css
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/layouts/main.handlebars
/branches/iland_regen/src/apidoc/yuidoc.json
1187 2919d 21h werner /branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/ apidocs CSS file updates  
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/css/main.css
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/bootstrap/css/bootstrap.css
1186 2919d 22h werner /branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/ update api-doc (yuidoc)  
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/css/custom.css
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/css/logo.png
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/css/main.css
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/favicon.png
1185 2920d 03h werner /branches/iland_regen/src/apidoc/node_modules/ added YUIdoc bootstrap-theme  
/branches/iland_regen/src/apidoc/node_modules
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/.npmignore
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/LICENSE.md
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/README.md
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/css
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/css/custom.css
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/css/external-small.png
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/css/logo.png
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/css/main.css
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/favicon.png
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/img
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/img/spinner.gif
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/index.html
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/js
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/js/yuidoc-bootstrap.js
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/bootstrap
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/bootstrap/css
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/bootstrap/css/bootstrap.css
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/bootstrap/css/bootstrap.min.css
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/bootstrap/img
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/bootstrap/img/glyphicons-halflings-white.png
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/bootstrap/img/glyphicons-halflings.png
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/bootstrap/js
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/bootstrap/js/bootstrap.js
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/bootstrap/js/bootstrap.min.js
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/jquery
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/jquery/jquery-1.8.2.min.js
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/prettify
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/prettify/prettify-min.css
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/assets/vendor/prettify/prettify-min.js
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/example
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/example.sh
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/example/BasicClass.js
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/example/MultiModule.js
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/helpers
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/helpers/helpers.js
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/layouts
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/layouts/main.handlebars
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/layouts/xhr.handlebars
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/package.json
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/partials
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/partials/attrs.handlebars
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/partials/classes.handlebars
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/partials/events.handlebars
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/partials/files.handlebars
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/partials/index.handlebars
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/partials/method.handlebars
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/partials/module.handlebars
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/partials/options.handlebars
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/partials/props.handlebars
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/partials/sidebar.handlebars
/branches/iland_regen/src/apidoc/node_modules/yuidoc-bootstrap-theme/theme.json
1184 2920d 04h werner /branches/iland_regen/src/ update JS documentation  
/branches/iland_regen/src/apidoc/ABE/abe_doc.js
/branches/iland_regen/src/apidoc/yuidoc.json
/branches/iland_regen/src/core/resourceunit.cpp
1183 2924d 00h werner /branches/iland_regen/src/ added new output with sapling details.
"version" in core folder.
 
/branches/iland_regen/src/core/version.cpp
/branches/iland_regen/src/core/version.h
/branches/iland_regen/src/output/saplingout.cpp
/branches/iland_regen/src/output/saplingout.h
1182 2924d 22h 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 2941d 23h 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 2946d 21h 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 2948d 23h 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
1178 2953d 21h werner /branches/iland_regen/src/ update the seed dispersal kernel: take the density of a point instead the density at a given radius
new option in the GUI to visualize newly created saplings
update of how sapling numbers are calculated and arrive in the output
 
/branches/iland_regen/src/core/resourceunit.cpp
/branches/iland_regen/src/core/saplings.cpp
/branches/iland_regen/src/core/saplings.h
/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.ui
1177 2955d 22h werner /branches/iland_regen/src/ updating the sapling growth (calculation of stem numbers)  
/branches/iland_regen/src/core/resourceunitspecies.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/standstatistics.cpp
/branches/iland_regen/src/output/saplingout.cpp
1176 2958d 22h werner /branches/iland_regen/src/core/ developing the long distance dispersal functionality;
looks as if we have a conceptual problem with how we use the seed kernel functions...
more to come...
 
/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/saplings.cpp
/branches/iland_regen/src/core/saplings.h
/branches/iland_regen/src/core/seeddispersal.cpp
/branches/iland_regen/src/core/seeddispersal.h
1175 2965d 23h werner /branches/iland_regen/src/core/ testing change in the way the number of saplings is estimated (when several species reside on the same pixel)  
/branches/iland_regen/src/core/resourceunitspecies.cpp
/branches/iland_regen/src/core/saplings.cpp
/branches/iland_regen/src/core/saplings.h
1174 2966d 22h 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 2980d 06h 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
1170 2982d 22h 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 2986d 23h 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 2987d 22h 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
1167 2988d 06h werner /branches/iland_regen/ merged serotiny from trunk  
/branches/iland_regen
/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/plugins/fire/firemodule.cpp
1165 2989d 21h werner /branches/iland_regen/src/ implementation of sprouting  
/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/species.h
/branches/iland_regen/src/core/tree.cpp
/branches/iland_regen/src/plugins/fire/firemodule.cpp
1164 2994d 23h 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 2995d 04h 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 2995d 05h 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 2995d 06h 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 2995d 21h 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 2996d 18h 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 2997d 00h 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 2997d 07h 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 3053d 03h 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 3054d 19h 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