Skip to content

Commit 0210a8b

Browse files
authored
Merge pull request #1974 from amgebauer/remove-3D-from-solid-elements
Remove 3D from solid element name
2 parents cc04f18 + 3d9dd89 commit 0210a8b

File tree

154 files changed

+444
-444
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+444
-444
lines changed

src/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ add_subdirectory(scatra)
6262
add_subdirectory(scatra_ele)
6363
add_subdirectory(shell7p)
6464
add_subdirectory(shell_kl_nurbs)
65-
add_subdirectory(solid_3D_ele)
66-
add_subdirectory(solid_poro_3D_ele)
67-
add_subdirectory(solid_scatra_3D_ele)
65+
add_subdirectory(solid_ele)
66+
add_subdirectory(solid_poro_ele)
67+
add_subdirectory(solid_scatra_ele)
6868
add_subdirectory(ssi)
6969
add_subdirectory(ssti)
7070
add_subdirectory(sti)

src/adapter/4C_adapter_str_structure_new.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "4C_rebalance_binning_based.hpp"
3535
#include "4C_rigidsphere.hpp"
3636
#include "4C_shell7p_ele.hpp"
37-
#include "4C_solid_3D_ele.hpp"
37+
#include "4C_solid_ele.hpp"
3838
#include "4C_solver_nonlin_nox_group.hpp"
3939
#include "4C_solver_nonlin_nox_group_prepostoperator.hpp"
4040
#include "4C_structure_new_solver_factory.hpp"

src/adapter/4C_adapter_structure_scatra_ele.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "4C_fem_general_element.hpp"
1111
#include "4C_membrane_scatra.hpp"
1212
#include "4C_shell7p_ele_scatra.hpp"
13-
#include "4C_solid_scatra_3D_ele.hpp"
13+
#include "4C_solid_scatra_ele.hpp"
1414
#include "4C_truss3_scatra.hpp"
1515

1616
FOUR_C_NAMESPACE_OPEN

src/adapter/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ set(_dependencies
3535
porofluid_pressure_based
3636
scatra
3737
shell7p
38-
solid_3D_ele
38+
solid_ele
3939
solver_nonlin_nox
4040
ssi
4141
ssti

src/ale/4C_ale_ale2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "4C_fem_discretization.hpp"
1414
#include "4C_fem_general_node.hpp"
1515
#include "4C_io_input_spec_builders.hpp"
16-
#include "4C_solid_3D_ele_nullspace.hpp"
16+
#include "4C_solid_ele_nullspace.hpp"
1717
#include "4C_utils_exceptions.hpp"
1818

1919
FOUR_C_NAMESPACE_OPEN

src/ale/4C_ale_ale3.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "4C_fem_discretization.hpp"
1313
#include "4C_fem_general_node.hpp"
1414
#include "4C_io_input_spec_builders.hpp"
15-
#include "4C_solid_3D_ele_nullspace.hpp"
15+
#include "4C_solid_ele_nullspace.hpp"
1616
#include "4C_utils_exceptions.hpp"
1717

1818
FOUR_C_NAMESPACE_OPEN

src/ale/4C_ale_ale3_nurbs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "4C_ale_ale3_nurbs.hpp"
99

1010
#include "4C_fem_general_node.hpp"
11-
#include "4C_solid_3D_ele_nullspace.hpp"
11+
#include "4C_solid_ele_nullspace.hpp"
1212

1313
FOUR_C_NAMESPACE_OPEN
1414

src/beaminteraction/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set(_dependencies
1919
mat
2020
rigidsphere
2121
shell_kl_nurbs
22-
solid_3D_ele
22+
solid_ele
2323
structure
2424
structure_new
2525
timestepping

src/beaminteraction/src/4C_beaminteraction_calc_utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "4C_linalg_utils_sparse_algebra_manipulation.hpp"
2929
#include "4C_rigidsphere.hpp"
3030
#include "4C_shell_kl_nurbs.hpp"
31-
#include "4C_solid_3D_ele.hpp"
31+
#include "4C_solid_ele.hpp"
3232
#include "4C_utils_exceptions.hpp"
3333

3434
FOUR_C_NAMESPACE_OPEN

src/beaminteraction/src/4C_beaminteraction_str_model_evaluator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include "4C_rebalance_graph_based.hpp"
4040
#include "4C_rebalance_print.hpp"
4141
#include "4C_rigidsphere.hpp"
42-
#include "4C_solid_3D_ele.hpp"
42+
#include "4C_solid_ele.hpp"
4343
#include "4C_structure_new_model_evaluator_data.hpp"
4444
#include "4C_structure_new_timint_base.hpp"
4545
#include "4C_structure_new_utils.hpp"

0 commit comments

Comments
 (0)