Merge

adrigzr · Oct 19, 2017 · 3fce852 · 3fce852
2 parents 6d32a5d + f78eb3f
commit 3fce852
Show file tree

Hide file tree

Showing 510 changed files with 47,989 additions and 8,788 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required (VERSION 2.8.6)
-cmake_policy(SET CMP0054 OLD)
+
+if(POLICY CMP0054)
+  cmake_policy(SET CMP0054 OLD)
+endif(POLICY CMP0054)
 
 project (KratosMultiphysics)
 
@@ -8,6 +11,19 @@ set (KratosMultiphysics_MAJOR_VERSION 5)
 set (KratosMultiphysics_MINOR_VERSION 1)
 set (KratosMultiphysics_PATCH_VERSION 0)
 
+# Define custom compiler build types
+SET( CMAKE_CONFIGURATION_TYPES "Release;RelWithDebInfo;Debug;FullDebug" )
+SET( BASIC_DEBUG_FLAGS "${CMAKE_CXX_FLAGS_DEBUG}")
+#SET( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}" )
+#SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" )
+SET( CMAKE_CXX_FLAGS_DEBUG "${BASIC_DEBUG_FLAGS} -DNDEBUG -DKRATOS_DEBUG" )
+SET( CMAKE_CXX_FLAGS_FULLDEBUG "${BASIC_DEBUG_FLAGS} -DKRATOS_DEBUG" )
+
+# Define internal CMake flags needed
+SET( CMAKE_C_FLAGS_FULLDEBUG "${CMAKE_C_FLAGS_DEBUG}" )
+SET( CMAKE_SHARED_LINKER_FLAGS_FULLDEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" )
+SET( CMAKE_EXE_LINKER_FLAGS_FULLDEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}" )
+
 # Get subversion data. This is done automagically by the cmakes
 include (GenerateExportHeader)
 
@@ -24,6 +40,13 @@ else(GIT_FOUND)
   set (KratosMultiphysics_SHA1_NUMBER 0)
 endif(GIT_FOUND)
 
+set (KratosMultiphysics_BUILD_TYPE ${CMAKE_BUILD_TYPE})
+if( ${CMAKE_BUILD_TYPE} MATCHES "Release" )
+  set (KratosMultiphysics_BUILD_SUFFIX "")
+else( ${CMAKE_BUILD_TYPE} MATCHES "Release" )
+  set (KratosMultiphysics_BUILD_SUFFIX "-${CMAKE_BUILD_TYPE}" )
+endif( ${CMAKE_BUILD_TYPE} MATCHES "Release" )
+
 configure_file(
   "${PROJECT_SOURCE_DIR}/kratos_version.h.in"
   "${PROJECT_SOURCE_DIR}/kratos/includes/kratos_version.h"
@@ -58,8 +81,8 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   endif(${CMAKE_CXX_COMPILER_ID} MATCHES Intel)
 else(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   if(${CMAKE_C_COMPILER} MATCHES "icc.*$")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC  -funroll-loops  ") 	#-lpthread -wd654 -wd10010  ")
-    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fPIC -funroll-loops  ") 			#-lpthread -wd654 -wd10010  ")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC  -funroll-loops  ") #-lpthread -wd654 -wd10010  ")
+    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fPIC -funroll-loops  ") #-lpthread -wd654 -wd10010  ")
     set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
     message("additional default options were set for intel compiler")
     message("CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}")
@@ -285,17 +308,6 @@ include_directories( ${CMAKE_BINARY_DIR}/external_libraries/zlib )
 # defines needed
 add_definitions( -DKRATOS_PYTHON )
 
