Dev

CMakeLists.txt

@@ -120,6 +120,10 @@ elseif (WIN32) # NOTE: this will execute for both 32-bit and 64-bit builds.
   set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
 endif()
 
+if (CMAKE_BUILD_TYPE STREQUAL "RELEASE")
+  add_compile_definitions(XARA_RELEASE)
+endif()
+
 # Check for IPO and maybe use it; this can significantly slow down linking 
 # and can be problematic on slow or memory constrained machines (e.g., my laptop)
 include(CheckIPOSupported)

SRC/Field.h

@@ -17,11 +17,6 @@ enum class Field {
   DensityZZ,
   DensityXY,
   DensityXZ,
-  DensityCentroidXX,
-  DensityCentroidYY,
-  DensityCentroidZZ,
-  DensityCentroidXY,
-  DensityCentroidXZ,
 
   PolarInertia,      // NOTE: not J0; this includes density
 

SRC/actor/objectBroker/FEM_ObjectBroker.cpp

@@ -56,14 +56,6 @@ FEM_ObjectBroker::getNewActor(int classTag, Channel *theChannel)
 }
 
 
-PartitionedModelBuilder          *
-FEM_ObjectBroker::getPtrNewPartitionedModelBuilder(Subdomain &theSubdomain,
-						   int classTag)
-{
-  return 0;
-}
-
-
 GraphNumberer *
 FEM_ObjectBroker::getPtrNewGraphNumberer(int classTag)
 {

SRC/actor/objectBroker/FEM_ObjectBroker.h

@@ -65,7 +65,6 @@ class LinearSOE;
 class EigenSOE;
 class DomainSolver;
 class DomainDecompositionAnalysis;
-class PartitionedModelBuilder;
 
 class CrdTransf;
 class Damping;
@@ -101,11 +100,7 @@ class FEM_ObjectBroker
     FEM_ObjectBroker();
     virtual ~FEM_ObjectBroker();
 
-    virtual Actor*getNewActor(int classTag, Channel *theChannel);
-
-    virtual PartitionedModelBuilder *
-      getPtrNewPartitionedModelBuilder(Subdomain &theSub,
-				       int classTag);
+    virtual Actor*getNewActor(int classTag, Channel *);
 
     virtual GraphNumberer *getPtrNewGraphNumberer(int classTag);
 

SRC/analysis/analysis/StaticDomainDecompositionAnalysis.cpp

@@ -38,8 +38,6 @@
 
 #include <FE_Element.h>
 #include <DOF_Group.h>
-#include <FE_EleIter.h>
-#include <DOF_GrpIter.h>
 #include <Matrix.h>
 #include <ID.h>
 #include <Graph.h>
@@ -258,7 +256,7 @@ StaticDomainDecompositionAnalysis::eigen(int numMode, bool generalized, bool fin
     // form K
     //
 
-    FE_EleIter &theEles = theAnalysisModel->getFEs();    
+    auto &theEles = theAnalysisModel->getFEs();    
     FE_Element *elePtr;
 
     while((elePtr = theEles()) != 0) {
@@ -276,7 +274,7 @@ StaticDomainDecompositionAnalysis::eigen(int numMode, bool generalized, bool fin
     //
 
     if (generalized == true) {
-      FE_EleIter &theEles2 = theAnalysisModel->getFEs();    
+      auto &theEles2 = theAnalysisModel->getFEs();    
       while((elePtr = theEles2()) != 0) {     
         elePtr->zeroTangent();
         elePtr->addMtoTang(1.0);
@@ -288,7 +286,7 @@ StaticDomainDecompositionAnalysis::eigen(int numMode, bool generalized, bool fin
       }
 
       DOF_Group *dofPtr;
-      DOF_GrpIter &theDofs = theAnalysisModel->getDOFs();    
+      auto &theDofs = theAnalysisModel->getDOFs();    
       while((dofPtr = theDofs()) != 0) {
         dofPtr->zeroTangent();
         dofPtr->addMtoTang(1.0);
@@ -305,8 +303,8 @@ StaticDomainDecompositionAnalysis::eigen(int numMode, bool generalized, bool fin
     //
 
     if (theEigenSOE->solve(numMode, generalized, findSmallest) < 0) {
-	opserr << "WARNING StaticAnalysis::eigen() - EigenSOE failed in solve()\n";
-	return -4;
+      opserr << "WARNING StaticAnalysis::eigen() - EigenSOE failed in solve()\n";
+      return -4;
     }
 
     //
@@ -328,24 +326,24 @@ StaticDomainDecompositionAnalysis::eigen(int numMode, bool generalized, bool fin
 int 
 StaticDomainDecompositionAnalysis::initialize()
 {
-    Domain *the_Domain = this->getDomainPtr();
-    
-    // check if domain has undergone change
-    int stamp = the_Domain->hasDomainChanged();
-    if (stamp != domainStamp) {
-      domainStamp = stamp;	
-      if (this->domainChanged() < 0) {
-	opserr << "DirectIntegrationAnalysis::initialize() - domainChanged() failed\n";
-	return -1;
-      }	
-    }
-    if (theIntegrator->initialize() < 0) {
-	opserr << "DirectIntegrationAnalysis::initialize() - integrator initialize() failed\n";
-	return -2;
-    } else
-      theIntegrator->commit();
-    
-    return 0;
+  Domain *the_Domain = this->getDomainPtr();
+
+  // check if domain has undergone change
+  int stamp = the_Domain->hasDomainChanged();
+  if (stamp != domainStamp) {
+    domainStamp = stamp;	
+    if (this->domainChanged() < 0) {
+      opserr << "DirectIntegrationAnalysis::initialize() - domainChanged() failed\n";
+      return -1;
+    }	
+  }
+  if (theIntegrator->initialize() < 0) {
+    opserr << "DirectIntegrationAnalysis::initialize() - integrator initialize() failed\n";
+    return -2;
+  } else
+    theIntegrator->commit();
+
+  return 0;
 }
 
 int

SRC/analysis/analysis/TransientDomainDecompositionAnalysis.cpp

@@ -44,8 +44,6 @@
 
 #include <FE_Element.h>
 #include <DOF_Group.h>
-#include <FE_EleIter.h>
-#include <DOF_GrpIter.h>
 #include <Matrix.h>
 #include <ID.h>
 #include <Graph.h>
@@ -261,7 +259,7 @@ TransientDomainDecompositionAnalysis::eigen(int numMode, bool generalized, bool
     // form K
     //
 
-    FE_EleIter &theEles = theAnalysisModel->getFEs();    
+    auto &theEles = theAnalysisModel->getFEs();    
     FE_Element *elePtr;
 
     while((elePtr = theEles()) != 0) {
@@ -279,7 +277,7 @@ TransientDomainDecompositionAnalysis::eigen(int numMode, bool generalized, bool
     //
 
     if (generalized == true) {
-      FE_EleIter &theEles2 = theAnalysisModel->getFEs();    
+      auto &theEles2 = theAnalysisModel->getFEs();    
       while((elePtr = theEles2()) != 0) {     
         elePtr->zeroTangent();
         elePtr->addMtoTang(1.0);
@@ -289,9 +287,9 @@ TransientDomainDecompositionAnalysis::eigen(int numMode, bool generalized, bool
           result = -2;
         }
       }
-      
+
       DOF_Group *dofPtr;
-      DOF_GrpIter &theDofs = theAnalysisModel->getDOFs();    
+      auto &theDofs = theAnalysisModel->getDOFs();    
       while((dofPtr = theDofs()) != 0) {
         dofPtr->zeroTangent();
         dofPtr->addMtoTang(1.0);
@@ -307,8 +305,8 @@ TransientDomainDecompositionAnalysis::eigen(int numMode, bool generalized, bool
     // solve for the eigen values & vectors
     //
     if (theEigenSOE->solve(numMode, generalized, findSmallest) < 0) {
-        opserr << "WARNING TransientDomainDecomposition::eigen() - EigenSOE failed in solve()\n";
-        return -4;
+      opserr << "WARNING TransientDomainDecomposition::eigen() - EigenSOE failed in solve()\n";
+      return -4;
     }
 
     //