Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
1212 |
2746d 19h |
werner |
/branches/iland_regen/src/ |
iLand-caption in pro files |
|
/branches/iland_regen/src/iland/iland.pro /branches/iland_regen/src/ilandc/ilandc.pro /branches/iland_regen/src/plugins/barkbeetle/barkbeetle.pro /branches/iland_regen/src/plugins/fire/fire.pro /branches/iland_regen/src/plugins/plugins.pro /branches/iland_regen/src/plugins/wind/wind.pro
|
1204 |
2753d 18h |
werner |
/branches/iland_regen/src/ |
fixed some text strings (debug messages). |
|
/branches/iland_regen/src/apidoc/iLand/spatialAnalysis_doc.js /branches/iland_regen/src/core/climate.cpp /branches/iland_regen/src/core/management.cpp /branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/modelcontroller.cpp /branches/iland_regen/src/core/seeddispersal.cpp /branches/iland_regen/src/core/tree.cpp /branches/iland_regen/src/iland/iland.pro /branches/iland_regen/src/ilandc/consoleshell.cpp /branches/iland_regen/src/output/landscapeout.cpp
|
1198 |
2859d 13h |
werner |
/branches/iland_regen/src/ |
api documentation... |
|
/branches/iland_regen/src/apidoc/ABE/abe_stand.js
/branches/iland_regen/src/apidoc/ABE/abe_context_doc.js /branches/iland_regen/src/apidoc/ABE/treelist_doc.js /branches/iland_regen/src/iland/iland.pro
|
1196 |
2861d 12h |
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 |
2871d 15h |
werner |
/branches/iland_regen/src/ |
more documentaiton... |
|
/branches/iland_regen/src/apidoc/iLand/iLand_doc.js
/branches/iland_regen/src/iland/iland.pro
|
1194 |
2871d 15h |
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 |
2873d 20h |
werner |
/branches/iland_regen/src/ |
update version |
|
/branches/iland_regen/src/core/version.cpp /branches/iland_regen/src/iland/aboutdialog.ui
|
1191 |
2875d 13h |
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 |
2878d 11h |
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
|
1182 |
2886d 12h |
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
|
1180 |
2908d 12h |
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 |
2910d 14h |
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 |
2915d 12h |
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
|
1172 |
2941d 20h |
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 |
2944d 13h |
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 |
2948d 13h |
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 |
2949d 12h |
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 |
2956d 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
|
1162 |
2956d 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
|
1159 |
2958d 09h |
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
|