Rev |
Age |
Author |
Path |
Log message |
Diff |
438 |
5127d 00h |
werner |
/src/ |
new GridRunner class to iterate nicely over grids with different sizes.
establishment.cpp: started to integrate the whole regeneration process (including "lazy" calculation of 3pg (only if necessary)). |
|
391 |
5182d 03h |
werner |
/src/ |
a rather large update mainly in course of the implementation of seed dispersal.
* integrating the seed dispersal within the model logic
(new function e.g. SpeciesSet::newYear() or SpeciesSet::regeneration()).
* SeedDispersal: implementation of the Seed-Kernel a la TreeMig (see the R-Script on dispersal by Rupert)
Additionally:
new functions (sum(), multiply() for the Grid-template. |
|
373 |
5198d 08h |
werner |
/src/ |
Creation of seeddispersal.
this includes some extensions to the grid (e.g. randomPosition()).
The seedDispersal-algorithm is implemented on CPU (but still not linked to tree growth) |
|
285 |
5374d 10h |
werner |
/src/core/ |
loading of the landscape. added "areaMask.imageFile" to "world" in xml file. This loads a image mask that establishes area that are inside and outside the project area respectively. |
|
261 |
5379d 22h |
werner |
/src/ |
* added NPP aboveground to stats
* some update in comments |
|
247 |
5384d 15h |
werner |
/src/ |
global script object (ScriptGlobal).
Doxygen documentation refinements. |
|
154 |
5413d 16h |
werner |
/src/core/ |
added warning... |
|
153 |
5413d 16h |
werner |
/src/ |
partitioning - corrected error w.r.t. units of diameter (rather tricky)
- now everything is calculated using meters.
wipe() of Grid does *not* work correctly with values != 0 (so returned
to initialize() for the grid itself). |
|
150 |
5413d 23h |
iland |
/src/ |
added Grid::wipe() to memset a whole grid |
|
145 |
5414d 20h |
Werner |
/src/ |
Run and compiled iLand on Linux (Kubuntu) with a virtual machine. The gcc on Linux issues lots of warnings which I fixed on the Linux side. Also fixed TTickTack (the clock issue).
Now iLand also runs on Linux - nice! |
|
143 |
5415d 15h |
Werner |
/src/ |
- StampContainer: find stamps out of HD bounds.
- AllTreeIterator fixed bug in next()
- improvements in Expression (function inlining, ...)
- use tree with expression, together with Stats-class.
... and much more ;) |
|
105 |
5425d 13h |
Werner |
/src/ |
several changes:
create multiple RessourceUnits as a grid
modified include-order for model.h and mainwindow.cpp
added clear() to Grid.
fixed bug in Grid::indexOf()
... |
|
80 |
5428d 21h |
Werner |
/ |
change master structure |
|
77 |
5437d 10h |
Werner |
/fonstudio/ |
streamlined the application of stamps (now much faster)
changed the internal layout of grids (now the lines are in x-direction)
some fiddling with compiler switches |
|
75 |
5437d 15h |
Werner |
/fonstudio/ |
Optimization: removed the abundant "isValid" calls in the Grid-Class
and tried some optimizations in the tree class (applyStamp).
Interestingly, the Grid-modification did not increase performance as expected. |
|
74 |
5437d 16h |
Werner |
/fonstudio/ |
Changed algorithm for dominant height grid.
* "smooth" height values if trees are not in center of 10m height Grid
* the height-value is the maximum value of all the trees in the pixel (thus no part of the crown is above this height) |
|
58 |
5471d 17h |
Werner |
/fonstudio/ |
working version of light alogorithnm:
* steps during read:
own_xy = 1 - writer_xy * la_factor / h_dom
value_xy = grid_xy / own_xy
lightvalue = sum( value_xy * reader_xy) [ sum(reader) = 1 ]
additional correction for overstorey:
if h > h_dom:
lightvalue = 1 - (1 - lightvalue) * h/h_dom
other issues:
* added buffer around sim. area
* cleaned xml-file and code to interpret
* fixed Viewport (handling of negative coordinates - see buffer)
* fixed StampContainer, added finalizeSetup() - (filling up of the lookup map) |
|
55 |
5472d 10h |
Werner |
/fonstudio/ |
made ViewPort to work properly - at least the FON visualization works fine now (including the mouse-move coordinate readout). It is (as always) a kick in the A... |
|
50 |
5473d 19h |
Werner |
/fonstudio/ |
grid: fixed bug that mRect was overwritten by setup() after being set by constructor.
Viewport unfinished still. |
|
49 |
5475d 11h |
Werner |
/fonstudio/ |
gfx stuff (added class Viewport; not finished yet).
as always some grid functions.
mouseMove in PaintArea. |
|
48 |
5475d 17h |
Werner |
/fonstudio/ |
grid: bugfix
mainwindow: added different visualizations
tree: adopted to new scheme: dominance height split in "above Z*" and "below Z*" |
|
46 |
5475d 20h |
Werner |
/fonstudio/core/ |
added [] operator for grids, fixed dumpToString function (orientation) |
|
45 |
5475d 20h |
Werner |
/fonstudio/ |
apply stamps at domiance grid |
|
41 |
5476d 14h |
Werner |
/fonstudio/ |
checked and fixed orientation of the grids:
x-direction: -x = west, +x = east
y-direction: -y = south, +y = north
-> for display: y-axis must be reversed to fit screen coordinate system! |
|
40 |
5476d 15h |
Werner |
/fonstudio/ |
reading out of stamp values.
lots of additional small changes. |
|
37 |
5477d 22h |
Werner |
/fonstudio/ |
little optimizations of grid, fixed a bug in stampcontainer; "radial" analysis of stams (see mainwindow.cpp) |
|
36 |
5479d 13h |
Werner |
/fonstudio/ |
some template dump functions for grids.
loading/saving of stamps. still a mess. |
|
33 |
5479d 16h |
Werner |
/fonstudio/ |
general handling of stamps. This includes:
* StampContainer class. encapsulates internal storage, fast access, read/write functions to binary streams
* factory-approach for creation of stamps with different size. This can be used to use specific looping routines depending on stamp size. |
|
32 |
5479d 23h |
Werner |
/fonstudio/ |
grid: average() function, more const access operators.
LightRoom: mod. mode of setup (now setup with metric length instead of pixelcount),
fixed "addition of angles" bug.
added generation of "subpixel" stamps. |
|
27 |
5483d 18h |
Werner |
/fonstudio/ |
reworked lightroom, fixed a sin/cos bug.
added solar radiation for result.
dropped the 3d-grid, because of some strange behaviour (seems to be related with Qt shared classes and that stuff). |
|
25 |
5484d 15h |
Werner |
/fonstudio/ |
lots of stuff.... |
|
22 |
5484d 23h |
Werner |
/fonstudio/ |
added offset to Grid
started impl of the "tree" within the LightRoom (called LightRoomObject). |
|
18 |
5485d 18h |
Werner |
/fonstudio/ |
LightRoom::setup() |
|
17 |
5485d 18h |
Werner |
/fonstudio/ |
created LightRoom. |
|
15 |
5485d 22h |
Werner |
/fonstudio/ |
|
|