Merge pull request #416 from mhscott/fbcSubdivide

Static allocation of subdivide arrays
zhuminjie · Aug 8, 2020 · 8c2fb29 · 8c2fb29
2 parents 126a388 + 5c971ec
commit 8c2fb29
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 134 deletions.
diff --git a/SRC/element/forceBeamColumn/ForceBeamColumn2d.cpp b/SRC/element/forceBeamColumn/ForceBeamColumn2d.cpp
@@ -423,17 +423,6 @@ ForceBeamColumn2d::ForceBeamColumn2d():
 
   theNodes[0] = 0;  
   theNodes[1] = 0;
-
-  //  if (vsSubdivide == 0)
-  //  vsSubdivide  = new Vector [maxNumSections];
-  //if (fsSubdivide == 0)
-  //  fsSubdivide  = new Matrix [maxNumSections];
-  //if (SsrSubdivide == 0)
-  //  SsrSubdivide  = new Vector [maxNumSections];
-  //if (!vsSubdivide || !fsSubdivide || !SsrSubdivide) {
-  //  opserr << "ForceBeamColumn2d::ForceBeamColumn2d() -- failed to allocate Subdivide arrays";   
-  //  exit(-1);
-  //}
 }
 
 // constructor which takes the unique element tag, sections,
@@ -476,17 +465,6 @@ ForceBeamColumn2d::ForceBeamColumn2d (int tag, int nodeI, int nodeJ,
   }
 
   this->setSectionPointers(numSec, sec);
-
-  //if (vsSubdivide == 0)
-  //  vsSubdivide  = new Vector [maxNumSections];
-  //if (fsSubdivide == 0)
-  //  fsSubdivide  = new Matrix [maxNumSections];
-  //if (SsrSubdivide == 0)
-  //  SsrSubdivide  = new Vector [maxNumSections];
-  //if (!vsSubdivide || !fsSubdivide || !SsrSubdivide) {
-  //  opserr << "ForceBeamColumn2d::ForceBeamColumn2d() -- failed to allocate Subdivide arrays";   
-  //  exit(-1);
-  //}
 }
 
 // ~ForceBeamColumn2d():

diff --git a/SRC/element/forceBeamColumn/ForceBeamColumn2dThermal.cpp b/SRC/element/forceBeamColumn/ForceBeamColumn2dThermal.cpp
@@ -87,9 +87,9 @@ Matrix ForceBeamColumn2dThermal::theMatrix(6,6);
 Vector ForceBeamColumn2dThermal::theVector(6);
 double ForceBeamColumn2dThermal::workArea[200];
 