-if(${DO_NOT_DEFINE_NDEBUG} MATCHES ON )
-    message("*************** ATTENTION AVOIDING DEFINING NDEBUG --- EXTREMELY SLOW!! ***************************")
-else(${DO_NOT_DEFINE_NDEBUG} MATCHES ON )
-    add_definitions( -DNDEBUG )
-endif(${DO_NOT_DEFINE_NDEBUG} MATCHES ON )
-
-if(${KRATOS_DEBUG} MATCHES ON )
-    message("*************** DEFINING KRATOS_DEBUG --- VERY SLOW!! ***************************")
-    add_definitions( -DKRATOS_DEBUG )
-endif(${KRATOS_DEBUG} MATCHES ON )
-
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   add_definitions( -fPIC )
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")

diff --git a/applications/ContactStructuralMechanicsApplication/CMakeLists.txt b/applications/ContactStructuralMechanicsApplication/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/kratos )
 include_directories( ${CMAKE_SOURCE_DIR}/applications/StructuralMechanicsApplication )
 include_directories( ${CMAKE_SOURCE_DIR}/applications/ContactStructuralMechanicsApplication )
 include_directories( ${CMAKE_SOURCE_DIR}/applications/MeshingApplication )
-include_directories( ${CMAKE_SOURCE_DIR}/applications/FSIapplication )
 
 ## generate variables with the sources
 set( KRATOS_CONTACT_STRUCTURAL_MECHANICS_APPLICATION_SOURCES
@@ -27,7 +26,7 @@ set( KRATOS_CONTACT_STRUCTURAL_MECHANICS_APPLICATION_SOURCES
 
   ## CONDITIONS
   # Mortar condition
-  ${CMAKE_CURRENT_SOURCE_DIR}/custom_conditions/mesh_tying_mortar_condition.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/custom_conditions/mesh_tying_mortar_condition.cpp # Mesh tying
   ${CMAKE_CURRENT_SOURCE_DIR}/custom_conditions/ALM_mortar_contact_condition.cpp # Base class
   ${CMAKE_CURRENT_SOURCE_DIR}/custom_conditions/ALM_frictionless_mortar_contact_condition.cpp # Frictionless
   ${CMAKE_CURRENT_SOURCE_DIR}/custom_conditions/ALM_frictionless_mortar_contact_axisym_condition.cpp # Frictionless axisym
@@ -42,6 +41,7 @@ endif(${KRATOS_BUILD_TESTING} MATCHES ON)
 ###############################################################
 ## define library Kratos which defines the basic python interface
 add_library(KratosContactStructuralMechanicsApplication SHARED ${KRATOS_CONTACT_STRUCTURAL_MECHANICS_APPLICATION_SOURCES} ${KRATOS_CONTACT_STRUCTURAL_MECHANICS_TESTING_SOURCES})
+
 target_link_libraries(KratosContactStructuralMechanicsApplication KratosCore KratosStructuralMechanicsApplication)
 set_target_properties(KratosContactStructuralMechanicsApplication PROPERTIES COMPILE_DEFINITIONS "CONTACT_STRUCTURAL_MECHANICS_APPLICATION=EXPORT,API")
 set_target_properties(KratosContactStructuralMechanicsApplication PROPERTIES PREFIX "")

diff --git a/...alMechanicsApplication/custom_conditions/ALM_frictional_mortar_contact_axisym_condition.h b/...alMechanicsApplication/custom_conditions/ALM_frictional_mortar_contact_axisym_condition.h
@@ -29,7 +29,7 @@ namespace Kratos
 ///@name Type Definitions
 ///@{
 
-    typedef Point<3>                                  PointType;
+    typedef Point                                  PointType;
     typedef Node<3>                                    NodeType;
     typedef Geometry<NodeType>                     GeometryType;
     typedef Geometry<PointType>               GeometryPointType;
@@ -91,7 +91,7 @@ class AugmentedLagrangianMethodFrictionalMortarContactAxisymCondition: public Au
 
     typedef typename std::vector<array_1d<PointType,2>>                                   ConditionArrayListType;
 
-    typedef Line2D2<Point<3>>                                                                  DecompositionType;
+    typedef Line2D2<Point>                                                                  DecompositionType;
 
     typedef DerivativeDataFrictional<2, TNumNodes>                                            DerivativeDataType;