cmp - remove lead underscore in new macros

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/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;
@@ -1189,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);
@@ -1522,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/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();

SRC/tcl/commands.cpp

@@ -139,7 +139,7 @@ extern "C" int         OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp
 #include <NormDispAndUnbalance.h>
 #include <NormDispOrUnbalance.h>
 
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
 #include <CTestPFEM.h>
 #endif
 
@@ -191,7 +191,7 @@ extern "C" int         OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp
 #include <DisplacementControl.h>
 #include <EQPath.h>
 
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
 #include <PFEMIntegrator.h>
 #endif
 
@@ -260,7 +260,7 @@ extern void OPS_ResponseSpectrumAnalysis(void);
 #include <DirectIntegrationAnalysis.h>
 #include <VariableTimeStepDirectIntegrationAnalysis.h>
 
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
 #include <PFEMAnalysis.h>
 #endif
 
@@ -296,7 +296,7 @@ extern void OPS_ResponseSpectrumAnalysis(void);
 
 #include <SparseGenColLinSOE.h>
 
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
 #include <PFEMSolver.h>
 #include <PFEMSolver_Umfpack.h>
 #include <PFEMLinSOE.h>
@@ -350,7 +350,7 @@ extern void OPS_ResponseSpectrumAnalysis(void);
 #include <SymSparseLinSOE.h>
 #include <SymSparseLinSolver.h>
 
-#ifdef _OPS_Numerics_UMFPACK
+#if defined(OPSDEF_Numerics_UMFPACK)
 #include <UmfpackGenLinSOE.h>
 #include <UmfpackGenLinSolver.h>
 #endif // _OPS_Numerics_UMFPACK
@@ -543,7 +543,7 @@ DirectIntegrationAnalysis *theTransientAnalysis = 0;
 VariableTimeStepDirectIntegrationAnalysis *theVariableTimeStepTransientAnalysis = 0;
 int numEigen = 0;
 
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
 static PFEMAnalysis* thePFEMAnalysis = 0;
 #endif
 
@@ -1510,7 +1510,7 @@ wipeAnalysis(ClientData clientData, Tcl_Interp *interp, int argc, TCL_Char **arg
   theTransientAnalysis =0;    
   theVariableTimeStepTransientAnalysis =0;   
   //  theSensitivityAlgorithm=0; 
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
   thePFEMAnalysis = 0;
 #endif
   theTest = 0;
@@ -1922,7 +1922,7 @@ analyzeModel(ClientData clientData, Tcl_Interp *interp, int argc, TCL_Char **arg
       return TCL_ERROR;	      
 
     result = theStaticAnalysis->analyze(numIncr);
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
   } else if(thePFEMAnalysis != 0) {
       result = thePFEMAnalysis->analyze();
 #endif
@@ -2469,7 +2469,7 @@ specifyAnalysis(ClientData clientData, Tcl_Interp *interp, int argc,
 #endif
 // AddingSensitivity:END /////////////////////////////////
 
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
     } else if(strcmp(argv[1], "PFEM") == 0) {
 
         if(argc < 5) {
@@ -3029,7 +3029,7 @@ specifySOE(ClientData clientData, Tcl_Interp *interp, int argc, TCL_Char **argv)
   }
 #endif
 
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
   else if(strcmp(argv[1], "PFEM") == 0) {
       if(argc <= 2) {
           PFEMSolver* theSolver = new PFEMSolver();
@@ -3320,7 +3320,7 @@ specifySOE(ClientData clientData, Tcl_Interp *interp, int argc, TCL_Char **argv)
     SymSparseLinSolver *theSolver = new SymSparseLinSolver();
     theSOE = new SymSparseLinSOE(*theSolver, lSparse);      
   }    
-#ifdef _OPS_Numerics_UMFPACK 
+#if defined(OPSDEF_Numerics_UMFPACK) 
   else if ((strcmp(argv[1],"UmfPack") == 0) || (strcmp(argv[1],"Umfpack") == 0)) {
 
     // now must determine the type of solver to create from rest of args
@@ -4220,7 +4220,7 @@ specifyCTest(ClientData clientData, Tcl_Interp *interp, int argc,
       if (Tcl_GetInt(interp, argv[7], &maxIncr) != TCL_OK)	
 	return TCL_ERROR;
     }
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
   } else if (strcmp(argv[1],"PFEM") == 0) {
       if(argc > 8) {
           if(Tcl_GetDouble(interp, argv[2], &tol) != TCL_OK)	
@@ -4349,7 +4349,7 @@ specifyCTest(ClientData clientData, Tcl_Interp *interp, int argc,
       theNewTest = new CTestRelativeEnergyIncr(tol,numIter,printIt,normType);             
     else if (strcmp(argv[1],"RelativeTotalNormDispIncr") == 0) 
       theNewTest = new CTestRelativeTotalNormDispIncr(tol,numIter,printIt,normType);
-#ifdef _OPS_Element_PFEM
+#if defined(OPSDEF_Element_PFEM)
     else if (strcmp(argv[1],"PFEM") == 0) 
         theNewTest = new CTestPFEM(tol,tolp,tol2,tolp2,tolrel,tolprel,numIter,maxIncr,printIt,normType);
 #endif // _OPS_Element_PFEM
@@ -4772,7 +4772,7 @@ specifyIntegrator(ClientData clientData, Tcl_Interp *interp, int argc,
     if (theTransientAnalysis != 0)
       theTransientAnalysis->setIntegrator(*theTransientIntegrator);
   }
-#ifdef _OPS_Element_PFEM 
+#if defined(OPSDEF_Element_PFEM) 
   else if (strcmp(argv[1],"PFEM") == 0) {
     theTransientIntegrator = new PFEMIntegrator();