fmk - all element dir now adding files to OPS_Element lib instead of …

…individual libs
zhuminjie · Nov 15, 2021 · ea1a596 · ea1a596
1 parent 5e56056
commit ea1a596
Show file tree

Hide file tree

Showing 36 changed files with 134 additions and 122 deletions.
diff --git a/SRC/element/CEqElement/CMakeLists.txt b/SRC/element/CEqElement/CMakeLists.txt
@@ -5,9 +5,13 @@
 #
 #==============================================================================
 
-opensees_elements(OPS_Element_CEq
-  SOURCES
+#opensees_elements(OPS_Element_CEq
+#  SOURCES
+
+target_sources(OPS_Element
+   PRIVATE
     ASDEmbeddedNodeElement.cpp
+   PUBLIC    
     ASDEmbeddedNodeElement.h
 )
 
diff --git a/SRC/element/PFEMElement/CMakeLists.txt b/SRC/element/PFEMElement/CMakeLists.txt
@@ -4,9 +4,10 @@
 #                Pacific Earthquake Engineering Research Center
 #
 #==============================================================================
-add_library(OPS_Element_PFEMElement)
+#add_library(OPS_Element_PFEMElement)
 
-target_sources(OPS_Element_PFEMElement
+#target_sources(OPS_Element_PFEMElement
+target_sources(OPS_PFEM
     PRIVATE
         BackgroundDef.cpp
         BackgroundFixData.cpp
@@ -82,5 +83,5 @@ target_sources(OPS_Element_PFEMElement
         TriMesh.h
 )
 
-target_include_directories(OPS_Element_PFEMElement PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(OPS_PFEM PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
diff --git a/SRC/element/PML/CMakeLists.txt b/SRC/element/PML/CMakeLists.txt
@@ -5,22 +5,25 @@
 #
 #==============================================================================
 
-opensees_elements(OPS_Element_PML
-  SOURCES
+#opensees_elements(OPS_Element_PML#
+#  SOURCES
+
+target_sources(OPS_Element
+  PRIVATE
     PML2D.cpp
-    PML2D.h
     PML3D.cpp
+  PUBLIC    
     PML3D.h
+    PML2D.h
 )
 
-add_library(OPS_Element_PML_f EXCLUDE_FROM_ALL)
-target_sources(OPS_Element_PML_f
+target_sources(OPS_ElementFortran
   PRIVATE
     pml_3d.f
     pml_2d.f
 )
 
-target_link_libraries(OPS_Element_PML PUBLIC OPS_Element_PML_f)
+#target_link_libraries(OPS_Element_PML PUBLIC OPS_Element_PML_f)
 #target_link_libraries(OPS_Element PUBLIC OPS_Element_PML_f)
-#target_include_directories(OPS_Element_PML PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(OPS_Element PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
diff --git a/SRC/element/PML/PML2D.cpp b/SRC/element/PML/PML2D.cpp
@@ -145,7 +145,7 @@ void  PML2D::setDomain( Domain *theDomain )
   int MCRD = 2; 
   int NNODE = PML2D_NUM_NODES;
 
-  pml_(K, 
+  pml2d_(K, 
        C, 
        M,   
        &NDOFEL, 

diff --git a/SRC/element/PML/PML2D.h b/SRC/element/PML/PML2D.h
@@ -46,9 +46,10 @@
 
 
 #ifdef _WIN32
-#define pml_	      PML_2D
 
-extern "C" void  pml_(double* kMatrix,
+#define pml2d_	      PML_2D
+
+extern "C" void  pml2d_(double* kMatrix,
 	double* cMatrix,
 	double* mMatrix,
 	int* NDOFEL,
@@ -60,9 +61,9 @@ extern "C" void  pml_(double* kMatrix,
 
 #else
 
-#define pml_	      pml_2d_
+#define pml2d_	      pml_2d_
 
-extern "C" void  pml_(double* kMatrix,
+extern "C" void  pml2d_(double* kMatrix,
 	double* cMatrix,
 	double* mMatrix,
 	int* NDOFEL,

diff --git a/SRC/element/PML/PML3D.cpp b/SRC/element/PML/PML3D.cpp
@@ -391,7 +391,7 @@ PML3D::update(void)
 	int MCRD = 3;
 	int NNODE = 8;
 
-	pml_(M,
+	pml3d_(M,
 		C,
 		K,
 		&NDOFEL,

diff --git a/SRC/element/PML/PML3D.h b/SRC/element/PML/PML3D.h
@@ -46,9 +46,9 @@
 
 #ifdef _WIN32
 
-#define pml_	      PML_3D
+#define pml3d_	      PML_3D
 
-extern "C" void  pml_(double* mMatrix,
+extern "C" void  pml3d_(double* mMatrix,
 	double* cMatrix,
 	double* kMatrix,
 	int* NDOFEL,
@@ -60,9 +60,9 @@ extern "C" void  pml_(double* mMatrix,
 
 #else
 
-#define pml_	      pml_3d_
+#define pml3d_	      pml_3d_
 
-extern "C" void  pml_(double* mMatrix,
+extern "C" void  pml3d_(double* mMatrix,
 	double* cMatrix,
 	double* kMatrix,
 	int* NDOFEL,

diff --git a/SRC/element/RockingBC/CMakeLists.txt b/SRC/element/RockingBC/CMakeLists.txt
@@ -4,13 +4,13 @@
 #                Pacific Earthquake Engineering Research Center
 #
 #==============================================================================
-add_library(OPS_Element_RockingBC OBJECT)
+#add_library(OPS_Element_RockingBC OBJECT)
 
-target_sources(OPS_Element_RockingBC
+target_sources(OPS_Element
     PRIVATE
         RockingBC.cpp
     PUBLIC
         RockingBC.h
 )
-target_include_directories(OPS_Element_RockingBC PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(OPS_Element PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
diff --git a/SRC/element/UP-ucsd/CMakeLists.txt b/SRC/element/UP-ucsd/CMakeLists.txt
@@ -4,9 +4,10 @@
 #                Pacific Earthquake Engineering Research Center
 #
 #==============================================================================
-add_library(OPS_Element_UP_ucsd OBJECT)
+#add_library(OPS_Element_UP_ucsd OBJECT)
 
-target_sources(OPS_Element_UP_ucsd
+#target_sources(OPS_Element_UP_ucsd
+target_sources(OPS_Element
     PRIVATE
         BBarBrickUP.cpp
         BBarFourNodeQuadUP.cpp
@@ -27,5 +28,5 @@ target_sources(OPS_Element_UP_ucsd
         shp3dv.h
         Twenty_Eight_Node_BrickUP.h
 )
-target_include_directories(OPS_Element_UP_ucsd PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(OPS_Element PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
diff --git a/SRC/element/XMUelements/CMakeLists.txt b/SRC/element/XMUelements/CMakeLists.txt
@@ -4,7 +4,7 @@
 #                Pacific Earthquake Engineering Research Center
 #
 #==============================================================================
-# TODO: Create new XMU element target
+
 target_sources(OPS_Element
   PRIVATE
       AC3D8HexWithSensitivity.cpp

diff --git a/SRC/element/absorbentBoundaries/CMakeLists.txt b/SRC/element/absorbentBoundaries/CMakeLists.txt
@@ -4,9 +4,12 @@
 #                Pacific Earthquake Engineering Research Center
 #
 #==============================================================================
-add_library(OPS_Element_absorbentBoundaries OBJECT)
 
-target_sources(OPS_Element_absorbentBoundaries
+#add_library(OPS_Element_absorbentBoundaries OBJECT)
+
+#target_sources(OPS_Element_absorbentBoundaries
+
+target_sources(OPS_Element
   PRIVATE
     ASDAbsorbingBoundary2D.cpp
     ASDAbsorbingBoundary3D.cpp
@@ -16,5 +19,6 @@ target_sources(OPS_Element_absorbentBoundaries
     ASDAbsorbingBoundary3D.h
     LysmerTriangle.h
 )
-target_include_directories(OPS_Element_absorbentBoundaries PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+
+target_include_directories(OPS_Element PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
diff --git a/SRC/element/adapter/CMakeLists.txt b/SRC/element/adapter/CMakeLists.txt
@@ -4,9 +4,9 @@
 #                Pacific Earthquake Engineering Research Center
 #
 #==============================================================================
-add_library(OPS_Element_adapter OBJECT)
+#add_library(OPS_Element_adapter OBJECT)
 
-target_sources(OPS_Element_adapter
+target_sources(OPS_Element
     PRIVATE
         ActuatorCorot.cpp
         Actuator.cpp
@@ -19,5 +19,5 @@ target_sources(OPS_Element_adapter
         Actuator.h
         Adapter.h
 )
-target_include_directories(OPS_Element_adapter PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(OPS_Element PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
diff --git a/SRC/element/beam3d/CMakeLists.txt b/SRC/element/beam3d/CMakeLists.txt
@@ -5,13 +5,17 @@
 #
 #==============================================================================
 
-opensees_elements(OPS_Element_beam3d
-  SOURCES
+# opensees_elements(OPS_Element_beam3d
+
+target_sources(OPS_Element
+  PRIVATE
      beam3d01.cpp
      beam3d02.cpp
+  PUBLIC     
      beam3d01.h
      beam3d02.h
 )
 
-target_include_directories(OPS_Element_beam3d PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+#target_include_directories(OPS_Element_beam3d PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(OPS_Element PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
diff --git a/SRC/element/beamWithHinges/CMakeLists.txt b/SRC/element/beamWithHinges/CMakeLists.txt
@@ -4,6 +4,7 @@
 #                Pacific Earthquake Engineering Research Center
 #
 #==============================================================================
+
 add_library(OPS_Element_beamWithHinges OBJECT)
 
 target_sources(OPS_Element_beamWithHinges

diff --git a/SRC/element/catenaryCable/CMakeLists.txt b/SRC/element/catenaryCable/CMakeLists.txt
@@ -4,13 +4,13 @@
 #                Pacific Earthquake Engineering Research Center
 #
 #==============================================================================
-add_library(OPS_Element_catenaryCable OBJECT)
+#add_library(OPS_Element_catenaryCable OBJECT)
 
-target_sources(OPS_Element_catenaryCable
+target_sources(OPS_Element
     PRIVATE
         CatenaryCable.cpp
     PUBLIC
         CatenaryCable.h
 )
-target_include_directories(OPS_Element_catenaryCable PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(OPS_Element PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
diff --git a/SRC/element/componentElement/CMakeLists.txt b/SRC/element/componentElement/CMakeLists.txt
@@ -4,13 +4,15 @@
 #                Pacific Earthquake Engineering Research Center
 #
 #==============================================================================
-add_library(OPS_Element_componentElement OBJECT)
+#add_library(OPS_Element_componentElement OBJECT)
 
-target_sources(OPS_Element_componentElement
+#target_sources(OPS_Element_componentElement
+target_sources(OPS_Element
     PRIVATE
         ComponentElement2d.cpp
     PUBLIC
         ComponentElement2d.h
 )
-target_include_directories(OPS_Element_componentElement PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+#target_include_directories(OPS_Element_componentElement PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(OPS_Element PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
diff --git a/SRC/element/dispBeamColumn/CMakeLists.txt b/SRC/element/dispBeamColumn/CMakeLists.txt
@@ -13,6 +13,8 @@ target_sources(OPS_Element
     DispBeamColumn2dThermal.cpp
     DispBeamColumn3dThermal.cpp
     DispBeamColumnNL2d.cpp
+    DispBeamColumnNL3d.cpp
+    DispBeamColumnWarping3d.cpp    
     DispBeamColumn2dWithSensitivity.cpp
     DispBeamColumn3dWithSensitivity.cpp
     AxEqDispBeamColumn2d.cpp
@@ -25,6 +27,8 @@ target_sources(OPS_Element
     DispBeamColumn2dThermal.h
     DispBeamColumn3dThermal.h
     DispBeamColumnNL2d.h
+    DispBeamColumnNL3d.h
+    DispBeamColumnWarping3d.h    
     DispBeamColumn2dWithSensitivity.h
     DispBeamColumn3dWithSensitivity.h
     AxEqDispBeamColumn2d.h

diff --git a/SRC/element/dispBeamColumnInt/CMakeLists.txt b/SRC/element/dispBeamColumnInt/CMakeLists.txt
@@ -4,9 +4,9 @@
 #                Pacific Earthquake Engineering Research Center
 #
 #==============================================================================
-add_library(OPS_Element_dispBeamColumnInt OBJECT)
+#add_library(OPS_Element_dispBeamColumnInt OBJECT)
 
-target_sources(OPS_Element_dispBeamColumnInt
+target_sources(OPS_Element
     PRIVATE
         DispBeamColumn2dInt.cpp
         FiberSection2dInt.cpp
@@ -17,5 +17,5 @@ target_sources(OPS_Element_dispBeamColumnInt
         FiberSection2dInt.h
         LinearCrdTransf2dInt.h
 )
-target_include_directories(OPS_Element_dispBeamColumnInt PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(OPS_Element PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
diff --git a/SRC/element/elasticBeamColumn/CMakeLists.txt b/SRC/element/elasticBeamColumn/CMakeLists.txt
@@ -8,13 +8,15 @@ target_sources(OPS_Element
     PRIVATE
       ElasticBeam2d.cpp
       ElasticBeam3d.cpp
+      ElasticBeamWarping3d.cpp      
       ElasticTimoshenkoBeam2d.cpp
       ElasticTimoshenkoBeam3d.cpp
       ModElasticBeam2d.cpp
       WheelRail.cpp
     PUBLIC
       ElasticBeam2d.h
       ElasticBeam3d.h
+      ElasticBeamWarping3d.h      
       ElasticTimoshenkoBeam2d.h
       ElasticTimoshenkoBeam3d.h
       ModElasticBeam2d.h

diff --git a/SRC/element/elastomericBearing/CMakeLists.txt b/SRC/element/elastomericBearing/CMakeLists.txt
@@ -4,9 +4,8 @@
 #                Pacific Earthquake Engineering Research Center
 #
 #==============================================================================
-add_library(OPS_Element_elastomericBearing OBJECT)
 
-target_sources(OPS_Element_elastomericBearing
+target_sources(OPS_Element
     PRIVATE
         ElastomericBearingBoucWen2d.cpp
         ElastomericBearingBoucWen3d.cpp
@@ -31,5 +30,5 @@ target_sources(OPS_Element_elastomericBearing
         HDR.h
         LeadRubberX.h
 )
-target_include_directories(OPS_Element_elastomericBearing PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(OPS_Element PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
diff --git a/SRC/element/feap/CMakeLists.txt b/SRC/element/feap/CMakeLists.txt
@@ -5,18 +5,19 @@
 #
 #==============================================================================
 
-opensees_elements(OPS_Element_feap
-  SOURCES
+#opensees_elements(OPS_Element_feap
+target_sources(OPS_Element
+  PRIVATE
     fElement.cpp
     fElmt02.cpp
     fElmt05.cpp
+  PUBLIC
     fElement.h
     fElmt02.h
     fElmt05.h
 )
 
-add_library(OPS_Element_feap_f)
-target_sources(OPS_Element_feap_f
+target_sources(OPS_ElementFortran
     PRIVATE
         dummyFeap.f
         elmt01.f
@@ -28,12 +29,11 @@ target_sources(OPS_Element_feap_f
         elmt11.f
         fillCommon.f
         getCommon.f
-        #TclFeapElementCommand.cpp
 )
 
-opensees_add_cxx_flag(OPS_Element_feap GNU -fpermissive)
-target_link_libraries(OPS_Element_feap PRIVATE OPS_Element_feap_f)
 
-target_include_directories(OPS_Element_feap PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+#opensees_add_cxx_flag(OPS_Element GNU -fpermissive)
+
+target_include_directories(OPS_Element PUBLIC ${CMAKE_CURRENT_LIST_DIR})