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
1175 3068d 01h 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 3068d 23h werner /branches/iland_regen/src/ fixed a bug in the establishment / saplinggrowth debug outputs (bookkeeping)  
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....
 
1170 3084d 23h 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).
 
1169 3089d 00h werner /branches/iland_regen/src/ debugging the crash in the firemodule... nasty.  
1168 3089d 23h werner /branches/iland_regen/src/ working on serotony, establishment etc. updated new establishment module w.r.t. debug outputs.  
1167 3090d 07h werner /branches/iland_regen/ merged serotiny from trunk  
1165 3091d 22h werner /branches/iland_regen/src/ implementation of sprouting  
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
 
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)
 
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
 
1161 3097d 08h werner /branches/iland_regen/src/core/ water limitation of establishment  
1160 3097d 23h werner /branches/iland_regen/src/core/ bug-fixes of the new establishment module (carbon)

first part of the YNP water limitation in establishment.
 
1159 3098d 19h werner /branches/iland_regen/src/ Changed memory layout of regeneration module.
problems now with invalid (NaN) soil values. Needs further analysis ;)
 
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)
 
1157 3099d 08h werner /branches/iland_regen/ merge of changes in the trunk (up to the version used for the 2016 DICE simulation batch).  
1118 3155d 04h werner /branches/iland_regen/src/core/ fixes for the new saplings, now it almost works as expected.  
1117 3156d 21h werner /branches/iland_regen/src/ including loading of saplings of snapshots....  
1115 3159d 22h werner /branches/iland_regen/src/ integrating sapling growth, testing  
1114 3159d 23h werner /branches/iland_regen/src/ new output for tree removals ("landscape_removed").  
1113 3160d 02h werner /branches/iland_regen/src/core/ integrating sapling growth...  
1112 3160d 02h werner /branches/iland_regen/src/core/ integrating the sapling growth (not finished yet)  
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...
 
1107 3166d 04h werner /branches/iland_regen/src/core/ changed the way the stocked area is calculated for not fully stocked stands. Test case was the YNP simulations of pinus contorta. It was the case that at low stocking levels (e.g. LAI=0.01, 20 trees/ha) too much light was intercepted thus boosting tree growth. We devised a more precise way of calculating stocked area based on tree crowns of individual trees. See also the test conducted for the site.  
1106 3168d 02h werner /branches/iland_regen/src/core/ change in seed-dispersal:
(i) add a third pass that aims to remove very small holes from the seed-maps (in order to decrease the number of "edges")
(ii) fixed a bug that caused having a large number of edges (always a problem, when modifying a grid while iterating over it...).
This reduces run-time (WBT) of seed-dispersal by 66%.
 
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
 
1103 3169d 06h werner /branches/port_qt5_64bit/src/core/ fix phenology error message for very cold climates (Alaska). Now the effective vegetation period is of 0 length in such cases.  
1102 3169d 19h werner /branches/port_qt5_64bit/src/ fixed couple of clang warnings.

some debugging/profiling work w.r.t. establishment/regen.
 
1101 3177d 06h werner /branches/port_qt5_64bit/src/ changes the names of some ABE JS function to run with Qt5.5
e.g.: basalArea(i) -> speciesBasalArea(i)
 
1100 3190d 02h werner /branches/port_qt5_64bit/src/ trying declaring the GRASSCOVERSTEPS in the cpp file.
some additional cleanups.
 
1099 3190d 02h werner /branches/port_qt5_64bit/src/ cleaning gcc warnings, trying to compile on VSC.  
1098 3190d 04h werner /branches/port_qt5_64bit/src/ilandc/ compile on VSC...  
1097 3190d 04h werner /branches/port_qt5_64bit/src/core/ try compile on cluster  
1096 3190d 04h werner /branches/port_qt5_64bit/src/ new version, compiling problems at VSC  
1095 3193d 23h werner /branches/port_qt5_64bit/ Adding basic C++ level documentation for ABE classes.  
1093 3214d 23h werner /branches/port_qt5_64bit/src/ toying around with yuidoc, some clang-related cleaning.  
1092 3218d 06h werner /branches/port_qt5_64bit/src/plugins/barkbeetle/ improved comments during final checkup of the model against the paper appendix.  
1091 3218d 22h werner /branches/port_qt5_64bit/src/tools/ additional JS functions for retrieving grids from iLand. fancy....  
1090 3230d 22h werner /branches/port_qt5_64bit/src/ abe udpates (scheduler problem when stand age is 0)  
1089 3236d 00h werner /branches/port_qt5_64bit/src/ ABE learned some new tricks ....