-Vector *ForceBeamColumn2dThermal::vsSubdivide = 0;
-Matrix *ForceBeamColumn2dThermal::fsSubdivide = 0;
-Vector *ForceBeamColumn2dThermal::SsrSubdivide = 0;
+Vector ForceBeamColumn2dThermal::vsSubdivide[maxNumSections];
+Matrix ForceBeamColumn2dThermal::fsSubdivide[maxNumSections];
+Vector ForceBeamColumn2dThermal::SsrSubdivide[maxNumSections];
 
 void* OPS_ForceBeamColumn2dThermal()
 {
@@ -173,17 +173,6 @@ ForceBeamColumn2dThermal::ForceBeamColumn2dThermal():
 {
   theNodes[0] = 0;  
   theNodes[1] = 0;
-
-  if (vsSubdivide == 0)
-    vsSubdivide  = new Vector [maxNumSections];
-  if (fsSubdivide == 0)
-    fsSubdivide  = new Matrix [maxNumSections];
-  if (SsrSubdivide == 0)
-    SsrSubdivide  = new Vector [maxNumSections];
-  if (!vsSubdivide || !fsSubdivide || !SsrSubdivide) {
-    opserr << "ForceBeamColumn2dThermal::ForceBeamColumn2dThermal() -- failed to allocate Subdivide arrays";   
-    exit(-1);
-  }
 }
 
 // constructor which takes the unique element tag, sections,
@@ -228,17 +217,6 @@ ForceBeamColumn2dThermal::ForceBeamColumn2dThermal (int tag, int nodeI, int node
   if(Vsth0==0)
 	  Vsth0 = new Vector[maxNumSections];
 
-  if (vsSubdivide == 0)
-    vsSubdivide  = new Vector [maxNumSections];
-  if (fsSubdivide == 0)
-    fsSubdivide  = new Matrix [maxNumSections];
-  if (SsrSubdivide == 0)
-    SsrSubdivide  = new Vector [maxNumSections];
-  if (!vsSubdivide || !fsSubdivide || !SsrSubdivide) {
-    opserr << "ForceBeamColumn2dThermal::ForceBeamColumn2dThermal() -- failed to allocate Subdivide arrays";   
-    exit(-1);
-  }
-
   for (int m=0; m<numSections; m++) {
  Vsth0[m] = Vector(2);
  Vsth0[m].Zero();

diff --git a/SRC/element/forceBeamColumn/ForceBeamColumn2dThermal.h b/SRC/element/forceBeamColumn/ForceBeamColumn2dThermal.h
@@ -203,9 +203,9 @@ class ForceBeamColumn2dThermal: public Element
   // following are added for subdivision of displacement increment
   int    maxSubdivisions;       // maximum number of subdivisons of dv for local iterations
 
-  static Vector *vsSubdivide;
-  static Vector *SsrSubdivide;
-  static Matrix *fsSubdivide;
+  static Vector vsSubdivide[];
+  static Vector SsrSubdivide[];
+  static Matrix fsSubdivide[];
   Vector *Vsth0;
   //static int maxNumSections;
 

diff --git a/SRC/element/forceBeamColumn/ForceBeamColumn3d.cpp b/SRC/element/forceBeamColumn/ForceBeamColumn3d.cpp
@@ -88,9 +88,9 @@ Matrix ForceBeamColumn3d::theMatrix(12,12);
 Vector ForceBeamColumn3d::theVector(12);
 double ForceBeamColumn3d::workArea[200];
 
-Vector *ForceBeamColumn3d::vsSubdivide = 0;
-Matrix *ForceBeamColumn3d::fsSubdivide = 0;
-Vector *ForceBeamColumn3d::SsrSubdivide = 0;
+Vector ForceBeamColumn3d::vsSubdivide[maxNumSections];
+Matrix ForceBeamColumn3d::fsSubdivide[maxNumSections];
+Vector ForceBeamColumn3d::SsrSubdivide[maxNumSections];
 
 void* OPS_ForceBeamColumn3d()
 {
@@ -195,17 +195,6 @@ ForceBeamColumn3d::ForceBeamColumn3d():
 
   theNodes[0] = 0;  
   theNodes[1] = 0;
-
-  if (vsSubdivide == 0)
-    vsSubdivide  = new Vector [maxNumSections];
-  if (fsSubdivide == 0) 
-    fsSubdivide  = new Matrix [maxNumSections];
-  if (SsrSubdivide == 0)
-    SsrSubdivide  = new Vector [maxNumSections];
-  if (!vsSubdivide || !fsSubdivide || !SsrSubdivide) {
-    opserr << "ForceBeamColumn3d::ForceBeamColumn3d() -- failed to allocate Subdivide arrays";   
-    exit(-1);
-  }
 }
 
 // constructor which takes the unique element tag, sections,
@@ -248,17 +237,6 @@ ForceBeamColumn3d::ForceBeamColumn3d (int tag, int nodeI, int nodeJ,
   }
 
   this->setSectionPointers(numSec, sec);
-
-  if (vsSubdivide == 0)
-    vsSubdivide  = new Vector [maxNumSections];
-  if (fsSubdivide == 0)
-    fsSubdivide  = new Matrix [maxNumSections];
-  if (SsrSubdivide == 0)
-    SsrSubdivide  = new Vector [maxNumSections];
-  if (!vsSubdivide || !fsSubdivide || !SsrSubdivide) {
-    opserr << "ForceBeamColumn3d::ForceBeamColumn3d() -- failed to allocate Subdivide arrays";   
-    exit(-1);
-  }
 }
 
 // ~ForceBeamColumn3d():

diff --git a/SRC/element/forceBeamColumn/ForceBeamColumn3d.h b/SRC/element/forceBeamColumn/ForceBeamColumn3d.h
@@ -209,9 +209,9 @@ class ForceBeamColumn3d: public Element
   // following are added for subdivision of displacement increment
   int    maxSubdivisions;       // maximum number of subdivisons of dv for local iterations
 
-  static Vector *vsSubdivide;
-  static Vector *SsrSubdivide;
-  static Matrix *fsSubdivide;
+  static Vector vsSubdivide[];
+  static Vector SsrSubdivide[];
+  static Matrix fsSubdivide[];
   //static int maxNumSections;
 
   // AddingSensitivity:BEGIN //////////////////////////////////////////

diff --git a/SRC/element/forceBeamColumn/ForceBeamColumnCBDI2d.cpp b/SRC/element/forceBeamColumn/ForceBeamColumnCBDI2d.cpp
@@ -83,9 +83,9 @@ Matrix ForceBeamColumnCBDI2d::theMatrix(6,6);
 Vector ForceBeamColumnCBDI2d::theVector(6);
 double ForceBeamColumnCBDI2d::workArea[200];
 
-Vector *ForceBeamColumnCBDI2d::vsSubdivide = 0;
-Matrix *ForceBeamColumnCBDI2d::fsSubdivide = 0;
-Vector *ForceBeamColumnCBDI2d::SsrSubdivide = 0;
+Vector ForceBeamColumnCBDI2d::vsSubdivide[maxNumSections];
+Matrix ForceBeamColumnCBDI2d::fsSubdivide[maxNumSections];
+Vector ForceBeamColumnCBDI2d::SsrSubdivide[maxNumSections];
 
 void* OPS_ForceBeamColumnCBDI2d()
 {
@@ -278,17 +278,6 @@ ForceBeamColumnCBDI2d::ForceBeamColumnCBDI2d():
 {
   theNodes[0] = 0;  
   theNodes[1] = 0;
-
-  if (vsSubdivide == 0)
-    vsSubdivide  = new Vector [maxNumSections];
-  if (fsSubdivide == 0)
-    fsSubdivide  = new Matrix [maxNumSections];
-  if (SsrSubdivide == 0)
-    SsrSubdivide  = new Vector [maxNumSections];
-  if (!vsSubdivide || !fsSubdivide || !SsrSubdivide) {
-    opserr << "ForceBeamColumnCBDI2d::ForceBeamColumnCBDI2d() -- failed to allocate Subdivide arrays";   
-    exit(-1);
-  }
 }
 
 // constructor which takes the unique element tag, sections,
@@ -330,17 +319,6 @@ ForceBeamColumnCBDI2d::ForceBeamColumnCBDI2d (int tag, int nodeI, int nodeJ,
   }
 
   this->setSectionPointers(numSec, sec);
-
-  if (vsSubdivide == 0)
-    vsSubdivide  = new Vector [maxNumSections];
-  if (fsSubdivide == 0)
-    fsSubdivide  = new Matrix [maxNumSections];
-  if (SsrSubdivide == 0)
-    SsrSubdivide  = new Vector [maxNumSections];
-  if (!vsSubdivide || !fsSubdivide || !SsrSubdivide) {
-    opserr << "ForceBeamColumnCBDI2d::ForceBeamColumnCBDI2d() -- failed to allocate Subdivide arrays";   
-    exit(-1);
-  }
 }
 
 // ~ForceBeamColumnCBDI2d():

diff --git a/SRC/element/forceBeamColumn/ForceBeamColumnCBDI2d.h b/SRC/element/forceBeamColumn/ForceBeamColumnCBDI2d.h
@@ -215,9 +215,9 @@ class ForceBeamColumnCBDI2d: public Element
   // following are added for subdivision of displacement increment
   int    maxSubdivisions;       // maximum number of subdivisons of dv for local iterations
 
-  static Vector *vsSubdivide;
-  static Vector *SsrSubdivide;
-  static Matrix *fsSubdivide;
+  static Vector vsSubdivide[];
+  static Vector SsrSubdivide[];
+  static Matrix fsSubdivide[];
   //static int maxNumSections;
 
   // AddingSensitivity:BEGIN //////////////////////////////////////////

diff --git a/SRC/element/forceBeamColumn/ForceBeamColumnWarping2d.cpp b/SRC/element/forceBeamColumn/ForceBeamColumnWarping2d.cpp
@@ -89,9 +89,9 @@ Matrix ForceBeamColumnWarping2d::theMatrix(8,8);
 Vector ForceBeamColumnWarping2d::theVector(10);
 double ForceBeamColumnWarping2d::workArea[200];
 
-Vector *ForceBeamColumnWarping2d::vsSubdivide = 0;
-Matrix *ForceBeamColumnWarping2d::fsSubdivide = 0;
-Vector *ForceBeamColumnWarping2d::SsrSubdivide = 0;
+Vector ForceBeamColumnWarping2d::vsSubdivide[maxNumSections];
+Matrix ForceBeamColumnWarping2d::fsSubdivide[maxNumSections];
+Vector ForceBeamColumnWarping2d::SsrSubdivide[maxNumSections];
 
 void* OPS_ForceBeamColumnWarping2d()
 {
@@ -194,17 +194,6 @@ ForceBeamColumnWarping2d::ForceBeamColumnWarping2d():
 {
   theNodes[0] = 0;  
   theNodes[1] = 0;
-
-  if (vsSubdivide == 0)
-    vsSubdivide  = new Vector [maxNumSections];
-  if (fsSubdivide == 0)
-    fsSubdivide  = new Matrix [maxNumSections];
-  if (SsrSubdivide == 0)
-    SsrSubdivide  = new Vector [maxNumSections];
-  if (!vsSubdivide || !fsSubdivide || !SsrSubdivide) {
-    opserr << "ForceBeamColumnWarping2d::ForceBeamColumnWarping2d() -- failed to allocate Subdivide arrays";   
-    exit(-1);
-  }
 }
 
 // constructor which takes the unique element tag, sections,
@@ -245,17 +234,6 @@ ForceBeamColumnWarping2d::ForceBeamColumnWarping2d (int tag, int nodeI, int node
   }
 
   this->setSectionPointers(numSec, sec);
-
-  if (vsSubdivide == 0)
-    vsSubdivide  = new Vector [maxNumSections];
-  if (fsSubdivide == 0)
-    fsSubdivide  = new Matrix [maxNumSections];
-  if (SsrSubdivide == 0)
-    SsrSubdivide  = new Vector [maxNumSections];
-  if (!vsSubdivide || !fsSubdivide || !SsrSubdivide) {
-    opserr << "ForceBeamColumnWarping2d::ForceBeamColumnWarping2d() -- failed to allocate Subdivide arrays";   
-    exit(-1);
-  }
 }
 
 // ~ForceBeamColumnWarping2d():

diff --git a/SRC/element/forceBeamColumn/ForceBeamColumnWarping2d.h b/SRC/element/forceBeamColumn/ForceBeamColumnWarping2d.h
@@ -200,9 +200,9 @@ class ForceBeamColumnWarping2d: public Element
   // following are added for subdivision of displacement increment
   int    maxSubdivisions;       // maximum number of subdivisons of dv for local iterations
 
-  static Vector *vsSubdivide;
-  static Vector *SsrSubdivide;
-  static Matrix *fsSubdivide;
+  static Vector vsSubdivide[];
+  static Vector SsrSubdivide[];
+  static Matrix fsSubdivide[];
   //static int maxNumSections;
 
   // AddingSensitivity:BEGIN //////////////////////////////////////////