Merge branch 'dmglib' of github.com:claudioperez/OpenSees into dmglib

CMakeLists.txt

@@ -59,16 +59,19 @@ endif()
 
 if(WIN32) # NOTE: this will execute for both 32-bit and 64-bit builds.
     include(OpenSeesDependenciesWin)
+
     # target_sources(OPS_OS_Specific_libs INTERFACE  ${OPS_SRC_DIR}/api/win32Functions.cpp)
     #target_link_libraries(OPS_OS_Specific_libs INTERFACE ${CBLAS_LIBRARIES} wsock32 ws2_32)
     target_link_libraries(OPS_OS_Specific_libs INTERFACE wsock32 ws2_32)
+# =======
+    add_compile_definitions(_WIN32)
+    # file(GLOB_RECURSE ops_precompiled CONFIGURE_DEPENDS "${PROJECT_SOURCE_DIR}/Win64/lib/debug/*.lib")
+    # message("OPS >>> Including the following precompiled libs: '${ops_precompiled}'")
+    # target_sources(OPS_OS_Specific_libs INTERFACE  ${OPS_SRC_DIR}/api/win32Functions.cpp)
+    # target_link_libraries(OPS_OS_Specific_libs INTERFACE ${CBLAS_LIBRARIES} ${ops_precompiled} wsock32 ws2_32)
+
     message(STATUS ">>> WIN32")
 endif()
-if(WIN64)
-    include(OpenSeesDependenciesWin)
-    target_link_libraries(OPS_OS_Specific_libs INTERFACE wsock64 ws2_64)
-    message(STATUS ">>> WIN64")
-endif()
 
 message("OPS >>> BLAS:    ${BLAS_LIBRARIES}")
 message("OPS >>> CBLAS:   ${CBLAS_LIBRARY}\n")
@@ -181,8 +184,8 @@ include_directories(${MYSQL_INCLUDE_DIR})
 
 # Temporary fix: include all directories with .h files through glob
 file(GLOB_RECURSE ops_include_files CONFIGURE_DEPENDS 
-	${OPS_SRC_DIR}/*.h
-	${OPS_BUNDLED_DIR}/*.h
+    ${OPS_SRC_DIR}/*.h
+    ${OPS_BUNDLED_DIR}/*.h
 )
 set(OPS_INCLUDE_DIRS "")
 foreach(filepath ${ops_include_files})
@@ -313,6 +316,22 @@ target_link_libraries(G3
 #----------------------------
 # OpenSees
 #----------------------------
+#<<<<<<< Updated upstream
+#=======
+#target_sources(OpenSees
+#    PRIVATE
+#    "${OPS_SRC_DIR}/interpreter/OpenSeesBeamIntegrationCommands.cpp"
+#    "${OPS_SRC_DIR}/interpreter/OpenSeesCrdTransfCommands.cpp"
+#    "${OPS_SRC_DIR}/interpreter/OpenSeesFrictionModelCommands.cpp"
+#    "${OPS_SRC_DIR}/interpreter/OpenSeesMiscCommands.cpp"
+#    "${OPS_SRC_DIR}/interpreter/OpenSeesNDMaterialCommands.cpp"
+#    "${OPS_SRC_DIR}/interpreter/OpenSeesOutputCommands.cpp"
+#  #"${OPS_SRC_DIR}/interpreter/OpenSeesCommands.cpp"
+#    "${OPS_SRC_DIR}/interpreter/OpenSeesElementCommands.cpp"
+#    "${OPS_SRC_DIR}/interpreter/OpenSeesSectionCommands.cpp"
+#    "${OPS_SRC_DIR}/interpreter/OpenSeesUniaxialMaterialCommands.cpp"
+#)
+#>>>>>>> Stashed changes
 
 target_link_libraries(OpenSees
     #OPS_Paraview
@@ -423,8 +442,8 @@ target_sources(OPS_Interp_Tcl PRIVATE
     "${OPS_SRC_DIR}/recorder/TclRecorderCommands.cpp"
     "${OPS_SRC_DIR}/damage/TclModelBuilderDamageModelCommand.cpp"
 
-	#"${OPS_SRC_DIR}/api/elementAPI_TCL.cpp"
-	"${OPS_SRC_DIR}/tcl/commands.cpp"
+    #"${OPS_SRC_DIR}/api/elementAPI_TCL.cpp"
+    "${OPS_SRC_DIR}/tcl/commands.cpp"
   "${OPS_SRC_DIR}/tcl/TclFeViewer.cpp"
 
     #"${OPS_SRC_DIR}/interpreter/TclInterpreter.cpp"

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

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();
 

SRC/material/uniaxial/CMakeLists.txt

@@ -107,7 +107,7 @@ target_sources(OPS_Material
       FRPConfinedConcrete.cpp
       FRPConfinedConcrete02.cpp
       FatigueMaterial.cpp
-      FedeasMaterial.cpp
+      #FedeasMaterial.cpp
       GNGMaterial.cpp
       HookGap.cpp
       HyperbolicGapMaterial.cpp
@@ -207,7 +207,7 @@ target_sources(OPS_Material
       FRPConfinedConcrete.h
       FRPConfinedConcrete02.h
       FatigueMaterial.h
-      FedeasMaterial.h
+      #FedeasMaterial.h
       GNGMaterial.h
       HardeningMaterial.cpp
       HardeningMaterial.h

SRC/material/uniaxial/TclModelBuilderUniaxialMaterialCommand.cpp

@@ -2893,8 +2893,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);

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})