| Rev |
Age |
Author |
Path |
Log message |
Diff |
| 1222 |
3037d 17h |
werner |
/ |
public SVN |
|
| 1221 |
3037d 17h |
werner |
/branches/ |
public SVN |
|
| 1220 |
3037d 17h |
werner |
/branches/version1.0/ |
Version 1.0 |
|
| 1218 |
3037d 19h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
| 1217 |
3037d 19h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
| 1203 |
3067d 20h |
werner |
/branches/iland_regen/src/ |
added the missing "ActPlanting" functions for the "new" regeneration module. |
|
| 1162 |
3254d 00h |
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 |
|
| 1159 |
3255d 13h |
werner |
/branches/iland_regen/src/ |
Changed memory layout of regeneration module.
problems now with invalid (NaN) soil values. Needs further analysis ;) |
|
| 1157 |
3256d 02h |
werner |
/branches/iland_regen/ |
merge of changes in the trunk (up to the version used for the 2016 DICE simulation batch). |
|
| 1118 |
3311d 22h |
werner |
/branches/iland_regen/src/core/ |
fixes for the new saplings, now it almost works as expected. |
|
| 1113 |
3316d 20h |
werner |
/branches/iland_regen/src/core/ |
integrating sapling growth... |
|
| 1104 |
3325d 23h |
werner |
/branches/iland_regen/ |
Branch dedicated to playing around with establishment/regeneration.
Goals are:
(i) speed up
(ii) introduction of new features for Yellowstone |
|
| 1045 |
3497d 19h |
werner |
/branches/port_qt5_64bit/src/ |
implemented possibility to load only a part of a snapshot into iland. This is done by creating along the snapshot a grid of resource-unit-indices (for spatial reference). |
|
| 1040 |
3577d 17h |
werner |
/branches/port_qt5_64bit/src/ |
working on bark beetle module (continuing on antagonists)
adding species share maps to iLand visualization. |
|
| 1017 |
3624d 17h |
werner |
/branches/port_qt5_64bit/src/ |
calculate crown cover maps |
|
| 1002 |
3675d 13h |
werner |
/branches/port_qt5_64bit/src/ |
new optimized establishment routine.
not finished yet, but looks promising in my first tests. |
|
| 863 |
4102d 18h |
werner |
/branches/port_qt5_64bit/ |
renaming of the FOME to AMIE.
unfortunately, some partial merge of changes in Qt4-branch. |
|
| 824 |
4142d 23h |
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 |
4309d 19h |
werner |
/branches/port_qt5_64bit/ |
|
|
| 720 |
4788d 13h |
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 |
4840d 20h |
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 |
4841d 16h |
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 |
4892d 20h |
werner |
/trunk/src/ |
Necessary changes for GPL licence (i.e. headers in all source files) |
|
| 664 |
4934d 19h |
werner |
/trunk/src/ |
fixes in the fire module |
|
| 662 |
4935d 19h |
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 |
5053d 17h |
werner |
/ |
move current content to the "trunk" |
|
| 600 |
5123d 13h |
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 |
5153d 22h |
werner |
/src/ |
* renamed toString() from IException to message() (several occurences).
* added a "name" property to the MapGridWrapper |
|
| 574 |
5154d 00h |
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 |
5159d 01h |
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 |
5212d 17h |
werner |
/src/ |
embedding the soil model into iLand. renamed the snag decay debug output. |
|
| 521 |
5213d 21h |
werner |
/src/ |
moved snag dynamics from rus-level to ru-level |
|
| 487 |
5263d 14h |
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 |
5263d 23h |
werner |
/src/core/ |
fixed bug that recruited trees modified the average aging calculation; added some diagnostic code here and there. |
|
| 461 |
5270d 16h |
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 |
5319d 23h |
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 |
5319d 23h |
werner |
/src/ |
improvements of regeneration/establishment. Looking for bug that stems obviously from copy-constructor problems (resourceUnitSpecies). |
|
| 452 |
5320d 18h |
werner |
/src/ |
searching for a bug in the sapling growth.... |
|
| 451 |
5320d 21h |
werner |
/src/ |
further development of sapling growth |
|
| 449 |
5321d 00h |
werner |
/src/ |
start of implementation of sapling growth.
setup of the temporal height-map for saplings. |
|