Merge commit '8ecd274bcf5cbcc4705362debb60f19749306dea'

opensees/DEVELOPER/core/classTags.h

@@ -218,11 +218,12 @@
 #define MAT_TAG_QzSimple1                    207
 #define MAT_TAG_PyLiq1                       208
 #define MAT_TAG_TzLiq1                       209
-#define MAT_TAG_PySimple2                    210
-#define MAT_TAG_TzSimple2                    211
-#define MAT_TAG_QzSimple2                    212
-#define MAT_TAG_SteelBRB                     213
-#define MAT_TAG_PySimple3                    214
+#define MAT_TAG_QzLiq1                       210
+#define MAT_TAG_PySimple2                    211
+#define MAT_TAG_TzSimple2                    212
+#define MAT_TAG_QzSimple2                    213
+#define MAT_TAG_SteelBRB                     214
+#define MAT_TAG_PySimple3                    215
 
 
 
@@ -722,6 +723,8 @@
 #define ELE_TAG_EightNodeQuad             208
 #define ELE_TAG_SixNodeTri                209
 
+#define ELE_TAG_ASDEmbeddedNodeElement             217  // Massimo Petracca (ASDEA)
+
 #define FRN_TAG_Coulomb            1
 #define FRN_TAG_VelDependent       2
 #define FRN_TAG_VelPressureDep     3

opensees/EXAMPLES/ExamplePython/Example1.1.py

@@ -29,11 +29,7 @@
 # create ModelBuilder (with two-dimensions and 2 DOF/node)
 model("BasicBuilder", "-ndm",2, "-ndf",2)
 
-# set default units
-defaultUnits("-force", "kip", "-length", "in", "-time", "sec", "-temp", "F")
-
 # create nodes & add to Domain - command: node nodeId xCrd yCrd
-#node(1, 0.0,    0.0, "-disp",0.0,0.0, "-vel", 0.0,0.0, "-mass", 0.0,0.0)
 node(1, 0.0,    0.0)
 node(2, 144.0,  0.0)
 node(3, 168.0,  0.0)

opensees/EXAMPLES/ExampleScripts/Example1.1.tcl

@@ -23,10 +23,11 @@
 # ------------------------------
 
 foreach eleType {truss corotTruss} {
-
+    
     # Create ModelBuilder (with two-dimensions and 2 DOF/node)
-    model BasicBuilder -ndm 2 -ndf 2
     wipe
+    model BasicBuilder -ndm 2 -ndf 2
+
     # Create nodes
     # ------------
 

opensees/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)

opensees/SRC/Makefile

@@ -240,6 +240,7 @@ REMO_LIBS = $(FE)/element/nonlinearBeamColumn/matrixutil/MatrixUtil.o \
 	$(FE)/element/forceBeamColumn/TrapezoidalBeamIntegration.o \
 	$(FE)/element/forceBeamColumn/FixedLocationBeamIntegration.o \
 	$(FE)/element/forceBeamColumn/LowOrderBeamIntegration.o \
+	$(FE)/element/forceBeamColumn/ChebyshevBeamIntegration.o \
 	$(FE)/coordTransformation/CrdTransf.o \
 	$(FE)/coordTransformation/LinearCrdTransf2d.o \
 	$(FE)/coordTransformation/PDeltaCrdTransf2d.o \
@@ -343,6 +344,7 @@ PY_SJB_RWB_BJ_LIBS = $(FE)/material/uniaxial/PY/PySimple1.o \
 	$(FE)/material/uniaxial/PY/ShallowFoundationGen.o \
 	$(FE)/material/uniaxial/PY/PyLiq1.o \
 	$(FE)/material/uniaxial/PY/TzLiq1.o \
+	$(FE)/material/uniaxial/PY/QzLiq1.o \
 	$(FE)/material/uniaxial/PY/PySimple1Gen.o \
 	$(FE)/material/uniaxial/PY/TzSimple1Gen.o
 
@@ -512,7 +514,9 @@ ELE_LIBS   =  $(FE)/element/Element.o \
 	$(FE)/element/dispBeamColumn/DispBeamColumnNL2d.o \
 	$(FE)/element/dispBeamColumn/DispBeamColumn2dThermal.o \
 	$(FE)/element/dispBeamColumn/DispBeamColumn3d.o \
