| Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
| 1212 |
2744d 22h |
werner |
/branches/iland_regen/src/ |
iLand-caption in pro files |
|
/branches/iland_regen/src/iland/iland.pro
/branches/iland_regen/src/ilandc/ilandc.pro
/branches/iland_regen/src/plugins/barkbeetle/barkbeetle.pro
/branches/iland_regen/src/plugins/fire/fire.pro
/branches/iland_regen/src/plugins/plugins.pro
/branches/iland_regen/src/plugins/wind/wind.pro
|
| 1202 |
2789d 17h |
werner |
/branches/iland_regen/src/ |
searching/fixing issues with carbon cycle: NEP as provided by carbonflow output (NPP-Rh-Mgmt) is different from NEP as derived by the delta of the carbon stocks.
As usual, very hard to track down these issues, but:
* bark beetle module: foliage loss from BB-trees now correctly routed to soil
* order of modules in model: switched disturbances and carbon cylcle (in order to correctly track all carbon changes due to disturbances)
* fixed a problem with the calculation of NPP: after disturbances stand level NPP was set to 0 (since statistics were recalculated after disturbaces, but NPP values are not available then). Introduced: StandStatistics::clearOnlyTrees()
* flow from branches to the atmosphere (decay of branches) now tracked correctly (changes the NEP calulation). |
|
/branches/iland_regen/src/core/model.cpp
/branches/iland_regen/src/core/resourceunit.cpp
/branches/iland_regen/src/core/snag.cpp
/branches/iland_regen/src/core/standstatistics.cpp
/branches/iland_regen/src/core/standstatistics.h
/branches/iland_regen/src/output/carbonflowout.cpp
/branches/iland_regen/src/plugins/barkbeetle/barkbeetlemodule.cpp
|
| 1172 |
2940d 00h |
werner |
/branches/iland_regen/src/ |
fixed nasty bug in fire module that caused crashes in release mode (but interestingly not in debug mode).
Reason: The ILAND_GUI #define is *not* visible when building the modules (fire, wind, barkbeetle); a conditional define in species.h has the effect that the structure (i.e. the memory address of some of the member properties) are different (specifically, the "mSeedDispersal" property). From the fire module, accessing the property resolved to a wrong memory address -> crash. Fix: moved the color-property (that is affected by the ILAND_GUI #define) to the end of the object.... |
|
/branches/iland_regen/src/core/species.cpp
/branches/iland_regen/src/core/species.h
/branches/iland_regen/src/iland/version.cpp
/branches/iland_regen/src/plugins/fire/firemodule.cpp
/branches/iland_regen/src/tools/scriptglobal.cpp
|
| 1170 |
2942d 16h |
werner |
/branches/iland_regen/src/ |
testing the grid-runners (etc) -- they seem to work fine, whew!
fixed a problem in the fire spread (never reached the right and bottom edge of a landscape). |
|
/branches/iland_regen/src/iland/tests.cpp
/branches/iland_regen/src/plugins/fire/firemodule.cpp
|
| 1169 |
2946d 17h |
werner |
/branches/iland_regen/src/ |
debugging the crash in the firemodule... nasty. |
|
/branches/iland_regen/src/iland/iland.pro
/branches/iland_regen/src/plugins/fire/firemodule.cpp
|
| 1167 |
2948d 00h |
werner |
/branches/iland_regen/ |
merged serotiny from trunk |
|
/branches/iland_regen
/branches/iland_regen/src/core/seeddispersal.cpp
/branches/iland_regen/src/core/seeddispersal.h
/branches/iland_regen/src/core/species.cpp
/branches/iland_regen/src/core/species.h
/branches/iland_regen/src/plugins/fire/firemodule.cpp
|
| 1165 |
2949d 15h |
werner |
/branches/iland_regen/src/ |
implementation of sprouting |
|
/branches/iland_regen/src/core/model.cpp
/branches/iland_regen/src/core/saplings.cpp
/branches/iland_regen/src/core/saplings.h
/branches/iland_regen/src/core/species.cpp
/branches/iland_regen/src/core/species.h
/branches/iland_regen/src/core/tree.cpp
/branches/iland_regen/src/plugins/fire/firemodule.cpp
|
| 1164 |
2954d 17h |
werner |
/branches/iland_regen/src/ |
found unexpected behavior of irandom(): obviously, it return *never* the upper bound.
eg. irandom(0,3) -> values 0,1, or 2, but never 3.
changed calls to irandom() accordingly.
added also a better random selection of species in the establishment routine |
|
/branches/iland_regen/src/abe/scheduler.cpp
/branches/iland_regen/src/core/climate.cpp
/branches/iland_regen/src/core/grid.h
/branches/iland_regen/src/core/management.cpp
/branches/iland_regen/src/core/model.cpp
/branches/iland_regen/src/core/saplings.cpp
/branches/iland_regen/src/core/speciesset.cpp
/branches/iland_regen/src/core/speciesset.h
/branches/iland_regen/src/core/standloader.cpp
/branches/iland_regen/src/core/tree.cpp
/branches/iland_regen/src/iland/tests.cpp
/branches/iland_regen/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/iland_regen/src/plugins/fire/firemodule.cpp
/branches/iland_regen/src/tools/randomgenerator.h
|
| 1162 |
2954d 23h |
werner |
/branches/iland_regen/src/ |
removed the old "mSaplings" from resource unit/model.
Open Issues:
* ActPlanting [init/remove of saplings]
* MapGrid: retrieve list of saplings
* testing of standloader |
|
/branches/iland_regen/src/abe/actplanting.cpp
/branches/iland_regen/src/core/establishment.cpp
/branches/iland_regen/src/core/management.cpp
/branches/iland_regen/src/core/model.cpp
/branches/iland_regen/src/core/resourceunit.cpp
/branches/iland_regen/src/core/resourceunit.h
/branches/iland_regen/src/core/resourceunitspecies.cpp
/branches/iland_regen/src/core/resourceunitspecies.h
/branches/iland_regen/src/core/sapling.cpp
/branches/iland_regen/src/core/saplings.cpp
/branches/iland_regen/src/core/saplings.h
/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/iland/tests.cpp
/branches/iland_regen/src/output/saplingout.cpp
/branches/iland_regen/src/output/snapshot.cpp
/branches/iland_regen/src/plugins/fire/firemodule.cpp
/branches/iland_regen/src/plugins/wind/windmodule.cpp
/branches/iland_regen/src/tools/mapgrid.cpp
/branches/iland_regen/src/tools/mapgrid.h
|
| 1157 |
2957d 01h |
werner |
/branches/iland_regen/ |
merge of changes in the trunk (up to the version used for the 2016 DICE simulation batch). |
|
/branches/iland_regen/src/output/waterout.cpp
/branches/iland_regen/src/output/waterout.h
/branches/iland_regen
/branches/iland_regen/src/abe/actsalvage.cpp
/branches/iland_regen/src/abe/actsalvage.h
/branches/iland_regen/src/abe/fmstand.cpp
/branches/iland_regen/src/abe/fmstand.h
/branches/iland_regen/src/abe/fmtreelist.cpp
/branches/iland_regen/src/abe/fmunit.cpp
/branches/iland_regen/src/abe/fmunit.h
/branches/iland_regen/src/abe/forestmanagementengine.cpp
/branches/iland_regen/src/abe/forestmanagementengine.h
/branches/iland_regen/src/abe/output/abestandout.cpp
/branches/iland_regen/src/abe/output/abestandremovalout.cpp
/branches/iland_regen/src/abe/scheduler.cpp
/branches/iland_regen/src/abe/scheduler.h
/branches/iland_regen/src/core/climate.h
/branches/iland_regen/src/core/grasscover.h
/branches/iland_regen/src/core/grid.h
/branches/iland_regen/src/core/model.cpp
/branches/iland_regen/src/core/model.h
/branches/iland_regen/src/core/modelcontroller.cpp
/branches/iland_regen/src/core/production3pg.cpp
/branches/iland_regen/src/core/resourceunit.cpp
/branches/iland_regen/src/core/resourceunit.h
/branches/iland_regen/src/core/resourceunitspecies.cpp
/branches/iland_regen/src/core/sapling.cpp
/branches/iland_regen/src/core/snag.cpp
/branches/iland_regen/src/core/snag.h
/branches/iland_regen/src/core/soil.cpp
/branches/iland_regen/src/core/species.cpp
/branches/iland_regen/src/core/speciesset.cpp
/branches/iland_regen/src/core/standloader.cpp
/branches/iland_regen/src/core/standstatistics.cpp
/branches/iland_regen/src/core/standstatistics.h
/branches/iland_regen/src/core/threadrunner.cpp
/branches/iland_regen/src/core/threadrunner.h
/branches/iland_regen/src/core/tree.cpp
/branches/iland_regen/src/core/tree.h
/branches/iland_regen/src/core/watercycle.cpp
/branches/iland_regen/src/core/watercycle.h
/branches/iland_regen/src/iland/iland.pro
/branches/iland_regen/src/iland/mainwindow.cpp
/branches/iland_regen/src/iland/tests.cpp
/branches/iland_regen/src/iland/version.cpp
/branches/iland_regen/src/ilandc/consoleshell.cpp
/branches/iland_regen/src/ilandc/ilandc.pro
/branches/iland_regen/src/output/carbonflowout.cpp
/branches/iland_regen/src/output/carbonflowout.h
/branches/iland_regen/src/output/carbonout.cpp
/branches/iland_regen/src/output/carbonout.h
/branches/iland_regen/src/output/dynamicstandout.cpp
/branches/iland_regen/src/output/landscapeout.cpp
/branches/iland_regen/src/output/managementout.cpp
/branches/iland_regen/src/output/outputmanager.cpp
/branches/iland_regen/src/output/snapshot.cpp
/branches/iland_regen/src/output/standout.cpp
/branches/iland_regen/src/plugins/barkbeetle/barkbeetle.pro
/branches/iland_regen/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/iland_regen/src/plugins/barkbeetle/barkbeetlemodule.h
/branches/iland_regen/src/plugins/barkbeetle/barkbeetleout.cpp
/branches/iland_regen/src/plugins/barkbeetle/barkbeetlescript.cpp
/branches/iland_regen/src/plugins/barkbeetle/barkbeetlescript.h
/branches/iland_regen/src/plugins/fire/fire.pro
/branches/iland_regen/src/plugins/fire/firemodule.cpp
/branches/iland_regen/src/plugins/wind/wind.pro
/branches/iland_regen/src/plugins/wind/windmodule.cpp
/branches/iland_regen/src/plugins/wind/windmodule.h
/branches/iland_regen/src/plugins/wind/windscript.cpp
/branches/iland_regen/src/plugins/wind/windscript.h
/branches/iland_regen/src/tools/colors.cpp
/branches/iland_regen/src/tools/expressionwrapper.cpp
/branches/iland_regen/src/tools/gisgrid.cpp
/branches/iland_regen/src/tools/gisgrid.h
/branches/iland_regen/src/tools/globalsettings.cpp
/branches/iland_regen/src/tools/globalsettings.h
/branches/iland_regen/src/tools/scriptglobal.cpp
/branches/iland_regen/src/tools/scriptglobal.h
|
| 1104 |
3026d 23h |
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
|
| 1095 |
3051d 16h |
werner |
/branches/port_qt5_64bit/ |
Adding basic C++ level documentation for ABE classes. |
|
/branches/port_qt5_64bit/doc/iland_doxyfile.doxy
/branches/port_qt5_64bit/src/abe/abegrid.cpp
/branches/port_qt5_64bit/src/abe/actgeneral.cpp
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/actplanting.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/actscheduled.cpp
/branches/port_qt5_64bit/src/abe/actthinning.cpp
/branches/port_qt5_64bit/src/abe/agent.cpp
/branches/port_qt5_64bit/src/abe/agenttype.cpp
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstp.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/fomescript.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleout.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.cpp
|
| 1092 |
3075d 23h |
werner |
/branches/port_qt5_64bit/src/plugins/barkbeetle/ |
improved comments during final checkup of the model against the paper appendix. |
|
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h
|
| 1088 |
3095d 17h |
werner |
/branches/port_qt5_64bit/src/ |
salavage management bark beetle damages
some fixes w.r.t. the correct extent of grids.
added "year" as stand varaible (abe). |
|
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fomewrapper.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/layeredgrid.h
/branches/port_qt5_64bit/src/core/snag.cpp
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.h
/branches/port_qt5_64bit/src/plugins/wind/windscript.cpp
/branches/port_qt5_64bit/src/tools/spatialanalysis.cpp
|
| 1087 |
3097d 16h |
werner |
/branches/port_qt5_64bit/src/ |
added "flushing" of log messages.
fixed a bug when some resource units were 0 in setting up the wind module. |
|
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/ilandc/consoleshell.cpp
/branches/port_qt5_64bit/src/ilandc/consoleshell.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetleplugin.cpp
|
| 1086 |
3100d 16h |
werner |
/branches/port_qt5_64bit/src/plugins/barkbeetle/ |
added new "killed" grid to the BB module. |
|
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
|
| 1085 |
3101d 16h |
werner |
/branches/port_qt5_64bit/src/ |
working on barkbeetle module (fixing problems, some small modifications, ...)
improving the JS-based spatial analysis toolkit. |
|
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/layeredgrid.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.cpp
/branches/port_qt5_64bit/src/plugins/wind/windscript.cpp
/branches/port_qt5_64bit/src/plugins/wind/windscript.h
/branches/port_qt5_64bit/src/tools/scriptgrid.cpp
/branches/port_qt5_64bit/src/tools/scriptgrid.h
/branches/port_qt5_64bit/src/tools/spatialanalysis.cpp
/branches/port_qt5_64bit/src/tools/spatialanalysis.h
|
| 1083 |
3103d 18h |
werner |
/branches/port_qt5_64bit/src/ |
improve API for spatial analysis - now patch creation works also with js. |
|
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.cpp
/branches/port_qt5_64bit/src/plugins/wind/windscript.cpp
/branches/port_qt5_64bit/src/tools/spatialanalysis.cpp
/branches/port_qt5_64bit/src/tools/spatialanalysis.h
|
| 1082 |
3104d 15h |
werner |
/branches/port_qt5_64bit/src/ |
remove out-of-project area from GrassCover
fixed error in calculating the number of bark beetle generations (and changed the handling of sister broods) |
|
/branches/port_qt5_64bit/src/core/grasscover.cpp
/branches/port_qt5_64bit/src/core/grasscover.h
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.h
/branches/port_qt5_64bit/src/tools/scriptgrid.h
|
| 1081 |
3108d 15h |
werner |
/branches/port_qt5_64bit/src/ |
created a new javascript wrapper for the iLand "grid" class. This includes some processing (e.g. calculate using expressions), and some function to retrieve grids from iLand (e.g. damage data from disturbance modules, height grid).
fancy! |
|
/branches/port_qt5_64bit/src/tools/scriptgrid.cpp
/branches/port_qt5_64bit/src/tools/scriptgrid.h
/branches/port_qt5_64bit/src/core/climate.cpp
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/ilandc/consoleshell.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.cpp
/branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.h
/branches/port_qt5_64bit/src/plugins/wind/windmodule.cpp
/branches/port_qt5_64bit/src/plugins/wind/windscript.cpp
/branches/port_qt5_64bit/src/plugins/wind/windscript.h
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.h
/branches/port_qt5_64bit/src/tools/spatialanalysis.cpp
|