WebSVN - public iLand - Diff - Rev 1158 and 1159

+}
 void Saplings::setup()
+{
-    mGrid.setup(GlobalSettings::instance()->model()->grid()->metricRect(), GlobalSettings::instance()->model()->grid()->cellsize());
+    //mGrid.setup(GlobalSettings::instance()->model()->grid()->metricRect(), GlobalSettings::instance()->model()->grid()->cellsize());
+    FloatGrid *lif_grid = GlobalSettings::instance()->model()->grid();
     // mask out out-of-project areas
     HeightGrid *hg = GlobalSettings::instance()->model()->heightGrid();
-    for (int i=0;i<mGrid.count();++i) {
+    for (int i=0; i<lif_grid->count(); ++i) {
+        SaplingCell *s = cell(lif_grid->indexOf(i), false); // false: retrieve also invalid cells
+        if (s) {
-        if (!hg->valueAtIndex(mGrid.index5(i)).isValid())
+            if (!hg->valueAtIndex(lif_grid->index5(i)).isValid())
-            mGrid[i].state = SaplingCell::CellInvalid;
+                s->state = SaplingCell::CellInvalid;
-        else
+            else
-            mGrid[i].state = SaplingCell::CellFree;
+                s->state = SaplingCell::CellFree;
+        }
+    }
+}
 void Saplings::establishment(const ResourceUnit *ru)
+{
         double abiotic_env = rus->establishment().abioticEnvironment();
         if (abiotic_env==0.)
             continue;
         // loop over all 2m cells on this resource unit
+        SaplingCell *sap_cells = ru->saplingCellArray();
         SaplingCell *s;
         int isc = 0; // index on 2m cell
         for (int iy=0; iy<cPxPerRU; ++iy) {
-            s = mGrid.ptr(imap.x(), imap.y()+iy); // ptr to the row
+            //s = mGrid.ptr(imap.x(), imap.y()+iy); // ptr to the row
+            s = &sap_cells[iy*cPxPerRU]; // pointer to a row
-            isc = mGrid.index(imap.x(), imap.y()+iy);
+            isc = lif_grid->index(imap.x(), imap.y()+iy);
             for (int ix=0;ix<cPxPerRU; ++ix, ++s, ++isc) {
                 if (s->state == SaplingCell::CellFree) {
                     // is a sapling of the current species already on the pixel?
                     // * test for sapling height already in cell state
+                        }
+                    }
                     if (stree) {
                         // grass cover?
-                        float seed_map_value = seedmap[mGrid.index10(isc)];
+                        float seed_map_value = seedmap[lif_grid->index10(isc)];
                         if (seed_map_value==0.f)
                             continue;
-                        const HeightGridValue &hgv = (*height_grid)[mGrid.index5(isc)];
+                        const HeightGridValue &hgv = (*height_grid)[lif_grid->index5(isc)];
                         float lif_value = (*lif_grid)[isc];
                         double &lif_corrected = lif_corr[iy*cPxPerRU+ix];
                         // calculate the LIFcorrected only once per pixel
                         if (lif_corrected<0.)
 void Saplings::saplingGrowth(const ResourceUnit *ru)
+{
     HeightGrid *height_grid = GlobalSettings::instance()->model()->heightGrid();
     FloatGrid *lif_grid = GlobalSettings::instance()->model()->grid();
-    QPoint imap =  mGrid.indexAt(ru->boundingBox().topLeft());
+    QPoint imap = ru->cornerPointOffset();
     bool need_check=false;
+    SaplingCell *sap_cells = ru->saplingCellArray();
     for (int iy=0; iy<cPxPerRU; ++iy) {
-        SaplingCell *s = mGrid.ptr(imap.x(), imap.y()+iy); // ptr to the row
+        //SaplingCell *s = mGrid.ptr(imap.x(), imap.y()+iy); // ptr to the row
+        SaplingCell *s = &sap_cells[iy*cPxPerRU]; // ptr to row
-        int isc = mGrid.index(imap.x(), imap.y()+iy);
+        int isc = lif_grid->index(imap.x(), imap.y()+iy);
         for (int ix=0;ix<cPxPerRU; ++ix, ++s, ++isc) {
             if (s->state != SaplingCell::CellInvalid) {
                 need_check=false;
                 for (int i=0;i<NSAPCELLS;++i) {
                     if (s->saplings[i].is_occupied()) {
                         // growth of this sapling tree
                         const HeightGridValue &hgv = (*height_grid)[height_grid->index5(isc)];
                         float lif_value = (*lif_grid)[isc];
-                        need_check |= growSapling(ru, s->saplings[i], isc, hgv.height, lif_value);
+                        need_check |= growSapling(ru, *s, s->saplings[i], isc, hgv.height, lif_value);
+                    }
+                }
                 if (need_check)
                     s->checkState();
+            }
     // store statistics on saplings/regeneration
     for (QList<ResourceUnitSpecies*>::const_iterator i=ru->ruSpecies().constBegin(); i!=ru->ruSpecies().constEnd(); ++i) {
         (*i)->saplingStat().calculate((*i)->species(), const_cast<ResourceUnit*>(ru));
         (*i)->statistics().add(&((*i)->saplingStat()));
+    }
+}
+SaplingCell *Saplings::cell(QPoint lif_coords, bool only_valid)
+{
+    FloatGrid *lif_grid = GlobalSettings::instance()->model()->grid();
+    // in this case, getting the actual cell is quite cumbersome: first, retrieve the resource unit, then the
+    // cell based on the offset of the given coordiantes relative to the corner of the resource unit.
+    ResourceUnit *ru = GlobalSettings::instance()->model()->ru(lif_grid->cellCenterPoint(lif_coords));
+    // ResourceUnit *ru = GlobalSettings::instance()->model()->RUgrid().constValueAt(lif_grid->cellCenterPoint(lif_coords));
+    if (ru) {
+        QPoint local_coords = lif_coords - ru->cornerPointOffset();
+        int idx = local_coords.y() * cPxPerRU + local_coords.x();
+        DBGMODE( if (idx<0 || idx>=cPxPerHectare)
+                 qDebug("invalid coords in Saplings::cell");
+                    );
+        SaplingCell *s=&ru->saplingCellArray()[idx];
+        if (s && (!only_valid || s->state!=SaplingCell::CellInvalid))
+            return s;
+    }
+    return 0;
+}
 void Saplings::updateBrowsingPressure()
+{
     if (GlobalSettings::instance()->settings().valueBool("model.settings.browsing.enabled"))
         Saplings::mBrowsingPressure = GlobalSettings::instance()->settings().valueDouble("model.settings.browsing.browsingPressure");
     else
         Saplings::mBrowsingPressure = 0.;
+}
-bool Saplings::growSapling(const ResourceUnit *ru, SaplingTree &tree, int isc, float dom_height, float lif_value)
+bool Saplings::growSapling(const ResourceUnit *ru, SaplingCell &scell, SaplingTree &tree, int isc, float dom_height, float lif_value)
+{
     ResourceUnitSpecies *rus = const_cast<ResourceUnitSpecies*>(ru->ruSpecies()[tree.species_index]);
     const Species *species = rus->species();
     // (1) calculate height growth potential for the tree (uses linerization of expressions...)
         // add a new tree
         for (int i=0;i<to_establish;i++) {
             Tree &bigtree = const_cast<ResourceUnit*>(ru)->newTree();
-            bigtree.setPosition(mGrid.indexOf(isc));
+            bigtree.setPosition(GlobalSettings::instance()->model()->grid()->indexOf(isc));
             // add variation: add +/-10% to dbh and *independently* to height.
             bigtree.setDbh(static_cast<float>(dbh * nrandom(1. - mRecruitmentVariation, 1. + mRecruitmentVariation)));
             bigtree.setHeight(static_cast<float>(tree.height * nrandom(1. - mRecruitmentVariation, 1. + mRecruitmentVariation)));
             bigtree.setSpecies( const_cast<Species*>(species) );
             bigtree.setAge(tree.age,tree.height);
             const Tree *t = &bigtree;
             const_cast<ResourceUnitSpecies*>(rus)->statistics().add(t, 0); // count the newly created trees already in the stats
+        }
         // clear all regeneration from this pixel (including this tree)
         tree.clear(); // clear this tree (no carbon flow to the ground)
-        SaplingCell &s=mGrid[isc];
         for (int i=0;i<NSAPCELLS;++i) {
-            if (s.saplings[i].is_occupied()) {
+            if (scell.saplings[i].is_occupied()) {
                 // add carbon to the ground
-                rus->saplingStat().addCarbonOfDeadSapling( s.saplings[i].height / species->saplingGrowthParameters().hdSapling * 100.f );
+                rus->saplingStat().addCarbonOfDeadSapling( scell.saplings[i].height / species->saplingGrowthParameters().hdSapling * 100.f );
-                s.saplings[i].clear();
+                scell.saplings[i].clear();
+            }
+        }
         return true; // need cleanup
+    }
     // book keeping (only for survivors) for the sapling of the resource unit / species

Subversion Repositories public iLand

(root)/src/core/saplings.cpp @ 1222 - Rev 1158 → 1159