Changed: Explicit nodal constraints and whole patch constraints

are now handled by SIMbase::addConstraint() which then is used
in the SIM[123]D methods removing the code duplications there.
SIMsupel then no longer needs to override this method to work.

Author: kmokstad

src/SIM/SIM1D.C

@@ -489,49 +489,30 @@ bool SIM1D::addConstraint (int patch, int lndx, int ldim, int dirs, int code,
 
   if (lndx < -10) lndx += 10; // no projection in 1D
 
-  IFEM::cout <<"\tConstraining P"<< patch;
-  if (ldim == 0)
-    IFEM::cout << " V"<< abs(lndx);
-  IFEM::cout <<" in direction(s) "<< dirs;
-  if (code != 0) IFEM::cout <<" code = "<< code;
-#if SP_DEBUG > 1
-  std::cout << std::endl;
-#endif
+  if (this->SIMbase::addConstraint(patch,lndx,ldim,dirs,code,ngnod,1,ovrD))
+    return true;
 
   // Must dynamic cast here, since ASM1D is not derived from ASMbase
   ASM1D* pch = dynamic_cast<ASM1D*>(myModel[patch-1]);
   if (!pch) return error("1D patch",patch);
 
-  switch (ldim)
-    {
-    case 0: // Vertex constraints
-      switch (lndx)
-        {
-        case  1: pch->constrainNode(0.0,dirs,code); break;
-        case  2: pch->constrainNode(1.0,dirs,code); break;
-        case -1:
-          ngnod += pch->constrainEndLocal(0,dirs,code);
-          break;
-        case -2:
-          ngnod += pch->constrainEndLocal(1,dirs,code);
-          break;
-        default:
-          return error("vertex index",lndx,true);
-        }
-      break;
-
-    case 1: // Curve constraint
-      myModel[patch-1]->constrainPatch(dirs,code);
-      break;
-
-    case 4: // Explicit nodal constraints
-      myModel[patch-1]->constrainNodes(myModel[patch-1]->getNodeSet(lndx),
-                                       dirs,code,ovrD);
-      break;
+  if (ldim == 0) // Vertex constraints
+    switch (lndx)
+      {
+      case  1: pch->constrainNode(0.0,dirs,code); break;
+      case  2: pch->constrainNode(1.0,dirs,code); break;
+      case -1:
+        ngnod += pch->constrainEndLocal(0,dirs,code);
+        break;
+      case -2:
+        ngnod += pch->constrainEndLocal(1,dirs,code);
+        break;
+      default:
+        return error("vertex index",lndx,true);
+      }
 
-    default:
-      return error("local dimension switch",ldim,true);
-    }
+  else
+    return error("local dimension switch",ldim,true);
 
   return true;
 }

src/SIM/SIM2D.C

@@ -704,21 +704,14 @@ bool SIM2D::addConstraint (int patch, int lndx, int ldim, int dirs, int code,
   if (patch < 1 || patch > (int)myModel.size())
     return error("patch index",patch);
 
+  if (this->SIMbase::addConstraint(patch,lndx,abs(ldim),dirs,code,
+                                   ngnod,basis,ovrD))
+    return true;
+
   bool open = ldim < 0; // open means without its end points
   bool project = lndx < -10;
   if (project) lndx += 10;
 
-  IFEM::cout <<"\tConstraining P"<< patch;
-  if (abs(ldim) < 2)
-    IFEM::cout << (ldim == 0 ? " V" : " E") << abs(lndx);
-  IFEM::cout <<" in direction(s) "<< dirs;
-  if (lndx < 0) IFEM::cout << (project ? " (local projected)" : " (local)");
-  if (code != 0) IFEM::cout <<" code = "<< abs(code);
-  if (basis > 1) IFEM::cout <<" basis = "<< (int)basis;
-#if SP_DEBUG > 1
-  std::cout << std::endl;
-#endif
-
   // Must dynamic cast here, since ASM2D is not derived from ASMbase
   ASM2D* pch = dynamic_cast<ASM2D*>(myModel[patch-1]);
   if (!pch) return error("2D patch",patch);
@@ -760,15 +753,6 @@ bool SIM2D::addConstraint (int patch, int lndx, int ldim, int dirs, int code,
 	}
       break;
 
-    case 2: // Face constraints
-      myModel[patch-1]->constrainPatch(dirs,code);
-      break;
-
-    case 4: // Explicit nodal constraints
-      myModel[patch-1]->constrainNodes(myModel[patch-1]->getNodeSet(lndx),
-				       dirs,code,ovrD);
-      break;
-
     default:
       return error("local dimension switch",ldim,true);
     }

src/SIM/SIM3D.C

