Subversion Repositories public iLand

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
1222 2876d 08h werner / public SVN  
/tags/release_1.0
/branches/release_1.0
1221 2876d 08h werner /branches/ public SVN  
/branches/release_1.0
/branches/version1.0
1220 2876d 08h werner /branches/version1.0/ Version 1.0  
/branches/version1.0
1218 2876d 10h werner / clean up repository - make 1.0 trunk again!  
/trunk
/iland_regen
1217 2876d 10h werner / clean up repository - make 1.0 trunk again!  
/iland_regen
/branches/iland_regen
1213 2882d 07h 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 2882d 14h 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 2884d 08h 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 2906d 11h 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 2997d 07h 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 3022d 08h 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 3039d 08h 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 3044d 07h 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 3046d 09h 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 3064d 08h 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 3077d 15h 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 3085d 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 3092d 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
1163 3092d 14h 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 3092d 14h 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

Show All