Subversion Repositories public iLand

Rev

Go to most recent revision | Show changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
1218 2742d 07h werner / clean up repository - make 1.0 trunk again!  
1217 2742d 07h werner / clean up repository - make 1.0 trunk again!  
1214 2742d 07h werner /branches/iland_regen/src/ fixed effect of waterlogging  
1213 2748d 04h werner /branches/iland_regen/src/ implementing the stand-wise snapshot feature (for the advanced dynamic initalization)  
1211 2748d 11h werner /branches/iland_regen/src/ added GPL headers for files that did not contain the header  
1210 2748d 12h werner /branches/iland_regen/ improve error message when Environment is not set up correctly.  
1204 2755d 11h werner /branches/iland_regen/src/ fixed some text strings (debug messages).  
1203 2772d 08h werner /branches/iland_regen/src/ added the missing "ActPlanting" functions for the "new" regeneration module.  
1202 2793d 05h werner /branches/iland_regen/src/ searching/fixing issues with carbon cycle: NEP as provided by carbonflow output (NPP-Rh-Mgmt) is different from NEP as derived by the delta of the carbon stocks.
As usual, very hard to track down these issues, but:
* bark beetle module: foliage loss from BB-trees now correctly routed to soil
* order of modules in model: switched disturbances and carbon cylcle (in order to correctly track all carbon changes due to disturbances)
* fixed a problem with the calculation of NPP: after disturbances stand level NPP was set to 0 (since statistics were recalculated after disturbaces, but NPP values are not available then). Introduced: StandStatistics::clearOnlyTrees()
* flow from branches to the atmosphere (decay of branches) now tracked correctly (changes the NEP calulation).
 
1196 2863d 04h werner /branches/iland_regen/src/ StandGPP debug output (instead of the missing StandNPP) output  
1194 2873d 07h werner /branches/iland_regen/src/ more documentation....  
1193 2875d 13h werner /branches/iland_regen/src/ update version  
1190 2880d 03h werner /branches/iland_regen/src/ api documentation....  
1184 2883d 10h werner /branches/iland_regen/src/ update JS documentation  
1183 2887d 06h werner /branches/iland_regen/src/ added new output with sapling details.
"version" in core folder.
 
1182 2888d 04h 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.
 
1181 2905d 05h werner /branches/iland_regen/src/ include LDD packages even for N<1 (choose probabilistically)

visualizing seed input from javascript
 
1180 2910d 04h 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)
 
1179 2912d 06h werner /branches/iland_regen/src/ GUI: visualizing seed maps
minor change in seed kernel calculation
 
1178 2917d 04h 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
 
1177 2919d 05h werner /branches/iland_regen/src/ updating the sapling growth (calculation of stem numbers)  
1176 2922d 05h 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...
 
1175 2929d 06h 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)  
1174 2930d 05h werner /branches/iland_regen/src/ fixed a bug in the establishment / saplinggrowth debug outputs (bookkeeping)  
1172 2943d 12h 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....
 
1168 2951d 04h werner /branches/iland_regen/src/ working on serotony, establishment etc. updated new establishment module w.r.t. debug outputs.  
1167 2951d 13h werner /branches/iland_regen/ merged serotiny from trunk  
1165 2953d 03h werner /branches/iland_regen/src/ implementation of sprouting  
1164 2958d 05h 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
 
1163 2958d 10h 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)
 
1162 2958d 11h 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
 
1161 2958d 13h werner /branches/iland_regen/src/core/ water limitation of establishment  
1160 2959d 04h werner /branches/iland_regen/src/core/ bug-fixes of the new establishment module (carbon)

first part of the YNP water limitation in establishment.
 
1159 2960d 01h werner /branches/iland_regen/src/ Changed memory layout of regeneration module.
problems now with invalid (NaN) soil values. Needs further analysis ;)
 
1158 2960d 07h 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)
 
1157 2960d 13h werner /branches/iland_regen/ merge of changes in the trunk (up to the version used for the 2016 DICE simulation batch).  
1118 3016d 10h werner /branches/iland_regen/src/core/ fixes for the new saplings, now it almost works as expected.  
1117 3018d 02h werner /branches/iland_regen/src/ including loading of saplings of snapshots....  
1115 3021d 04h werner /branches/iland_regen/src/ integrating sapling growth, testing  
1114 3021d 05h werner /branches/iland_regen/src/ new output for tree removals ("landscape_removed").