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
646 4764d 09h werner /trunk/src/ reorganized the fire module code and other stuff.
* added new interfaces and linked some of them already (setup(), ...)
* separated the plugin from the implementation (fireplugin.h vs. FireModule)
* worked on finding a way to create "layeredgrids" (how to avoid the templates...)- i have a solution now but still not sure if it really works		  
/trunk/src/core/layeredgrid.h
/trunk/src/plugins/fire/firemodule.cpp
/trunk/src/plugins/fire/firemodule.h
/trunk/src/core/grid.h
/trunk/src/core/model.cpp
/trunk/src/core/model.h
/trunk/src/core/modelcontroller.cpp
/trunk/src/core/modelcontroller.h
/trunk/src/core/plugin_interface.h
/trunk/src/core/watercycle.cpp
/trunk/src/iland/iland.pro
/trunk/src/plugins/fire/fire.pro
/trunk/src/plugins/fire/fireplugin.cpp
/trunk/src/plugins/fire/fireplugin.h
/trunk/src/tools/gisgrid.cpp
/trunk/src/tools/gisgrid.h
/trunk/src/tools/modules.cpp
/trunk/src/tools/modules.h
643 4770d 14h werner /trunk/src/ improved the visualization of grids - now the main windows stores a list of grids along with type of drawing (black/white, color, ...).
The GUI has a combo box to select the grid to draw. Nice: this can easily be extended to be used with grids to come (fire, grids provided from scripts...)
Whats missing: some life cycle kind of thing: now it is quite dangerous to produce crashes.... needs some investigation of scoped pointer classes...		  
/trunk/src/core/grid.h
/trunk/src/core/modelcontroller.cpp
/trunk/src/core/modelcontroller.h
/trunk/src/iland/mainwindow.cpp
/trunk/src/iland/mainwindow.h
/trunk/src/iland/mainwindow.ui
/trunk/src/iland/tests.cpp
/trunk/src/tools/helper.cpp
/trunk/src/tools/helper.h
642 4771d 02h werner /trunk/src/ added DEMs.
The DEM is an enriched FloatGrid featuring some special functions to load DEMs from file and to calculate aspect/slope and such.
currently only in testing, not really used in the model.		  
/trunk/src/tools/dem.cpp
/trunk/src/tools/dem.h
/trunk/src/core/modelcontroller.cpp
/trunk/src/core/modelcontroller.h
/trunk/src/iland/iland.pro
/trunk/src/iland/mainwindow.cpp
/trunk/src/iland/mainwindow.h
/trunk/src/iland/tests.cpp
639 4784d 06h werner / move current content to the "trunk"  
/trunk/executable
/trunk/src
/executable
/src
634 4830d 06h werner /src/ iland movie maker  
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
632 4831d 07h werner /src/ bugfixes and improved writing of error messages  
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/core/stampcontainer.cpp
/src/iland/iland.pro
/src/iland/version.cpp
596 4867d 12h werner /src/ painting of MapGrid from javascript; the call is tunneled through the ModelController.  
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/tools/scriptglobal.cpp
/src/tools/scriptglobal.h
590 4881d 08h werner /src/ added new global scripting functions (e.g. screenshot()). This required some work to do in the combination of MainWindow and the ModelController; removed the static connection (is bad!) and changed to signal / slot connections....  
/src/core/management.cpp
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/tools/globalsettings.cpp
/src/tools/globalsettings.h
/src/tools/scriptglobal.cpp
514 4965d 09h werner /src/ added a species-selection drop down box for GUI visualization.  
/src/core/model.h
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/core/speciesset.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/mainwindow.ui
498 4991d 05h werner /src/ fixed bug in stampcontainer that led to crashes when trees grew very very big.  
/src/core/modelcontroller.h
/src/core/stampcontainer.cpp
/src/iland/mainwindow.cpp
497 4991d 09h werner /src/ tried some possibilities to eliminate "strange" crashes when simulating very for a long time. Ended up with adding additional "pause" between every 50 year or so (see modelcontroller.cpp); this helps at least a little.
also updated the expression-linearization		  
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/core/tree.cpp
/src/iland/mainwindow.cpp
/src/iland/tests.cpp
/src/tools/expression.cpp
493 4991d 12h werner /src/ some GUI improvements: paint trees according to a predefined tree color, added also a general info-statusbar-message that shows the runyear/maxrunyear.

