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
557 5009d 06h werner /src/ added initialization of snags and some new resource unit variables.
Example: model.initialization node:
<snags>
<swdC>12000</swdC>
<swdCN>120</swdCN>
<swdCount>50</swdCount>
<otherC>4000</otherC>
<otherCN>30</otherCN>
<swdDecompRate>0.05</swdDecompRate>
<woodDecompRate>0.05</woodDecompRate>
<swdHalfLife>30</swdHalfLife>
</snags>		  
/src/core/snag.cpp
/src/core/snag.h
/src/tools/expressionwrapper.cpp
553 5010d 11h werner /src/core/ another variant to calculate 're', following Adair et al 2008. Based on monthly sums of precipitation and PET. PET is calculated during the water cycle, monthly precipitation is summed in the climate object itself.  
/src/core/climate.cpp
/src/core/climate.h
/src/core/snag.cpp
/src/core/watercycle.cpp
/src/core/watercycle.h
552 5010d 12h werner /src/ fixed bug when calculating 're' with the day / dayOfMonth confusion. Changed name of the data field to avoid future problems.  
/src/core/climate.cpp
/src/core/climate.h
/src/core/management.cpp
/src/core/management.h
/src/core/snag.cpp
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
547 5012d 12h 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 5012d 13h 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 5037d 10h werner /src/ included new setting "model.settings.decayReferencePsi"  
/src/core/modelsettings.cpp
/src/core/modelsettings.h
/src/core/snag.cpp
/src/iland/version.cpp
540 5037d 11h werner /src/ removed the storage of rel. water content in water cycle module; changed the way the climate modifier (re) for snag/soil decay is calculated.
Added the coarse wood of died trees to the 5-year decay pattern of branches (and renamed therefore to otherWood).		  
/src/core/snag.cpp
/src/core/snag.h
/src/core/watercycle.cpp
/src/core/watercycle.h
/src/tools/globalsettings.cpp
534 5046d 10h werner /src/ large(r) update of the soil model. Now, the 'kyl' and 'kyr' parameters (i.e. decomposition rates for the litter/wood-soil pool) are now species parameters and calculated dynamically from the litter inputs.  
/src/core/resourceunit.cpp
/src/core/snag.cpp
/src/core/snag.h
/src/core/soil.cpp
/src/core/soil.h
/src/core/species.cpp
/src/core/species.h
/src/core/speciesset.cpp
/src/iland/mainwindow.ui
/src/iland/tests.cpp
/src/tools/globalsettings.cpp
532 5050d 01h werner /src/ force calculation of 're' in Snag even if no snags are present (Soil needs that value later)  
/src/core/snag.cpp
/src/core/soil.cpp
/src/iland/version.cpp
528 5050d 03h werner /src/ more enabling of C/N cycling in iLand. little GUI-feature: click on a RU in resource-unit visualization now properly shows RU-related debug outputs.  
/src/core/model.cpp
/src/core/snag.cpp
/src/core/soil.cpp
/src/core/species.cpp
/src/core/species.h
/src/iland/mainwindow.cpp
/src/iland/version.cpp
/src/tools/globalsettings.cpp
526 5050d 07h werner /src/ embedding the soil model into iLand. renamed the snag decay debug output.  
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/snag.cpp
/src/core/snag.h
/src/core/soil.cpp
/src/core/soil.h
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/tools/globalsettings.cpp
/src/tools/globalsettings.h
525 5050d 08h werner /src/ implemented ICBM/2N soil model (class Soil) and some testing code. So far, the results look promising.  
/src/core/snag.cpp
/src/core/soil.cpp
/src/core/soil.h
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/iland/tests.h
524 5050d 13h werner /src/ some polishing of the snag dynamics and extending the debug output for that.  
/src
/src/core/snag.cpp
/src/iland
/src/tools/globalsettings.cpp
523 5051d 02h werner /src/ some updates to the snag-book-keeping and debug outputs  
/src/core/snag.cpp
/src/iland/mainwindow.cpp
/src/tools/globalsettings.cpp
522 5051d 06h werner /src/core/ updating the snag-concept (to version 5 from RS)  
/src/core/snag.cpp
/src/core/snag.h
490 5099d 14h werner /src/core/ added calculation of the climate indicator "re" used for snag dynamics (decay rate).  
/src/core/climate.h
/src/core/grid.h
/src/core/resourceunitspecies.cpp
/src/core/snag.cpp
/src/core/snag.h
/src/core/watercycle.h
477 5102d 11h werner /src/ testing and refining snag dynamics (esp. debug outputs)  
/src/core/resourceunitspecies.cpp
/src/core/snag.cpp
/src/core/snag.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/mainwindow.ui
/src/tools/globalsettings.cpp
476 5102d 11h werner /src/ added snag debug output to the gui
corrected calculation of branch biomass in Tree		  
/src/core/snag.cpp
/src/core/snag.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland/mainwindow.cpp
475 5102d 12h werner /src/ * Snag dynamics
debug output "SnagDynamics"
life cycle of Snag objects
include Snag Dynamics in newYear / year end routines

* threadrunner.cpp: parallel execution of species related tasks, e.g. the seed dispersal. In the current form, the ThreadRunner is much nicer:
ThreadRunner runner(mActiveSpecies);
runner.run(func_ptr);		  
/src/core/model.cpp
/src/core/resourceunit.cpp
/src/core/resourceunitspecies.cpp
/src/core/resourceunitspecies.h
/src/core/snag.cpp
/src/core/snag.h
/src/core/species.h
/src/core/speciesset.cpp
/src/core/threadrunner.cpp
/src/core/threadrunner.h
/src/tools/globalsettings.cpp
/src/tools/globalsettings.h
468 5107d 10h 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