Merge branch 'dmglib' of https://github.com/claudioperez/OpenSees int…

…o dmglib

Conf.cmake

@@ -107,6 +107,7 @@ set(OPS_Element_List
     OPS_Element_shell
     OPS_Element_surfaceLoad
     OPS_Element_updatedLagrangianBeamColumn
+    OPS_Element_masonry
     #OPS_Element_feap
     #OPS_Element_PFEMElement
 )

SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp

@@ -166,7 +166,7 @@
 #include "PlaneStressUserMaterial.h"
 //end Yuli Huang & Xinzheng Lu
 
-#ifdef _OPS_Element_FEAP
+#if defined(OPSDEF_Element_FEAP)
 #include "feap/FeapMaterial03.h"
 #endif // _OPS_Element_FEAP
 
@@ -305,7 +305,7 @@
 #include "frictionBearing/SingleFPSimple3d.h"
 #include "frictionBearing/TripleFrictionPendulum.h"
 
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
 #include "PFEMElement/PFEMElement2D.h"
 #endif // _OPS_Element_PFEM
 
@@ -473,7 +473,7 @@
 #include "NewmarkHSIncrLimit.h"
 #include "NewmarkHSIncrReduct.h"
 
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
 #include "PFEMIntegrator.h"
 #endif // _OPS_Element_PFEM
 
@@ -767,7 +767,7 @@ FEM_ObjectBrokerAllClasses::getNewElement(int classTag)
 
     case ELE_TAG_SSPbrickUP:
       return new SSPbrickUP();
-#if defined(_OPS_ELEMENT_PML)
+#if defined(OPSDEF_ELEMENT_PML)
 	case ELE_TAG_PML2D:
 	  return new PML2D();
 
@@ -900,7 +900,7 @@ FEM_ObjectBrokerAllClasses::getNewElement(int classTag)
     case ELE_TAG_TripleFrictionPendulum:
       return new TripleFrictionPendulum();
 
-#if defined(_OPS_ELEMENT_PFEM)
+#if defined(OPSDEF_ELEMENT_PFEM)
     case ELE_TAG_PFEMElement2D:
       return new PFEMElement2D();
 #endif // _OPS_Element_PFEM
@@ -1488,7 +1488,7 @@ FEM_ObjectBrokerAllClasses::getNewNDMaterial(int classTag)
   case ND_TAG_PressureIndependMultiYield:
     return new PressureIndependMultiYield();
 
-#ifdef _OPS_Element_FEAP
+#if defined(OPSDEF_Element_FEAP)
   case ND_TAG_FeapMaterial03:
     return new FeapMaterial03();
 #endif // _OPS_Element_FEAP
@@ -2204,7 +2204,7 @@ FEM_ObjectBrokerAllClasses::getNewTransientIntegrator(int classTag)
     case INTEGRATOR_TAGS_NewmarkHSIncrReduct:  
 	     return new NewmarkHSIncrReduct();
 
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
     case INTEGRATOR_TAGS_PFEMIntegrator:
         return new PFEMIntegrator();
 #endif // _OPS_Element_PFEM

SRC/element/CMakeLists.txt

@@ -70,6 +70,7 @@ add_subdirectory(UP-ucsd)
 add_subdirectory(UWelements)
 add_subdirectory(HUelements)
 add_subdirectory(XMUelements)
+add_subdirectory(masonry)
 #add_subdirectory(dmglib)
 
 target_include_directories(OPS_Element PUBLIC ${CMAKE_CURRENT_LIST_DIR})

SRC/element/TclElementCommands.cpp

@@ -148,12 +148,12 @@ extern void* OPS_MVLEM_3D(void);    // Kristijan Kolozvari
 extern void* OPS_SFI_MVLEM_3D(void);    // Kristijan Kolozvari
 extern void *OPS_AxEqDispBeamColumn2d(void);
 extern void *OPS_ElastomericBearingBoucWenMod3d(void);
-#if defined(_OPS_ELEMENT_PFEM)
+#if defined(OPSDEF_ELEMENT_PFEM)
 extern void *OPS_PFEMElement2DBubble(const ID &info);
 extern void *OPS_PFEMElement2Dmini(const ID &info);
 extern void *OPS_PFEMElement2D();
 #endif
-#if defined(_HAVE_LHNMYS) || defined(_OPS_ELEMENT_LHNMYS)
+#if defined(_HAVE_LHNMYS) || defined(OPSDEF_ELEMENT_LHNMYS)
 extern void* OPS_BeamColumn2DwLHNMYS(void);
 extern void* OPS_BeamColumn2DwLHNMYS_Damage(void);
 extern void* OPS_BeamColumn3DwLHNMYS(void);