use this SQL to add necessary columns:

-- script to add "displayColor" and to fix the spelling error of "reineke"
-- 2010-10-16

alter table species rename to species_copy;

CREATE TABLE "species" ("shortName" CHAR(4),"name" TEXT,"active" INTEGER, "displayColor" TEXT, "LIPFile" TEXT,"specificLeafArea" REAL,"turnoverLeaf" REAL,"turnoverRoot" REAL,"HDlow" TEXT,"HDhigh" TEXT,"woodDensity" REAL,"formFactor" REAL,"bmWoody_a" REAL,"bmWoody_b" REAL,"bmFoliage_a" REAL,"bmFoliage_b" REAL,"bmRoot_a" REAL,"bmRoot_b" REAL,"bmBranch_a" REAL,"bmBranch_b" REAL,"probIntrinsic" REAL,"probStress" REAL,"maximumAge" REAL,"maximumHeight" REAL,"aging" TEXT,
"respVpdExponent" real,"respTempMin" real,"respTempMax" real,"respNitrogenClass" real,"phenologyClass" integer,"isConiferous" INTEGER,"isEvergreen" INTEGER,"maxCanopyConductance" INTEGER,"psiMin" INTEGER,"lightResponseClass" real,"finerootFoliageRatio" real, maturityYears integer, seedYearInterval integer, nonSeedYearFraction real, fecundity_m2 real, seedKernel_as1 real, seedKernel_as2 real, seedKernel_ks0 real,
estMinTemp real, estChillRequirement integer, estGDDMin integer, estGDDMax integer, estGDDBaseTemp real, estBudBirstGDD integer, estFrostFreeDays integer, estFrostTolerance double, sapHeightGrowthPotential text, sapMaxStressYears integer, sapStressThreshold real, sapHDSapling real, sapReinekesR real, sapReferenceRatio real);

insert into species (shortName, name, active, LIPFile, specificLeafArea, turnoverLeaf, turnoverRoot, HDlow, HDhigh, woodDensity, formFactor, bmWoody_a, bmWoody_b, bmFoliage_a, bmFoliage_b, bmRoot_a, bmRoot_b, bmBranch_a, bmBranch_b, probIntrinsic, probStress, maximumAge, maximumHeight, aging, respVpdExponent,
respTempMin, respTempMax, respNitrogenClass, phenologyClass, isConiferous, isEvergreen, maxCanopyConductance, psiMin, lightResponseClass, finerootFoliageRatio, maturityYears, seedYearInterval, nonSeedYearFraction, fecundity_m2, seedKernel_as1, seedKernel_as2, seedKernel_ks0,
estMinTemp, estChillRequirement, estGDDMin, estGDDMax, estGDDBaseTemp, estBudBirstGDD, estFrostFreeDays, estFrostTolerance, sapHeightGrowthPotential, sapMaxStressYears, sapStressThreshold, sapHDSapling, sapReinekesR, sapReferenceRatio
)
select shortName, name, active, LIPFile, specificLeafArea, turnoverLeaf, turnoverRoot, HDlow, HDhigh, woodDensity, formFactor, bmWoody_a, bmWoody_b, bmFoliage_a, bmFoliage_b, bmRoot_a, bmRoot_b, bmBranch_a, bmBranch_b, probIntrinsic, probStress, maximumAge, maximumHeight, aging, respVpdExponent,
respTempMin, respTempMax, respNitrogenClass, phenologyClass, isConiferous, isEvergreen, maxCanopyConductance, psiMin, lightResponseClass, finerootFoliageRatio, maturityYears, seedYearInterval, nonSeedYearFraction, fecundity_m2, seedKernel_as1, seedKernel_as2, seedKernel_ks0,
estMinTemp, estChillRequirement, estGDDMin, estGDDMax, estGDDBaseTemp, estBudBirstGDD, estFrostFreeDays, estFrostTolerance, sapHeightGrowthPotential, sapMaxStressYears, sapStressThreshold, sapHDSapling, sapReineckesR, sapReferenceRatio
FROM species_copy;

