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 3149d 08h werner / public SVN  
/tags/release_1.0
/branches/release_1.0
1221 3149d 08h werner /branches/ public SVN  
/branches/release_1.0
/branches/version1.0
1220 3149d 08h werner /branches/version1.0/ Version 1.0  
/branches/version1.0
1218 3149d 10h werner / clean up repository - make 1.0 trunk again!  
/trunk
/iland_regen
1217 3149d 10h werner / clean up repository - make 1.0 trunk again!  
/iland_regen
/branches/iland_regen
1203 3179d 11h werner /branches/iland_regen/src/ added the missing "ActPlanting" functions for the "new" regeneration module.  
/branches/iland_regen/src/abe/actplanting.cpp
/branches/iland_regen/src/abe/actplanting.h
/branches/iland_regen/src/core/management.cpp
/branches/iland_regen/src/core/resourceunit.cpp
/branches/iland_regen/src/core/resourceunit.h
/branches/iland_regen/src/core/saplings.h
/branches/iland_regen/src/core/standloader.cpp
/branches/iland_regen/src/core/version.cpp
/branches/iland_regen/src/tools/mapgrid.cpp
/branches/iland_regen/src/tools/mapgrid.h
1162 3365d 14h werner /branches/iland_regen/src/ removed the old "mSaplings" from resource unit/model.
Open Issues:
* ActPlanting [init/remove of saplings]
* MapGrid: retrieve list of saplings
* testing of standloader		  
/branches/iland_regen/src/abe/actplanting.cpp
/branches/iland_regen/src/core/establishment.cpp
/branches/iland_regen/src/core/management.cpp
/branches/iland_regen/src/core/model.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/resourceunitspecies.h
/branches/iland_regen/src/core/sapling.cpp
/branches/iland_regen/src/core/saplings.cpp
/branches/iland_regen/src/core/saplings.h
/branches/iland_regen/src/core/species.cpp
/branches/iland_regen/src/core/species.h
/branches/iland_regen/src/core/standloader.cpp
/branches/iland_regen/src/iland/tests.cpp
/branches/iland_regen/src/output/saplingout.cpp
/branches/iland_regen/src/output/snapshot.cpp
/branches/iland_regen/src/plugins/fire/firemodule.cpp
/branches/iland_regen/src/plugins/wind/windmodule.cpp
/branches/iland_regen/src/tools/mapgrid.cpp
/branches/iland_regen/src/tools/mapgrid.h
1111 3429d 07h werner /branches/iland_regen/src/ first draft of the new "establishment"
added the "Saplings", the new container for establishment/sapling growth
some basic functionality is already there...		  
/branches/iland_regen/src/core/saplings.cpp
/branches/iland_regen/src/core/saplings.h
/branches/iland_regen/src/core/establishment.h
/branches/iland_regen/src/core/grid.h
/branches/iland_regen/src/core/management.cpp
/branches/iland_regen/src/core/model.cpp
/branches/iland_regen/src/core/model.h
/branches/iland_regen/src/core/resourceunitspecies.h
/branches/iland_regen/src/core/sapling.cpp
/branches/iland_regen/src/core/sapling.h
/branches/iland_regen/src/iland/iland.pro
/branches/iland_regen/src/iland/tests.cpp
/branches/iland_regen/src/output/snapshot.cpp
/branches/iland_regen/src/tools/mapgrid.cpp
/branches/iland_regen/src/tools/mapgrid.h
1104 3437d 14h 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
932 3967d 09h werner /branches/port_qt5_64bit/src/ worked on multithreading enabling for ABE;
created a class MapGridRULock that should serialize access --- found some minor bugs in the rest of the code, but finally I think that this locking-code is not strictly necessary since the treelists are *not* changed by management (i.e. a remove does not change the physical layout of the treelist and therefore does not invalidate any pointers to it). The unit-based approach for multithreading does reduce the chance of issues; there is a small chance of lost updates when updating the biomass pools of snags (i.e. if two trees (on two units) of the same resource unit die at the same time).		  
/branches/port_qt5_64bit/src/abe/actthinning.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.h
/branches/port_qt5_64bit/src/abe/fmunit.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/scheduler.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
914 4060d 05h werner /branches/port_qt5_64bit/src/ finish of the stand split thing
many other tweaks in ABE land.		  
/branches/port_qt5_64bit/src/abe/activity.cpp
/branches/port_qt5_64bit/src/abe/actplanting.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstand.h
/branches/port_qt5_64bit/src/abe/fmstp.cpp
/branches/port_qt5_64bit/src/abe/fmtreelist.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.h
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/core/management.cpp
/branches/port_qt5_64bit/src/core/management.h
/branches/port_qt5_64bit/src/iland/tests.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
911 4064d 18h werner /branches/port_qt5_64bit/src/ scheduling, update in planting  
/branches/port_qt5_64bit/src/abe/activity.h
/branches/port_qt5_64bit/src/abe/actplanting.cpp
/branches/port_qt5_64bit/src/abe/actplanting.h
/branches/port_qt5_64bit/src/abe/actsalvage.cpp
/branches/port_qt5_64bit/src/abe/actsalvage.h
/branches/port_qt5_64bit/src/abe/fmstand.cpp
/branches/port_qt5_64bit/src/abe/fmstp.cpp
/branches/port_qt5_64bit/src/abe/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/core/resourceunitspecies.h
/branches/port_qt5_64bit/src/core/sapling.cpp
/branches/port_qt5_64bit/src/core/sapling.h
/branches/port_qt5_64bit/src/core/standloader.cpp
/branches/port_qt5_64bit/src/tools/globalsettings.h
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
903 4076d 08h werner /branches/port_qt5_64bit/src/ working on AMIE - calculation of mean annual increment.  
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/amiegrid.cpp
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmunit.cpp
/branches/port_qt5_64bit/src/amie/fmunit.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/amie/forestmanagementengine.h
/branches/port_qt5_64bit/src/amie/scheduler.cpp
/branches/port_qt5_64bit/src/amie/scheduler.h
/branches/port_qt5_64bit/src/core/model.cpp
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/core/tree.h
/branches/port_qt5_64bit/src/plugins/fire/firemodule.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
885 4115d 07h werner /branches/port_qt5_64bit/src/ .... continuing.... ABE  
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/fmstand.cpp
/branches/port_qt5_64bit/src/amie/fmstand.h
/branches/port_qt5_64bit/src/amie/fmtreelist.cpp
/branches/port_qt5_64bit/src/amie/fmtreelist.h
/branches/port_qt5_64bit/src/amie/fomescript.cpp
/branches/port_qt5_64bit/src/amie/fomescript.h
/branches/port_qt5_64bit/src/apidoc/abe_doc.js
/branches/port_qt5_64bit/src/apidoc/treelist_doc.js
/branches/port_qt5_64bit/src/core/tree.h
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/tools/expressionwrapper.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
884 4116d 04h werner /branches/port_qt5_64bit/src/ working on the AMIE/ABE, whatever...  
/branches/port_qt5_64bit/src/amie/fmtreelist.cpp
/branches/port_qt5_64bit/src/amie/fmtreelist.h
/branches/port_qt5_64bit/src/apidoc/treelist_doc.js
/branches/port_qt5_64bit/src/amie/activity.cpp
/branches/port_qt5_64bit/src/amie/amie_global.h
/branches/port_qt5_64bit/src/amie/fmstp.cpp
/branches/port_qt5_64bit/src/amie/fmstp.h
/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/apidoc/abe_doc.js
/branches/port_qt5_64bit/src/core/tree.cpp
/branches/port_qt5_64bit/src/iland/iland.pro
/branches/port_qt5_64bit/src/iland/mainwindow.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
863 4214d 09h werner /branches/port_qt5_64bit/ renaming of the FOME to AMIE.
unfortunately, some partial merge of changes in Qt4-branch.		  
/branches/port_qt5_64bit/src/amie
/branches/port_qt5_64bit/src/fome
/branches/port_qt5_64bit
/branches/port_qt5_64bit/src/amie/fmunit.h
/branches/port_qt5_64bit/src/amie/forestmanagementengine.cpp
/branches/port_qt5_64bit/src/core/establishment.cpp
/branches/port_qt5_64bit/src/core/model.h
/branches/port_qt5_64bit/src/core/resourceunit.h
/branches/port_qt5_64bit/src/core/resourceunitspecies.cpp
/branches/port_qt5_64bit/src/core/resourceunitspecies.h
/branches/port_qt5_64bit/src/core/sapling.cpp
/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/tools/globalsettings.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
848 4248d 08h werner /branches/port_qt5_64bit/src/ advanced management functions for FUNDIV project
* create shapes (defined by mathematical functions) in stand grids
* filter not only based on boolean, but on continuous functions (0..1, values are seen as probabilities)		  
/branches/port_qt5_64bit/src/core/management.cpp
/branches/port_qt5_64bit/src/core/management.h
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
/branches/port_qt5_64bit/src/tools/scriptglobal.cpp
/branches/port_qt5_64bit/src/tools/scriptglobal.h
797 4291d 06h werner /branches/port_qt5_64bit/src/ added a function to MapGrid that extracts neighborhood relationships between polygons of the grid.  
/branches/port_qt5_64bit/src/core/grid.h
/branches/port_qt5_64bit/src/tools/mapgrid.cpp
/branches/port_qt5_64bit/src/tools/mapgrid.h
779 4421d 09h werner /branches/port_qt5_64bit/  
/branches/port_qt5_64bit
732 4867d 10h werner /trunk/src/ initialization of trees with given tree heights. The tree height data (e.g. Lidar data) is loaded from a GIS grid file.
some additional changes with painting different grids.
added also an option to use mapgrids without the 'spatial index' (e.g. for float grids on height grid resolution).		  
/trunk/src/core/climate.cpp
/trunk/src/core/standloader.cpp
/trunk/src/core/standloader.h
/trunk/src/iland/mainwindow.cpp
/trunk/src/iland/mainwindow.h
/trunk/src/iland/mainwindow.ui
/trunk/src/tools/mapgrid.cpp
/trunk/src/tools/mapgrid.h

←Prev12Next→

Show All