Subversion Repositories public iLand

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
1222 2970d 04h werner / public SVN  
/tags/release_1.0
/branches/release_1.0
1221 2970d 04h werner /branches/ public SVN  
/branches/release_1.0
/branches/version1.0
1220 2970d 04h werner /branches/version1.0/ Version 1.0  
/branches/version1.0
1218 2970d 06h werner / clean up repository - make 1.0 trunk again!  
/trunk
/iland_regen
1217 2970d 06h werner / clean up repository - make 1.0 trunk again!  
/iland_regen
/branches/iland_regen
1104 3258d 10h 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
1067 3368d 22h werner /branches/port_qt5_64bit/src/ added new efficient grid access functions index2 and index5.
They are >2 times faster than using double conversion to grid coordinates.
 
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/iland/tests.h
1002 3607d 23h werner /branches/port_qt5_64bit/src/ new optimized establishment routine.
not finished yet, but looks promising in my first tests.
 
/branches/port_qt5_64bit/src/core/establishment.cpp
/branches/port_qt5_64bit/src/core/establishment.h
/branches/port_qt5_64bit/src/core/resourceunit.h
/branches/port_qt5_64bit/src/core/sapling.h
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/iland/tests.h
/branches/port_qt5_64bit/src/tools/randomgenerator.h
876 3980d 03h werner /branches/port_qt5_64bit/src/ trying to identify why we observe crashes when calling javascript-functions.
Results: not sure, but:
happens, when in JS-file "include('anotherfile.js');" is used;
happens not, if "Globals.include('anotherfile.js');" is used.
bug is related to loosing the "scope" of the (Qt-internal) FunctionObject ("scope->owner" is rubbish, access violations when trying to climb up the scope tree).
I was not able to reproduce the behavior in a mini-project (jstest.pro).
 
/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/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/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/iland/tests.h
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
808 4090d 02h 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
780 4229d 06h 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 4242d 05h werner /branches/port_qt5_64bit/  
/branches/port_qt5_64bit
766 4421d 06h werner /trunk/src/ adding the rumple index calculation to iland. missing: script binding, ...
time to move the qtscript engine from management to the main model....
 
/trunk/src/tools/spatialanalysis.cpp
/trunk/src/tools/spatialanalysis.h
/trunk/src/core/tree.cpp
/trunk/src/iland/iland.pro
/trunk/src/iland/mainwindow.cpp
/trunk/src/iland/tests.cpp
/trunk/src/iland/tests.h
/trunk/src/plugins/fire/firescript.h
/trunk/src/tools/climateconverter.cpp
/trunk/src/tools/csvfile.cpp
/trunk/src/tools/csvfile.h
/trunk/src/tools/scriptglobal.h
702 4780d 01h werner /trunk/src/ implementing the "fetch" calculations for the wind module. The calculation uses the bresenhem line-drawing algorithm to "draw" from each edge-pixel in wind direction a line and check the height of the canopy on the way.
added a test for the wind module.
 
