Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
1222 |
2774d 18h |
werner |
/ |
public SVN |
|
/tags/release_1.0
/branches/release_1.0
|
1221 |
2774d 18h |
werner |
/branches/ |
public SVN |
|
/branches/release_1.0
/branches/version1.0
|
1220 |
2774d 19h |
werner |
/branches/version1.0/ |
Version 1.0 |
|
/branches/version1.0
|
1218 |
2774d 21h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/trunk
/iland_regen
|
1217 |
2774d 21h |
werner |
/ |
clean up repository - make 1.0 trunk again! |
|
/iland_regen
/branches/iland_regen
|
1182 |
2920d 18h |
werner |
/branches/iland_regen/src/ |
Torus also effective for seed distribution
new output "SaplingDetails" (super high detail level of individual cohorts)
version information also in ilandc [move version.cpp to core]
[due to a sync problem with the SVN server, some revisions where lost: here they are:]
compiling ilandc
some code clean up - removed old code (sapling.cpp) for sapling trees and establishment. |
|
/branches/iland_regen/src/core/climate.cpp /branches/iland_regen/src/core/establishment.cpp /branches/iland_regen/src/core/establishment.h /branches/iland_regen/src/core/model.cpp /branches/iland_regen/src/core/modelcontroller.cpp /branches/iland_regen/src/core/modelcontroller.h /branches/iland_regen/src/core/modelsettings.cpp /branches/iland_regen/src/core/modelsettings.h /branches/iland_regen/src/core/resourceunitspecies.cpp /branches/iland_regen/src/core/resourceunitspecies.h /branches/iland_regen/src/core/saplings.cpp /branches/iland_regen/src/core/seeddispersal.cpp /branches/iland_regen/src/core/species.cpp /branches/iland_regen/src/core/species.h /branches/iland_regen/src/core/standloader.cpp /branches/iland_regen/src/core/standstatistics.h /branches/iland_regen/src/iland/iland.pro /branches/iland_regen/src/iland/mainwindow.cpp /branches/iland_regen/src/iland/mainwindow.h /branches/iland_regen/src/ilandc/consoleshell.cpp /branches/iland_regen/src/ilandc/ilandc.pro /branches/iland_regen/src/ilandc/main.cpp /branches/iland_regen/src/output/outputmanager.cpp /branches/iland_regen/src/output/saplingout.cpp /branches/iland_regen/src/output/saplingout.h /branches/iland_regen/src/output/snapshot.cpp /branches/iland_regen/src/tools/helper.cpp
|
1104 |
3063d 01h |
werner |
/branches/iland_regen/ |
Branch dedicated to playing around with establishment/regeneration.
Goals are:
(i) speed up
(ii) introduction of new features for Yellowstone |
|
/branches/iland_regen
|
779 |
4046d 20h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
671 |
4629d 21h |
werner |
/trunk/src/ |
Necessary changes for GPL licence (i.e. headers in all source files) |
|
/trunk/src/core/climate.cpp /trunk/src/core/climate.h /trunk/src/core/environment.cpp /trunk/src/core/environment.h /trunk/src/core/establishment.cpp /trunk/src/core/establishment.h /trunk/src/core/exception.h /trunk/src/core/global.h /trunk/src/core/grid.h /trunk/src/core/layeredgrid.h /trunk/src/core/management.cpp /trunk/src/core/management.h /trunk/src/core/model.cpp /trunk/src/core/model.h /trunk/src/core/modelcontroller.cpp /trunk/src/core/modelcontroller.h /trunk/src/core/modelsettings.cpp /trunk/src/core/modelsettings.h /trunk/src/core/phenology.cpp /trunk/src/core/phenology.h /trunk/src/core/plugin_interface.h /trunk/src/core/production3pg.cpp /trunk/src/core/production3pg.h /trunk/src/core/resourceunit.cpp /trunk/src/core/resourceunit.h /trunk/src/core/sapling.cpp /trunk/src/core/sapling.h /trunk/src/core/seeddispersal.cpp /trunk/src/core/seeddispersal.h /trunk/src/core/snag.cpp /trunk/src/core/snag.h /trunk/src/core/soil.cpp /trunk/src/core/soil.h /trunk/src/core/species.cpp /trunk/src/core/species.h /trunk/src/core/speciesresponse.cpp /trunk/src/core/speciesresponse.h /trunk/src/core/speciesset.cpp /trunk/src/core/speciesset.h /trunk/src/core/stamp.cpp /trunk/src/core/stamp.h /trunk/src/core/stampcontainer.cpp /trunk/src/core/stampcontainer.h /trunk/src/core/standloader.cpp /trunk/src/core/standloader.h /trunk/src/core/standstatistics.cpp /trunk/src/core/standstatistics.h /trunk/src/core/threadrunner.cpp /trunk/src/core/threadrunner.h /trunk/src/core/timeevents.cpp /trunk/src/core/timeevents.h /trunk/src/core/tree.cpp /trunk/src/core/tree.h /trunk/src/core/watercycle.cpp /trunk/src/core/watercycle.h /trunk/src/iland/aboutdialog.cpp /trunk/src/iland/aboutdialog.h /trunk/src/iland/aboutdialog.ui /trunk/src/iland/mainwindow.cpp /trunk/src/iland/mainwindow.h /trunk/src/iland/paintarea.cpp /trunk/src/iland/paintarea.h /trunk/src/iland/stable.h /trunk/src/iland/tests.cpp /trunk/src/iland/tests.h /trunk/src/iland/version.h /trunk/src/output/carbonflowout.cpp /trunk/src/output/carbonflowout.h /trunk/src/output/carbonout.cpp /trunk/src/output/carbonout.h /trunk/src/output/dynamicstandout.cpp /trunk/src/output/dynamicstandout.h /trunk/src/output/managementout.cpp /trunk/src/output/managementout.h /trunk/src/output/output.cpp /trunk/src/output/output.h /trunk/src/output/outputmanager.cpp /trunk/src/output/outputmanager.h /trunk/src/output/productionout.cpp /trunk/src/output/productionout.h /trunk/src/output/saplingout.cpp /trunk/src/output/saplingout.h /trunk/src/output/standdeadout.cpp /trunk/src/output/standdeadout.h /trunk/src/output/standout.cpp /trunk/src/output/standout.h /trunk/src/output/treeout.cpp /trunk/src/output/treeout.h /trunk/src/plugins/fire/firemodule.cpp /trunk/src/plugins/fire/firemodule.h /trunk/src/plugins/fire/fireout.cpp /trunk/src/plugins/fire/fireout.h /trunk/src/plugins/fire/fireplugin.cpp /trunk/src/plugins/fire/fireplugin.h /trunk/src/tools/climateconverter.cpp /trunk/src/tools/climateconverter.h /trunk/src/tools/csvfile.cpp /trunk/src/tools/csvfile.h /trunk/src/tools/dem.cpp /trunk/src/tools/dem.h /trunk/src/tools/expression.cpp /trunk/src/tools/expression.h /trunk/src/tools/expressionwrapper.cpp /trunk/src/tools/expressionwrapper.h /trunk/src/tools/floatingaverage.cpp /trunk/src/tools/floatingaverage.h /trunk/src/tools/gisgrid.cpp /trunk/src/tools/gisgrid.h /trunk/src/tools/globalsettings.cpp /trunk/src/tools/globalsettings.h /trunk/src/tools/helper.cpp /trunk/src/tools/helper.h /trunk/src/tools/mapgrid.cpp /trunk/src/tools/mapgrid.h /trunk/src/tools/modules.cpp /trunk/src/tools/modules.h /trunk/src/tools/random.cpp /trunk/src/tools/random.h /trunk/src/tools/scriptglobal.cpp /trunk/src/tools/scriptglobal.h /trunk/src/tools/settingmetadata.cpp /trunk/src/tools/settingmetadata.h /trunk/src/tools/sqlhelper.cpp /trunk/src/tools/sqlhelper.h /trunk/src/tools/ticktack.cpp /trunk/src/tools/ticktack.h /trunk/src/tools/xmlhelper.cpp /trunk/src/tools/xmlhelper.h
|
639 |
4790d 18h |
werner |
/ |
move current content to the "trunk" |
|
/trunk/executable /trunk/src
/executable /src
|
547 |
4911d 23h |
werner |
/src/core/ |
restructured the topLayerWaterContent setting; it is now RU-specific (and not a global parameter) |
|
/src/core/modelsettings.cpp /src/core/modelsettings.h /src/core/snag.cpp /src/core/watercycle.cpp /src/core/watercycle.h
|
546 |
4912d 01h |
werner |
/src/core/ |
modified calculation of 're' (decay rate for snags), and added new model setting ('topLayerWaterContent') for that purpose. New variable 'waterDeficit' per day in WaterCycle. |
|
/src/core/modelsettings.cpp /src/core/modelsettings.h /src/core/snag.cpp /src/core/watercycle.cpp /src/core/watercycle.h
|
541 |
4936d 22h |
werner |
/src/ |
included new setting "model.settings.decayReferencePsi" |
|
/src/core/modelsettings.cpp /src/core/modelsettings.h /src/core/snag.cpp /src/iland/version.cpp
|
536 |
4945d 18h |
werner |
/src/core/ |
update the calculation of belowground allocation. Due to a mishap an error was in there (a difference in implementation and concept). In short, the fraction of utilizable and global radiaton was not in the formula.
german info:
Eq. S13: ok, gut das wir da noch einmal gecheckt haben. Sollte so sein wie urspruenglich im Supplement (und auch im Wiki), also mit dem uAPAR/APAR ratio und fN. In fact, wenn die Pflanze Trockenstress hat, sollte mehr in die Wurzeln gehen, das ist die Logik dahinter. Ich nehm mal an das das einiges aendert, wir sollten es aber bereinigen. Kannst es mir ev. im project file als switch anlegen? Dann kann ich den Effekt besser testen. Thx und sorry fuer ev. Unklarheiten in der Kommunikation.
--> ok. da gibt es ein neues setting: "usePARFractionBelowGroundAllocation" (in "model.settings") . Wenn true (das ist auch default), dann wird das so gerechnet wie im paper, mit false ist es die "alte" und falsche variante. Und wahrscheinlich hab ich das versemmelt und irgendwie übersehen - es tut eher mir leid, wenn du jetzt deswegen noch recht viel arbeit hast... sorry. |
|
/src/core/modelsettings.cpp /src/core/modelsettings.h /src/core/production3pg.cpp /src/core/speciesresponse.cpp /src/core/speciesresponse.h
|
530 |
4949d 13h |
werner |
/src/ |
enabled the dynamic coupling of available nitrogen from the soil module with the "available nitrogen" (fertility rating) used for calculations of species responses. |
|
/src/core/modelsettings.cpp /src/core/modelsettings.h /src/core/resourceunit.cpp /src/core/soil.cpp /src/tools/xmlhelper.cpp
|
468 |
5006d 21h |
werner |
/src/ |
starting the implementation of the snag dynamics submodule.
New class: Snag
added Snag to ResourceUnitSpecies
added links to Snag in Tree |
|
/src/core/snag.cpp /src/core/snag.h
/src/core/model.cpp /src/core/modelsettings.h /src/core/resourceunitspecies.cpp /src/core/resourceunitspecies.h /src/core/tree.cpp /src/iland/iland.pro
|
391 |
5166d 22h |
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
|
368 |
5184d 03h |
werner |
/src/ |
new model settings: laiThresholdForClosedStand, boundaryLayerConductance.
dropped the "evapotranspirationBGC" and the related model settings |
|
/src/core/modelsettings.cpp /src/core/modelsettings.h /src/core/watercycle.cpp /src/core/watercycle.h /src/tools/globalsettings.cpp
|
340 |
5294d 20h |
werner |
/src/ |
Added "TimeEvents"
improved documentation of Environment.
added CSVFile::values() to retrieve a list of column values. |
|
/src/core/timeevents.cpp /src/core/timeevents.h
/src/core/environment.cpp /src/core/environment.h /src/core/model.cpp /src/core/model.h /src/core/modelsettings.h /src/iland/iland.pro /src/tools/csvfile.cpp /src/tools/csvfile.h /src/tools/globalsettings.cpp
|
281 |
5359d 09h |
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). |
|
/src/core/environment.cpp /src/core/environment.h /src/core/exception.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/speciesresponse.cpp /src/core/standloader.cpp /src/core/standloader.h /src/core/watercycle.cpp /src/iland/tests.cpp
|
274 |
5362d 17h |
werner |
/src/ |
lightResponseClasses (changed in SpeciesSet, Species and Tree) |
|
/src/core/modelsettings.cpp /src/core/modelsettings.h /src/core/species.cpp /src/core/species.h /src/core/speciesset.cpp /src/core/speciesset.h /src/core/tree.cpp /src/iland/mainwindow.cpp /src/iland/mainwindow.h /src/iland/mainwindow.ui
|
240 |
5370d 14h |
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
|
239 |
5370d 17h |
werner |
/src/ |
debug logging of water cycle. embedding of water cycle in model logic. |
|
/src/core/modelsettings.cpp /src/core/modelsettings.h /src/core/watercycle.cpp /src/core/watercycle.h /src/iland/mainwindow.cpp /src/iland/mainwindow.h /src/iland/mainwindow.ui /src/tools/globalsettings.cpp /src/tools/globalsettings.h
|
226 |
5373d 12h |
werner |
/src/core/ |
working on 3pg, the species specific responses and linking it all together. |
|
/src/core/climate.cpp /src/core/climate.h /src/core/modelsettings.cpp /src/core/modelsettings.h /src/core/phenology.cpp /src/core/phenology.h /src/core/production3pg.cpp /src/core/production3pg.h /src/core/resourceunit.cpp /src/core/resourceunitspecies.cpp /src/core/resourceunitspecies.h /src/core/species.h /src/core/speciesresponse.cpp /src/core/speciesresponse.h
|
210 |
5379d 18h |
werner |
/src/ |
class "Sun", added "site"-varaibles to the project file. |
|
/src/core/climate.cpp /src/core/climate.h /src/core/global.h /src/core/modelsettings.cpp /src/core/modelsettings.h /src/core/speciesset.cpp /src/iland/tests.cpp
|
205 |
5380d 18h |
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
|
201 |
5384d 10h |
werner |
/src/core/ |
delayed temperature calculation. |
|
/src/core/climate.cpp /src/core/climate.h /src/core/modelsettings.cpp /src/core/modelsettings.h
|
200 |
5384d 11h |
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
|