Merge branch 'master' into add-zero-length-implex-contact

zhuminjie · Aug 27, 2021 · 84911e5 · 84911e5
2 parents 9b533e7 + 494ad90
commit 84911e5
Show file tree

Hide file tree

Showing 36 changed files with 5,171 additions and 2,648 deletions.
diff --git a/DEVELOPER/core/classTags.h b/DEVELOPER/core/classTags.h
@@ -723,6 +723,8 @@
 #define ELE_TAG_SixNodeTri                209
 #define ELE_TAG_ZeroLengthImplexContact   218  // Onur Deniz Akan (IUSS), Massimo Petracca (ASDEA)
 
+#define ELE_TAG_ASDEmbeddedNodeElement             217  // Massimo Petracca (ASDEA)
+
 #define FRN_TAG_Coulomb            1
 #define FRN_TAG_VelDependent       2
 #define FRN_TAG_VelPressureDep     3

diff --git a/MAKES/Makefile.def.Ubuntu20.04 b/MAKES/Makefile.def.Ubuntu20.04
@@ -15,29 +15,22 @@
 
 
 # Instructuction for building OpenSees on Ubuntu 20.04
-# NOTE: if you plan to contribue code, fork your own github reo in the browser
+# NOTE: if you plan to contribue code, fork your own github repo in the browser
 #       and make change to git clone below to point to your own fork. We will
 #       never give anyone access to repo itself.
 
 
 # mkdir $HOME/lib
 # mkdir $HOME/bin
 # sudo apt-get update 
-# sudo apt-get install git
-# sudo apt-get install emacs
-# sudo apt-get install build-essential
-# sudo apt-get install gfortran
-# wget https://prdownloads.sourceforge.net/tcl/tcl8.6.10-src.tar.gz
-# tar zxBf tcl8.6.tar.gz
-# cd tcl8.6.10/unix
-# configure --prefix=$HOME/tcl8.6 --enable-static --disable-shared --enable-64bit
+# sudo apt-get install -y git emacs build-essential gfortran tcl8.6  tcl8.6-dev
 # make
 # make install
 # cd $HOME
 # git clone https://github.com/OpenSees/OpenSees.git
 # cd OpenSees
 # cp ./MAKES/Makefile.def.Ubuntu20.04 ./Makefile.def 
-# make
+# make ## For faster compilation, add -j $(numberOfCores)
 
 
 #INTERPRETER_LANGUAGE = PYTHON
@@ -115,8 +108,7 @@ UMFPACK_LIBRARY = $(HOME)/lib/libUmfpack.a
 METIS_LIBRARY   = $(HOME)/lib/libMetis.a
 CSPARSE_LIBRARY   = $(HOME)/lib/libCSparse.a
 
-TCL_LIBRARY = $(HOME)/tcl8.6/lib/libtcl8.6.a
-
+TCL_LIBRARY = /usr/lib/x86_64-linux-gnu/libtcl8.6.so
 BLITZ_LIBRARY = $(HOME)/blitz/lib/libblitz.a
 GRAPHIC_LIBRARY     = 
 
@@ -267,8 +259,7 @@ MACHINE_INCLUDES        = -I/usr/include \
 # this file contains all the OpenSees/SRC includes
 include $(FE)/Makefile.incl
 
-#TCL_INCLUDES = -I/usr/includes/tcl-private/generic
-TCL_INCLUDES = -I$(HOME)/tcl8.6/include
+TCL_INCLUDES = -I/usr/include/tcl8.6
 PYTHON_INCLUDES = -I/usr/include/python3.5
 
 INCLUDES = $(TCL_INCLUDES) $(FE_INCLUDES) $(MACHINE_INCLUDES) $(PYTHON_INCLUDES)

diff --git a/SRC/Makefile b/SRC/Makefile
@@ -658,7 +658,8 @@ ELE_LIBS   =  $(FE)/element/Element.o \
 	$(FE)/element/RockingBC/RockingBC.o \
 	$(FE)/element/masonry/MasonPan12.o \
 	$(FE)/element/masonry/MasonPan3D.o \
-	$(FE)/element/masonry/BeamGT.o
+	$(FE)/element/masonry/BeamGT.o \
+	$(FE)/element/CEqElement/ASDEmbeddedNodeElement.o
 
 #	$(FE)/material/nD/Damage2p.o \
 #	$(FE)/material/nD/Damage2p3D.o \
@@ -861,6 +862,7 @@ MATERIAL_LIBS   =  $(FE)/material/Material.o \
 	$(FE)/material/uniaxial/Trilinwpd.o \
 	$(FE)/material/uniaxial/Trilinwp.o \
 	$(FE)/material/uniaxial/Trilinwp2.o \
+	$(FE)/material/uniaxial/SteelFractureDI.o \
 	$(FE)/material/nD/NDMaterial.o \
 	$(FE)/material/nD/PlaneStressLayeredMaterial.o \
 	$(FE)/material/nD/PlaneStressRebarMaterial.o \

diff --git a/SRC/Makefile.incl b/SRC/Makefile.incl
@@ -113,6 +113,7 @@ FE_INCLUDES  = -I$(FE)/matrix \
                -I$(FE)/element/twoNodeLink \
                -I$(FE)/element/updatedLagrangianBeamColumn \
 			   -I$(FE)/element/RockingBC \
+			   -I$(FE)/element/CEqElement \
 	       -I$(FE)/element/UWelements \
 	       -I$(FE)/element/HUelements \
                -I$(FE)/analysis    \

diff --git a/SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp b/SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp
@@ -304,6 +304,8 @@
 #include "PFEMElement/PFEMElement2D.h"
 #include "RockingBC/RockingBC.h"
 
+#include "CEqElement/ASDEmbeddedNodeElement.h"
+
 #include "LinearCrdTransf2d.h"
 #include "LinearCrdTransf3d.h"
 #include "PDeltaCrdTransf2d.h"
@@ -897,6 +899,9 @@ FEM_ObjectBrokerAllClasses::getNewElement(int classTag)
     case ELE_TAG_RockingBC:
       return new RockingBC();
 
+    case ELE_TAG_ASDEmbeddedNodeElement:
+      return new ASDEmbeddedNodeElement();
+
     default:
       opserr << "FEM_ObjectBrokerAllClasses::getNewElement - ";
       opserr << " - no Element type exists for class tag " ;

diff --git a/SRC/classTags.h b/SRC/classTags.h
@@ -230,6 +230,7 @@
 #define MAT_TAG_PySimple3                    214
 #define MAT_TAG_PlateBearingConnectionThermal 215
 #define MAT_TAG_ASD_SMA_3K                    216
+#define MAT_TAG_SteelFractureDI			217 // galvisf
 
 #define MAT_TAG_Masonry 217
 #define MAT_TAG_Masonryt 218
@@ -788,6 +789,7 @@
 #define ELE_TAG_BeamGT                    214
 #define ELE_TAG_MasonPan12                    215
 #define ELE_TAG_MasonPan3D                    216
+#define ELE_TAG_ASDEmbeddedNodeElement             217  // Massimo Petracca (ASDEA)
 #define ELE_TAG_ZeroLengthImplexContact   218  // Onur Deniz Akan (IUSS), Massimo Petracca (ASDEA)
 #define ELE_TAG_ExternalElement           99990