/trunk/src/iland/mainwindow.cpp
/trunk/src/iland/tests.cpp
/trunk/src/iland/tests.h
/trunk/src/plugins/wind/windmodule.cpp
/trunk/src/plugins/wind/windmodule.h
/trunk/src/plugins/wind/windplugin.h
/trunk/src/tools/helper.cpp
/trunk/src/tools/helper.h
671 4825d 06h werner /trunk/src/ Necessary changes for GPL licence (i.e. headers in all source files)  
/trunk/src/core/climate.cpp
/trunk/src/core/climate.h
/trunk/src/core/environment.cpp
/trunk/src/core/environment.h
/trunk/src/core/establishment.cpp
/trunk/src/core/establishment.h
/trunk/src/core/exception.h
/trunk/src/core/global.h
/trunk/src/core/grid.h
/trunk/src/core/layeredgrid.h
/trunk/src/core/management.cpp
/trunk/src/core/management.h
/trunk/src/core/model.cpp
/trunk/src/core/model.h
/trunk/src/core/modelcontroller.cpp
/trunk/src/core/modelcontroller.h
/trunk/src/core/modelsettings.cpp
/trunk/src/core/modelsettings.h
/trunk/src/core/phenology.cpp
/trunk/src/core/phenology.h
/trunk/src/core/plugin_interface.h
/trunk/src/core/production3pg.cpp
/trunk/src/core/production3pg.h
/trunk/src/core/resourceunit.cpp
/trunk/src/core/resourceunit.h
/trunk/src/core/sapling.cpp
/trunk/src/core/sapling.h
/trunk/src/core/seeddispersal.cpp
/trunk/src/core/seeddispersal.h
/trunk/src/core/snag.cpp
/trunk/src/core/snag.h
/trunk/src/core/soil.cpp
/trunk/src/core/soil.h
/trunk/src/core/species.cpp
/trunk/src/core/species.h
/trunk/src/core/speciesresponse.cpp
/trunk/src/core/speciesresponse.h
/trunk/src/core/speciesset.cpp
/trunk/src/core/speciesset.h
/trunk/src/core/stamp.cpp
/trunk/src/core/stamp.h
/trunk/src/core/stampcontainer.cpp
/trunk/src/core/stampcontainer.h
/trunk/src/core/standloader.cpp
/trunk/src/core/standloader.h
/trunk/src/core/standstatistics.cpp
/trunk/src/core/standstatistics.h
/trunk/src/core/threadrunner.cpp
/trunk/src/core/threadrunner.h
/trunk/src/core/timeevents.cpp
/trunk/src/core/timeevents.h
/trunk/src/core/tree.cpp
/trunk/src/core/tree.h
/trunk/src/core/watercycle.cpp
/trunk/src/core/watercycle.h
/trunk/src/iland/aboutdialog.cpp
/trunk/src/iland/aboutdialog.h
/trunk/src/iland/aboutdialog.ui
/trunk/src/iland/mainwindow.cpp
/trunk/src/iland/mainwindow.h
/trunk/src/iland/paintarea.cpp
/trunk/src/iland/paintarea.h
/trunk/src/iland/stable.h
/trunk/src/iland/tests.cpp
/trunk/src/iland/tests.h
/trunk/src/iland/version.h
/trunk/src/output/carbonflowout.cpp
/trunk/src/output/carbonflowout.h
/trunk/src/output/carbonout.cpp
/trunk/src/output/carbonout.h
/trunk/src/output/dynamicstandout.cpp
/trunk/src/output/dynamicstandout.h
/trunk/src/output/managementout.cpp
/trunk/src/output/managementout.h
/trunk/src/output/output.cpp
/trunk/src/output/output.h
/trunk/src/output/outputmanager.cpp
/trunk/src/output/outputmanager.h
/trunk/src/output/productionout.cpp
/trunk/src/output/productionout.h
/trunk/src/output/saplingout.cpp
/trunk/src/output/saplingout.h
/trunk/src/output/standdeadout.cpp
/trunk/src/output/standdeadout.h
/trunk/src/output/standout.cpp
/trunk/src/output/standout.h
/trunk/src/output/treeout.cpp
/trunk/src/output/treeout.h
/trunk/src/plugins/fire/firemodule.cpp
/trunk/src/plugins/fire/firemodule.h
/trunk/src/plugins/fire/fireout.cpp
/trunk/src/plugins/fire/fireout.h
/trunk/src/plugins/fire/fireplugin.cpp
/trunk/src/plugins/fire/fireplugin.h
/trunk/src/tools/climateconverter.cpp
/trunk/src/tools/climateconverter.h
/trunk/src/tools/csvfile.cpp
/trunk/src/tools/csvfile.h
/trunk/src/tools/dem.cpp
/trunk/src/tools/dem.h
/trunk/src/tools/expression.cpp
/trunk/src/tools/expression.h
/trunk/src/tools/expressionwrapper.cpp
/trunk/src/tools/expressionwrapper.h
/trunk/src/tools/floatingaverage.cpp
/trunk/src/tools/floatingaverage.h
/trunk/src/tools/gisgrid.cpp
/trunk/src/tools/gisgrid.h
/trunk/src/tools/globalsettings.cpp
/trunk/src/tools/globalsettings.h
/trunk/src/tools/helper.cpp
/trunk/src/tools/helper.h
/trunk/src/tools/mapgrid.cpp
/trunk/src/tools/mapgrid.h
/trunk/src/tools/modules.cpp
/trunk/src/tools/modules.h
/trunk/src/tools/random.cpp
/trunk/src/tools/random.h
/trunk/src/tools/scriptglobal.cpp
/trunk/src/tools/scriptglobal.h
/trunk/src/tools/settingmetadata.cpp
/trunk/src/tools/settingmetadata.h
/trunk/src/tools/sqlhelper.cpp
/trunk/src/tools/sqlhelper.h
/trunk/src/tools/ticktack.cpp
/trunk/src/tools/ticktack.h
/trunk/src/tools/xmlhelper.cpp
/trunk/src/tools/xmlhelper.h
652 4959d 01h werner /trunk/src/ added a test routine to check the fire spread algorithm. Looks basically ok, but maybe we need to spread to the 8neighborhood.  
/trunk/src/core/modelcontroller.cpp
/trunk/src/core/modelcontroller.h
/trunk/src/iland/mainwindow.cpp
/trunk/src/iland/tests.cpp
/trunk/src/iland/tests.h
/trunk/src/plugins/fire/firemodule.cpp
/trunk/src/plugins/fire/fireplugin.h
/trunk/src/tools/modules.cpp
/trunk/src/tools/modules.h
641 4973d 00h werner /trunk/src/ started development of the plugin / module system.
this includes playing around with qmake and the QPluginLoader.
Now the plan is to build a static library for each module and use the Qt mechanism to load them. The fire module is a kind of a test pilot - lets see how the needed interfaces etc. develop.
 
/trunk/src/core/plugin_interface.h
/trunk/src/plugins
/trunk/src/plugins/fire
/trunk/src/plugins/fire/fire.pro
/trunk/src/plugins/fire/fireplugin.cpp
/trunk/src/plugins/fire/fireplugin.h
/trunk/src/plugins/plugins.pro
/trunk/src/tools/modules.cpp
/trunk/src/tools/modules.h
/trunk/src/core/model.cpp
/trunk/src/core/model.h
/trunk/src/iland/tests.h
639 4986d 04h werner / move current content to the "trunk"  
/trunk/executable
/trunk/src
/executable
/src
539 5133d 06h werner /src/ continue implementing grid functionality (yeah! a simple grid input already works)
removing the bug that caused db locks when reloaded model without actually simulating.
 
/src/core/model.cpp
/src/core/model.h
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/iland/tests.h
/src/output/output.cpp
/src/output/outputmanager.cpp
/src/tools/gisgrid.cpp
/src/tools/gisgrid.h
525 5145d 04h 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

Show All