Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
240 |
5475d 15h |
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. |
|
/src/core/climate.h /src/core/model.cpp /src/core/model.h /src/core/modelsettings.cpp /src/core/modelsettings.h /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/standstatistics.cpp /src/core/standstatistics.h /src/core/watercycle.cpp /src/core/watercycle.h /src/iland/mainwindow.cpp /src/iland/tests.cpp /src/iland/tests.h /src/tools/globalsettings.cpp
|
234 |
5476d 10h |
werner |
/src/core/ |
added (during dev. of watercycle) new properties: area() to ResourceUnit, leafArea() to Tree, added LAI-counting to StandStatistics. |
|
/src/core/climate.h /src/core/resourceunit.h /src/core/resourceunitspecies.h /src/core/standstatistics.cpp /src/core/standstatistics.h /src/core/tree.h
|
230 |
5477d 08h |
werner |
/src/ |
3PG work out |
|
/src/core/production3pg.cpp /src/core/production3pg.h /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/resourceunitspecies.cpp /src/core/resourceunitspecies.h /src/core/speciesresponse.cpp /src/core/tree.cpp /src/output/output.cpp /src/tools/globalsettings.cpp
|
215 |
5484d 06h |
werner |
/src/core/ |
distribution of GPP - what a mess... |
|
/src/core/production3pg.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/tree.cpp
|
212 |
5484d 14h |
werner |
/src/ |
added LightResponse as a TreeVariable, fixed bug during Light distribution. |
|
/src/core/climate.cpp /src/core/resourceunit.h /src/core/speciesresponse.cpp /src/core/tree.cpp /src/core/tree.h /src/tools/expressionwrapper.cpp
|
208 |
5485d 16h |
werner |
/src/core/ |
included "Climate" in the model (i.e. list of climates in Model, climate ptr in resource unit, call of response calculation in production(). |
|
/src/core/climate.cpp /src/core/climate.h /src/core/model.cpp /src/core/model.h /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/resourceunitspecies.h /src/core/speciesresponse.cpp
|
205 |
5485d 19h |
werner |
/src/ |
added LightResponse function (modelsettings) to allow examination of various options for the distribution of NPP. |
|
/src/core/modelsettings.cpp /src/core/modelsettings.h /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/tree.cpp /src/tools/expression.h
|
200 |
5489d 12h |
werner |
/src/ |
added "ModelSettings", i.e. a high performant storage for model settings, further spelling resource vs ressource, including the "batch" job feature from fonstudio into iland. added a slot for MainWindow to force a repaint. and much more. |
|
/src/core/management.cpp /src/core/management.h /src/core/modelsettings.cpp /src/core/modelsettings.h
/src/iland/management.cpp /src/iland/management.h
/src/core/model.cpp /src/core/model.h /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/threadrunner.cpp /src/core/threadrunner.h /src/core/tree.cpp /src/fonstudio/fonstudio.pro /src/fonstudio/mainwindow.cpp /src/iland/iland.pro /src/iland/mainwindow.cpp /src/iland/mainwindow.h /src/iland/tests.cpp /src/iland/tests.h /src/output/outputmanager.cpp /src/tools/expressionwrapper.h
|
189 |
5491d 05h |
iland |
/src/ |
finished ressource vs. resource struggle, some cleanup within xml file
reading. |
|
/src/core/model.cpp /src/core/model.h /src/core/production3pg.cpp /src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/resourceunitspecies.cpp /src/core/standloader.cpp /src/core/tree.cpp /src/iland/iland.pro /src/iland/mainwindow.cpp /src/iland/management.cpp /src/iland/tests.cpp /src/output/dynamicstandout.cpp /src/output/standout.cpp /src/output/treeout.cpp /src/tools/expressionwrapper.cpp /src/tools/globalsettings.cpp /src/tools/globalsettings.h /src/tools/xmlhelper.cpp
|
188 |
5491d 05h |
werner |
/src/core/ |
rename ressoure files. |
|
/src/core/resourceunit.cpp /src/core/resourceunit.h /src/core/resourceunitspecies.cpp /src/core/resourceunitspecies.h
/src/core/ressourceunit.cpp /src/core/ressourceunit.h /src/core/ressourceunitspecies.cpp /src/core/ressourceunitspecies.h
|
187 |
5491d 05h |
iland |
/src/ |
wow. Ressource is correctly spelled as Resource. I jerk. |
|
/src/core/global.h /src/core/model.cpp /src/core/production3pg.h /src/core/ressourceunit.h /src/core/ressourceunitspecies.cpp /src/core/ressourceunitspecies.h /src/core/standloader.cpp /src/core/standloader.h /src/core/threadrunner.cpp /src/core/threadrunner.h /src/core/tree.h /src/iland/mainwindow.cpp /src/iland/management.cpp /src/iland/tests.cpp /src/tools/expressionwrapper.cpp /src/tools/expressionwrapper.h /src/tools/xmlhelper.h
|
183 |
5491d 16h |
werner |
/src/ |
Added isEmpty() for Expression. Added new output DynamicStandOutput. New wrapper for RessourceUnits. Everything is in its right place ;) |
|
/src/output/dynamicstandout.cpp /src/output/dynamicstandout.h
/src/core/ressourceunit.h /src/iland/iland.pro /src/output/standout.h /src/output/treeout.cpp /src/tools/expression.cpp /src/tools/expression.h /src/tools/expressionwrapper.cpp /src/tools/expressionwrapper.h
|
180 |
5492d 10h |
werner |
/src/ |
created StandStatistics (similar to the solution in Picus). Each tree adds itself to the statistics object of RU x species. During yearEnd() of RessourceUnit the data is aggregated for the whole stand. |
|
/src/core/standstatistics.cpp /src/core/standstatistics.h
/src/core/model.cpp /src/core/ressourceunit.cpp /src/core/ressourceunit.h /src/core/ressourceunitspecies.h /src/core/tree.cpp /src/core/tree.h /src/iland/iland.pro
|
179 |
5492d 10h |
werner |
/src/ |
added standoutput (accompanied by some changes at other places) |
|
/src/output/standout.cpp /src/output/standout.h
/src/core/ressourceunit.h /src/core/species.h /src/core/speciesset.cpp /src/core/speciesset.h /src/iland/iland.pro /src/output/output.h /src/output/outputmanager.cpp
|
157 |
5502d 12h |
werner |
/src/ |
cleaning of memory after trees died; this had some impacts on AllTreeIterator and some other places.
added a "Tests" class to combine some simple tests. |
|
/src/iland/tests.cpp /src/iland/tests.h
/src/core/global.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/iland/iland.pro /src/iland/mainwindow.cpp /src/tools/expression.cpp /src/tools/expressionwrapper.cpp
|
151 |
5503d 17h |
iland |
/src/ |
- now calculating the area per RU which is stocked.
to achieve that, changes were made to:
- heightGrid() in Tree
- RessourceUnit: new member variables
- Model: function to iterate over RUs and calculate actual values.
- added functions for binary (QByteArray) loading/saving to file in
Helper
GUI: saveState/restoreState in MainWindow - used for dockwindows. |
|
/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/iland/mainwindow.cpp /src/iland/mainwindow.ui /src/tools/globalsettings.cpp /src/tools/helper.cpp /src/tools/helper.h
|
147 |
5504d 13h |
werner |
/src/core/ |
redistribution of radiation from RessourceUnit to trees. |
|
/src/core/ressourceunit.cpp /src/core/ressourceunit.h /src/core/tree.cpp
|
145 |
5504d 16h |
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 |
5505d 11h |
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
|
113 |
5513d 14h |
Werner |
/src/ |
started Production3PG-class which couples the (stand-level) production.
implemented zooming and panning in Viewport (this is always a hell of a job) |
|
/src/core/production3pg.cpp /src/core/production3pg.h
/src/core/model.cpp /src/core/ressourceunit.cpp /src/core/ressourceunit.h /src/core/ressourceunitspecies.h /src/core/standloader.cpp /src/core/tree.cpp /src/core/tree.h /src/fonstudio/fonstudio.pro /src/fonstudio/mainwindow.cpp /src/fonstudio/mainwindow.h /src/fonstudio/paintarea.cpp /src/fonstudio/paintarea.h /src/tools/helper.cpp /src/tools/helper.h
|