Subversion Repositories public iLand

Rev

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

Filtering Options

Rev Age Author Path Log message Diff
1222 2744d 16h werner / public SVN  
1221 2744d 16h werner /branches/ public SVN  
1220 2744d 16h werner /branches/version1.0/ Version 1.0  
1218 2744d 18h werner / clean up repository - make 1.0 trunk again!  
1217 2744d 18h werner / clean up repository - make 1.0 trunk again!  
1182 2890d 16h werner /branches/iland_regen/src/ Torus also effective for seed distribution
new output "SaplingDetails" (super high detail level of individual cohorts)
version information also in ilandc [move version.cpp to core]

[due to a sync problem with the SVN server, some revisions where lost: here they are:]
compiling ilandc

some code clean up - removed old code (sapling.cpp) for sapling trees and establishment.		  
1104 3032d 22h werner /branches/iland_regen/ Branch dedicated to playing around with establishment/regeneration.
Goals are:
(i) speed up
(ii) introduction of new features for Yellowstone		  
1066 3143d 22h werner /branches/port_qt5_64bit/src/ wind-bark-beetle interaction, now functional
fixed this annoyance of the mixed-up species order in the UI.		  
1064 3145d 17h werner /branches/port_qt5_64bit/src/ many changes. Most notably:
* improvements in the grass-cover sub Modules
* interaction between wind and bark beetle
* javascript function to extract seed-distribution-maps
* fixed a bug when continuous seed input was assumed		  
1061 3152d 16h werner /branches/port_qt5_64bit/src/ developinig ABE.
groundwork: creating STP options (i.e. pure JS-options of STPs that can be used in activities)
working on species specific targets for thinnings (involves a lot of thinking and fiddling with javascript)
added an option to include "shortcuts" to often-used functions (i.e. links in the GUI that directly call JS-functions).		  
1041 3283d 19h werner /branches/port_qt5_64bit/src/ improved visualization and "movie"-support. New JS functions to control the main visualization.  
893 3702d 16h werner /branches/port_qt5_64bit/src/ ABE ABE ABE ...  
837 3844d 20h 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"		  
802 3884d 00h werner /branches/port_qt5_64bit/ merge from trunk up to revision 801  
779 4016d 18h werner /branches/port_qt5_64bit/  
776 4087d 16h werner /trunk/src/ updated logic for starting/stopping the model (there actually was an error with infinite calling depth)  
671 4599d 19h werner /trunk/src/ Necessary changes for GPL licence (i.e. headers in all source files)  
652 4733d 13h 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.  
649 4739d 12h werner /trunk/src/ the fire module is growing functional, which actually means: the Interfaces/plugin/thingy is getting more stable ;)
Now the fire module can: calculate drought indices and even start a fire event.
Nice: the mechanism to push grids from the model to the GUI for means of visualization works like a charm.		  
647 4740d 16h werner /trunk/src/ setup a way how layered grids can be organized; it is a little bit complicated - but in the end it seems to work! (at least partially ;))  
646 4740d 20h 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		  
643 4747d 01h 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...		  
642 4747d 12h 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.		  
639 4760d 16h werner / move current content to the "trunk"  
634 4806d 17h werner /src/ iland movie maker  
632 4807d 17h werner /src/ bugfixes and improved writing of error messages  
596 4843d 23h werner /src/ painting of MapGrid from javascript; the call is tunneled through the ModelController.  
590 4857d 19h 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....  
514 4941d 19h werner /src/ added a species-selection drop down box for GUI visualization.  
498 4967d 15h werner /src/ fixed bug in stampcontainer that led to crashes when trees grew very very big.  
497 4967d 19h 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		  
493 4967d 22h 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		  
225 5343d 12h werner /src/ Run/Pause/Stop, etc. in ModelController.  
223 5347d 08h werner /src/ Model Pause, Model restart,etc. (wamod little hack)  
222 5347d 13h 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...		  
161 5364d 13h werner /src/ dynamic outputs (i.e. a list of value defined in xml project file)  
145 5369d 13h 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!		  
136 5371d 08h 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.		  
128 5373d 08h Werner /src/ Model Controller, iLand main window.  
105 5380d 06h 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()
...