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 3037d 22h werner / public SVN  
/tags/release_1.0
/branches/release_1.0
1221 3037d 22h werner /branches/ public SVN  
/branches/release_1.0
/branches/version1.0
1220 3037d 22h werner /branches/version1.0/ Version 1.0  
/branches/version1.0
1218 3038d 00h werner / clean up repository - make 1.0 trunk again!  
/trunk
/iland_regen
1217 3038d 00h werner / clean up repository - make 1.0 trunk again!  
/iland_regen
/branches/iland_regen
1212 3044d 03h 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
1157 3256d 06h 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 3326d 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
816 4150d 18h werner /branches/port_qt5_64bit/ merge from iLand trunk (e.g. the new in() function for expressions)

now first (+-) working version of the bridging of Javascript and C++ world.
 
/branches/port_qt5_64bit/R_analysis/stacked.dbh-distribution.charts.R
/branches/port_qt5_64bit
/branches/port_qt5_64bit/R_analysis/stacked.timeseries.R
/branches/port_qt5_64bit/src/core/production3pg.cpp
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/fome/activity.cpp
/branches/port_qt5_64bit/src/fome/activity.h
/branches/port_qt5_64bit/src/fome/fmstand.cpp
/branches/port_qt5_64bit/src/fome/fmstand.h
/branches/port_qt5_64bit/src/fome/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/fome/knowledgebase.cpp
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/plugins/fire/fire.pro
811 4155d 20h werner /branches/port_qt5_64bit/src/ working on the Forest Management Engine.
* new classes that represent Agent, AgentType, FMUnit, FMStand, ...
* +- working evaluation of expressions (activities) in the context of stand/site/... variables.
 
/branches/port_qt5_64bit/src/fome/agent.cpp
/branches/port_qt5_64bit/src/fome/agent.h
/branches/port_qt5_64bit/src/fome/agenttype.cpp
/branches/port_qt5_64bit/src/fome/agenttype.h
/branches/port_qt5_64bit/src/fome/fmstand.cpp
/branches/port_qt5_64bit/src/fome/fmstand.h
/branches/port_qt5_64bit/src/fome/fmunit.cpp
/branches/port_qt5_64bit/src/fome/fmunit.h
/branches/port_qt5_64bit/src/fome/activity.cpp
/branches/port_qt5_64bit/src/fome/activity.h
/branches/port_qt5_64bit/src/fome/fomewrapper.cpp
/branches/port_qt5_64bit/src/fome/fomewrapper.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/plugins/fire/fire.pro
793 4185d 22h werner /branches/port_qt5_64bit/src/ Move from QScriptEngine to QJSEngine (=V8). Most of the stuff was quite smooth, but there are some open issues.
• Global functions (“print”, “include”, “alert”) are commented out (could be solved by moving functions to the “Globals” object and by creating alias JS-functions, i.e. function alert(x) {Globals.alert(x); } )
• Object creation: “new XXX”, XXX=ClimateConverter, CSVFile, … does not work now
possible solution: factory-pattern (i.e. var csv = Globals.newCSV())
 
/branches/port_qt5_64bit/src/core/management.cpp
/branches/port_qt5_64bit/src/core/management.h
/branches/port_qt5_64bit/src/core/plugin_interface.h
/branches/port_qt5_64bit/src/iland/iland.pro
/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/climateconverter.cpp
/branches/port_qt5_64bit/src/tools/climateconverter.h
/branches/port_qt5_64bit/src/tools/csvfile.cpp
/branches/port_qt5_64bit/src/tools/csvfile.h
/branches/port_qt5_64bit/src/tools/globalsettings.cpp
/branches/port_qt5_64bit/src/tools/globalsettings.h
/branches/port_qt5_64bit/src/tools/modules.cpp
/branches/port_qt5_64bit/src/tools/modules.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
780 4297d 00h 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 4309d 23h werner /branches/port_qt5_64bit/  
/branches/port_qt5_64bit
769 4440d 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
763 4502d 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
762 4502d 01h werner /trunk/src/plugins/ upgrade Qt 4.8.3  
/trunk/src/plugins/fire/fire.pro
/trunk/src/plugins/wind/wind.pro
761 4502d 05h 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
759 4533d 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
758 4535d 22h werner /trunk/src/ tests with the random generator; (see also the blog post about random numbers). Now the generations of the generator are deactivated (i.e. set to 0). The ignition calculation of the fire module is now based on the resource unit (instead of the single fire pixel).  
/trunk/src/core/threadrunner.cpp
/trunk/src/iland/iland.pro
/trunk/src/iland/mainwindow.cpp
/trunk/src/plugins/fire/fire.pro
/trunk/src/plugins/fire/firemodule.cpp
/trunk/src/plugins/fire/firescript.cpp
/trunk/src/tools/randomgenerator.cpp
/trunk/src/tools/randomgenerator.h
710 4831d 01h werner /trunk/ new exe version.
includes limitation to 1 fire/year and fixes to ESRI ASCII grid exports.
 
/trunk/executable/iland.exe
/trunk/src/iland/version.cpp
/trunk/src/plugins/fire/fire.pro
/trunk/src/plugins/fire/firemodule.cpp

Show All