@@ -580,22 +580,14 @@ bool SIM3D::addConstraint (int patch, int lndx, int ldim, int dirs, int code,
     return error("patch index",patch);
 
   int aldim = abs(ldim);
+  if (this->SIMbase::addConstraint(patch,lndx,aldim,dirs,code,ngnod,basis,ovrD))
+    return true;
+
   bool open = ldim < 0; // open means without face edges or edge ends
   bool project = lndx < -10;
   if (project) lndx += 10;
   if (lndx < 0 && aldim > 3) aldim = 2; // local tangent direction is indicated
 
-  IFEM::cout <<"\tConstraining P"<< patch;
-  if (aldim < 3)
-    IFEM::cout << (ldim == 0 ? " V" : (aldim == 1 ? " E" : " F")) << lndx;
-  IFEM::cout <<" in direction(s) "<< dirs;
-  if (lndx < 0) IFEM::cout << (project ? " (local projected)" : " (local)");
-  if (code != 0) IFEM::cout <<" code = "<< abs(code);
-  if (basis > 1) IFEM::cout <<" basis = "<< (int)basis;
-#if SP_DEBUG > 1
-  std::cout << std::endl;
-#endif
-
   // Must dynamic cast here, since ASM3D is not derived from ASMbase
   ASM3D* pch = dynamic_cast<ASM3D*>(myModel[patch-1]);
   if (!pch) return error("3D patch",patch);
@@ -656,15 +648,6 @@ bool SIM3D::addConstraint (int patch, int lndx, int ldim, int dirs, int code,
         }
       break;
 
-    case 3: // Volume constraints
-      myModel[patch-1]->constrainPatch(dirs,code);
-      break;
-
-    case 4: // Explicit nodal constraints
-      myModel[patch-1]->constrainNodes(myModel[patch-1]->getNodeSet(lndx),
-                                       dirs,code,ovrD);
-      break;
-
     default:
       return error("local dimension switch",ldim,true);
     }

src/SIM/SIMbase.C

@@ -414,6 +414,45 @@ bool SIMbase::preprocess (const IntVec& ignored, bool fixDup)
 }
 
 
+bool SIMbase::addConstraint (int patch, int lndx, int ldim, int dirs, int code,
+                             int& ngnod, char basis, bool ovrD)
+{
+  if (patch < 1 || patch > static_cast<int>(myModel.size()))
+  {
+    std::cerr <<" *** SIMbase::addConstraint: Invalid patch index ("<< patch
+              <<")."<< std::endl;
+    return false;
+  }
+
+  const int numdim = this->getNoParamDim();
+  const bool doProject = lndx < -10;
+  if (doProject) lndx += 10;
+  if (lndx < 0 && numdim == 3 && ldim > 3)
+    ldim = 2; // local tangent direction is indicated
+
+  IFEM::cout <<"\tConstraining P"<< patch;
+  if (ldim >= 0 && ldim < numdim)
+    IFEM::cout << (ldim == 0 ? " V" : (ldim == 1 ? " E" : " F")) << abs(lndx);
+  IFEM::cout <<" in direction(s) "<< dirs;
+  if (lndx < 0)  IFEM::cout << (doProject ? " (local projected)" : " (local)");
+  if (code != 0) IFEM::cout <<" code = "<< abs(code);
+  if (basis > 1) IFEM::cout <<" basis = "<< static_cast<int>(basis);
+#if SP_DEBUG > 1
+  std::cout << std::endl;
+#endif
+
+  if (ldim == numdim) // Constrain the whole patch (all control/nodal points)
+    myModel[patch-1]->constrainPatch(dirs,code);
+  else if (ldim == 4) // Explicit nodal constraints
+    myModel[patch-1]->constrainNodes(myModel[patch-1]->getNodeSet(lndx),
+                                     dirs,code,ovrD);
+  else
+    return false;
+
+  return true;
+}
+
+
 bool SIMbase::merge (SIMbase* that, const std::map<int,int>* old2new, int poff)
 {
   if (this == that)

src/SIM/SIMbase.h

@@ -86,8 +86,7 @@ class SIMbase : public SIMadmin, public SIMdependency
   bool readModel(const char* fileName);
 
   //! \brief Creates the computational FEM model from the spline patches.
-  //! \param[in] resetNumb If \e 'y', start element and node numbers from zero
-  virtual bool createFEMmodel(char resetNumb = 'y') = 0;
+  virtual bool createFEMmodel(char resetNumb) = 0;
 
   //! \brief Initializes the property containers of the model.
   //! \details Use this method to clear the model before re-reading
@@ -619,7 +618,7 @@ class SIMbase : public SIMadmin, public SIMdependency
   //! \param[in] basis Which basis to apply the constraint to (mixed methods)
   //! \param[in] ovrD If \e true, override conflicting Dirichlet conditions
   virtual bool addConstraint(int patch, int lndx, int ldim, int dirs, int code,
-                             int& ngnod, char basis = 1, bool ovrD = false) = 0;
+                             int& ngnod, char basis = 1, bool ovrD = false);
 
   //! \brief Preprocessing performed before the FEM model generation.
   virtual void preprocessA() {}

src/SIM/SIMdummy.h

@@ -50,9 +50,6 @@ template<class Base> class SIMdummy : public Base
   //! \brief Parses a dimension-specific subelement of the \a geometry XML-tag.
   virtual bool parseGeometryDimTag(const tinyxml2::XMLElement*)
   { return false; }
-  //! \brief Preprocesses a user-defined Dirichlet boundary property.
-  virtual bool addConstraint(int,int,int,int,int,int&,char,bool)
-  { return false; }
   //! \brief Preprocesses the result sampling points.
   virtual void preprocessResultPoints() {}
   //! \brief Creates a model generator.