cmp - init contrib-src branch

zhuminjie · Jul 5, 2021 · 3bf99fe · 3bf99fe
1 parent ee85233
commit 3bf99fe
Show file tree

Hide file tree

Showing 13 changed files with 796 additions and 12 deletions.
diff --git a/SRC/actor/channel/Channel.cpp b/SRC/actor/channel/Channel.cpp
@@ -67,3 +67,11 @@ Channel::getTag(void)
 {
 		return tag;
 }
+
+int
+Channel::recvMsgUnknownSize(int dataTag, int commitTag, Message &, ChannelAddress *theAddress)
+{
+    // opserr << "Channel::recvMsgUnknownSize() - not yet implemented\n";
+    return -1;
+}
+
diff --git a/SRC/actor/channel/Channel.h b/SRC/actor/channel/Channel.h
@@ -83,7 +83,7 @@ class Channel
 
     virtual int recvMsgUnknownSize(int dbTag, int commitTag, 
 			Message &theMessage, 
-			ChannelAddress *theAddress =0) =0;  
+			ChannelAddress *theAddress =0) ; //=0;  
 
     virtual int sendMatrix(int dbTag, int commitTag, 
 			const Matrix &theMatrix, 

diff --git a/SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp b/SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp
@@ -158,13 +158,18 @@
 #include "J2ThreeDimensional.h"
 #include "PlaneStressMaterial.h"
 #include "PlateFiberMaterial.h"
+
 //start Yuli Huang & Xinzheng L
 #include "PlateRebarMaterial.h"
 #include "PlateFromPlaneStressMaterial.h"
 //#include "ConcreteS.h"
 #include "PlaneStressUserMaterial.h"
 //end Yuli Huang & Xinzheng Lu
+
+#ifdef _OPS_Element_FEAP
 #include "feap/FeapMaterial03.h"
+#endif // _OPS_Element_FEAP
+
 #include "CycLiqCP3D.h"
 #include "CycLiqCPPlaneStrain.h"
 #include "CycLiqCPSP3D.h"
@@ -1483,8 +1488,10 @@ FEM_ObjectBrokerAllClasses::getNewNDMaterial(int classTag)
   case ND_TAG_PressureIndependMultiYield:
     return new PressureIndependMultiYield();
 
+#ifdef _OPS_Element_FEAP
   case ND_TAG_FeapMaterial03:
     return new FeapMaterial03();
+#endif // _OPS_Element_FEAP
 
   case ND_TAG_ContactMaterial2D:
     return new ContactMaterial2D();			

diff --git a/SRC/database/MySqlDatastore.cpp b/SRC/database/MySqlDatastore.cpp
@@ -21,7 +21,7 @@
 // $Revision: 1.7 $
 // $Date: 2005-11-07 21:34:25 $
 // $Source: /usr/local/cvs/OpenSees/SRC/database/MySqlDatastore.cpp,v $
-
+#include <stdio.h>
 #include <MySqlDatastore.h>
 #include <Vector.h>
 #include <Matrix.h>

diff --git a/SRC/domain/component/TclParameterCommands.cpp b/SRC/domain/component/TclParameterCommands.cpp
@@ -33,6 +33,7 @@
 #include <ElementParameter.h>
 
 #include <RVParameter.h>
+
 #include <NodeResponseParameter.h>
 #include <LoadFactorParameter.h>
 

diff --git a/SRC/domain/domain/Domain.cpp b/SRC/domain/domain/Domain.cpp
@@ -3685,3 +3685,4 @@ int Domain::deactivateElements(const ID& elementList)
     }
     return 0;
 }
+
diff --git a/SRC/element/TclElementCommands.cpp b/SRC/element/TclElementCommands.cpp
@@ -192,8 +192,10 @@ extern void* OPS_LehighJoint2d(void);
 extern void* OPS_DispBeamColumnAsym3dTcl();  //Xinlong Du
 extern void* OPS_MixedBeamColumnAsym3dTcl(); //Xinlong Du
 
