Merge branch 'OpenSees:master' into master

Author: aschellenberg74

DEVELOPER/core/classTags.h

@@ -432,9 +432,12 @@
 #define ND_TAG_PM4Sand                        14021
 // PM4Silt material - L.Chen
 #define ND_TAG_PM4Silt                        14022
-// J2CyclicBoundingSurface material - D.Turello
-#define ND_TAG_J2CyclicBoundingSurface        14023
-
+// J2CyclicBoundingSurface material - P. Arduino,  D.Turello
+#define ND_TAG_J2CyclicBoundingSurface            14023
+#define ND_TAG_J2CyclicBoundingSurface3D          14024
+#define ND_TAG_J2CyclicBoundingSurfacePlaneStrain 14025
+// LinearElasticGGmax material - P. Arduino
+#define ND_TAG_LinearElasticGGmax             14026
 // MultiaxialCyclicPlasticity, add by Gang Wang
 #define ND_TAG_MultiaxialCyclicPlasticity             10031
 #define ND_TAG_MultiaxialCyclicPlasticity3D           10032

OTHER/LAPACK/CMakeLists.txt

@@ -143,6 +143,26 @@ target_sources(LAPACK PUBLIC
   dlatrs.f
   dla_rpvgrw.f
   dla_gerpvgrw.f
+
+  dsygvx.f
+  dsygst.f
+  dsygs2.f
+  dsyevx.f
+  dormtr.f
+  dorgtr.f
+  dorgql.f 
+  dorg2l.f
+  dormql.f
+  dorm2l.f
+  dlansy.f
+  dlarf1l.f
+  iladlr.f
+  iladlc.f
+  disnan.f
+  dlaisnan.f
+  dsytrd.f
+  dlatrd.f
+  dsytd2.f
 )  
 
 add_library(LAPACK_C)

OTHER/LAPACK/Makefile

@@ -20,7 +20,10 @@ DOBJ  = dgeqr2.o dlabad.o dlacon.o dlacpy.o dladiv.o dlae2.o dlaev2.o\
 	chla_transtype.o dla_gercond.o dla_wwaddw.o ilaprec.o ilatrans.o dgecon.o \
 	dla_geamv.o dlacn2.o dla_lin_berr.o drscl.o dlatrs.o dla_rpvgrw.o dla_gerpvgrw.o \
 	BLAS_dgemv2_x.o BLAS_dgemv2_x-f2c.o \
-	BLAS_dgemv_x.o BLAS_dgemv_x-f2c.o BLAS_error.o BLAS_error.o
+	BLAS_dgemv_x.o BLAS_dgemv_x-f2c.o BLAS_error.o BLAS_error.o \
+	dsygvx.o dsygst.o dsygs2.o dsyevx.o dormtr.o dorgtr.o dorgql.o \
+	dorg2l.o dormql.o dorm2l.o dlansy.o dlarf1l.o iladlr.o iladlc.o \
+	disnan.o dlaisnan.o dsytrd.o dlatrd.o dsytd2.o
 
 
 

SRC/Makefile

@@ -1009,6 +1009,7 @@ MATERIAL_LIBS   =  $(FE)/material/Material.o \
 	$(FE)/material/nD/UWmaterials/J2CyclicBoundingSurfacePlaneStrain.o \
 	$(FE)/material/nD/UWmaterials/PM4Sand.o \
 	$(FE)/material/nD/UWmaterials/PM4Silt.o \
+	$(FE)/material/nD/UWmaterials/LinearElasticGGmax.o \
 	$(FE)/material/nD/UANDESmaterials/SAniSandMS.o \
 	$(FE)/material/nD/UANDESmaterials/SAniSandMS3D.o \
 	$(FE)/material/nD/UANDESmaterials/SAniSandMSPlaneStrain.o \
@@ -1270,7 +1271,9 @@ SequentialSysOfEqn_LIBS =	$(FE)/system_of_eqn/linearSOE/LinearSOE.o \
 	$(FE)/system_of_eqn/linearSOE/umfGEN/UmfpackGenLinSOE.o \
 	$(FE)/system_of_eqn/linearSOE/umfGEN/UmfpackGenLinSolver.o \
 	$(FE)/system_of_eqn/eigenSOE/FullGenEigenSOE.o \
