add func

NonLinearSolver/modelReduction/ANNUtils.cpp

@@ -26,7 +26,7 @@ activationFunction* activationFunction::createActivationFunction(const char what
   else if (strcmp(what, "rectifier")==0)
   {
     Msg::Info("create RectifierActivationFunction");
-    return new RectifierActivationFunction();
+    return new RectifierActivationFunction(10.);
   }
   else if (strcmp(what, "linear")==0)
   {

NonLinearSolver/modelReduction/ANNUtils.h

@@ -60,14 +60,16 @@ class SquareActivationFunction: public activationFunction
 
 class RectifierActivationFunction: public activationFunction
 {
+  protected:
+    double _fact;
   public:
-    RectifierActivationFunction(){}
+    RectifierActivationFunction(double f=10.): activationFunction(),_fact(f){}
     RectifierActivationFunction(const RectifierActivationFunction& src): activationFunction(src){}
     virtual ~RectifierActivationFunction(){}
     virtual activationFunction::functionType getType() const {return activationFunction::rectifier;};
     virtual std::string getName() const {return "rectifier";};
-    virtual double getVal(double x) const  {return (log(1.+exp(10.*x)))/10.;};
-    virtual double getDiff(double x) const {return exp(10.*x)/(1.+exp(10.*x));};
+    virtual double getVal(double x) const  {return (log(1.+exp(_fact*x)))/_fact;};
+    virtual double getDiff(double x) const {return exp(_fact*x)/(1.+exp(_fact*x));};
     virtual activationFunction* clone() const {return new RectifierActivationFunction(*this);};
 };
 

NonLinearSolver/nlsolver/meshModification.cpp

@@ -149,7 +149,11 @@ void makePhysicalByBox::write_MSH2(const std::map<int, elementGroup>& gMap,  con
 bool makePhysicalByBox::box::inBox(MElement* ele) const
 {
   SPoint3 P = ele->barycenter();
-  if ( (P.x() >=xmin)&& (P.x()<=xmax) && (P.y() >=ymin)&& (P.y()<=ymax))
+  SPoint3 Pc;
+  Pc[0] = 0.5*(xmax+xmin);
+  Pc[1] = 0.5*(ymax+ymin);
+  Pc[2] = 0.;
+  if ((P.distance(Pc) < r) && ( (P.x() >=xmin)&& (P.x()<=xmax) && (P.y() >=ymin)&& (P.y()<=ymax)))
   {
     return true;
   }
@@ -173,6 +177,7 @@ void makePhysicalByBox::run(const std::string inputMeshFile, const std::string o
     {
       allBox.emplace_back();
       box& b = allBox.back();
+      b.r = 0.3*std::min(dx,dy);
       b.xmin = xmin+i*dx;
       b.xmax = xmin+(i+1)*dx;
       b.ymin = ymin+j*dy;
@@ -193,21 +198,29 @@ void makePhysicalByBox::run(const std::string inputMeshFile, const std::string o
   std::map<int, std::vector<GEntity*> > &entmap = groups[dim];
 
   std::map<int, elementGroup> allG;
+  int boxSize = allBox.size();
   for (std::map<int, std::vector<GEntity*> >::iterator it = entmap.begin(); it!= entmap.end(); it++){
     std::vector<GEntity*> &ent = it->second;
     for (unsigned int i = 0; i < ent.size(); i++){
       for (unsigned int j = 0; j < ent[i]->getNumMeshElements(); j++){
         MElement *e = ent[i]->getMeshElement(j);
+        bool found = false;
         for (int num=0; num < allBox.size(); num++)
         {
           box& b = allBox[num];
           if (b.inBox(e))
           {
-            elementGroup& gr = allG[num];
+            elementGroup& gr = allG[1];
             gr.insert(e);
+            found = true;
             break;
           }
         }
+        if (!found)
+        {
+          elementGroup& gr = allG[boxSize];
+          gr.insert(e);
+        }
       }
     }
   }

NonLinearSolver/nlsolver/meshModification.h

@@ -93,7 +93,8 @@ class makePhysicalByBox
     {
       public:
         double xmin, xmax, ymin, ymax;
-        box():xmin(0.),xmax(0.),ymin(0.),ymax(0.){}
+        double r; //
+        box():xmin(0.),xmax(0.),ymin(0.),ymax(0.), r(0.){}
         ~box(){}
         bool inBox(MElement* ele) const;
         void printData() const