update species set displayColor = '3E9C49'; -- a simple green		  
/src/core/model.cpp
/src/core/modelcontroller.h
/src/core/species.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/mainwindow.ui
225 5367d 02h werner /src/ Run/Pause/Stop, etc. in ModelController.  
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/mainwindow.ui
/src/output/outputmanager.cpp
223 5370d 22h werner /src/ Model Pause, Model restart,etc. (wamod little hack)  
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/tests.cpp
/src/output/outputmanager.cpp
/src/tools/helper.h
222 5371d 03h werner /src/ * outputs: delayed commits of transactions. transactions are commited (and thus written to disk) at the end of run
* improved the "remotecontrol", added signals and slots to indicate progress...		  
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/output/output.cpp
/src/output/output.h
/src/output/outputmanager.cpp
/src/output/outputmanager.h
161 5388d 03h werner /src/ dynamic outputs (i.e. a list of value defined in xml project file)  
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/core/tree.cpp
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/mainwindow.ui
145 5393d 02h Werner /src/ Run and compiled iLand on Linux (Kubuntu) with a virtual machine. The gcc on Linux issues lots of warnings which I fixed on the Linux side. Also fixed TTickTack (the clock issue).
Now iLand also runs on Linux - nice!		  
/src/core/grid.h
/src/core/model.h
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/core/production3pg.h
/src/core/ressourceunit.h
/src/core/species.cpp
/src/core/species.h
/src/core/speciesset.h
/src/core/stamp.h
/src/core/stampcontainer.h
/src/core/threadrunner.h
/src/core/tree.cpp
/src/core/tree.h
/src/iland.pro
/src/iland/iland.pro
/src/iland/mainwindow.cpp
/src/iland/stable.h
/src/tools/expression.cpp
/src/tools/expression.h
/src/tools/expressionwrapper.cpp
/src/tools/expressionwrapper.h
/src/tools/globalsettings.h
/src/tools/helper.cpp
/src/tools/helper.h
/src/tools/ticktack.cpp
/src/tools/xmlhelper.cpp
/src/tools/xmlhelper.h
136 5394d 22h Werner /src/ rework of the partition model. changed species parameter and partition routine, also some work on debug outputs.
added the "year" of the simulation now th globalsettings.		  
/src/core/model.cpp
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/core/species.cpp
/src/core/species.h
/src/core/tree.cpp
/src/core/tree.h
/src/tools/globalsettings.cpp
/src/tools/globalsettings.h
128 5396d 22h Werner /src/ Model Controller, iLand main window.  
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/iland/mainwindow.cpp
/src/iland/mainwindow.h
/src/iland/mainwindow.ui
105 5403d 19h Werner /src/ several changes:
create multiple RessourceUnits as a grid
modified include-order for model.h and mainwindow.cpp
added clear() to Grid.
fixed bug in Grid::indexOf()
...		  
/src/core/modelcontroller.cpp
/src/core/modelcontroller.h
/src/core/exception.h
/src/core/grid.h
/src/core/model.cpp
/src/core/model.h
/src/core/ressourceunit.cpp
/src/core/ressourceunit.h
/src/core/tree.cpp
/src/core/tree.h
/src/fonstudio/fonstudio.pro
/src/fonstudio/lightroom.cpp
/src/fonstudio/mainwindow.cpp
/src/fonstudio/mainwindow.h

←Prev12Next→

Show All