Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
1071 |
3180d 09h |
werner |
/branches/port_qt5_64bit/src/ |
alternative mortality formulation
COST PROFOUND exercise (H. Bugmann) |
|
/branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/core/tree.h /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/tools/scriptglobal.cpp /branches/port_qt5_64bit/src/tools/scriptglobal.h
|
1068 |
3185d 16h |
werner |
/branches/port_qt5_64bit/src/ |
some optimizations for grass / establishment
START |
|
/branches/port_qt5_64bit/src/core/establishment.cpp /branches/port_qt5_64bit/src/core/establishment.h /branches/port_qt5_64bit/src/core/grasscover.cpp /branches/port_qt5_64bit/src/core/grasscover.h /branches/port_qt5_64bit/src/core/grid.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/sapling.cpp /branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp
|
1065 |
3187d 04h |
werner |
/branches/port_qt5_64bit/src/ |
interaction of bark beetle and wind disturbances. |
|
/branches/port_qt5_64bit/src/abe/fmstand.cpp /branches/port_qt5_64bit/src/abe/fomescript.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/iland/mainwindow.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/barkbeetlemodule.h /branches/port_qt5_64bit/src/tools/modules.cpp /branches/port_qt5_64bit/src/tools/scriptglobal.cpp
|
1064 |
3188d 08h |
werner |
/branches/port_qt5_64bit/src/ |
many changes. Most notably:
* improvements in the grass-cover sub Modules
* interaction between wind and bark beetle
* javascript function to extract seed-distribution-maps
* fixed a bug when continuous seed input was assumed |
|
/branches/port_qt5_64bit/src/abe/fmstand.cpp /branches/port_qt5_64bit/src/abe/fmstand.h /branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.h /branches/port_qt5_64bit/src/core/environment.cpp /branches/port_qt5_64bit/src/core/grasscover.cpp /branches/port_qt5_64bit/src/core/grasscover.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/modelcontroller.h /branches/port_qt5_64bit/src/core/seeddispersal.cpp /branches/port_qt5_64bit/src/core/seeddispersal.h /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/core/tree.h /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp /branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h /branches/port_qt5_64bit/src/tools/scriptglobal.cpp /branches/port_qt5_64bit/src/tools/scriptglobal.h
|
1063 |
3191d 09h |
werner |
/branches/port_qt5_64bit/src/ |
implementing a first version of the browsing submodule.
many small improvements for ABE. |
|
/branches/port_qt5_64bit/src/abe/activity.cpp /branches/port_qt5_64bit/src/abe/actplanting.cpp /branches/port_qt5_64bit/src/abe/actscheduled.cpp /branches/port_qt5_64bit/src/abe/fmstp.cpp /branches/port_qt5_64bit/src/abe/fomescript.cpp /branches/port_qt5_64bit/src/abe/fomescript.h /branches/port_qt5_64bit/src/abe/scheduler.cpp /branches/port_qt5_64bit/src/abe/scheduler.h /branches/port_qt5_64bit/src/apidoc/ABE/abe_context_doc.js /branches/port_qt5_64bit/src/apidoc/ABE/abe_doc.js /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/sapling.cpp /branches/port_qt5_64bit/src/core/sapling.h /branches/port_qt5_64bit/src/core/species.cpp /branches/port_qt5_64bit/src/core/species.h
|
1062 |
3193d 07h |
werner |
/branches/port_qt5_64bit/src/ |
small fixes for ABE,
implementation of v1 of the "grass"-model (herbs and grasses on the ground). |
|
/branches/port_qt5_64bit/src/core/grasscover.cpp /branches/port_qt5_64bit/src/core/grasscover.h
/branches/port_qt5_64bit/src/abe/actthinning.cpp /branches/port_qt5_64bit/src/abe/fmtreelist.cpp /branches/port_qt5_64bit/src/abe/fomescript.h /branches/port_qt5_64bit/src/core/establishment.cpp /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/standloader.cpp /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/version.cpp
|
1058 |
3201d 10h |
werner |
/branches/port_qt5_64bit/src/ |
Changes in ABE:
new grid (stand treatment program), and now STP is shown when clicking on a standGrid
additional warnings when STPs are not properly defined
other changes:
more recent files, recent files are saved before creating the model
fixed splash screenshot
fixed potential bug in setting up saplings
new JS-function Globals.reloadABE() --> force the reload of the agent based forest engine module |
|
/branches/port_qt5_64bit/src/abe/abegrid.cpp /branches/port_qt5_64bit/src/abe/abegrid.h /branches/port_qt5_64bit/src/abe/fmstand.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/standloader.cpp /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/mainwindow.h /branches/port_qt5_64bit/src/iland/res/iland_splash.png /branches/port_qt5_64bit/src/tools/scriptglobal.cpp /branches/port_qt5_64bit/src/tools/scriptglobal.h
|
1032 |
3356d 16h |
werner |
/branches/port_qt5_64bit/src/ |
fixed compiler warnings (compiled again with GCC), and edited *.pro files for GCC. |
|
/branches/port_qt5_64bit/src/abe/activity.cpp /branches/port_qt5_64bit/src/abe/activity.h /branches/port_qt5_64bit/src/abe/actplanting.cpp /branches/port_qt5_64bit/src/abe/agenttype.cpp /branches/port_qt5_64bit/src/abe/fmstand.cpp /branches/port_qt5_64bit/src/abe/fmunit.cpp /branches/port_qt5_64bit/src/abe/scheduler.cpp /branches/port_qt5_64bit/src/core/establishment.cpp /branches/port_qt5_64bit/src/core/grid.cpp /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/modelcontroller.cpp /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/ilandc/ilandc.pro /branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.cpp /branches/port_qt5_64bit/src/tools/csvfile.cpp /branches/port_qt5_64bit/src/tools/mapgrid.cpp
|
1024 |
3367d 08h |
werner |
/branches/port_qt5_64bit/src/ |
working on the bark beetle module.
now on startup of the model the first year of the climate is loaded automatically. |
|
/branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/resourceunit.cpp /branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp /branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h /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/barkbeetlescript.h /branches/port_qt5_64bit/src/plugins/barkbeetle/bbgenerations.cpp
|
1013 |
3410d 07h |
werner |
/branches/port_qt5_64bit/src/ |
working on the bark beetle module.
Now jigsaw start falling into place ;) |
|
/branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.cpp /branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlemodule.h /branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.cpp /branches/port_qt5_64bit/src/plugins/barkbeetle/barkbeetlescript.h
|
1011 |
3410d 14h |
werner |
/branches/port_qt5_64bit/src/core/ |
optimized the way how climate is loaded when the simulated landscape is smaller than the whole defined landscape: now the actual creating of the climate-data structures happens only if they are really accessed (e.g. for the nationalpark we have 200 climate clusters, for a test region we have only 10 or 20 clusters). This reduces startup time considerably: (debug mode): from 2min 20secs to 40 secs. Good for testing ;) |
|
/branches/port_qt5_64bit/src/core/environment.cpp /branches/port_qt5_64bit/src/core/model.cpp
|
1001 |
3425d 09h |
werner |
/branches/port_qt5_64bit/src/ |
removed some of the "DebugTimer" --- they tend to cause problems especially when multi-threading is enabled. |
|
/branches/port_qt5_64bit/src/core/establishment.cpp /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/seeddispersal.cpp /branches/port_qt5_64bit/src/core/speciesset.cpp /branches/port_qt5_64bit/src/iland/iland.pro
|
999 |
3426d 11h |
werner |
/branches/port_qt5_64bit/src/core/ |
trying to find crash on VSC |
|
/branches/port_qt5_64bit/src/core/model.cpp
|
998 |
3426d 14h |
werner |
/branches/port_qt5_64bit/src/core/ |
more debug timers in regeneration/establishment |
|
/branches/port_qt5_64bit/src/core/model.cpp
|
967 |
3492d 09h |
werner |
/branches/port_qt5_64bit/src/core/ |
loading of saplings: this works now when running in standgrid mode. |
|
/branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/sapling.cpp /branches/port_qt5_64bit/src/core/sapling.h /branches/port_qt5_64bit/src/core/standloader.cpp /branches/port_qt5_64bit/src/core/standloader.h
|
937 |
3592d 08h |
werner |
/branches/port_qt5_64bit/src/ |
hunting some bugs in summarizing GWL |
|
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp /branches/port_qt5_64bit/src/core/management.cpp /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/resourceunit.cpp /branches/port_qt5_64bit/src/core/resourceunitspecies.h
|
936 |
3593d 08h |
werner |
/branches/port_qt5_64bit/src/ |
searching for bugs in the bookkeeping of increments, volumes.
very cumbersome.... |
|
/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/core/management.cpp /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/resourceunit.cpp /branches/port_qt5_64bit/src/core/resourceunitspecies.cpp /branches/port_qt5_64bit/src/core/resourceunitspecies.h /branches/port_qt5_64bit/src/core/standstatistics.cpp
|
934 |
3601d 09h |
werner |
/branches/port_qt5_64bit/src/ |
working on ABE.
* new functions like "elapsed()" for stands
* created a global onInit-Handler
* devised a way to initalized regen (using the ActPlanting-code and the onInit Handler)
* updated YUIdoc documentation a bit |
|
/branches/port_qt5_64bit/src/abe/activity.cpp /branches/port_qt5_64bit/src/abe/actplanting.cpp /branches/port_qt5_64bit/src/abe/actplanting.h /branches/port_qt5_64bit/src/abe/agenttype.cpp /branches/port_qt5_64bit/src/abe/fmstand.cpp /branches/port_qt5_64bit/src/abe/fmstand.h /branches/port_qt5_64bit/src/abe/fmunit.h /branches/port_qt5_64bit/src/abe/fomescript.cpp /branches/port_qt5_64bit/src/abe/fomescript.h /branches/port_qt5_64bit/src/abe/fomewrapper.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.h /branches/port_qt5_64bit/src/apidoc/ABE/abe_context_doc.js /branches/port_qt5_64bit/src/core/model.cpp
|
917 |
3682d 10h |
werner |
/branches/port_qt5_64bit/src/ |
start of implementing a 2nd queue in the scheduler
when setting up landscape in matrix mode (environment file) now only valid cells need to be present in the env. file. |
|
/branches/port_qt5_64bit/src/abe/scheduler.cpp /branches/port_qt5_64bit/src/abe/scheduler.h /branches/port_qt5_64bit/src/core/model.cpp
|
910 |
3710d 08h |
werner |
/branches/port_qt5_64bit/src/ |
scheduler, testing, ... |
|
/branches/port_qt5_64bit/src/abe/activity.cpp /branches/port_qt5_64bit/src/abe/activity.h /branches/port_qt5_64bit/src/abe/fmstand.cpp /branches/port_qt5_64bit/src/abe/fmstand.h /branches/port_qt5_64bit/src/abe/fmstp.cpp /branches/port_qt5_64bit/src/abe/scheduler.cpp /branches/port_qt5_64bit/src/abe/scheduler.h /branches/port_qt5_64bit/src/core/model.cpp
|
909 |
3710d 13h |
werner |
/branches/port_qt5_64bit/src/ |
more renaming: now it is hopefully done. |
|
/branches/port_qt5_64bit/src/abe/abegrid.cpp /branches/port_qt5_64bit/src/abe/abegrid.h
/branches/port_qt5_64bit/src/abe/amiegrid.cpp /branches/port_qt5_64bit/src/abe/amiegrid.h
/branches/port_qt5_64bit/src/abe/abe_global.h /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/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/forestmanagementengine.h /branches/port_qt5_64bit/src/abe/scheduler.cpp /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/tests.cpp
|
907 |
3710d 13h |
werner |
/branches/port_qt5_64bit/src/ |
amie -> abe transition |
|
/branches/port_qt5_64bit/src/abe/actgeneral.cpp /branches/port_qt5_64bit/src/abe/activity.cpp /branches/port_qt5_64bit/src/abe/activity.h /branches/port_qt5_64bit/src/abe/actplanting.cpp /branches/port_qt5_64bit/src/abe/actplanting.h /branches/port_qt5_64bit/src/abe/actsalvage.cpp /branches/port_qt5_64bit/src/abe/actsalvage.h /branches/port_qt5_64bit/src/abe/actscheduled.cpp /branches/port_qt5_64bit/src/abe/agenttype.cpp /branches/port_qt5_64bit/src/abe/agenttype.h /branches/port_qt5_64bit/src/abe/fmstand.cpp /branches/port_qt5_64bit/src/abe/fmstand.h /branches/port_qt5_64bit/src/abe/fmstp.cpp /branches/port_qt5_64bit/src/abe/fmstp.h /branches/port_qt5_64bit/src/abe/fmtreelist.cpp /branches/port_qt5_64bit/src/abe/fmtreelist.h /branches/port_qt5_64bit/src/abe/fmunit.cpp /branches/port_qt5_64bit/src/abe/fmunit.h /branches/port_qt5_64bit/src/abe/fomescript.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp /branches/port_qt5_64bit/src/abe/forestmanagementengine.h /branches/port_qt5_64bit/src/abe/scheduler.cpp /branches/port_qt5_64bit/src/abe/scheduler.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/iland/iland.pro
|
905 |
3710d 13h |
werner |
/branches/port_qt5_64bit/src/ |
working on scheduler and on implementing disturbances.
now again the AMIE/ABE transformation.... |
|
/branches/port_qt5_64bit/src/amie/actsalvage.cpp /branches/port_qt5_64bit/src/amie/actsalvage.h
/branches/port_qt5_64bit/src/amie/actgeneral.h /branches/port_qt5_64bit/src/amie/activity.cpp /branches/port_qt5_64bit/src/amie/activity.h /branches/port_qt5_64bit/src/amie/actscheduled.h /branches/port_qt5_64bit/src/amie/agent.cpp /branches/port_qt5_64bit/src/amie/agent.h /branches/port_qt5_64bit/src/amie/agenttype.h /branches/port_qt5_64bit/src/amie/amiegrid.h /branches/port_qt5_64bit/src/amie/fmstand.cpp /branches/port_qt5_64bit/src/amie/fmstand.h /branches/port_qt5_64bit/src/amie/fmstp.cpp /branches/port_qt5_64bit/src/amie/fmstp.h /branches/port_qt5_64bit/src/amie/fomescript.h /branches/port_qt5_64bit/src/amie/fomewrapper.cpp /branches/port_qt5_64bit/src/amie/fomewrapper.h /branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp /branches/port_qt5_64bit/src/amie/forestmanagementengine.h /branches/port_qt5_64bit/src/amie/scheduler.cpp /branches/port_qt5_64bit/src/amie/scheduler.h /branches/port_qt5_64bit/src/amie/thinning.cpp /branches/port_qt5_64bit/src/amie/thinning.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/iland/tests.cpp
|
904 |
3711d 05h |
werner |
/branches/port_qt5_64bit/src/ |
... working on amie... |
|
/branches/port_qt5_64bit/src/amie/activity.cpp /branches/port_qt5_64bit/src/amie/agenttype.cpp /branches/port_qt5_64bit/src/amie/agenttype.h /branches/port_qt5_64bit/src/amie/fmstand.cpp /branches/port_qt5_64bit/src/amie/fmstand.h /branches/port_qt5_64bit/src/amie/fmunit.cpp /branches/port_qt5_64bit/src/amie/fmunit.h /branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp /branches/port_qt5_64bit/src/amie/forestmanagementengine.h /branches/port_qt5_64bit/src/amie/scheduler.cpp /branches/port_qt5_64bit/src/amie/scheduler.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/standloader.cpp /branches/port_qt5_64bit/src/core/standloader.h /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/core/tree.h /branches/port_qt5_64bit/src/iland/mainwindow.cpp
|
903 |
3714d 08h |
werner |
/branches/port_qt5_64bit/src/ |
working on AMIE - calculation of mean annual increment. |
|
/branches/port_qt5_64bit/src/amie/activity.cpp /branches/port_qt5_64bit/src/amie/amiegrid.cpp /branches/port_qt5_64bit/src/amie/fmstand.cpp /branches/port_qt5_64bit/src/amie/fmstand.h /branches/port_qt5_64bit/src/amie/fmunit.cpp /branches/port_qt5_64bit/src/amie/fmunit.h /branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp /branches/port_qt5_64bit/src/amie/forestmanagementengine.h /branches/port_qt5_64bit/src/amie/scheduler.cpp /branches/port_qt5_64bit/src/amie/scheduler.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/core/tree.h /branches/port_qt5_64bit/src/plugins/fire/firemodule.cpp /branches/port_qt5_64bit/src/tools/mapgrid.cpp /branches/port_qt5_64bit/src/tools/mapgrid.h
|
902 |
3718d 09h |
werner |
/branches/port_qt5_64bit/src/ |
work on AMIE.
introduced new activity: planting.
zillions of other small mods. |
|
/branches/port_qt5_64bit/src/amie/actplanting.cpp /branches/port_qt5_64bit/src/amie/actplanting.h
/branches/port_qt5_64bit/src/amie/actgeneral.cpp /branches/port_qt5_64bit/src/amie/activity.cpp /branches/port_qt5_64bit/src/amie/actscheduled.cpp /branches/port_qt5_64bit/src/amie/amie_global.h /branches/port_qt5_64bit/src/amie/amiegrid.cpp /branches/port_qt5_64bit/src/amie/fmstand.cpp /branches/port_qt5_64bit/src/amie/fmstand.h /branches/port_qt5_64bit/src/amie/fmstp.cpp /branches/port_qt5_64bit/src/amie/fmtreelist.cpp /branches/port_qt5_64bit/src/amie/fmunit.cpp /branches/port_qt5_64bit/src/amie/fomescript.cpp /branches/port_qt5_64bit/src/amie/fomewrapper.cpp /branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp /branches/port_qt5_64bit/src/amie/scheduler.cpp /branches/port_qt5_64bit/src/core/grid.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/sapling.cpp /branches/port_qt5_64bit/src/core/sapling.h /branches/port_qt5_64bit/src/core/tree.cpp /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/output/snapshot.cpp /branches/port_qt5_64bit/src/tools/mapgrid.cpp
|
901 |
3720d 18h |
werner |
/branches/port_qt5_64bit/src/ |
repeating activities,
canceling of execution of javascript code in ABE (abort())
some other stuff.... |
|
/branches/port_qt5_64bit/src/amie/activity.cpp /branches/port_qt5_64bit/src/amie/activity.h /branches/port_qt5_64bit/src/amie/fmstand.cpp /branches/port_qt5_64bit/src/amie/fmstp.cpp /branches/port_qt5_64bit/src/amie/fomescript.cpp /branches/port_qt5_64bit/src/amie/fomescript.h /branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp /branches/port_qt5_64bit/src/amie/forestmanagementengine.h /branches/port_qt5_64bit/src/amie/scheduler.cpp /branches/port_qt5_64bit/src/apidoc/ABE/abe_context_doc.js /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/sapling.cpp /branches/port_qt5_64bit/src/core/standloader.cpp /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/tools/random.cpp /branches/port_qt5_64bit/src/tools/random.h
|
893 |
3745d 08h |
werner |
/branches/port_qt5_64bit/src/ |
ABE ABE ABE ... |
|
/branches/port_qt5_64bit/src/amie/actgeneral.cpp /branches/port_qt5_64bit/src/amie/activity.cpp /branches/port_qt5_64bit/src/amie/activity.h /branches/port_qt5_64bit/src/amie/amiegrid.cpp /branches/port_qt5_64bit/src/amie/amiegrid.h /branches/port_qt5_64bit/src/amie/fmstand.cpp /branches/port_qt5_64bit/src/amie/fmstp.cpp /branches/port_qt5_64bit/src/amie/fomescript.cpp /branches/port_qt5_64bit/src/amie/fomescript.h /branches/port_qt5_64bit/src/amie/scheduler.cpp /branches/port_qt5_64bit/src/core/layeredgrid.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/modelcontroller.cpp /branches/port_qt5_64bit/src/core/modelcontroller.h /branches/port_qt5_64bit/src/core/species.cpp /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/mainwindow.h
|
890 |
3747d 14h |
werner |
/branches/port_qt5_64bit/src/ |
working on ABE.
restructuring the directories for the documentation. |
|
/branches/port_qt5_64bit/src/apidoc/ABE /branches/port_qt5_64bit/src/apidoc/ABE/abe_doc.js /branches/port_qt5_64bit/src/apidoc/ABE/treelist_doc.js /branches/port_qt5_64bit/src/apidoc/iLand /branches/port_qt5_64bit/src/apidoc/iLand/globals_doc.js /branches/port_qt5_64bit/src/apidoc/yuidoc.json
/branches/port_qt5_64bit/src/amie/treelist.cpp /branches/port_qt5_64bit/src/amie/treelist.h
/branches/port_qt5_64bit/src/amie/activity.cpp /branches/port_qt5_64bit/src/amie/agenttype.cpp /branches/port_qt5_64bit/src/amie/agenttype.h /branches/port_qt5_64bit/src/amie/fmstand.cpp /branches/port_qt5_64bit/src/amie/fmtreelist.h /branches/port_qt5_64bit/src/amie/fmunit.h /branches/port_qt5_64bit/src/amie/fomescript.cpp /branches/port_qt5_64bit/src/amie/fomescript.h /branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/model.h /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/tools/colors.cpp
|
889 |
3748d 08h |
werner |
/branches/port_qt5_64bit/src/ |
abe, abe, abe |
|
/branches/port_qt5_64bit/src/amie/activity.cpp /branches/port_qt5_64bit/src/amie/activity.h /branches/port_qt5_64bit/src/amie/amiegrid.cpp /branches/port_qt5_64bit/src/amie/fmstand.cpp /branches/port_qt5_64bit/src/amie/fmstand.h /branches/port_qt5_64bit/src/amie/fmtreelist.cpp /branches/port_qt5_64bit/src/amie/fmtreelist.h /branches/port_qt5_64bit/src/amie/fmunit.cpp /branches/port_qt5_64bit/src/amie/fmunit.h /branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp /branches/port_qt5_64bit/src/amie/forestmanagementengine.h /branches/port_qt5_64bit/src/amie/scheduler.cpp /branches/port_qt5_64bit/src/amie/scheduler.h /branches/port_qt5_64bit/src/core/environment.cpp /branches/port_qt5_64bit/src/core/environment.h /branches/port_qt5_64bit/src/core/layeredgrid.h /branches/port_qt5_64bit/src/core/model.cpp
|
882 |
3760d 10h |
werner |
/branches/port_qt5_64bit/src/ |
introduced delayed setup for the resource units (in order for the Mapgrids to behave right).
smaller fixes in the qml-based rulers. |
|
/branches/port_qt5_64bit/src/amie/amiegrid.cpp /branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp /branches/port_qt5_64bit/src/amie/forestmanagementengine.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/iland/qml/ruler.qml /branches/port_qt5_64bit/src/tools/colors.cpp /branches/port_qt5_64bit/src/tools/mapgrid.cpp
|
881 |
3789d 06h |
werner |
/branches/port_qt5_64bit/src/ |
fixed problem with new resource unit storage that allows gaps.
some smaller additions (e.g. the literals "true" and "false" in the expression engine).
DEM: a new bilinear interpolation algorithm to improve DEM. Still not perfect. |
|
/branches/port_qt5_64bit/src/core/grid.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/paintarea.h /branches/port_qt5_64bit/src/tools/dem.cpp /branches/port_qt5_64bit/src/tools/expression.cpp /branches/port_qt5_64bit/src/tools/gisgrid.cpp /branches/port_qt5_64bit/src/tools/gisgrid.h
|
864 |
3851d 08h |
werner |
/branches/port_qt5_64bit/src/ |
fixed typos (after merge) and version number |
|
/branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/iland/version.cpp
|
837 |
3887d 11h |
werner |
/branches/port_qt5_64bit/src/ |
* added total carbon to stand output
* created a new output "landscape" for stand aggregates on landscape level (per species)
* improved error handling ModelController
* improved ilandc: now model settings can be changed via command line (and javascript function can be called)
* finalized "background external seeds" |
|
/branches/port_qt5_64bit/src/output/landscapeout.cpp /branches/port_qt5_64bit/src/output/landscapeout.h
/branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/modelcontroller.cpp /branches/port_qt5_64bit/src/core/modelcontroller.h /branches/port_qt5_64bit/src/core/seeddispersal.cpp /branches/port_qt5_64bit/src/core/species.h /branches/port_qt5_64bit/src/core/standstatistics.cpp /branches/port_qt5_64bit/src/core/standstatistics.h /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/ilandc/consoleshell.cpp /branches/port_qt5_64bit/src/ilandc/consoleshell.h /branches/port_qt5_64bit/src/ilandc/ilandc.pro /branches/port_qt5_64bit/src/ilandc/main.cpp /branches/port_qt5_64bit/src/output/carbonout.cpp /branches/port_qt5_64bit/src/output/carbonout.h /branches/port_qt5_64bit/src/output/outputmanager.cpp /branches/port_qt5_64bit/src/output/standout.cpp /branches/port_qt5_64bit/src/output/standout.h /branches/port_qt5_64bit/src/tools/scriptglobal.cpp
|
824 |
3892d 14h |
werner |
/branches/port_qt5_64bit/src/ |
fixed *big* regeneration bug. The map with the height of saplings on a resource unit was used in the establishment subroutine although it was *invalid*. Now the establishment and the regeneration are (again?) in one function and use the same valid map.
this removed the strange stripes in the regeneration pattern (there should have been crashes, but weren't). Consequently, the performance debug output was modified.
added better formatting to debugtimer.cpp for large times (in hours, minutes, seconds). |
|
/branches/port_qt5_64bit/src/core/establishment.cpp /branches/port_qt5_64bit/src/core/establishment.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/resourceunit.cpp /branches/port_qt5_64bit/src/core/resourceunit.h /branches/port_qt5_64bit/src/core/standstatistics.cpp /branches/port_qt5_64bit/src/core/standstatistics.h /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/tests.cpp /branches/port_qt5_64bit/src/tools/debugtimer.cpp /branches/port_qt5_64bit/src/tools/debugtimer.h /branches/port_qt5_64bit/src/tools/globalsettings.cpp
|
821 |
3893d 15h |
werner |
/branches/port_qt5_64bit/src/core/ |
fixed bug in regeneration module. Its been the case that *after* years with no *newly* established trees, the sapling growth module was not working (it checked the number of living saplings, but that was cleared ad the beginning of the year).
this bug caused some of these strange resource unit pattern. Now regen comes out much more uniform (for uniform environmental conditions in bare ground sims). |
|
/branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/sapling.cpp
|
808 |
3907d 06h |
werner |
/branches/port_qt5_64bit/src/ |
implementing FOME.
* splitting "helper.cpp" into several files (debugtimer.h, statdata.h, viewport.h) (and changing lots of includes)
* implementing setup of activities (extracting from Javascript) |
|
/branches/port_qt5_64bit/src/tools/debugtimer.cpp /branches/port_qt5_64bit/src/tools/debugtimer.h /branches/port_qt5_64bit/src/tools/statdata.cpp /branches/port_qt5_64bit/src/tools/statdata.h /branches/port_qt5_64bit/src/tools/viewport.cpp /branches/port_qt5_64bit/src/tools/viewport.h
/branches/port_qt5_64bit/src/core/environment.cpp /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/modelcontroller.cpp /branches/port_qt5_64bit/src/core/resourceunitspecies.cpp /branches/port_qt5_64bit/src/core/seeddispersal.cpp /branches/port_qt5_64bit/src/core/speciesresponse.cpp /branches/port_qt5_64bit/src/core/watercycle.cpp /branches/port_qt5_64bit/src/fome/activity.cpp /branches/port_qt5_64bit/src/fome/activity.h /branches/port_qt5_64bit/src/fome/forestmanagementengine.cpp /branches/port_qt5_64bit/src/fome/forestmanagementengine.h /branches/port_qt5_64bit/src/fome/knowledgebase.cpp /branches/port_qt5_64bit/src/fome/knowledgebase.h /branches/port_qt5_64bit/src/iland/iland.pro /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/mainwindow.h /branches/port_qt5_64bit/src/iland/mainwindow.ui /branches/port_qt5_64bit/src/iland/tests.cpp /branches/port_qt5_64bit/src/iland/tests.h /branches/port_qt5_64bit/src/output/dynamicstandout.cpp /branches/port_qt5_64bit/src/output/outputmanager.cpp /branches/port_qt5_64bit/src/output/productionout.cpp /branches/port_qt5_64bit/src/output/snapshot.cpp /branches/port_qt5_64bit/src/output/treeout.cpp /branches/port_qt5_64bit/src/plugins/wind/windmodule.cpp /branches/port_qt5_64bit/src/tools/helper.cpp /branches/port_qt5_64bit/src/tools/helper.h /branches/port_qt5_64bit/src/tools/modules.cpp /branches/port_qt5_64bit/src/tools/scriptglobal.cpp
|
802 |
3926d 16h |
werner |
/branches/port_qt5_64bit/ |
merge from trunk up to revision 801 |
|
/branches/port_qt5_64bit/R_analysis
/branches/port_qt5_64bit /branches/port_qt5_64bit/executable/iland.exe /branches/port_qt5_64bit/src/core/climate.cpp /branches/port_qt5_64bit/src/core/climate.h /branches/port_qt5_64bit/src/core/global.h /branches/port_qt5_64bit/src/core/model.cpp /branches/port_qt5_64bit/src/core/modelcontroller.cpp /branches/port_qt5_64bit/src/core/modelcontroller.h /branches/port_qt5_64bit/src/core/production3pg.cpp /branches/port_qt5_64bit/src/core/sapling.cpp /branches/port_qt5_64bit/src/core/seeddispersal.cpp /branches/port_qt5_64bit/src/core/speciesresponse.cpp /branches/port_qt5_64bit/src/core/speciesresponse.h /branches/port_qt5_64bit/src/core/speciesset.cpp /branches/port_qt5_64bit/src/core/speciesset.h /branches/port_qt5_64bit/src/core/stampcontainer.cpp /branches/port_qt5_64bit/src/core/watercycle.cpp /branches/port_qt5_64bit/src/core/watercycle.h /branches/port_qt5_64bit/src/fonstudio/mainwindow.cpp /branches/port_qt5_64bit/src/iland/mainwindow.cpp /branches/port_qt5_64bit/src/iland/version.cpp /branches/port_qt5_64bit/src/output/dynamicstandout.cpp /branches/port_qt5_64bit/src/output/dynamicstandout.h /branches/port_qt5_64bit/src/output/productionout.cpp /branches/port_qt5_64bit/src/output/snapshot.cpp /branches/port_qt5_64bit/src/output/standdeadout.cpp /branches/port_qt5_64bit/src/plugins/fire/firemodule.cpp /branches/port_qt5_64bit/src/plugins/fire/firescript.cpp /branches/port_qt5_64bit/src/plugins/fire/firescript.h /branches/port_qt5_64bit/src/plugins/wind/windmodule.cpp /branches/port_qt5_64bit/src/tools/expression.cpp /branches/port_qt5_64bit/src/tools/expression.h /branches/port_qt5_64bit/src/tools/scriptglobal.cpp
|
779 |
4059d 09h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
767 |
4238d 03h |
werner |
/trunk/src/ |
larger restructuring of code (moving scripting related parts)
adding a shell for "spatialAnalysis".
In the future, a cleanup of all the "spatial" grids/maps/stuff is necessary... |
|
/trunk/src/core/management.cpp /trunk/src/core/management.h /trunk/src/core/model.cpp /trunk/src/core/model.h /trunk/src/core/timeevents.cpp /trunk/src/iland/mainwindow.cpp /trunk/src/plugins/fire/firemodule.cpp /trunk/src/tools/globalsettings.cpp /trunk/src/tools/globalsettings.h /trunk/src/tools/modules.cpp /trunk/src/tools/modules.h /trunk/src/tools/scriptglobal.cpp /trunk/src/tools/scriptglobal.h /trunk/src/tools/spatialanalysis.cpp /trunk/src/tools/spatialanalysis.h
|