+	$(FE)/element/dispBeamColumn/DispBeamColumnNL3d.o \
 	$(FE)/element/dispBeamColumn/DispBeamColumnWarping3d.o \
+	$(FE)/element/dispBeamColumn/DispBeamColumnAsym3d.o \
 	$(FE)/element/dispBeamColumn/DispBeamColumn3dThermal.o \
 	$(FE)/element/dispBeamColumn/DispBeamColumn2dWithSensitivity.o \
 	$(FE)/element/dispBeamColumn/DispBeamColumn3dWithSensitivity.o \
@@ -533,6 +537,7 @@ ELE_LIBS   =  $(FE)/element/Element.o \
 	$(FE)/element/gradientInelasticBeamColumn/TclGradientInelasticBeamColumnCommand.o \
 	$(FE)/element/mixedBeamColumn/MixedBeamColumn2d.o \
 	$(FE)/element/mixedBeamColumn/MixedBeamColumn3d.o \
+	$(FE)/element/mixedBeamColumn/MixedBeamColumnAsym3d.o \
 	$(FE)/element/fourNodeQuad/FourNodeQuad.o \
 	$(FE)/element/fourNodeQuad/FourNodeQuad3d.o \
 	$(FE)/element/fourNodeQuad/FourNodeQuadWithSensitivity.o \
@@ -626,6 +631,8 @@ ELE_LIBS   =  $(FE)/element/Element.o \
 	$(FE)/element/PFEMElement/HigherOrder.o \
 	$(FE)/element/PFEMElement/Mesh.o \
 	$(FE)/element/PFEMElement/PFEMContact2D.o \
+	$(FE)/element/PFEMElement/BNode.o \
+	$(FE)/element/PFEMElement/BCell.o \
 	$(FE)/element/UWelements/SSPquad.o \
 	$(FE)/element/UWelements/SSPquadUP.o \
 	$(FE)/element/UWelements/SSPbrick.o \
@@ -648,7 +655,11 @@ ELE_LIBS   =  $(FE)/element/Element.o \
         $(FE)/element/PML/PML3D.o \
         $(FE)/element/PML/pml_2d.o \
         $(FE)/element/PML/PML2D.o \
-	$(FE)/element/RockingBC/RockingBC.o
+	$(FE)/element/RockingBC/RockingBC.o \
+	$(FE)/element/masonry/MasonPan12.o \
+	$(FE)/element/masonry/MasonPan3D.o \
+	$(FE)/element/masonry/BeamGT.o \
+	$(FE)/element/CEqElement/ASDEmbeddedNodeElement.o
 
 #	$(FE)/material/nD/Damage2p.o \
 #	$(FE)/material/nD/Damage2p3D.o \
@@ -808,6 +819,7 @@ MATERIAL_LIBS   =  $(FE)/material/Material.o \
 	$(FE)/material/uniaxial/ImpactMaterial.o \
 	$(FE)/material/uniaxial/SteelBRB.o \
 	$(FE)/material/uniaxial/GNGMaterial.o \
+	$(FE)/material/uniaxial/SMAMaterial.o \
 	$(FE)/material/uniaxial/SelfCenteringMaterial.o \
 	$(FE)/material/uniaxial/SPSW02.o \
 	$(FE)/material/uniaxial/TDConcrete.o \
@@ -845,6 +857,12 @@ MATERIAL_LIBS   =  $(FE)/material/Material.o \
 	$(FE)/material/uniaxial/unloading/TakedaUnloadingRule.o \
 	$(FE)/material/uniaxial/unloading/EnergyUnloadingRule.o \
 	$(FE)/material/uniaxial/unloading/KarsanUnloadingRule.o \
+	$(FE)/material/uniaxial/Masonry.o \
+	$(FE)/material/uniaxial/Masonryt.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 \
@@ -896,6 +914,8 @@ MATERIAL_LIBS   =  $(FE)/material/Material.o \
 	$(FE)/material/nD/UWmaterials/ManzariDafaliasPlaneStrainRO.o \
 	$(FE)/material/nD/UWmaterials/InitialStateAnalysisWrapper.o \
 	$(FE)/material/nD/UWmaterials/J2CyclicBoundingSurface.o \