@@ -194,7 +194,7 @@ extern void *OPS_BeamGT(void);
 extern void* OPS_DispBeamColumnAsym3dTcl();  //Xinlong Du
 extern void* OPS_MixedBeamColumnAsym3dTcl(); //Xinlong Du
 
-#if defined(_OPS_Element_FEAP)
+#if defined(OPSDEF_Element_FEAP)
 extern int TclModelBuilder_addFeapTruss(ClientData clientData, Tcl_Interp *interp,  int argc,
 					TCL_Char **argv, Domain*, TclModelBuilder *, int argStart);
 #endif // _OPS_Element_FEAP
@@ -524,7 +524,7 @@ TclModelBuilderElementCommand(ClientData clientData, Tcl_Interp *interp,
       opserr << "TclElementCommand -- unable to create element of type : " << argv[1] << endln;
       return TCL_ERROR;
     }
-#if defined(_OPS_ELEMENT_PML)
+#if defined(OPSDEF_ELEMENT_PML)
   } else if ((strcmp(argv[1],"PML") == 0) || (strcmp(argv[1],"pml")) == 0) {
     Element *theEle = 0;
     ID info;
@@ -555,7 +555,7 @@ TclModelBuilderElementCommand(ClientData clientData, Tcl_Interp *interp,
     }
   }*/
 
