integer types in interface cleaned up, to reduce warnings related to...

integer types in interface cleaned up, to reduce warnings related to comparison between signed and unsigned integers

dune/foamgrid/foamgrid.hh

@@ -420,7 +420,7 @@ class FoamGrid :
 
           for(std::size_t i = 0; i < vertices.size(); i++)
           {
-            if(vertices[i] >= this->leafGridView().size(dimgrid))
+            if(int(vertices[i]) >= this->leafGridView().size(dimgrid))
             {
               // initialize with pointer to vertex in verticesToInsert_ vector, later overwrite with actual pointer
               auto vIt = verticesToInsert_.begin();

dune/foamgrid/foamgrid/foamgrid.cc

@@ -345,13 +345,13 @@ void Dune::FoamGrid<dimgrid, dimworld>::erasePointersToEntities(std::list<FoamGr
         father.sons_[i]=nullptr;
       // reset the number of sons for the father
       father.nSons_ = 0;
-      for (unsigned int i=0; i<father.corners(); i++)
+      for (int i=0; i<father.corners(); i++)
         if (father.vertex_[i]->sons_[0]!=nullptr && father.vertex_[i]->sons_[0]->willVanish_)
         {
           father.vertex_[i]->sons_[0]=nullptr;
           --father.vertex_[i]->nSons_;
         }
-      for (unsigned int i=0; i<father.corners(); i++)
+      for (int i=0; i<father.corners(); i++)
         if (father.facet_[i]->sons_[0]!=nullptr
             && father.facet_[i]->sons_[0]->willVanish_)
           for (unsigned int j=0; j<dimgrid; j++)
@@ -518,7 +518,7 @@ void Dune::FoamGrid<dimgrid, dimworld>::refineSimplexElement(FoamGridEntityImp<2
   std::size_t vertexIndex=0;
 
   // create copies of the vertices of the element
-  for(unsigned int c=0; c<element.corners(); ++c)
+  for(int c=0; c<element.corners(); ++c)
   {
     if(element.vertex_[c]->sons_[0]==nullptr){
       // Vertex doesn't exist yet on the next level
@@ -813,7 +813,7 @@ void Dune::FoamGrid<dimgrid, dimworld>::refineSimplexElement(FoamGridEntityImp<1
   std::size_t vertexIndex=0;
 
   // create copies of the vertices of the element
-  for(unsigned int c=0; c<element.corners(); ++c)
+  for(int c=0; c<element.corners(); ++c)
   {
     if(element.vertex_[c]->sons_[0]==nullptr){
       // Vertex doesn't exist yet on the next level
@@ -1099,7 +1099,7 @@ bool Dune::FoamGrid<dimgrid, dimworld>::grow()
         minElementLevel[&(*eIt)] = std::max(minElementLevel[&(*eIt)], minVertexLevel[*vIt]);
 
     // set the element level
-    const unsigned int level = std::max(minElementLevel[&(*eIt)], 0);
+    const int level = std::max(minElementLevel[&(*eIt)], 0);
     eIt->level_ = level;
 
     // set the vertex levels

dune/foamgrid/foamgrid/foamgridedge.hh

@@ -67,7 +67,7 @@ namespace Dune {
         }
 
         /** \brief Number of corners (==2) */
-        unsigned int corners() const {
+        int corners() const {
             return 2;
         }
 

dune/foamgrid/foamgrid/foamgridelements.hh

@@ -105,13 +105,13 @@ namespace Dune {
         }
 
         /** \brief Number of corners (==2) */
-        unsigned int corners() const {
+        int corners() const {
             return 2;
         }
 
         FieldVector<double, dimworld> corner(int i) const {
             assert(i < this->corners());
-            assert(vertex_.size()==this->corners());
+            assert(int(vertex_.size())==this->corners());
             assert(vertex_[i]!=nullptr);
             return vertex_[i]->pos_;
         }
@@ -206,7 +206,7 @@ namespace Dune {
         }
 
 
-        unsigned int corners() const {
+        int corners() const {
             return 3;
         }
 
@@ -365,4 +365,4 @@ namespace Dune {
     };
 }
 
-#endif
\ No newline at end of file
+#endif

dune/foamgrid/foamgrid/foamgridentity.hh

@@ -132,7 +132,7 @@ class FoamGridEntity :
         Geometry geometry () const
         {
             std::vector<FieldVector<double, dimworld> > coordinates(target_->corners());
-            for (std::size_t i=0; i<target_->corners(); i++)
+            for (int i=0; i<target_->corners(); i++)
                 coordinates[i] = target_->corner(i);
 
             return Geometry(FoamGridGeometry<dimgrid-codim, dimworld, GridImp>(target_->type(), coordinates));
@@ -250,7 +250,7 @@ class FoamGridEntity<0, 2, GridImp> :
         Geometry geometry () const
         {
             std::vector<FieldVector<double, dimworld> > coordinates(target_->corners());
-            for (std::size_t i=0; i<target_->corners(); i++)
+            for (int i=0; i<target_->corners(); i++)
                 coordinates[i] = target_->vertex_[i]->pos_;
 
             return Geometry(FoamGridGeometry<dimgrid, dimworld, const GridImp>(target_->type(), coordinates));
@@ -568,7 +568,7 @@ class FoamGridEntity<0, 1, GridImp> :
         Geometry geometry () const
         {
             std::vector<FieldVector<double, dimworld> > coordinates(target_->corners());
-            for (std::size_t i=0; i<target_->corners(); i++)
+            for (int i=0; i<target_->corners(); i++)
                 coordinates[i] = target_->corner(i);
 
             return Geometry(FoamGridGeometry<dimgrid, dimworld, const GridImp>(target_->type(), coordinates));

dune/foamgrid/foamgrid/foamgridintersectioniterators.hh

@@ -251,7 +251,7 @@ class FoamGridLevelIntersectionIterator
     //! \brief Constructor for a given grid entity and a given neighbor
     //! \param center Pointer to the element where the iterator was created.
     //! \param facet The index of the facet to start the investigation.
-    FoamGridLevelIntersectionIterator(const FoamGridEntityImp<dimgrid, dimgrid, dimworld>* center, std::size_t facet)
+    FoamGridLevelIntersectionIterator(const FoamGridEntityImp<dimgrid, dimgrid, dimworld>* center, int facet)
         : intersection_(FoamGridLevelIntersection<GridImp>(center,facet))
     {
         if(facet==center->corners())

dune/foamgrid/foamgrid/foamgridintersections.hh

@@ -68,7 +68,7 @@ class FoamGridIntersection
      * \param facet The index of the facet this intersection lives on.
      */
     FoamGridIntersection(const FoamGridEntityImp<dimgrid, dimgrid, dimworld>* center,
-                         std::size_t facet)
+                         int facet)
         : center_(center), facetIndex_(facet), neighbor_(FoamGridNullIteratorFactory<dimgrid, dimworld>::null())
     {}
 
@@ -334,7 +334,7 @@ public:
             = Dune::ReferenceElements<double, dimgrid>::general((*this->neighbor_)->type());
 
         for (std::size_t j=0; j<dimgrid; j++)
-          for (std::size_t i=0; i<refElementOther.size(dimgrid); i++)
+          for (int i=0; i<refElementOther.size(dimgrid); i++)
              if (vtx[j] == (*this->neighbor_)->vertex_[refElementOther.subEntity(0, 0, i, dimgrid)])
               coordinates[j] = refElement.position(refElement.subEntity(0, 0, i, dimgrid), dimgrid);
 

dune/foamgrid/foamgrid/foamgridvertex.hh

@@ -19,7 +19,7 @@ namespace Dune {
             : level_(level), id_(id), willVanish_()
         {}
 
-        unsigned int level() const {
+        int level() const {
             return level_;
         }
 
@@ -83,7 +83,7 @@ namespace Dune {
         }
 
         /** \brief Number of corners (==1) */
-        unsigned int corners() const {
+        int corners() const {
             return 1;
         }
 

dune/foamgrid/test/growth-test-1d.cc

@@ -397,7 +397,7 @@ int main (int argc, char *argv[])
     writer.write("after_second_growth_1d2d");
     Dune::gridinfo(*grid1d);
     checkIndexSet(*grid1d, grid1d->leafGridView(), std::cout);
-    for (std::size_t i = 0; i < grid1d->maxLevel(); ++i)
+    for (int i = 0; i < grid1d->maxLevel(); ++i)
         checkIndexSet(*grid1d, grid1d->levelGridView(i), std::cout);
 
     // do a grid check on a refined grid
@@ -445,7 +445,7 @@ int main (int argc, char *argv[])
     writer2.write("after_second_growth_1d3d");
     Dune::gridinfo(*grid1d3d);
     checkIndexSet(*grid1d3d, grid1d3d->leafGridView(), std::cout);
-    for (std::size_t i = 0; i < grid1d3d->maxLevel(); ++i)
+    for (int i = 0; i < grid1d3d->maxLevel(); ++i)
         checkIndexSet(*grid1d3d, grid1d3d->levelGridView(i), std::cout);
 
     // do a grid check on a refined grid

dune/foamgrid/test/growth-test-2d.cc

@@ -165,7 +165,7 @@ int main (int argc, char *argv[])
     writer.write("after_removal");
     Dune::gridinfo(*grid);
     checkIndexSet(*grid, grid->leafGridView(), std::cout);
-    for (std::size_t i = 0; i < grid->maxLevel(); ++i)
+    for (int i = 0; i < grid->maxLevel(); ++i)
         checkIndexSet(*grid, grid->levelGridView(i), std::cout);
 
     // add an element unrelated to the rest of the grid
@@ -179,7 +179,7 @@ int main (int argc, char *argv[])
     writer.write("add_unrelated_element");
     Dune::gridinfo(*grid);
     checkIndexSet(*grid, grid->leafGridView(), std::cout);
-    for (std::size_t i = 0; i < grid->maxLevel(); ++i)
+    for (int i = 0; i < grid->maxLevel(); ++i)
       checkIndexSet(*grid, grid->levelGridView(i), std::cout);
 
     // call growth without adding anything