+	$(FE)/material/nD/UWmaterials/J2CyclicBoundingSurface3D.o \
+	$(FE)/material/nD/UWmaterials/J2CyclicBoundingSurfacePlaneStrain.o \
 	$(FE)/material/nD/UWmaterials/PM4Sand.o \
 	$(FE)/material/nD/UWmaterials/PM4Silt.o \
 	$(FE)/material/nD/LinearCap.o \
@@ -1015,9 +1035,9 @@ SECTION_LIBS = $(FE)/material/section/SectionForceDeformation.o \
 	$(FE)/material/section/LayeredShellFiberSectionThermal.o \
 	$(FE)/material/section/FiberSection3dThermal.o \
 	$(FE)/material/section/MembranePlateFiberSectionThermal.o \
-	$(FE)/material/section/FiberSectionGJThermal.o \
 	$(FE)/material/section/FiberSection3d.o \
 	$(FE)/material/section/FiberSectionWarping3d.o \
+	$(FE)/material/section/FiberSectionAsym3d.o \
 	$(FE)/material/section/NDFiberSection3d.o \
 	$(FE)/material/section/SectionAggregator.o \
 	$(FE)/material/section/ParallelSection.o \

opensees/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    \

opensees/SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp

@@ -107,6 +107,7 @@
 #include "PY/QzSimple2.h"
 #include "PY/PyLiq1.h"
 #include "PY/TzLiq1.h"
+#include "PY/QzLiq1.h"
 
 #include "fedeas/FedeasBond1Material.h"
 #include "fedeas/FedeasBond2Material.h"
@@ -138,6 +139,7 @@
 //#include "FiberSection.h"
 #include "FiberSection2d.h"
 #include "FiberSection3d.h"
+#include "FiberSectionAsym3d.h" //Xinlong Du
 #include "ElasticPlateSection.h"
 #include "ElasticMembranePlateSection.h"
 #include "MembranePlateFiberSection.h"
@@ -190,6 +192,9 @@
 #include "UWmaterials/ManzariDafaliasPlaneStrainRO.h"
 #include "UWmaterials/PM4Sand.h"
 #include "UWmaterials/PM4Silt.h"
+#include "J2CyclicBoundingSurface.h"
+#include "J2CyclicBoundingSurface3D.h"
+#include "J2CyclicBoundingSurfacePlaneStrain.h"
 #include "UWmaterials/InitialStateAnalysisWrapper.h"
 #include "stressDensityModel/stressDensity.h"
 #include "InitStressNDMaterial.h"
@@ -259,6 +264,8 @@
 
 #include "dispBeamColumn/DispBeamColumn2d.h"
 #include "dispBeamColumn/DispBeamColumn3d.h"
+#include "dispBeamColumn/DispBeamColumnAsym3d.h"    //Xinlong Du
+#include "mixedBeamColumn/MixedBeamColumnAsym3d.h"  //Xinlong Du
 #include "shell/ShellMITC4.h"
 #include "shell/ShellMITC9.h"
 #include "shell/ShellDKGQ.h"   //Added by Lisha Wang, Xinzheng Lu, Linlin Xie, Song Cen & Quan Gu
@@ -297,6 +304,8 @@
 #include "PFEMElement/PFEMElement2D.h"
 #include "RockingBC/RockingBC.h"
 
+#include "CEqElement/ASDEmbeddedNodeElement.h"
+
 #include "LinearCrdTransf2d.h"
 #include "LinearCrdTransf3d.h"
 #include "PDeltaCrdTransf2d.h"
@@ -713,6 +722,12 @@ FEM_ObjectBrokerAllClasses::getNewElement(int classTag)
 
     case ELE_TAG_DispBeamColumn3d:  
       return new DispBeamColumn3d(); 
