Rev |
Age |
Author |
Path |
Log message |
Diff |
Changes |
904 |
3804d 20h |
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 |
3808d 00h |
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 |
3812d 01h |
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 |
3814d 10h |
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 |
3839d 00h |
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 |
3841d 05h |
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 |
3842d 00h |
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 |
3854d 02h |
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 |
3882d 22h |
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 |
3945d 00h |
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 |
3981d 03h |
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 |
3986d 06h |
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 |
3987d 07h |
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 |
4000d 21h |
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 |
4020d 07h |
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 |
4153d 01h |
werner |
/branches/port_qt5_64bit/ |
|
|
/branches/port_qt5_64bit
|
767 |
4331d 18h |
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
|
753 |
4392d 01h |
werner |
/trunk/src/ |
minor changes after using CPPCheck source code scan utilty. |
|
/trunk/src/core/management.cpp /trunk/src/core/model.cpp /trunk/src/core/standloader.cpp /trunk/src/fonstudio/hemigrid.cpp
|
739 |
4562d 03h |
werner |
/trunk/src/core/ |
removed some warnings, added a ASSERT to stamp-selection (problem with
old stamps) |
|
/trunk/src/core/model.cpp /trunk/src/core/stamp.h /trunk/src/core/standloader.cpp
|
737 |
4566d 03h |
werner |
/trunk/ |
version 0.8.1
this is a bugfix release. |
|
/trunk/executable/iland.exe /trunk/src/core/model.cpp /trunk/src/core/speciesresponse.cpp /trunk/src/iland/version.cpp
|