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
1104 3079d 04h 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
1099 3100d 01h werner /branches/port_qt5_64bit/src/ cleaning gcc warnings, trying to compile on VSC.  
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/core/grasscover.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/output/snapshot.cpp
/branches/port_qt5_64bit/src/tools/helper.cpp
1098 3100d 02h werner /branches/port_qt5_64bit/src/ilandc/ compile on VSC...  
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
1087 3149d 21h 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
1081 3160d 21h 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
1075 3171d 00h werner /branches/port_qt5_64bit/src/ilandc/ allowed changing log-directory in ilandc.  
/branches/port_qt5_64bit/src/ilandc/consoleshell.cpp
1065 3190d 18h 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
1053 3225d 06h werner /branches/port_qt5_64bit/src/ updates for Qt 5.5 and GCC (Linux).  
/branches/port_qt5_64bit/src/core/management.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/output/snapshot.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/helper.cpp
/branches/port_qt5_64bit/src/tools/helper.h
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
1032 3360d 06h 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
996 3433d 05h werner /branches/port_qt5_64bit/src/ log messages in snapshot loading
timer for linux (use QElapsedTimer)
switched off debug messages for ilandc		  
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/output/snapshot.cpp
/branches/port_qt5_64bit/src/tools/ticktack.cpp
994 3434d 03h werner /branches/port_qt5_64bit/src/ilandc/ error handling in console shell  
/branches/port_qt5_64bit/src/ilandc/consoleshell.cpp
993 3434d 22h werner /branches/port_qt5_64bit/src/ilandc/ little text edits  
/branches/port_qt5_64bit/src/ilandc/main.cpp
989 3435d 01h werner /branches/port_qt5_64bit/src/ removed the QT GUI library dependency for the console variant of iLand. For this some #ifdef were required.  
/branches/port_qt5_64bit/src/core/grid.cpp
/branches/port_qt5_64bit/src/core/seeddispersal.cpp
/branches/port_qt5_64bit/src/core/species.cpp
/branches/port_qt5_64bit/src/core/species.h
/branches/port_qt5_64bit/src/ilandc/consoleshell.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/tools/helper.cpp
988 3435d 03h werner /branches/port_qt5_64bit/src/ trying to debug build on linux  
/branches/port_qt5_64bit/src/iland/version.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
987 3435d 03h werner /branches/port_qt5_64bit/src/ilandc/ ... the same  
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
986 3435d 03h werner /branches/port_qt5_64bit/src/ilandc/ adapt pro file for linux.  
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
984 3435d 05h werner /branches/port_qt5_64bit/src/ fix warnings  
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/ilandc/consoleshell.cpp
976 3457d 03h werner /branches/port_qt5_64bit/src/ compiling ilandc with Qt5.4 (and barkbeetle plugin).  
/branches/port_qt5_64bit/src/abe/scheduler.h
/branches/port_qt5_64bit/src/iland/version.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
947 3569d 23h werner /branches/port_qt5_64bit/src/ little change to make ilandc compile, more verbose error message for external seeds  
/branches/port_qt5_64bit/src/core/seeddispersal.cpp
/branches/port_qt5_64bit/src/ilandc/consoleshell.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/tools/helper.cpp
924 3666d 22h werner /branches/port_qt5_64bit/src/ minor changes to allow compilation of ilandc.  
/branches/port_qt5_64bit/src/abe/activity.h
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
870 3812d 19h werner /branches/port_qt5_64bit/src/ amie development....  
/branches/port_qt5_64bit/src/amie/actgeneral.cpp
/branches/port_qt5_64bit/src/amie/actgeneral.h
/branches/port_qt5_64bit/src/amie/amie_global.h
/branches/port_qt5_64bit/src/amie/thinning.cpp
/branches/port_qt5_64bit/src/amie/thinning.h
/branches/port_qt5_64bit/src/amie/fome_global.h
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/activity.h
/branches/port_qt5_64bit/src/amie/agent.cpp
/branches/port_qt5_64bit/src/amie/agent.h
/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/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fmstp.h
/branches/port_qt5_64bit/src/amie/fmunit.cpp
/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/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/knowledgebase.cpp
/branches/port_qt5_64bit/src/amie/knowledgebase.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/tools/expression.cpp
865 3827d 18h werner /branches/port_qt5_64bit/src/ilandc/ small change in ilandc pro file (now it compiles)  
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
837 3891d 01h 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
835 3892d 18h werner /branches/port_qt5_64bit/ fixes to allow compilation on 64bit Linux  
/branches/port_qt5_64bit
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/core/stampcontainer.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/ilandc/main.cpp
/branches/port_qt5_64bit/src/tools/settingmetadata.cpp
827 3895d 02h werner /branches/port_qt5_64bit/src/ some minor changes in order to compile the "ilandc" console mode program with Qt5.1 / MSVC.  
/branches/port_qt5_64bit/src/fome/activity.h
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/ilandc/main.cpp
/branches/port_qt5_64bit/src/tools/csvfile.h
/branches/port_qt5_64bit/src/tools/scriptglobal.h
780 4050d 01h werner /branches/port_qt5_64bit/src/ Steps to build iLand with Qt 5 and with MSVC compiler and 64 bit.
http://iland.boku.ac.at/blogpost44