-#if defined(_HAVE_LHNMYS) || defined(_OPS_ELEMENT_LHNMYS)    
+#if defined(_HAVE_LHNMYS) || defined(OPSDEF_ELEMENT_LHNMYS)    
   } else if (strcmp(argv[1],"beamColumn2DwLHNMYS") == 0) {
     Element *theEle = 0;
     ID info;
@@ -590,7 +590,6 @@ TclModelBuilderElementCommand(ClientData clientData, Tcl_Interp *interp,
     }
 #endif
 
-#if defined(_OPS_ELEMENT_WHEELRAIL)
   // Beginning of WheelRail element TCL command
   //Added by Quan Gu and Yongdou Liu, et al. on 2018/10/31
 
@@ -600,8 +599,8 @@ TclModelBuilderElementCommand(ClientData clientData, Tcl_Interp *interp,
     int result = TclModelBuilder_addWheelRail(clientData, interp, argc, argv,
 					      theTclDomain, theTclBuilder, eleArgStart);
     return result;
+
   // End of WheelRail element TCL command
-#endif
 
   } else if ((strcmp(argv[1],"ElasticTimoshenkoBeam") == 0) || (strcmp(argv[1],"elasticTimoshenkoBeam")) == 0) {
     Element *theEle = 0;
@@ -1190,7 +1189,7 @@ TclModelBuilderElementCommand(ClientData clientData, Tcl_Interp *interp,
       return TCL_ERROR;
     }
 
-#if defined(_OPS_ELEMENT_PFEM)
+#if defined(OPSDEF_ELEMENT_PFEM)
   } else if (strcmp(argv[1], "PFEMElement2DBuble") == 0) {
     ID info;
       void *theEle = OPS_PFEMElement2DBubble(info);
@@ -1523,7 +1522,7 @@ TclModelBuilderElementCommand(ClientData clientData, Tcl_Interp *interp,
   }
 
 
-#ifdef _OPS_ELEMENT_FEAP
+#if defined(OPSDEF_ELEMENT_FEAP)
   if (strcmp(argv[1],"fTruss") == 0) {
     int eleArgStart = 1;
     int result = TclModelBuilder_addFeapTruss(clientData, interp, argc, argv,

SRC/element/masonry/CMakeLists.txt

@@ -0,0 +1,28 @@
+add_library(OPS_Element_masonry)
+
+target_sources(OPS_Element_masonry
+  PUBLIC
+  BeamGT.cpp
+  MasonPan12.cpp
+  MasonPan3D.cpp
+  PRIVATE
+  BeamGT.h
+  MasonPan12.h
+  MasonPan3D.h
+
+)    
+
+target_sources(OPS_Material
+  PRIVATE
+  "${OPS_SRC_DIR}/material/uniaxial/Masonry.cpp"
+  "${OPS_SRC_DIR}/material/uniaxial/Masonryt.cpp"
+  "${OPS_SRC_DIR}/material/uniaxial/Trilinwp.cpp"
+  "${OPS_SRC_DIR}/material/uniaxial/Trilinwp2.cpp"
+  "${OPS_SRC_DIR}/material/uniaxial/Trilinwpd.cpp"
+  PUBLIC
+  "${OPS_SRC_DIR}/material/uniaxial/Masonry.h"
+  "${OPS_SRC_DIR}/material/uniaxial/Masonryt.h"
+  "${OPS_SRC_DIR}/material/uniaxial/Trilinwp.h"
+  "${OPS_SRC_DIR}/material/uniaxial/Trilinwp2.h"
+  "${OPS_SRC_DIR}/material/uniaxial/Trilinwpd.h"
+)

SRC/material/nD/TclModelBuilderNDMaterialCommand.cpp

@@ -141,7 +141,7 @@ extern  void *OPS_FSAMMaterial(void); // K Kolozvari
 extern void *OPS_Damage2p(void);
 #endif
 
-#ifdef _OPS_Material_FEAP
+#if defined(OPSDEF_Material_FEAP)
 NDMaterial *
 TclModelBuilder_addFeapMaterial(ClientData clientData, Tcl_Interp *interp,
 				int argc, TCL_Char **argv,
@@ -2103,7 +2103,7 @@ TclModelBuilderNDMaterialCommand (ClientData clientData, Tcl_Interp *interp, int
 
 	//end of adding thermo-mechanical nd materials-L.Jiang[SIF]
 
-#ifdef _OPS_Material_FEAP
+#if defined(OPSDEF_Material_FEAP)
     else {
       theMaterial = TclModelBuilder_addFeapMaterial(clientData,
 						    interp,

SRC/material/uniaxial/CMakeLists.txt

@@ -157,12 +157,15 @@ target_sources(OPS_Material
       TDConcreteMC10.cpp
       TDConcreteMC10NL.cpp
       TensionOnlyMaterial.cpp
-      TriMatrix.cpp
       UniaxialJ2Plasticity.cpp
       ViscousDamper.cpp
       ViscousMaterial.cpp
       WrapperUniaxialMaterial.cpp
       pyUCLA.cpp
+      SMAMaterial.cpp
+
+      TriMatrix.cpp
+
     PUBLIC
       ASD_SMA_3K.h
       BackboneMaterial.h
@@ -258,14 +261,16 @@ target_sources(OPS_Material
       TDConcreteMC10.h
       TDConcreteMC10NL.h
       TensionOnlyMaterial.h
-      TriMatrix.h
       UniaxialJ2Plasticity.h
       ViscousDamper.h
       ViscousMaterial.h
       WrapperUniaxialMaterial.h
       pyUCLA.h
+
+      TriMatrix.h  # move to SRC/matrix ?
 )
 
+
 add_library(OPS_Material_f)
 
 target_sources(OPS_Material_f PRIVATE

SRC/modelbuilder/tcl/TclModelBuilder.cpp

@@ -172,7 +172,7 @@ TclCommand_mesh(ClientData clientData, Tcl_Interp *interp,  int argc,
 int
 TclCommand_remesh(ClientData clientData, Tcl_Interp *interp,  int argc, 
 		  TCL_Char **argv);
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
 int 
 TclCommand_backgroundMesh(ClientData clientData, Tcl_Interp *interp, int argc, TCL_Char **argv);
 #endif // _OPS_Element_PFEM
@@ -469,7 +469,7 @@ TclModelBuilder::TclModelBuilder(Domain &theDomain, Tcl_Interp *interp, int NDM,
 		    (ClientData)NULL, NULL);
   Tcl_CreateCommand(interp, "remesh", TclCommand_remesh,
 		    (ClientData)NULL, NULL);
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
   Tcl_CreateCommand(interp, "background", &TclCommand_backgroundMesh, 
 		    (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
 #endif // _OPS_Element_PFEM
@@ -1359,7 +1359,7 @@ TclCommand_remesh(ClientData clientData, Tcl_Interp *interp,  int argc,
 
 }
 
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
 extern int OPS_BgMesh();
 
 int 

SRC/recorder/TclRecorderCommands.cpp

@@ -56,15 +56,15 @@
  #include <NormElementRecorder.h>
  #include <NormEnvelopeElementRecorder.h>
 
-#ifdef _OPS_Recorder_PVD
+#if defined(OPSDEF_Recorder_PVD)
  #include <PVDRecorder.h>
 #endif // _OPS_Recorder_PVD
 
 // #include <MPCORecorder.h>
  #include <GmshRecorder.h>
  #include <VTK_Recorder.h>
 
-#ifdef _OPS_Recorder_PVD
+#if defined(OPSDEF_Recorder_PVD)
 extern void* OPS_PVDRecorder();
 #endif // _OPS_Recorder_PVD
 
@@ -1844,7 +1844,7 @@ enum outputMode  {STANDARD_STREAM, DATA_STREAM, XML_STREAM, DATABASE_STREAM, BIN
 	 (*theRecorder) = thePlotter;
  #endif // _NOGRAPHICS
      } 
-#ifdef _OPS_Recorder_PVD
+#if defined(OPSDEF_Recorder_PVD)
      else if (strcmp(argv[1],"pvd") == 0 || strcmp(argv[1],"PVD") == 0) {
        OPS_ResetInputNoBuilder(clientData, interp, 2, argc, argv, &theDomain);
        (*theRecorder) = (Recorder*) OPS_PVDRecorder();