+
+	case ELE_TAG_DispBeamColumnAsym3d:
+		return new DispBeamColumnAsym3d();    //Xinlong Du
+
+	case ELE_TAG_MixedBeamColumnAsym3d:
+		return new MixedBeamColumnAsym3d();   //Xinlong Du
 
     case ELE_TAG_EnhancedQuad:
       return new EnhancedQuad();
@@ -882,6 +897,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 " ;
@@ -1197,7 +1215,7 @@ FEM_ObjectBrokerAllClasses::getNewUniaxialMaterial(int classTag)
 	case MAT_TAG_Fatigue:
 		return new FatigueMaterial();
 
-       case MAT_TAG_TzLiq1:
+    case MAT_TAG_TzLiq1:
 		return new TzLiq1();
 
 	case MAT_TAG_QzSimple1:
@@ -1206,6 +1224,9 @@ FEM_ObjectBrokerAllClasses::getNewUniaxialMaterial(int classTag)
 	case MAT_TAG_QzSimple2:
 		return new QzSimple2();
 
+    case MAT_TAG_QzLiq1:
+		return new QzLiq1();
+
 	case MAT_TAG_Hysteretic:
 		return new HystereticMaterial();
 
@@ -1367,6 +1388,9 @@ FEM_ObjectBrokerAllClasses::getNewSection(int classTag)
 	case SEC_TAG_FiberSection3d:
 		return new FiberSection3d();
 
+	case SEC_TAG_FiberSectionAsym3d:
+		return new FiberSectionAsym3d(); //Xinlong Du
+
 	case SEC_TAG_ElasticPlateSection:
 		return new ElasticPlateSection();
 
@@ -1507,6 +1531,15 @@ FEM_ObjectBrokerAllClasses::getNewNDMaterial(int classTag)
   case ND_TAG_PM4Silt:
 	return new PM4Silt();
 
+  case ND_TAG_J2CyclicBoundingSurface:
+	  return new J2CyclicBoundingSurface();
+
+  case ND_TAG_J2CyclicBoundingSurface3D:
+	  return new J2CyclicBoundingSurface3D();
+
+  case ND_TAG_J2CyclicBoundingSurfacePlaneStrain:
+	  return new J2CyclicBoundingSurfacePlaneStrain();
+
   case ND_TAG_InitialStateAnalysisWrapper:
       return new InitialStateAnalysisWrapper(); 
 

opensees/SRC/analysis/algorithm/equiSolnAlgo/ExpressNewton.cpp

@@ -54,6 +54,35 @@
 #include <elementAPI.h>
 #include <string>
 
+void *OPS_ExpressNewton()
+{
+  int nIter = 2, factorOnce = 0, formTangent = CURRENT_TANGENT;
+  double kMultiplier = 1.0;
+
+  int nArgs = OPS_GetNumRemainingInputArgs();
+  int numData = 1;
+  if (nArgs > 0 && OPS_GetIntInput(&numData,&nIter) < 0) {
+    opserr << "WARNING ExpressNewton -- error reading nIter\n";
+    return 0;
+  }
+  if (nArgs > 1 && OPS_GetDoubleInput(&numData,&kMultiplier) < 0) {
+    opserr << "WARNING ExpressNewton -- error reading kMultiplier\n";
+    return 0;
+  }
+  while (OPS_GetNumRemainingInputArgs() > 0) {
+    const char *type = OPS_GetString();
+    if ((strcmp(type,"-initialTangent") == 0) || (strcmp(type,"-InitialTangent") == 0)) {
+      formTangent = INITIAL_TANGENT;
+    } else if ((strcmp(type,"-currentTangent") == 0) || (strcmp(type,"-CurrentTangent") ==0 )) {
+      formTangent = CURRENT_TANGENT;
+    } else if ((strcmp(type,"-factorOnce") == 0) || (strcmp(type,"-FactorOnce") ==0 )) {
+      factorOnce = 1;
+    }
+  }
+
+    return new ExpressNewton(nIter,kMultiplier,formTangent,factorOnce);
+}
+
 // Constructor
 ExpressNewton::ExpressNewton(int ni, double km, int tg, int fo)
   :EquiSolnAlgo(EquiALGORITHM_TAGS_ExpressNewton), nIter(ni), factorOnce(fo)