cmp

CMakeLists.txt

@@ -414,16 +414,22 @@ foreach(extension IN LISTS OPS_SysOfEqn_List OPS_Element_List OPS_Extension_List
     # message("    Adding macro definition '${ext_flag}'")
     add_compile_definitions(${ext_flag})
 endforeach()
+foreach(extension IN LISTS OPS_Exclude_List)
+    string(TOUPPER "${extension}" ext_flag) 
+    string(REGEX REPLACE "^OPS_" "OPS_EXCLUDE_" ext_flag "${ext_flag}")
+    message("    Adding macro definition '${ext_flag}'")
+    add_compile_definitions(${ext_flag})
+endforeach()
 
 # PFEM
 #----------------------------
 if (OPS_Use_PFEM)
   add_subdirectory("${OPS_EXTERNALS_DIR}/Tetgen")
-  #add_subdirectory("${OPS_EXTERNALS_DIR}/UMFPACK")
-  #add_subdirectory("${OPS_EXTERNALS_DIR}/CSPARSE")
   target_link_libraries(${OPS_FINAL_TARGET}
     OPS_Element_PFEMElement OPS_PFEM  #tet
   )
+  else()
+    add_compile_definitions(OPS_EXCLUDE_PFEMELEMENT)
 endif()
 
 # Renderer

Conf.cmake

@@ -31,7 +31,7 @@ option(OPS_Use_HDF5
   "HDF5 Dependent Code"                                    OFF)
 
 option(OPS_Use_PFEM
-  "                   "                                    OFF)
+  "                   "                                    ON )
 
 
 #==============================================================================
@@ -47,8 +47,6 @@ set(OPS_Numlib_List
 set(OPS_SysOfEqn_List
   OPS_SysOfEqn_UMF
   #OPS_SysOfEqn_ITPACK
-  #OPS_NumLib_PETSC
-  #OPS_NumLib_METIS
 )
 
 set(OPS_Extension_List
@@ -94,9 +92,11 @@ set(OPS_Element_List
   OPS_Element_surfaceLoad
   OPS_Element_updatedLagrangianBeamColumn
   OPS_Element_masonry
-  #OPS_Element_feap
-  #OPS_Element_PFEMElement
+  OPS_Element_PFEMElement
   OPS_Element_CEq
 )
 
+set(OPS_Exclude_List
+  OPS_Element_feap
+)
 

OTHER/AMD/CMakeLists.txt

@@ -41,12 +41,17 @@ target_compile_definitions(AMD_DINT PRIVATE DINT)
 target_compile_options(AMD_DINT PRIVATE -fexceptions -fPIC -I.)
 
 add_library(AMD_DLNG ${AMD_SOURCES})
-target_compile_definitions(AMD_DINT PRIVATE DLONG)
+target_compile_definitions(AMD_DLNG PRIVATE DLONG)
 target_compile_options(AMD_DLNG PRIVATE -fexceptions -fPIC -I.)
 
 #-------------------------------------------------------------------------------
 
-add_library(AMD SuiteSparse_config.c)
-target_link_libraries(AMD PRIVATE AMD_DINT AMD_DLNG)
+add_library(AMD)
+target_sources(AMD PRIVATE
+  SuiteSparse_config.c
+  $<TARGET_OBJECTS:AMD_DINT>
+  $<TARGET_OBJECTS:AMD_DLNG>
+)
+#target_link_libraries(AMD PUBLIC AMD_DINT AMD_DLNG)
 
 

SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.cpp

@@ -760,7 +760,7 @@ FEM_ObjectBrokerAllClasses::getNewElement(int classTag)
 
     case ELE_TAG_SSPbrickUP:
       return new SSPbrickUP();
-#if defined(OPSDEF_ELEMENT_PML)
+#if !defined(OPS_EXCLUDE_ELEMENT_PML)
 	case ELE_TAG_PML2D:
 	  return new PML2D();
 
@@ -893,10 +893,10 @@ FEM_ObjectBrokerAllClasses::getNewElement(int classTag)
     case ELE_TAG_TripleFrictionPendulum:
       return new TripleFrictionPendulum();
 
-#if defined(OPSDEF_ELEMENT_PFEM)
+#if !defined(OPS_EXCLUDE_ELEMENT_PFEM)
     case ELE_TAG_PFEMElement2D:
       return new PFEMElement2D();
-#endif // OPSDEF_ELEMENT_PFEM
+#endif // OPS_EXCLUDE_ELEMENT_PFEM
 
     case ELE_TAG_RockingBC:
       return new RockingBC();
@@ -1293,7 +1293,7 @@ FEM_ObjectBrokerAllClasses::getNewUniaxialMaterial(int classTag)
 
 	case MAT_TAG_FedeasSteel2:
 		return new FedeasSteel2Material();
-#endif
+#endif // OPSDEF_UNIAXIAL_FEDEAS
 	case MAT_TAG_DrainBilinear:
 		return new DrainBilinearMaterial();
 

SRC/material/uniaxial/CMakeLists.txt

@@ -31,7 +31,7 @@ target_sources(OPS_Material
       SteelMPF.cpp
       UVCuniaxial.cpp
       UniaxialMaterial.cpp
-      TclDegradingUniaxial.cpp
+      #TclDegradingUniaxial.cpp
     PUBLIC
       AxialSp.h
       AxialSp.h

SRC/material/uniaxial/TclModelBuilderUniaxialMaterialCommand.cpp

@@ -2923,9 +2923,10 @@ TclModelBuilderUniaxialMaterialCommand (ClientData clientData, Tcl_Interp *inter
 	theMaterial = Tcl_AddLimitStateMaterial(clientData, interp, argc, argv);
 
 
+#if defined(OPSDEF_DAMAGE_FEDEAS)
       if (theMaterial == 0)
         theMaterial = TclModelBuilder_addDegradingMaterial(clientData, interp, argc, argv);
-
+#endif
     }
 
     if (theMaterial == 0) {