Merge branch 'master' into core-adding-table-accessor

KratosMultiphysics · Aug 3, 2023 · c648610 · c648610
2 parents dad767a + 972ae53
commit c648610
Show file tree

Hide file tree

Showing 201 changed files with 58,854 additions and 2,484 deletions.
diff --git a/applications/DamApplication/CMakeLists.txt b/applications/DamApplication/CMakeLists.txt
@@ -50,8 +50,6 @@ set( KRATOS_DAM_APPLICATION_CORE_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/custom_constitutive/thermal_modified_mises_nonlocal_damage_3D_law.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/custom_constitutive/thermal_modified_mises_nonlocal_damage_plane_strain_2D_law.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/custom_constitutive/thermal_modified_mises_nonlocal_damage_plane_stress_2D_law.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/custom_constitutive/dam_joint_3D_law.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/custom_constitutive/dam_joint_2D_law.cpp
 
     # Elements
     ${CMAKE_CURRENT_SOURCE_DIR}/custom_elements/small_displacement_thermo_mechanic_element.cpp

diff --git a/applications/DamApplication/custom_constitutive/dam_joint_2D_law.cpp b/applications/DamApplication/custom_constitutive/dam_joint_2D_law.cpp
diff --git a/applications/DamApplication/custom_constitutive/dam_joint_2D_law.hpp b/applications/DamApplication/custom_constitutive/dam_joint_2D_law.hpp