cmp

zhuminjie · Aug 30, 2021 · 98c79f8 · 98c79f8
1 parent 7d83518
commit 98c79f8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/Conf.cmake b/Conf.cmake
@@ -69,6 +69,7 @@ set(OPS_Extension_List
 
 set(OPS_Element_List
     #OPS_Material_StressDensity
+    #OPS_Uniaxial_Fedeas
 
     OPS_Element_truss
     #OPS_Element_beam2d

diff --git a/SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp b/SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp
@@ -1264,7 +1264,7 @@ FEM_ObjectBrokerAllClasses::getNewUniaxialMaterial(int classTag)
 
 	case MAT_TAG_ENTMaterial:
 		return new ENTMaterial();
-
+#if defined(OPSDEF_UNIAXIAL_FEDEAS)
 	case MAT_TAG_FedeasBond1:
 		return new FedeasBond1Material();
 
@@ -1294,7 +1294,7 @@ FEM_ObjectBrokerAllClasses::getNewUniaxialMaterial(int classTag)
 
 	case MAT_TAG_FedeasSteel2:
 		return new FedeasSteel2Material();
-
+#endif
 	case MAT_TAG_DrainBilinear:
 		return new DrainBilinearMaterial();
 

diff --git a/SRC/material/uniaxial/CMakeLists.txt b/SRC/material/uniaxial/CMakeLists.txt
@@ -106,7 +106,7 @@ target_sources(OPS_Material
       FRPConfinedConcrete.cpp
       FRPConfinedConcrete02.cpp
       FatigueMaterial.cpp
-      FedeasMaterial.cpp
+      #FedeasMaterial.cpp
       GNGMaterial.cpp
       HookGap.cpp
       HyperbolicGapMaterial.cpp
@@ -206,7 +206,7 @@ target_sources(OPS_Material
       FRPConfinedConcrete.h
       FRPConfinedConcrete02.h
       FatigueMaterial.h
-      FedeasMaterial.h
+      #FedeasMaterial.h
       GNGMaterial.h
       HardeningMaterial.cpp
       HardeningMaterial.h

diff --git a/SRC/material/uniaxial/TclModelBuilderUniaxialMaterialCommand.cpp b/SRC/material/uniaxial/TclModelBuilderUniaxialMaterialCommand.cpp
@@ -2891,8 +2891,9 @@ TclModelBuilderUniaxialMaterialCommand (ClientData clientData, Tcl_Interp *inter
     }								// END Salvatore Sessa 14-Jan-2021 Mail: salvatore.sessa2@unina.it
     else {
       // Fedeas
+ #if defined(_STEEL2) || defined(OPSDEF_UNIAXIAL_FEDEAS)
       theMaterial = TclModelBuilder_addFedeasMaterial(clientData, interp, argc, argv);
-      
+ #endif
       // Drain
       if (theMaterial == 0)
 	theMaterial = TclModelBuilder_addDrainMaterial(clientData, interp, argc, argv);

diff --git a/SRC/material/uniaxial/fedeas/CMakeLists.txt b/SRC/material/uniaxial/fedeas/CMakeLists.txt
@@ -1,6 +1,7 @@
-
-target_sources(OPS_Material
+add_library(OPS_Uniaxial_Fedeas)
+target_sources(OPS_Uniaxial_Fedeas
     PRIVATE
+        ../FedeasMaterial.cpp
         FedeasBond1Material.cpp
         FedeasBond2Material.cpp
         FedeasConcr1Material.cpp
@@ -14,6 +15,7 @@ target_sources(OPS_Material
         PD1.c
         PlasticDamageMaterial.cpp
     PUBLIC
+        ../FedeasMaterial.h
         FedeasBond1Material.h
         FedeasBond2Material.h
         FedeasConcr1Material.h
@@ -27,11 +29,14 @@ target_sources(OPS_Material
         PlasticDamageMaterial.h
 )
 
-add_library(OPS_Material_Uniaxial_Fedeas OBJECT)
-target_sources(OPS_Material_Uniaxial_Fedeas 
+add_library(OPS_Uniaxial_Fedeas_f OBJECT)
+target_sources(OPS_Uniaxial_Fedeas_f 
     PRIVATE
         Hard1.f
         PD1.f
 )
-target_include_directories(OPS_Material PUBLIC ${CMAKE_CURRENT_LIST_DIR})
+target_link_libraries(OPS_Uniaxial_Fedeas PUBLIC
+  OPS_Uniaxial_Fedeas_f
+  ${BUNDLE_LIBS}/fedeas.lib)
+#target_include_directories(OPS_Material PUBLIC ${CMAKE_CURRENT_LIST_DIR})