+#ifdef _OPS_Element_FEAP
 extern int TclModelBuilder_addFeapTruss(ClientData clientData, Tcl_Interp *interp,  int argc,
 					TCL_Char **argv, Domain*, TclModelBuilder *, int argStart);
+#endif // _OPS_Element_FEAP
 
 extern int
 Tcl_addWrapperElement(eleObj *, ClientData clientData, Tcl_Interp *interp,  int argc,
@@ -1477,13 +1479,17 @@ TclModelBuilderElementCommand(ClientData clientData, Tcl_Interp *interp,
   }
 
 
+#ifdef _OPS_Element_FEAP
   if (strcmp(argv[1],"fTruss") == 0) {
     int eleArgStart = 1;
     int result = TclModelBuilder_addFeapTruss(clientData, interp, argc, argv,
 					      theTclDomain, theTclBuilder, eleArgStart);
     return result;
 
-  } else if (strcmp(argv[1],"dispBeamColumnInt") == 0) {
+  } else 
+#endif // _OPS_Element_FEAP
+
+  if (strcmp(argv[1],"dispBeamColumnInt") == 0) {
     int result = TclModelBuilder_addDispBeamColumnInt(clientData, interp, argc, argv,
 						   theTclDomain, theTclBuilder);
     return result;

diff --git a/SRC/material/nD/TclModelBuilderNDMaterialCommand.cpp b/SRC/material/nD/TclModelBuilderNDMaterialCommand.cpp
@@ -141,12 +141,12 @@ extern  void *OPS_FSAMMaterial(void); // K Kolozvari
 extern void *OPS_Damage2p(void);
 #endif
 
-
+#ifdef _OPS_Material_FEAP
 NDMaterial *
 TclModelBuilder_addFeapMaterial(ClientData clientData, Tcl_Interp *interp,
 				int argc, TCL_Char **argv,
 				TclModelBuilder *theTclBuilder);
-
+#endif // _OPS_Material_FEAP
 
 extern int OPS_ResetInput(ClientData clientData, 
 			  Tcl_Interp *interp,  
@@ -2102,13 +2102,16 @@ TclModelBuilderNDMaterialCommand (ClientData clientData, Tcl_Interp *interp, int
 	}
 
 	//end of adding thermo-mechanical nd materials-L.Jiang[SIF]
+
+#ifdef _OPS_Material_FEAP
     else {
       theMaterial = TclModelBuilder_addFeapMaterial(clientData,
 						    interp,
 						    argc,
 						    argv,
 						    theTclBuilder);
     }
+#endif // _OPS_Material_FEAP
 
     if (theMaterial == 0) {
       //

diff --git a/SRC/modelbuilder/tcl/TclModelBuilder.cpp b/SRC/modelbuilder/tcl/TclModelBuilder.cpp
@@ -172,9 +172,10 @@ 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
 int 
 TclCommand_backgroundMesh(ClientData clientData, Tcl_Interp *interp, int argc, TCL_Char **argv);
+#endif // _OPS_Element_PFEM
 
 int
 TclCommand_addUniaxialMaterial(ClientData clientData, Tcl_Interp *interp, int argc, TCL_Char **argv);
@@ -468,10 +469,10 @@ 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
   Tcl_CreateCommand(interp, "background", &TclCommand_backgroundMesh, 
 		    (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-
+#endif // _OPS_Element_PFEM
 
   Tcl_CreateCommand(interp, "uniaxialMaterial", TclCommand_addUniaxialMaterial,
 		    (ClientData)NULL, NULL);
@@ -1356,6 +1357,7 @@ TclCommand_remesh(ClientData clientData, Tcl_Interp *interp,  int argc,
 
 }
 
+#ifdef _OPS_Element_PFEM
 extern int OPS_BgMesh();
 
 int 
@@ -1373,6 +1375,7 @@ TclCommand_backgroundMesh(ClientData clientData, Tcl_Interp *interp, int argc, T
     else return TCL_ERROR;
     return TCL_OK;
 }
+#endif // _OPS_Element_PFEM
 
 extern void* OPS_LobattoBeamIntegration(int& integrationTag, ID& secTags);
 extern void* OPS_LegendreBeamIntegration(int& integrationTag, ID& secTags);

diff --git a/SRC/recorder/PVDRecorder.cpp b/SRC/recorder/PVDRecorder.cpp
@@ -35,6 +35,7 @@
 #include <Matrix.h>
 #include <classTags.h>
 #include <NodeIter.h>
+
 #include "PFEMElement/BackgroundDef.h"
 #include "PFEMElement/Particle.h"
 #include "PFEMElement/ParticleGroup.h"

diff --git a/SRC/recorder/TclRecorderCommands.cpp b/SRC/recorder/TclRecorderCommands.cpp
@@ -55,11 +55,19 @@
  #include <EnvelopeElementRecorder.h>
  #include <NormElementRecorder.h>
  #include <NormEnvelopeElementRecorder.h>
+
+#ifdef _OPS_Recorder_PVD
  #include <PVDRecorder.h>
+#endif // _OPS_Recorder_PVD
+
 // #include <MPCORecorder.h>
  #include <GmshRecorder.h>
  #include <VTK_Recorder.h>
+
+#ifdef _OPS_Recorder_PVD
 extern void* OPS_PVDRecorder();
+#endif // _OPS_Recorder_PVD
+
 extern void* OPS_GmshRecorder();
 extern void* OPS_MPCORecorder();
 extern void* OPS_VTK_Recorder();
@@ -1834,12 +1842,15 @@ enum outputMode  {STANDARD_STREAM, DATA_STREAM, XML_STREAM, DATABASE_STREAM, BIN
 								    argv[2], xLoc, yLoc, width, height, 
 								    displayRecord, fileName);
 	 (*theRecorder) = thePlotter;
- #endif
+ #endif // _NOGRAPHICS
      } 
+#ifdef _OPS_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();
      }
+#endif // _OPS_Recorder_PVD
+
      else if (strcmp(argv[1],"vtk") == 0 || strcmp(argv[1],"VTK") == 0) {
        OPS_ResetInputNoBuilder(clientData, interp, 2, argc, argv, &theDomain);
        (*theRecorder) = (Recorder*) OPS_VTK_Recorder();

diff --git a/SRC/renderer/Renderer.h b/SRC/renderer/Renderer.h
@@ -68,9 +68,9 @@ class Renderer
     virtual int drawPoint(const Vector &, const Vector &rgb1, int tag = 0, int mode = 0, int width = 1) =0;
 
     virtual int drawLine(const Vector &, const Vector &, 
-        float V1, float V2, int tag = 0, int mode = 0) =0;
+        float V1, float V2, int tag = 0, int mode = 0) ;// =0;
     virtual int drawLine(const Vector &end1, const Vector &end2, 
-			 const Vector &rgb1, const Vector &rgb2,int tag = 0, int mode = 0) =0;
+			 const Vector &rgb1, const Vector &rgb2,int tag = 0, int mode = 0) ;//=0;
 
     virtual int drawCube(const Matrix &points, const Vector &values, int tag = 0, int mode = 0);
 
@@ -102,7 +102,7 @@ class Renderer
 
     virtual int setProjectionMode(const char *mode) =0; //parallel or perspective
     virtual int setFillMode(const char *mode) =0;    // wire or fill
-    virtual int setLineWidth(int width) = 0;    // line width
+    virtual int setLineWidth(int width) ;// = 0;    // line width
 
     virtual int setPRP(float u, float v, float n) =0; // eye location if 
 	                       // perspective, dirn to +ViewPlane if parallel