Subversion Repositories public iLand

Rev

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

Filtering Options

Rev Age Author Path Log message Diff Changes
438 5215d 11h 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)).		  
/src/core/establishment.cpp
/src/core/grid.h
/src/core/model.h
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/resourceunitspecies.h
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/iland/tests.h
391 5270d 13h 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.		  
/src/core/grid.h
/src/core/model.cpp
/src/core/modelsettings.h
/src/core/seeddispersal.cpp
/src/core/seeddispersal.h
/src/core/species.cpp
/src/core/species.h
/src/core/speciesset.cpp
/src/core/speciesset.h
/src/iland/mainwindow.cpp
373 5286d 18h 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)		  
/src/core/seeddispersal.cpp
/src/core/seeddispersal.h
/src/core/grid.cpp
/src/core/grid.h
/src/iland/iland.pro
/src/iland/tests.cpp
/src/iland/tests.h
285 5462d 20h 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.  
/src/core/global.h
/src/core/grid.cpp
/src/core/grid.h
/src/core/model.cpp
/src/core/model.h
/src/core/modelcontroller.cpp
/src/core/standloader.cpp
/src/core/tree.cpp
261 5468d 08h werner /src/ * added NPP aboveground to stats
* some update in comments		  
/src/core/grid.h
/src/core/model.cpp
/src/core/standstatistics.cpp
/src/core/standstatistics.h
/src/core/tree.cpp
/src/core/tree.h
/src/output/dynamicstandout.cpp
/src/output/standout.cpp
247 5473d 01h werner /src/ global script object (ScriptGlobal).
Doxygen documentation refinements.		  
/src/iland/maindoc.cpp
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
/src/core/climate.cpp
/src/core/grid.h
/src/core/management.cpp
/src/core/model.cpp
/src/core/resourceunitspecies.cpp
/src/core/species.cpp
/src/core/speciesresponse.cpp
/src/core/stampcontainer.h
/src/core/standloader.cpp
/src/core/tree.h
/src/iland/iland.pro
/src/tools/climateconverter.cpp
/src/tools/expression.cpp
/src/tools/globalsettings.cpp
154 5502d 02h werner /src/core/ added warning...  
/src/core/grid.h
153 5502d 02h 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).		  
/src/core/grid.h
/src/core/model.cpp
/src/core/ressourceunit.cpp
/src/core/species.cpp
/src/core/threadrunner.cpp
/src/core/tree.cpp
/src/iland/mainwindow.cpp
150 5502d 09h iland /src/ added Grid::wipe() to memset a whole grid  
/src/core/grid.h
/src/core/model.cpp
/src/iland/mainwindow.cpp
/src/iland/mainwindow.ui
145 5503d 06h 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!		  
/src/core/grid.h
/src/core/model.h
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/core/production3pg.h
/src/core/ressourceunit.h
/src/core/species.cpp
/src/core/species.h
/src/core/speciesset.h
/src/core/stamp.h
/src/core/stampcontainer.h
/src/core/threadrunner.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland.pro
/src/iland/iland.pro
/src/iland/mainwindow.cpp
/src/iland/stable.h
/src/tools/expression.cpp
/src/tools/expression.h
/src/tools/expressionwrapper.cpp
/src/tools/expressionwrapper.h
/src/tools/globalsettings.h
/src/tools/helper.cpp
/src/tools/helper.h
/src/tools/ticktack.cpp
/src/tools/xmlhelper.cpp
/src/tools/xmlhelper.h
143 5504d 01h 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 ;)		  
/src/core/grid.h
/src/core/model.cpp
/src/core/model.h
/src/core/ressourceunit.h
/src/core/stampcontainer.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
/src/tools/expression.cpp
/src/tools/expression.h
/src/tools/globalsettings.cpp
/src/tools/helper.cpp
/src/tools/helper.h
105 5513d 23h 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()
...		  
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/core/exception.h
/src/core/grid.h
/src/core/model.cpp
/src/core/model.h
/src/core/ressourceunit.cpp
/src/core/ressourceunit.h
/src/core/tree.cpp
/src/core/tree.h
/src/fonstudio/fonstudio.pro
/src/fonstudio/lightroom.cpp
/src/fonstudio/mainwindow.cpp
/src/fonstudio/mainwindow.h
80 5517d 07h Werner / change master structure  
/src
/fonstudio
77 5525d 21h 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		  
/fonstudio/core/grid.h
/fonstudio/fonstudio.pro
/fonstudio/tree.cpp
75 5526d 01h 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.		  
/fonstudio/core/grid.h
/fonstudio/tree.cpp
74 5526d 02h 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)		  
/fonstudio/core/grid.h
/fonstudio/tree.cpp
58 5560d 03h 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)		  
/fonstudio/core/grid.h
/fonstudio/core/stamp.h
/fonstudio/core/stampcontainer.cpp
/fonstudio/core/stampcontainer.h
/fonstudio/inits/fon.xml
/fonstudio/mainwindow.cpp
/fonstudio/mainwindow.h
/fonstudio/mainwindow.ui
/fonstudio/tools/helper.cpp
/fonstudio/tree.cpp
/fonstudio/tree.h
55 5560d 20h 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...  
/fonstudio/core/grid.h
/fonstudio/mainwindow.cpp
/fonstudio/tools/helper.cpp
/fonstudio/tools/helper.h
50 5562d 05h Werner /fonstudio/ grid: fixed bug that mRect was overwritten by setup() after being set by constructor.
Viewport unfinished still.		  
/fonstudio/core/grid.h
/fonstudio/inits/fon.xml
/fonstudio/mainwindow.cpp
/fonstudio/tools/helper.cpp
49 5563d 22h Werner /fonstudio/ gfx stuff (added class Viewport; not finished yet).
as always some grid functions.
mouseMove in PaintArea.		  
/fonstudio/core/grid.h
/fonstudio/mainwindow.cpp
/fonstudio/mainwindow.h
/fonstudio/mainwindow.ui
/fonstudio/paintarea.cpp
/fonstudio/paintarea.h
/fonstudio/tools/helper.cpp
/fonstudio/tools/helper.h

←Prev12Next→

Show All