Merge branch 'master' into cbdi3d

zhuminjie · Feb 4, 2021 · 707e390 · 707e390
2 parents 1b9d63d + d4d9803
commit 707e390
Show file tree

Hide file tree

Showing 113 changed files with 7,496 additions and 578 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,7 +48,7 @@ obj
 .idea
 cmake-build-debug
 cmake-build-release
-CMakeLists.txt
+#CMakeLists.txt
 .dropbox.attr
 
 # VSCode
@@ -79,4 +79,16 @@ SRC/interpreter/pythonInterpreter
 SRC/interpreter/tclInterpreter
 SRC/interpreter/openseespy
 SRC/interpreter/openseestcl
-bin
+<<<<<<< HEAD
+filip
+PML
+CPlaneStrain.h
+CPlaneStress.h
+CPlaneStress2d.h
+CThreeDimensional.h
+Concrete.h
+forumat.for
+build
+=======
+bin
+>>>>>>> 732044f5b1846fa0047e4516e0717dc0d22bffc3
diff --git a/EXAMPLES/ExampleScripts/Example1.1.tcl b/EXAMPLES/ExampleScripts/Example1.1.tcl
@@ -88,8 +88,8 @@ foreach eleType {truss corotTruss} {
 # Create the integration scheme, the LoadControl scheme using steps of 1.0
 integrator LoadControl 1.0
 
-# Create the solution algorithm, a Linear algorithm is created
-algorithm Linear
+# Create the solution algorithm, a Newton algorithm is created
+algorithm Newton
 
 # create the analysis object 
 analysis Static 
@@ -122,4 +122,4 @@ analyze 1
 print node 4
 print ele
 
-}
+}
diff --git a/MAKES/Makefile.def.EC2-REDHAT-ENTERPRISE b/MAKES/Makefile.def.EC2-REDHAT-ENTERPRISE
@@ -45,6 +45,10 @@
 # Specify the location and name of the OpenSees interpreter program
 # that will be created (if this all works!)
 
+#########################################
+HOME = /Users/jia-weichen/OpenSeesFile/DEVELOPER
+############Added, Jiawei################
+
 OpenSees_PROGRAM = $(HOME)/bin/OpenSees
 
 OPERATING_SYSTEM = LINUX

diff --git a/MAKES/Makefile.def.Ubuntu20.04 b/MAKES/Makefile.def.Ubuntu20.04
@@ -30,7 +30,7 @@
 # wget https://prdownloads.sourceforge.net/tcl/tcl8.6.10-src.tar.gz
 # tar zxBf tcl8.6.tar.gz
 # cd tcl8.6.10/unix
-# configure --prefx=$HOME/tcl8.6 --enable-static --disable-shared --enable-64bit
+# configure --prefix=$HOME/tcl8.6 --enable-static --disable-shared --enable-64bit
 # make
 # make install
 # cd $HOME

diff --git a/OTHER/Triangle/triangle.c b/OTHER/Triangle/triangle.c
@@ -231,7 +231,7 @@
 /* If yours is not a Unix system, define the NO_TIMER compiler switch to     */
 /*   remove the Unix-specific timing code.                                   */
 
-/* #define NO_TIMER */
+#define NO_TIMER
 
 /* To insert lots of self-checks for internal errors, define the SELF_CHECK  */
 /*   symbol.  This will slow down the program significantly.  It is best to  */

diff --git a/SRC/Makefile b/SRC/Makefile
@@ -639,6 +639,10 @@ ELE_LIBS   =  $(FE)/element/Element.o \
 	$(FE)/element/UWelements/EmbeddedBeamInterfaceP.o \
 	$(FE)/element/UWelements/EmbeddedEPBeamInterface.o \
 	$(FE)/element/UWelements/Tcl_generateInterfacePoints.o \
+	$(FE)/element/PML/pml_3d.o \
+        $(FE)/element/PML/PML3D.o \
+        $(FE)/element/PML/pml_2d.o \
+        $(FE)/element/PML/PML2D.o \
 	$(FE)/element/RockingBC/RockingBC.o
 
 #	$(FE)/material/nD/Damage2p.o \
@@ -665,11 +669,7 @@ endif
 
 
 ifdef PLAINCONCRETE_FLAG
-	PLAINCONCRETE = $(FE)/material/nD/PlainConcrete.o $(FE)/material/nD/forumat.o \
-       $(FE)/element/PML/PMLDynamicSymmDamp3D.o \
-       $(FE)/element/PML/PML3D.o \
-       $(FE)/element/PML/PMLDynamicSymmDamp2D.o \
-       $(FE)/element/PML/PML2D.o
+	PLAINCONCRETE = $(FE)/material/nD/PlainConcrete.o $(FE)/material/nD/forumat.o
 else
 	PLAINCONCRETE = 
 endif
@@ -1142,6 +1142,7 @@ DOMAIN_LIBS =  $(FE)/domain/component/DomainComponent.o \
 	$(FE)/domain/component/MaterialStageParameter.o \
 	$(FE)/domain/component/MatParameter.o \
 	$(FE)/domain/domain/Domain.o \
+	$(FE)/domain/domain/DomainModalProperties.o \
 	$(FE)/domain/domain/single/SingleDomEleIter.o \
 	$(FE)/domain/domain/single/SingleDomNodIter.o \
 	$(FE)/domain/domain/single/SingleDomSP_Iter.o \
@@ -1230,6 +1231,7 @@ ANALYSIS_LIBS = $(FE)/analysis/analysis/Analysis.o \
 	$(FE)/analysis/analysis/StaticDomainDecompositionAnalysis.o \
 	$(FE)/analysis/analysis/TransientDomainDecompositionAnalysis.o \
 	$(FE)/analysis/analysis/SubstructuringAnalysis.o \
+	$(FE)/analysis/analysis/ResponseSpectrumAnalysis.o \
 	$(FE)/analysis/algorithm/SolutionAlgorithm.o \
 	$(FE)/analysis/algorithm/equiSolnAlgo/EquiSolnAlgo.o \
 	$(FE)/analysis/algorithm/equiSolnAlgo/Linear.o \

diff --git a/SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp b/SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp
@@ -248,6 +248,9 @@
 #include "UWelements/BeamEndContact3Dp.h"
 #include "UWelements/QuadBeamEmbedContact.h"
 
+#include "PML/PML2D.h"
+#include "PML/PML3D.h"
+
 #include "UP-ucsd/Nine_Four_Node_QuadUP.h"
 #include "UP-ucsd/BrickUP.h"
 #include "UP-ucsd/BBarBrickUP.h"
@@ -736,6 +739,12 @@ FEM_ObjectBrokerAllClasses::getNewElement(int classTag)
 
     case ELE_TAG_SSPbrickUP:
       return new SSPbrickUP();
+
+	case ELE_TAG_PML2D:
+		return new PML2D();
+
+	case ELE_TAG_PML3D:
+		return new PML3D();
 
     case ELE_TAG_BeamContact2D:
       return new BeamContact2D();

diff --git a/SRC/analysis/analysis/Makefile b/SRC/analysis/analysis/Makefile
@@ -6,7 +6,8 @@ OBJS       = DomainUser.o Analysis.o StaticAnalysis.o TransientAnalysis.o \
 	     VariableTimeStepDirectIntegrationAnalysis.o \
 	     StaticDomainDecompositionAnalysis.o \
 	     TransientDomainDecompositionAnalysis.o \
-	     PFEMAnalysis.o 
+	     PFEMAnalysis.o \
+		 ResponseSpectrumAnalysis.o
 
 # Compilation control
 all:         $(OBJS)