Master

NonLinearSolver/BoundaryConditions/nonLinearBC.h

@@ -202,30 +202,9 @@ class nonLinearSameDisplacementBC: public nonLinearBoundaryCondition{
 		}
 };
 
-class nonLinearSameDisplacementBCBetweenTwoGroups : public nonLinearBoundaryCondition{
-public:
-  int comp;
-  elementGroup* g1, *g2; // two pbc group
-  int phys1, phys2;
-  
-  virtual nonLinearBoundaryCondition::type getType() const {return nonLinearBoundaryCondition::PERIODIC;}
-  nonLinearSameDisplacementBCBetweenTwoGroups():nonLinearBoundaryCondition(),comp(0),g1(NULL),g2(NULL){};
-  nonLinearSameDisplacementBCBetweenTwoGroups(const nonLinearSameDisplacementBCBetweenTwoGroups& src) : nonLinearBoundaryCondition(src){
-   this->comp = src.comp;
-   this->g1 = src.g1;
-   this->g2 = src.g2;
-   this->phys1 = src.phys1;
-   this->phys2 = src.phys2;
-  }
-  virtual ~nonLinearSameDisplacementBCBetweenTwoGroups(){
-		if (g1!=NULL){delete g1; g1 = NULL;}
-		if (g2!=NULL){delete g2; g2 = NULL;};
-	}
-};
-
 class nonLinearPeriodicBCBetweenTwoGroups : public nonLinearBoundaryCondition{
  public:
-  int comp;
+  std::vector<int> comp;
 	MVertex* v1, *v2; // two root vertices
   elementGroup* g1, *g2; // two pbc group
   int phys1, phys2;
@@ -234,7 +213,7 @@ class nonLinearPeriodicBCBetweenTwoGroups : public nonLinearBoundaryCondition{
 	std::pair<Dof,Dof>* rootDofs;
 
   virtual nonLinearBoundaryCondition::type getType() const {return nonLinearBoundaryCondition::PERIODIC;}
-  nonLinearPeriodicBCBetweenTwoGroups():nonLinearBoundaryCondition(),comp(0),g1(NULL),g2(NULL),dofMap(),v1(NULL),v2(NULL),rootDofs(NULL){};
+  nonLinearPeriodicBCBetweenTwoGroups():nonLinearBoundaryCondition(),comp(),g1(NULL),g2(NULL),dofMap(),v1(NULL),v2(NULL),rootDofs(NULL){};
   nonLinearPeriodicBCBetweenTwoGroups(const nonLinearPeriodicBCBetweenTwoGroups& src) : nonLinearBoundaryCondition(src){
    this->comp = src.comp;
    this->g1 = src.g1;
@@ -297,14 +276,14 @@ class nonLinearLinearConstraintBCBetweenTwoGroups : public nonLinearBoundaryCond
 
 class nonLinearAveragePeriodicBCBetweenTwoGroups : public nonLinearBoundaryCondition{
  public:
-  int comp;
+  std::vector<int> comp;
 	MVertex* v1, *v2; // two root vertices
   elementGroup* g1, *g2; // two pbc group
   int phys1, phys2;
   int physVer1, physVer2;
 
   virtual nonLinearBoundaryCondition::type getType() const {return nonLinearBoundaryCondition::PERIODIC;}
-  nonLinearAveragePeriodicBCBetweenTwoGroups():nonLinearBoundaryCondition(),comp(0),g1(NULL),g2(NULL),v1(NULL),v2(NULL){};
+  nonLinearAveragePeriodicBCBetweenTwoGroups():nonLinearBoundaryCondition(),comp(),g1(NULL),g2(NULL),v1(NULL),v2(NULL){};
   nonLinearAveragePeriodicBCBetweenTwoGroups(const nonLinearAveragePeriodicBCBetweenTwoGroups& src) : nonLinearBoundaryCondition(src){
    this->comp = src.comp;
    this->g1 = src.g1;