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
574 4989d 04h werner /src/ * modified outputs to write only rows for valid resource units
* dropped setting "woodDecompRate" (snag.cpp)
* calculate the "stockableArea" of a resource unit based on the stand grid
* use the stockableArea for calculation of LAI		  
/src/core/grid.h
/src/core/model.cpp
/src/core/model.h
/src/core/resourceunit.cpp
/src/core/resourceunit.h
/src/core/snag.cpp
/src/output/dynamicstandout.cpp
/src/output/managementout.cpp
/src/output/productionout.cpp
/src/output/saplingout.cpp
/src/output/standdeadout.cpp
/src/output/standout.cpp
/src/tools/expressionwrapper.cpp
/src/tools/globalsettings.h
564 4999d 20h werner /src/ Improvements of the Management API and functionality.
new functionality:
* killSaplings() -> use a "MapGrid" and remove small trees specifically
* properties defining biomass remove fractions during management

Now the tree list of the management object is cleaned up after a management, i.e. successive managements without reloading the tree list are possible.		  
/src/core/management.cpp
/src/core/management.h
/src/core/resourceunitspecies.cpp
/src/core/sapling.cpp
/src/core/sapling.h
/src/core/snag.cpp
/src/core/tree.cpp
/src/core/tree.h
/src/tools/mapgrid.cpp
/src/tools/mapgrid.h
562 5003d 00h werner /src/ calculate ET0 (reference evapotranspiration) that is used for snag decay 're'. Another version of penman monteith is used for calculation.
See the excel - based "re_decomp.xlsx" for details		  
/src/core/snag.cpp
/src/core/watercycle.cpp
/src/core/watercycle.h
/src/iland/tests.cpp
557 5006d 20h 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 5008d 00h 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 5008d 02h 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 5010d 01h 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 5010d 03h 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 5035d 00h 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 5035d 00h 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 5044d 00h 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 5047d 15h 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 5047d 17h 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 5047d 20h 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 5047d 21h 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 5048d 03h 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 5048d 16h 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 5048d 19h werner /src/core/ updating the snag-concept (to version 5 from RS)  
/src/core/snag.cpp
/src/core/snag.h
490 5097d 04h 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 5100d 00h 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

←Prev12Next→

Show All