removed also a couple of warnings that were thrown by the MSVC compiler.		  
/branches/port_qt5_64bit/src/plugins/fire/fireplugin.json
/branches/port_qt5_64bit/src/plugins/wind/windplugin.json
/branches/port_qt5_64bit/src/3rdparty/MersenneTwister.h
/branches/port_qt5_64bit/src/core/modelcontroller.cpp
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/core/snag.h
/branches/port_qt5_64bit/src/core/species.h
/branches/port_qt5_64bit/src/core/threadrunner.cpp
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/core/watercycle.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/main.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.h
/branches/port_qt5_64bit/src/iland/paintarea.cpp
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/iland/tests.h
/branches/port_qt5_64bit/src/ilandc/consoleshell.cpp
/branches/port_qt5_64bit/src/ilandc/ilandc.pro
/branches/port_qt5_64bit/src/output/snapshot.cpp
/branches/port_qt5_64bit/src/plugins/fire/fire.pro
/branches/port_qt5_64bit/src/plugins/fire/fireplugin.cpp
/branches/port_qt5_64bit/src/plugins/fire/fireplugin.h
/branches/port_qt5_64bit/src/plugins/wind/wind.pro
/branches/port_qt5_64bit/src/plugins/wind/windplugin.cpp
/branches/port_qt5_64bit/src/plugins/wind/windplugin.h
/branches/port_qt5_64bit/src/tools/expression.cpp
/branches/port_qt5_64bit/src/tools/gisgrid.cpp
/branches/port_qt5_64bit/src/tools/globalsettings.cpp
/branches/port_qt5_64bit/src/tools/helper.cpp
/branches/port_qt5_64bit/src/tools/modules.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/ticktack.cpp
779 4063d 00h werner /branches/port_qt5_64bit/  
/branches/port_qt5_64bit
774 4135d 00h werner /trunk/src/ some additional error messages (expressions, stand loading)  
/trunk/src/fonstudio/globalsettings.h
/trunk/src/core
/trunk/src/core/standloader.cpp
/trunk/src/ilandc
/trunk/src/plugins
/trunk/src/tools/expression.cpp
773 4156d 05h werner /trunk/ fresh compile (Qt 4.8.3), removed debug symbols from executables, included recompiled fonstudio.  
/trunk/executable/fonstudio.exe
/trunk/executable/iland.exe
/trunk/executable/ilandc.exe
/trunk/src/iland/iland.pro
/trunk/src/ilandc/ilandc.pro
769 4193d 06h werner /trunk/src/ v 0.84
helper.cpp: added QMutex to handle possible crash when adding timers to the timers list
modules: added a catch() around the execution of modules (this should fix crashes due to unhandled exceptions)		  
/trunk/src/iland/version.cpp
/trunk/src/ilandc/ilandc.pro
/trunk/src/plugins/fire/fire.pro
/trunk/src/tools/helper.cpp
/trunk/src/tools/modules.cpp
/trunk/src/tools/spatialanalysis.h
768 4240d 00h werner /trunk/src/ilandc/ added spatialAnalysis to ilandc.  
/trunk/src/ilandc/ilandc.pro
763 4255d 01h werner /trunk/ Build for Qt 4.8.3 - new executables and DLLs  
/trunk/executable/QtCore4.dll
/trunk/executable/QtGui4.dll
/trunk/executable/QtScript4.dll
/trunk/executable/QtSql4.dll
/trunk/executable/QtXml4.dll
/trunk/executable/iland.exe
/trunk/executable/ilandc.exe
/trunk/executable/sqldrivers/qsqlite4.dll
/trunk/src/fonstudio/fonstudio.pro
/trunk/src/fonstudio/main.cpp
/trunk/src/iland/iland.pro
/trunk/src/ilandc/ilandc.pro
/trunk/src/plugins/fire/fire.pro
761 4255d 06h werner /trunk/ upgrade to Qt 4.8.3  
/trunk
/trunk/src/3rdparty/MersenneTwister.h
/trunk/src/iland/iland.pro
/trunk/src/iland/tests.cpp
/trunk/src/ilandc/ilandc.pro
/trunk/src/plugins/fire/fire.pro
/trunk/src/plugins/fire/firemodule.h
/trunk/src/plugins/wind/wind.pro
760 4275d 06h werner /trunk/src/ improved the ilandc version, removed a bug with trying to show a message box in the non-GUI version; ilandc runs now quite stable (e.g. 11 replicates of HJA fire simulations without problems)  
/trunk/src/core/modelcontroller.cpp
/trunk/src/ilandc/consoleshell.cpp
/trunk/src/ilandc/ilandc.pro
/trunk/src/ilandc/main.cpp
/trunk/src/plugins/fire/firemodule.cpp
759 4286d 23h werner /trunk/src/ restarting the "ilandc" command line version of iLand.  
/trunk/src/core/modelcontroller.cpp
/trunk/src/iland/iland.pro
/trunk/src/ilandc/ilandc.pro
/trunk/src/ilandc/main.cpp
/trunk/src/plugins/fire/fire.pro
/trunk/src/tools/randomgenerator.cpp
704 4597d 21h werner /trunk/ Speed-Patch!
fixing the missing "&" in the const Grid<float> seedMap() const { return mSeedMap; } ///< access to the seedMap
function. This dramatically improves the performance of the model. Lots of time was lost in duplicating the seedmaps for each species * resourceunit.
in addition: limited max-size of the logging QPlainTextEdit; this could maybe stop iLand from crashing....		  
/trunk/executable/iland.exe
/trunk/src/core/seeddispersal.h
/trunk/src/iland/iland.pro
/trunk/src/iland/mainwindow.cpp
/trunk/src/iland/version.cpp
/trunk/src/ilandc/consoleshell.cpp
/trunk/src/ilandc/ilandc.pro
703 4598d 06h werner /trunk/src/ build directories for ilandc  
/trunk/src
/trunk/src/ilandc/ilandc.pro
679 4640d 00h werner /trunk/ several improvements of the console application ilandc.exe  
/trunk/executable/ilandc.exe
/trunk/src/core/model.cpp
/trunk/src/ilandc/consoleshell.cpp
/trunk/src/ilandc/main.cpp
/trunk/src/tools/globalsettings.cpp
/trunk/src/tools/globalsettings.h
678 4640d 01h werner /trunk/src/ Created initial version of the console based iLand.
The console application will get the nice name: "ilandc".		  
/trunk/src/ilandc
/trunk/src/ilandc/consoleshell.cpp
/trunk/src/ilandc/consoleshell.h
/trunk/src/ilandc/ilandc.pro
/trunk/src/ilandc/main.cpp
/trunk/src/ilandc/stable.h
/trunk/src
/trunk/src/core/modelcontroller.cpp
/trunk/src/iland/iland.pro
/trunk/src/output/snapshot.cpp
/trunk/src/plugins/fire/fireplugin.cpp
/trunk/src/tools/expression.h
/trunk/src/tools/floatingaverage.h