*** empty log message ***

Numeric/gmshTermOfFormulation.h

@@ -10,6 +10,7 @@
 #include <map>
 #include <vector>
 #include "GmshMatrix.h"
+#include "gmshFunction.h"
 #include "gmshAssembler.h"
 #include "GModel.h"
 #include "MElement.h"
@@ -105,8 +106,9 @@ class gmshNodalFemTerm : public gmshTermOfFormulation<scalar> {
 		    gmshAssembler<scalar> &lsys)
   {
     std::vector<MVertex *> v;
-    _gm->getMeshVertices (physical, dim,v);
-    for (int i=0;i<v.size();i++)
+    GModel *m = gmshTermOfFormulation<scalar>::_gm;
+    m->getMeshVertices(physical, dim, v);
+    for (unsigned int i = 0; i < v.size(); i++)
       lsys.fixVertex(v[i], comp, field, e(v[i]->x(), v[i]->y(), v[i]->z()));
   }
   void addNeumann(int physical,
@@ -117,14 +119,15 @@ class gmshNodalFemTerm : public gmshTermOfFormulation<scalar> {
 		  gmshAssembler<scalar> &lsys)
   {
     std::map<int, std::vector<GEntity*> > groups[4];
-  _gm->getPhysicalGroups(groups);
+    GModel *m = gmshTermOfFormulation<scalar>::_gm;
+    m->getPhysicalGroups(groups);
     std::map<int, std::vector<GEntity*> >::iterator it = groups[dim].find(physical);  
     if (it == groups[dim].end()) return;
     double jac[3][3];
 
-  for (int i=0;i<it->second.size();++i){
+    for (unsigned int i = 0; i < it->second.size(); ++i){
       GEntity *ge = it->second[i];
-    for (int j=0; j<ge->getNumMeshElements();j++){
+      for (unsigned int j = 0; j < ge->getNumMeshElements(); j++){
         MElement *e = ge->getMeshElement(j);
         int integrationOrder = 2 * e->getPolynomialOrder();
         int nbNodes = e->getNumVertices();
@@ -154,6 +157,7 @@ class gmshNodalFemTerm : public gmshTermOfFormulation<scalar> {
         }
       }
     }
+  }
 };
 
 #endif