-	$(FE)/system_of_eqn/eigenSOE/FullGenEigenSolver.o
+	$(FE)/system_of_eqn/eigenSOE/FullGenEigenSolver.o \
+	$(FE)/system_of_eqn/eigenSOE/SymmGeneralizedEigenSOE.o \
+	$(FE)/system_of_eqn/eigenSOE/SymmGeneralizedEigenSolver.o
 
 ifeq ($(PROGRAMMING_MODE), PARALLEL_INTERPRETERS)
 SysOfEqn_LIBS = $(SequentialSysOfEqn_LIBS) \

SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp

@@ -297,6 +297,7 @@
 #include "J2CyclicBoundingSurface.h"
 #include "J2CyclicBoundingSurface3D.h"
 #include "J2CyclicBoundingSurfacePlaneStrain.h"
+#include "UWmaterials/LinearElasticGGmax.h"
 #include "UWmaterials/InitialStateAnalysisWrapper.h"
 #include "stressDensityModel/stressDensity.h"
 #include "InitStressNDMaterial.h"
@@ -2378,6 +2379,9 @@ FEM_ObjectBrokerAllClasses::getNewNDMaterial(int classTag)
   case ND_TAG_J2CyclicBoundingSurfacePlaneStrain:
 	  return new J2CyclicBoundingSurfacePlaneStrain();
 
+  case ND_TAG_LinearElasticGGmax:
+	  return new LinearElasticGGmax();    
+
   case ND_TAG_InitialStateAnalysisWrapper:
       return new InitialStateAnalysisWrapper(); 
   case ND_TAG_stressDensity:

SRC/analysis/analysis/SDFAnalysis.cpp

@@ -31,8 +31,21 @@ int OPS_sdfResponse()
 
   int numOptionalArgs = 0;
   int numArgs = OPS_GetNumRemainingInputArgs();
