| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 1040 |
3329d 08h |
werner |
/branches/port_qt5_64bit/src/ |
working on bark beetle module (continuing on antagonists)
adding species share maps to iLand visualization. |
|
| 1017 |
3376d 07h |
werner |
/branches/port_qt5_64bit/src/ |
calculate crown cover maps |
|
| 1002 |
3427d 03h |
werner |
/branches/port_qt5_64bit/src/ |
new optimized establishment routine.
not finished yet, but looks promising in my first tests. |
|
| 863 |
3854d 09h |
werner |
/branches/port_qt5_64bit/ |
renaming of the FOME to AMIE.
unfortunately, some partial merge of changes in Qt4-branch. |
|
| 824 |
3894d 14h |
werner |
/branches/port_qt5_64bit/src/ |
fixed *big* regeneration bug. The map with the height of saplings on a resource unit was used in the establishment subroutine although it was *invalid*. Now the establishment and the regeneration are (again?) in one function and use the same valid map.
this removed the strange stripes in the regeneration pattern (there should have been crashes, but weren't). Consequently, the performance debug output was modified.
added better formatting to debugtimer.cpp for large times (in hours, minutes, seconds). |
|
| 779 |
4061d 09h |
werner |
/branches/port_qt5_64bit/ |
|
|
| 720 |
4540d 04h |
werner |
/trunk/src/ |
fixed a problem when trees died in disturbance and the (unupdated) statistics were used (e.g. the LAI for calculating the water cycle). Now for affected resource units, not only the treelists but also the RU-statistics are updated.
implemented a "radiating" mechanism of border cells. If stand-grid-cells (i.e. 10m height grid resolution) are marked as "outside and forest", then the cells "radiate" some influence on the LIF into the project area. Thus, trees on the edge of the project do *not* have properties of trees standing on a stand edge. Currently, the form/amount of this edge-effect is hard coded. |
|
| 707 |
4592d 11h |
werner |
/trunk/src/ |
rework of the random numbers in iland.
Now, many (200000) random numbers are precalculated using a given algorithm (there are three or four choices), then the drandom() etc functions read from this array. After some rotations, the numbers are renewed. The point is: this is now reentrant, so the per-thread storage of MTRand objects is obsolete. |
|
| 705 |
4593d 06h |
werner |
/trunk/src/ |
series of performance tests / modifications.
Using "valgrind" on the linux virtual machine, some performance
measurements were made.
Some candidates for optimization were tested. (1) the applyLIP()
function (about 30% of total run time in runYear()): here several
inlining options were tested; testing the value of the stamp before
using it (in order to omit the other steps) prooved to be slower than
unsing all stamp values.
(2) the random number generator; here the random number generation is
about 5% of the total run time; the commit contains two/three other
variants. |
|
| 671 |
4644d 10h |
werner |
/trunk/src/ |
Necessary changes for GPL licence (i.e. headers in all source files) |
|
| 664 |
4686d 09h |
werner |
/trunk/src/ |
fixes in the fire module |
|
| 662 |
4687d 10h |
werner |
/trunk/src/ |
continued to work on the fire module. Include the fire severity (i.e. mortality due to fire). This had various other impacts, e.g., on the carbon cycle of saplings. |
|
| 639 |
4805d 07h |
werner |
/ |
move current content to the "trunk" |
|
| 600 |
4875d 04h |
werner |
/src/ |
corrected grid export (flipping of y-axis)
added initialization of saplings; StandLoader contains now a routine similar to the one for larger trees to distribute saplings; additionally, a script function (Globals.addSaplingsOnStand()) can be used to use this functionality. |
|
| 575 |
4905d 12h |
werner |
/src/ |
* renamed toString() from IException to message() (several occurences).
* added a "name" property to the MapGridWrapper |
|
| 574 |
4905d 15h |
werner |
/src/ |
* modified outputs to write only rows for valid resource units
* dropped setting "woodDecompRate" (snag.cpp)
* calculate the "stockableArea" of a resource unit based on the stand grid
* use the stockableArea for calculation of LAI |
|
| 569 |
4910d 15h |
werner |
/src/ |
added a "id" for resource units (which comes from initialization grids).
fixed a bug that ru-grids only worked well on second creation of the model. |
|
| 526 |
4964d 07h |
werner |
/src/ |
embedding the soil model into iLand. renamed the snag decay debug output. |
|
| 521 |
4965d 12h |
werner |
/src/ |
moved snag dynamics from rus-level to ru-level |
|
| 487 |
5015d 05h |
werner |
/src/core/ |
some performance optimizations done on Linux with valgrind /
KCacheGrind.
stamp: did inlining of "distanceToCenter" (is still relatively expensive
due to heavy usage in e.g. applyLip)
Saplings: removed the very exensive way to check if a sapling of a
species is already on a given pixel; we now use a std::bitmap for that
purpose.
grid: optimized the "indexOf(float*)"-method; this method is used very
often. |
|
| 482 |
5015d 13h |
werner |
/src/core/ |
fixed bug that recruited trees modified the average aging calculation; added some diagnostic code here and there. |
|
| 461 |
5022d 07h |
werner |
/src/core/ |
fixed a bug in bookkeeping values from saplings per ru (average height/average age). little refactoring and improvement of code that deals with "SaplingMaps". |
|
| 455 |
5071d 13h |
werner |
/src/ |
changed the layout of the resourceUnitSpecies from a QVector to a QList<ResourceUnitSpecies*>. This seems to be much more appropriate. But caused many small changes throughout the project. |
|
| 454 |
5071d 14h |
werner |
/src/ |
improvements of regeneration/establishment. Looking for bug that stems obviously from copy-constructor problems (resourceUnitSpecies). |
|
| 452 |
5072d 09h |
werner |
/src/ |
searching for a bug in the sapling growth.... |
|
| 451 |
5072d 11h |
werner |
/src/ |
further development of sapling growth |
|
| 449 |
5072d 15h |
werner |
/src/ |
start of implementation of sapling growth.
setup of the temporal height-map for saplings. |
|
| 444 |
5123d 11h |
werner |
/src/core/ |
added a "randomGenerator" - function to the resource unit -> this should be used when fetching random numbers from within functions that are executed in a multi-threaded way. You could also use GlobalSettings::instance()->randomGenerator(). |
|
| 376 |
5191d 14h |
werner |
/src/ |
calculation of an average value for aging at resource unit level.
added variable 'aging' for resource units.
changed comments. |
|
| 367 |
5198d 16h |
werner |
/src/core/ |
changes in the watercycle.
see http://iland.boku.ac.at/tiki-view_tracker_item.php?itemId=30
the calculation of the effect on the canopy conductance is changed. Now, the combined effects of soil water and vpd response together modify the canopy conductance. In order to do this some structural changes have been necessary. Note: now the response values for vpd and soil water are calculated two times. |
|
| 294 |
5369d 20h |
werner |
/src/ |
lots of scripting stuff: new global functions (include, alert)
new methods of the "Globals" javascript object (set, setting, addTrees, ...) |
|
| 293 |
5370d 02h |
werner |
/src/ |
added reasonable ResourceUnit variables, when clicked in main window, the variable values are displayed in the tree view. |
|
| 287 |
5371d 22h |
werner |
/src/ |
Tree initialization (random variant). works almost... |
|
| 281 |
5373d 22h |
werner |
/src/ |
setup of the world - remodeled the init-routine in Model, changed the init of stands (also some xml-keys). added a storage for variables local to rseource units (e.g. nitrogenAvailable). |
|
| 280 |
5374d 04h |
werner |
/src/ |
Creation of the "Environment" class (loading of the "world" into iLand).
- added setter-functions to XmlHelper
- added auxiliary functions to CSVFile
- smaller changes to a bunch of other files. |
|
| 269 |
5378d 02h |
werner |
/src/ |
changed waterholding capacity to "soilDepth", started with "Environment". |
|
| 255 |
5381d 00h |
werner |
/src/ |
const-ness of Climate.
shell for species response water. |
|
| 251 |
5381d 02h |
werner |
/src/ |
Light-Redistribution: Changed again (12.10.2009). LRI of trees are now modified with a modifier based on stockedarea*beerLambert-fraction (pPar). The modified LRI is then used to calculate a light response. The light response * leafarea eventually acts as the share of GPP assigned to a particular tree. |
|
| 241 |
5385d 00h |
werner |
/src/core/ |
watercycle within the model sequence. |
|
| 240 |
5385d 03h |
werner |
/src/ |
water cycle yields first results.
implemented a "createStandStatistics()" function, that calculates stocked areas, and statistics after initialization and before the actual model run. |
|