+  double t_end = 0.0; bool t_end_specified = false;
   while (OPS_GetNumRemainingInputArgs() > 0) {
     std::string type = OPS_GetString();
+    if (type == "-tend") {
+      numOptionalArgs++;
+      if (OPS_GetNumRemainingInputArgs() > 0) {
+	numData = 1;
+	if (OPS_GetDoubleInput(&numData, &t_end) < 0) {
+	  opserr << "ERROR sdfResponse - failed to read tend" << endln;
+	  return 0;
+	}
+	numOptionalArgs++;
+	t_end_specified = true;
+      }      
+    }
     if (type == "-uresid" || type == "-uresidual") {
       numOptionalArgs++;
       if (OPS_GetNumRemainingInputArgs() > 0) {
@@ -64,8 +77,8 @@ int OPS_sdfResponse()
 
     if (numArgs < 7 || numArgs > 8) {
 	opserr << "Incorrect number of arguments to sdfResponse --";
-	opserr << "m, zeta, k, Fy, alpha, dtF, filename, dt, <-uresidual, uresid, -umaxprev, umaxp>" << endln;
-	opserr << "m, zeta, k, Fy, alpha, tsTag, dt, <-uresidual, uresid, -umaxprev, umaxp>" << endln;	
+	opserr << "m, zeta, k, Fy, alpha, dtF, filename, dt, <-uresidual, uresid, -umaxprev, umaxp, -tend, tend>" << endln;
+	opserr << "m, zeta, k, Fy, alpha, tsTag, dt, <-uresidual, uresid, -umaxprev, umaxp, -tend, tend>" << endln;	
 	return -1;
     }
 
@@ -171,7 +184,7 @@ int OPS_sdfResponse()
     int i = 0;
     double ft, u=0, du, v, a, fs, zs, ftrial, kT, kTeff, dg, phat, R, R0, accel;
     double time = accelSeries->getStartTime();
-    double Tend = accelSeries->getDuration();
+    double Tend = t_end_specified ? t_end : accelSeries->getDuration();
     while (time < Tend) {
 
       ft = accelSeries->getFactor(time);

SRC/classTags.h

@@ -51,12 +51,14 @@
 #define EigenSOE_TAGS_FullGenEigenSOE   4
 #define EigenSOE_TAGS_ArpackSOE 	5
 #define EigenSOE_TAGS_GeneralArpackSOE 	6
+#define EigenSOE_TAGS_SymmGeneralizedEigenSOE 	7
 #define EigenSOLVER_TAGS_BandArpackSolver 	1
 #define EigenSOLVER_TAGS_SymArpackSolver 	2
 #define EigenSOLVER_TAGS_SymBandEigenSolver     3
 #define EigenSOLVER_TAGS_FullGenEigenSolver  4
 #define EigenSOLVER_TAGS_ArpackSolver  5
 #define EigenSOLVER_TAGS_GeneralArpackSolver  6
+#define EigenSOLVER_TAGS_SymmGeneralizedEigenSolver  7
 
 #define EigenALGORITHM_TAGS_Frequency 1
 #define EigenALGORITHM_TAGS_Standard  2
@@ -520,11 +522,12 @@
 #define ND_TAG_PM4Sand                        14021
 // PM4Silt material - L.Chen
 #define ND_TAG_PM4Silt                        14022
-// J2CyclicBoundingSurface material - P. Arduino,  D.Turello
+// J2CyclicBoundingSurface material - P. Arduino
 #define ND_TAG_J2CyclicBoundingSurface            14023
 #define ND_TAG_J2CyclicBoundingSurface3D          14024
 #define ND_TAG_J2CyclicBoundingSurfacePlaneStrain 14025
-
+// LinearElasticGGmax material - P. Arduino
+#define ND_TAG_LinearElasticGGmax             14026
 // MultiaxialCyclicPlasticity, add by Gang Wang
 #define ND_TAG_MultiaxialCyclicPlasticity             10031
 #define ND_TAG_MultiaxialCyclicPlasticity3D           10032

SRC/domain/constraints/RigidDiaphragm.cpp

@@ -174,52 +174,45 @@ RigidDiaphragm::RigidDiaphragm(Domain &theDomain, int nR, ID &nC,
 
 	  // rigid diaphragm in xy plane
 	  if (perpPlaneConstrained == 2) { 
+		  
+	    // dof corresponding to dX, dY and theta Z (0,1,5)
+	    id(0) = 0; id(1) = 1; id(2) = 5;
 
+	    // set up transformation matrix
+	    mat(0,2) = - deltaY;
+	    mat(1,2) = deltaX;
+	  
 	    // check constrained node in xy plane with retained node
-	    if (deltaZ == 0.0) {
-
-	      // dof corresponding to dX, dY and theta Z (0,1,5)
-	      id(0) = 0; id(1) = 1; id(2) = 5;
-
-	      // set up transformation matrix
-	      mat(0,2) = - deltaY;
-	      mat(1,2) = deltaX;
-	      
-	    } else 
-	      opserr << "RigidDiaphragm::RigidDiaphragm - ignoring constrained Node " << ndC << ", not in xy plane\n";
+	    if (deltaZ != 0.0)
+	      opserr << "RigidDiaphragm::RigidDiaphragm - proceeding with constrained Node " << ndC << " not in xy plane\n";
 
 	  // rigid diaphragm in xz plane
 	  } else if (perpPlaneConstrained == 1) { 
 
-	    // check constrained node in xy plane with retained node
-	    if (deltaY == 0.0) {
-
-	      // dof corresponding to dX, dZ and theta Y (0,2,4)
-	      id(0) = 0; id(1) = 2; id(2) = 4;
+	    // dof corresponding to dX, dZ and theta Y (0,2,4)
+	    id(0) = 0; id(1) = 2; id(2) = 4;
 
-	      // set up transformation matrix
-	      mat(0,2) = deltaZ;
-	      mat(1,2) = -deltaX;
+	    // set up transformation matrix
+	    mat(0,2) = deltaZ;
+	    mat(1,2) = -deltaX;
 
-	    } else
-	      opserr << "RigidDiaphragm::RigidDiaphragm - ignoring constrained Node " << ndC << ", not in xz plane\n";
+	    // check constrained node in xy plane with retained node
+	    if (deltaY != 0.0)
+	      opserr << "RigidDiaphragm::RigidDiaphragm - proceeding with constrained Node " << ndC << " not in xz plane\n";
 
 	  // rigid diaphragm in yz plane
 	  } else {	  
 
-	    // check constrained node in xy plane with retained node
-	    if (deltaX == 0.0) {
-
-	      // dof corresponding to dY, dZ and theta X (1,2,3)
-	      id(0) = 1; id(1) = 2; id(2) = 3;
+	    // dof corresponding to dY, dZ and theta X (1,2,3)
+	    id(0) = 1; id(1) = 2; id(2) = 3;
 
-	      // set up transformation matrix
-	      mat(0,2) = -deltaZ;
-	      mat(1,2) = deltaY;
+	    // set up transformation matrix
+	    mat(0,2) = -deltaZ;
+	    mat(1,2) = deltaY;
 
-	    } else
-	      opserr << "RigidDiaphragm::RigidDiaphragm - ignoring constrained Node " << ndC << 
-		", not in xz plane\n";
+	    // check constrained node in xy plane with retained node
+	    if (deltaX != 0.0)
+	      opserr << "RigidDiaphragm::RigidDiaphragm - proceeding with constrained Node " << ndC << " not in yz plane\n";
 	  }
 	}
 	else  // node not in proper space

SRC/interpreter/OpenSeesCommands.cpp

@@ -79,6 +79,8 @@ UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #include <SymBandEigenSOE.h>
 #include <FullGenEigenSolver.h>
 #include <FullGenEigenSOE.h>
+#include <SymmGeneralizedEigenSolver.h>
+#include <SymmGeneralizedEigenSOE.h>
 #include <ArpackSOE.h>
 #include <LoadControl.h>
 #include <CTestPFEM.h>
@@ -343,6 +345,11 @@ OpenSeesCommands::eigen(int typeSolver, double shift,
 	    FullGenEigenSolver *theEigenSolver = new FullGenEigenSolver();
 	    theEigenSOE = new FullGenEigenSOE(*theEigenSolver, *theAnalysisModel);
 
+	} else if (typeSolver == EigenSOE_TAGS_SymmGeneralizedEigenSOE) {
+
+	    SymmGeneralizedEigenSolver *theEigenSolver = new SymmGeneralizedEigenSolver();
+	    theEigenSOE = new SymmGeneralizedEigenSOE(*theEigenSolver, *theAnalysisModel);
+	    
 	} else {
 
 	    theEigenSOE = new ArpackSOE(shift);
@@ -2681,6 +2688,12 @@ int OPS_eigenAnalysis()
 		 (strcmp(type,"-symmBandLapackEigen") == 0))
 	    typeSolver = EigenSOE_TAGS_SymBandEigenSOE;
 
+	else if ((strcmp(type,"symmGenLapack") == 0) ||
+		 (strcmp(type,"-symmGenLapack") == 0) ||
+		 (strcmp(type,"symmGenLapackEigen") == 0) ||
+		 (strcmp(type,"-symmGenLapackEigen") == 0))
+	    typeSolver = EigenSOE_TAGS_SymmGeneralizedEigenSOE;	
+
     else if ((strcmp(type, "fullGenLapack") == 0) ||
                 (strcmp(type, "-fullGenLapack") == 0) ||
                 (strcmp(type, "fullGenLapackEigen") == 0) ||

SRC/interpreter/OpenSeesNDMaterialCommands.cpp

@@ -72,6 +72,7 @@ void* OPS_BeamFiberMaterial2d();
 void* OPS_BeamFiberMaterial2dPS();
 void* OPS_PM4SandMaterial();
 void* OPS_PM4SiltMaterial();
+void* OPS_LinearElasticGGmaxMaterial();
 void* OPS_UVCplanestress();
 void* OPS_UVCmultiaxial();
 void* OPS_PressureDependMultiYield03();
@@ -197,7 +198,8 @@ namespace {
 	nDMaterialsMap.insert(std::make_pair("BeamFiber2d", &OPS_BeamFiberMaterial2d));
 	nDMaterialsMap.insert(std::make_pair("BeamFiber2dPS", &OPS_BeamFiberMaterial2dPS));
 	nDMaterialsMap.insert(std::make_pair("PM4Sand", &OPS_PM4SandMaterial));
-	nDMaterialsMap.insert(std::make_pair("PM4Silt", &OPS_PM4SiltMaterial));	
+	nDMaterialsMap.insert(std::make_pair("PM4Silt", &OPS_PM4SiltMaterial));
+	nDMaterialsMap.insert(std::make_pair("LinearElasticGGmax", &OPS_LinearElasticGGmaxMaterial));
 	nDMaterialsMap.insert(std::make_pair("UVCplanestress", &OPS_UVCplanestress));
 	nDMaterialsMap.insert(std::make_pair("UVCmultiaxial", &OPS_UVCmultiaxial));
 	nDMaterialsMap.insert(std::make_pair("PressureDependMultiYield03", &OPS_PressureDependMultiYield03));