Skip to content

Commit be7fda7

Browse files
bgoderbauerbgoderbauer
committed
Apply CamelCase to GEOMETRYPAIR namespace
The base class GeometryPair is renamed to GeometryPairBase to avoid conflicts.
1 parent 14fb0be commit be7fda7

File tree

112 files changed

+1286
-1284
lines changed

Some content is hidden

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

112 files changed

+1286
-1284
lines changed

‎src/beaminteraction/src/4C_beaminteraction_beam_to_beam_point_coupling_pair.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ void BeamInteraction::BeamToBeamPointCouplingPair<Beam>::evaluate_and_assemble_p
8686

8787
// Initialize variables for evaluation of the positional coupling terms.
8888
std::array<Core::LinAlg::Matrix<Beam::n_dof_, 1, int>, 2> gid_pos;
89-
std::array<GEOMETRYPAIR::ElementData<Beam, scalar_type_pos>, 2> beam_pos = {
90-
GEOMETRYPAIR::InitializeElementData<Beam, scalar_type_pos>::initialize(beam_ele[0]),
91-
GEOMETRYPAIR::InitializeElementData<Beam, scalar_type_pos>::initialize(beam_ele[1])};
89+
std::array<GeometryPair::ElementData<Beam, scalar_type_pos>, 2> beam_pos = {
90+
GeometryPair::InitializeElementData<Beam, scalar_type_pos>::initialize(beam_ele[0]),
91+
GeometryPair::InitializeElementData<Beam, scalar_type_pos>::initialize(beam_ele[1])};
9292
std::array<Core::LinAlg::Matrix<3, 1, scalar_type_pos>, 2> r;
9393
Core::LinAlg::Matrix<3, 1, scalar_type_pos> force;
9494
std::array<Core::LinAlg::Matrix<Beam::n_dof_, 1, scalar_type_pos>, 2> force_element;
@@ -115,7 +115,7 @@ void BeamInteraction::BeamToBeamPointCouplingPair<Beam>::evaluate_and_assemble_p
115115
i_beam * Beam::n_dof_ + i_dof, element_posdofvec_absolutevalues[i_dof]);
116116

117117
// Evaluate the position of the coupling point.
118-
GEOMETRYPAIR::evaluate_position<Beam>(
118+
GeometryPair::evaluate_position<Beam>(
119119
position_in_parameterspace_[i_beam], beam_pos[i_beam], r[i_beam]);
120120
}
121121

@@ -326,7 +326,7 @@ void BeamInteraction::BeamToBeamPointCouplingPair<
326326
*/
327327
namespace BeamInteraction
328328
{
329-
using namespace GEOMETRYPAIR;
329+
using namespace GeometryPair;
330330

331331
template class BeamToBeamPointCouplingPair<t_hermite>;
332332
} // namespace BeamInteraction

‎src/beaminteraction/src/4C_beaminteraction_beam_to_beam_point_coupling_pair.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace BeamInteraction
3030
{
3131
/**
3232
* \brief Class for point-wise beam to beam mesh tying.
33-
* @param beam Type from GEOMETRYPAIR::ElementDiscretization... representing the beam.
33+
* @param beam Type from GeometryPair::ElementDiscretization... representing the beam.
3434
*/
3535
template <typename Beam>
3636
class BeamToBeamPointCouplingPair : public BeamContactPair

‎src/beaminteraction/src/4C_beaminteraction_beam_to_beam_point_coupling_pair_condition.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ BeamInteraction::BeamToBeamPointCouplingCondition::create_contact_pair(
4646

4747
// Create the beam contact pair.
4848
std::shared_ptr<BeamInteraction::BeamContactPair> contact_pair =
49-
std::make_shared<BeamToBeamPointCouplingPair<GEOMETRYPAIR::t_hermite>>(
49+
std::make_shared<BeamToBeamPointCouplingPair<GeometryPair::t_hermite>>(
5050
rotational_penalty_parameter_, positional_penalty_parameter_,
5151
local_parameter_coordinates_);
5252
// Return the newly created pair.

‎src/beaminteraction/src/4C_beaminteraction_beam_to_solid_conditions.cpp‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ BeamInteraction::BeamToSolidConditionVolumeMeshtying::BeamToSolidConditionVolume
163163

164164
// Create the geometry evaluation data for this condition.
165165
geometry_evaluation_data_ =
166-
std::make_shared<GEOMETRYPAIR::LineTo3DEvaluationData>(input_parameter_list);
166+
std::make_shared<GeometryPair::LineTo3DEvaluationData>(input_parameter_list);
167167
}
168168

169169
/**
@@ -192,22 +192,22 @@ BeamInteraction::create_beam_to_solid_volume_pair_shape(const Core::FE::CellType
192192
{
193193
case Core::FE::CellType::hex8:
194194
return std::make_shared<
195-
BtsClass<GEOMETRYPAIR::t_hermite, GEOMETRYPAIR::t_hex8, BtsTemplateArguments...>>();
195+
BtsClass<GeometryPair::t_hermite, GeometryPair::t_hex8, BtsTemplateArguments...>>();
196196
case Core::FE::CellType::hex20:
197197
return std::make_shared<
198-
BtsClass<GEOMETRYPAIR::t_hermite, GEOMETRYPAIR::t_hex20, BtsTemplateArguments...>>();
198+
BtsClass<GeometryPair::t_hermite, GeometryPair::t_hex20, BtsTemplateArguments...>>();
199199
case Core::FE::CellType::hex27:
200200
return std::make_shared<
201-
BtsClass<GEOMETRYPAIR::t_hermite, GEOMETRYPAIR::t_hex27, BtsTemplateArguments...>>();
201+
BtsClass<GeometryPair::t_hermite, GeometryPair::t_hex27, BtsTemplateArguments...>>();
202202
case Core::FE::CellType::tet4:
203203
return std::make_shared<
204-
BtsClass<GEOMETRYPAIR::t_hermite, GEOMETRYPAIR::t_tet4, BtsTemplateArguments...>>();
204+
BtsClass<GeometryPair::t_hermite, GeometryPair::t_tet4, BtsTemplateArguments...>>();
205205
case Core::FE::CellType::tet10:
206206
return std::make_shared<
207-
BtsClass<GEOMETRYPAIR::t_hermite, GEOMETRYPAIR::t_tet10, BtsTemplateArguments...>>();
207+
BtsClass<GeometryPair::t_hermite, GeometryPair::t_tet10, BtsTemplateArguments...>>();
208208
case Core::FE::CellType::nurbs27:
209209
return std::make_shared<
210-
BtsClass<GEOMETRYPAIR::t_hermite, GEOMETRYPAIR::t_nurbs27, BtsTemplateArguments...>>();
210+
BtsClass<GeometryPair::t_hermite, GeometryPair::t_nurbs27, BtsTemplateArguments...>>();
211211
default:
212212
FOUR_C_THROW("Wrong element type for solid element.");
213213
return nullptr;
@@ -225,19 +225,19 @@ BeamInteraction::create_beam_to_solid_volume_pair_shape_no_nurbs(const Core::FE:
225225
{
226226
case Core::FE::CellType::hex8:
227227
return std::make_shared<
228-
BtsClass<GEOMETRYPAIR::t_hermite, GEOMETRYPAIR::t_hex8, BtsTemplateArguments...>>();
228+
BtsClass<GeometryPair::t_hermite, GeometryPair::t_hex8, BtsTemplateArguments...>>();
229229
case Core::FE::CellType::hex20:
230230
return std::make_shared<
231-
BtsClass<GEOMETRYPAIR::t_hermite, GEOMETRYPAIR::t_hex20, BtsTemplateArguments...>>();
231+
BtsClass<GeometryPair::t_hermite, GeometryPair::t_hex20, BtsTemplateArguments...>>();
232232
case Core::FE::CellType::hex27:
233233
return std::make_shared<
234-
BtsClass<GEOMETRYPAIR::t_hermite, GEOMETRYPAIR::t_hex27, BtsTemplateArguments...>>();
234+
BtsClass<GeometryPair::t_hermite, GeometryPair::t_hex27, BtsTemplateArguments...>>();
235235
case Core::FE::CellType::tet4:
236236
return std::make_shared<
237-
BtsClass<GEOMETRYPAIR::t_hermite, GEOMETRYPAIR::t_tet4, BtsTemplateArguments...>>();
237+
BtsClass<GeometryPair::t_hermite, GeometryPair::t_tet4, BtsTemplateArguments...>>();
238238
case Core::FE::CellType::tet10:
239239
return std::make_shared<
240-
BtsClass<GEOMETRYPAIR::t_hermite, GEOMETRYPAIR::t_tet10, BtsTemplateArguments...>>();
240+
BtsClass<GeometryPair::t_hermite, GeometryPair::t_tet10, BtsTemplateArguments...>>();
241241
default:
242242
FOUR_C_THROW("Wrong element type for solid element.");
243243
return nullptr;
@@ -258,13 +258,13 @@ BeamInteraction::create_beam_to_solid_volume_pair_mortar(const Core::FE::CellTyp
258258
{
259259
case Inpar::BeamToSolid::BeamToSolidMortarShapefunctions::line2:
260260
return create_beam_to_solid_volume_pair_mortar<BtsClass, BtsMortarTemplateArguments...,
261-
GEOMETRYPAIR::t_line2>(shape, other_mortar_shape_function...);
261+
GeometryPair::t_line2>(shape, other_mortar_shape_function...);
262262
case Inpar::BeamToSolid::BeamToSolidMortarShapefunctions::line3:
263263
return create_beam_to_solid_volume_pair_mortar<BtsClass, BtsMortarTemplateArguments...,
264-
GEOMETRYPAIR::t_line3>(shape, other_mortar_shape_function...);
264+
GeometryPair::t_line3>(shape, other_mortar_shape_function...);
265265
case Inpar::BeamToSolid::BeamToSolidMortarShapefunctions::line4:
266266
return create_beam_to_solid_volume_pair_mortar<BtsClass, BtsMortarTemplateArguments...,
267-
GEOMETRYPAIR::t_line4>(shape, other_mortar_shape_function...);
267+
GeometryPair::t_line4>(shape, other_mortar_shape_function...);
268268
default:
269269
FOUR_C_THROW("Wrong mortar shape function.");
270270
return nullptr;
@@ -375,7 +375,7 @@ BeamInteraction::BeamToSolidConditionSurface::BeamToSolidConditionSurface(
375375

376376
// Create the geometry evaluation data for this condition.
377377
geometry_evaluation_data_ =
378-
std::make_shared<GEOMETRYPAIR::LineToSurfaceEvaluationData>(input_parameter_list);
378+
std::make_shared<GeometryPair::LineToSurfaceEvaluationData>(input_parameter_list);
379379
}
380380

381381
/**
@@ -425,10 +425,10 @@ void BeamInteraction::BeamToSolidConditionSurface::setup(
425425

426426
// Cast the geometry evaluation data to the correct type.
427427
auto line_to_surface_evaluation_data =
428-
std::dynamic_pointer_cast<GEOMETRYPAIR::LineToSurfaceEvaluationData>(
428+
std::dynamic_pointer_cast<GeometryPair::LineToSurfaceEvaluationData>(
429429
geometry_evaluation_data_);
430430
if (line_to_surface_evaluation_data == nullptr)
431-
FOUR_C_THROW("Could not cast to GEOMETRYPAIR::LineToSurfaceEvaluationData.");
431+
FOUR_C_THROW("Could not cast to GeometryPair::LineToSurfaceEvaluationData.");
432432

433433
// If the pairs are FAD, i.e., if the averaged normals have to be evaluated using FAD.
434434
int fad_order = 0;
@@ -451,7 +451,7 @@ void BeamInteraction::BeamToSolidConditionSurface::setup(
451451
}
452452

453453
// Loop over all pairs and add the needed face elements.
454-
std::unordered_map<int, std::shared_ptr<GEOMETRYPAIR::FaceElement>> pair_face_elements;
454+
std::unordered_map<int, std::shared_ptr<GeometryPair::FaceElement>> pair_face_elements;
455455
pair_face_elements.clear();
456456
for (const auto& pair : condition_contact_pairs_)
457457
{
@@ -464,8 +464,8 @@ void BeamInteraction::BeamToSolidConditionSurface::setup(
464464
if (find_in_pair == pair_face_elements.end())
465465
{
466466
// The face element has to be created and added to the contact pair.
467-
std::shared_ptr<GEOMETRYPAIR::FaceElement> new_face_element =
468-
GEOMETRYPAIR::face_element_factory(find_in_condition->second, fad_order,
467+
std::shared_ptr<GeometryPair::FaceElement> new_face_element =
468+
GeometryPair::face_element_factory(find_in_condition->second, fad_order,
469469
line_to_surface_evaluation_data->get_surface_normal_strategy());
470470
new_face_element->set_part_of_pair(true);
471471
pair_face_elements[solid_id] = new_face_element;
@@ -486,7 +486,7 @@ void BeamInteraction::BeamToSolidConditionSurface::setup(
486486

487487
// Now all faces of contact pairs are in pair_face_elements, we still need to add faces that are
488488
// needed for averaged normal calculation, but are not contained in any pair.
489-
std::unordered_map<int, std::shared_ptr<GEOMETRYPAIR::FaceElement>> face_elements_needed;
489+
std::unordered_map<int, std::shared_ptr<GeometryPair::FaceElement>> face_elements_needed;
490490
face_elements_needed = pair_face_elements;
491491
for (const auto& face_element_iterator : pair_face_elements)
492492
{
@@ -508,7 +508,7 @@ void BeamInteraction::BeamToSolidConditionSurface::setup(
508508
{
509509
// It is not already in the needed faces -> add it.
510510
face_elements_needed[element_id] =
511-
GEOMETRYPAIR::face_element_factory(find_in_condition->second, fad_order,
511+
GeometryPair::face_element_factory(find_in_condition->second, fad_order,
512512
line_to_surface_evaluation_data->get_surface_normal_strategy());
513513
}
514514
}
@@ -538,16 +538,16 @@ void BeamInteraction::BeamToSolidConditionSurface::set_state(
538538
if (is_contact())
539539
{
540540
auto line_to_other_evaluation_data =
541-
std::dynamic_pointer_cast<GEOMETRYPAIR::LineTo3DEvaluationData>(geometry_evaluation_data_);
541+
std::dynamic_pointer_cast<GeometryPair::LineTo3DEvaluationData>(geometry_evaluation_data_);
542542
line_to_other_evaluation_data->reset_tracker();
543543
}
544544

545545
// Cast the geometry evaluation data to the correct type.
546546
auto line_to_surface_evaluation_data =
547-
std::dynamic_pointer_cast<GEOMETRYPAIR::LineToSurfaceEvaluationData>(
547+
std::dynamic_pointer_cast<GeometryPair::LineToSurfaceEvaluationData>(
548548
geometry_evaluation_data_);
549549
if (line_to_surface_evaluation_data == nullptr)
550-
FOUR_C_THROW("Could not cast to GEOMETRYPAIR::LineToSurfaceEvaluationData.");
550+
FOUR_C_THROW("Could not cast to GeometryPair::LineToSurfaceEvaluationData.");
551551

552552
// Setup the geometry data for the surface patch.
553553
line_to_surface_evaluation_data->set_state(beaminteraction_data_state->get_dis_col_np());
@@ -560,7 +560,7 @@ std::shared_ptr<BeamInteraction::BeamContactPair>
560560
BeamInteraction::BeamToSolidConditionSurface::create_contact_pair_internal(
561561
const std::vector<Core::Elements::Element const*>& ele_ptrs)
562562
{
563-
using namespace GEOMETRYPAIR;
563+
using namespace GeometryPair;
564564

565565
const auto* beam_element = dynamic_cast<const Discret::Elements::Beam3Base*>(ele_ptrs[0]);
566566
const bool beam_is_hermite = beam_element->hermite_centerline_interpolation();
@@ -569,10 +569,10 @@ BeamInteraction::BeamToSolidConditionSurface::create_contact_pair_internal(
569569
const auto shape = core_element->shape();
570570

571571
auto line_to_surface_evaluation_data =
572-
std::dynamic_pointer_cast<GEOMETRYPAIR::LineToSurfaceEvaluationData>(
572+
std::dynamic_pointer_cast<GeometryPair::LineToSurfaceEvaluationData>(
573573
geometry_evaluation_data_);
574574
if (line_to_surface_evaluation_data == nullptr)
575-
FOUR_C_THROW("Could not cast to GEOMETRYPAIR::LineToSurfaceEvaluationData.");
575+
FOUR_C_THROW("Could not cast to GeometryPair::LineToSurfaceEvaluationData.");
576576
auto surface_normal_strategy = line_to_surface_evaluation_data->get_surface_normal_strategy();
577577

578578
if (is_mesh_tying())
@@ -637,7 +637,7 @@ BeamInteraction::BeamToSolidConditionSurface::create_contact_pair_internal(
637637
case Inpar::BeamToSolid::BeamToSolidSurfaceCoupling::displacement_fad:
638638
case Inpar::BeamToSolid::BeamToSolidSurfaceCoupling::consistent_fad:
639639
{
640-
if (surface_normal_strategy == Inpar::GEOMETRYPAIR::SurfaceNormals::standard)
640+
if (surface_normal_strategy == Inpar::GeometryPair::SurfaceNormals::standard)
641641
{
642642
switch (shape)
643643
{
@@ -665,7 +665,7 @@ BeamInteraction::BeamToSolidConditionSurface::create_contact_pair_internal(
665665
}
666666
}
667667
else if (surface_normal_strategy ==
668-
Inpar::GEOMETRYPAIR::SurfaceNormals::extended_volume)
668+
Inpar::GeometryPair::SurfaceNormals::extended_volume)
669669
{
670670
switch (shape)
671671
{

‎src/beaminteraction/src/4C_beaminteraction_beam_to_solid_conditions.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ namespace BeamInteraction
9696
/**
9797
* \brief Return a pointer to the geometry evaluation data in this condition.
9898
*/
99-
std::shared_ptr<const GEOMETRYPAIR::GeometryEvaluationDataBase> get_geometry_evaluation_data()
99+
std::shared_ptr<const GeometryPair::GeometryEvaluationDataBase> get_geometry_evaluation_data()
100100
const
101101
{
102102
return geometry_evaluation_data_;
@@ -122,7 +122,7 @@ namespace BeamInteraction
122122

123123
protected:
124124
//! Pointer to the geometry evaluation data for this condition.
125-
std::shared_ptr<GEOMETRYPAIR::GeometryEvaluationDataBase> geometry_evaluation_data_;
125+
std::shared_ptr<GeometryPair::GeometryEvaluationDataBase> geometry_evaluation_data_;
126126

127127
//! Pointer to the solid condition.
128128
std::shared_ptr<const Core::Conditions::Condition> condition_other_;

‎src/beaminteraction/src/4C_beaminteraction_beam_to_solid_pair_base.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ void BeamInteraction::BeamToSolidPairBase<ScalarType, SegmentsScalarType, Beam,
4444
BeamContactPair::setup();
4545

4646
// Get the beam element data container
47-
ele1posref_ = GEOMETRYPAIR::InitializeElementData<Beam, double>::initialize(element1());
48-
ele1pos_ = GEOMETRYPAIR::InitializeElementData<Beam, ScalarType>::initialize(element1());
47+
ele1posref_ = GeometryPair::InitializeElementData<Beam, double>::initialize(element1());
48+
ele1pos_ = GeometryPair::InitializeElementData<Beam, ScalarType>::initialize(element1());
4949

5050
// Set reference nodal positions (and tangents) for beam element
5151
for (unsigned int n = 0; n < Beam::n_nodes_; ++n)
@@ -108,7 +108,7 @@ void BeamInteraction::BeamToSolidPairBase<ScalarType, SegmentsScalarType, Beam,
108108
const std::vector<double>& solid_nodal_dofvec)
109109
{
110110
// Set the current configuration of the beam element
111-
ele1pos_ = GEOMETRYPAIR::InitializeElementData<Beam, ScalarType>::initialize(element1());
111+
ele1pos_ = GeometryPair::InitializeElementData<Beam, ScalarType>::initialize(element1());
112112
for (unsigned int i = 0; i < Beam::n_dof_; i++)
113113
ele1pos_.element_position_(i) = Core::FADUtils::HigherOrderFadValue<ScalarType>::apply(
114114
Beam::n_dof_ + Solid::n_dof_, i, beam_centerline_dofvec[i]);
@@ -179,15 +179,15 @@ void BeamInteraction::BeamToSolidPairBase<ScalarType, SegmentsScalarType, Beam,
179179
*/
180180
template <typename ScalarType, typename SegmentsScalarType, typename Beam, typename Solid>
181181
void BeamInteraction::BeamToSolidPairBase<ScalarType, SegmentsScalarType, Beam,
182-
Solid>::evaluate_beam_position_double(const GEOMETRYPAIR::ProjectionPoint1DTo3D<double>&
182+
Solid>::evaluate_beam_position_double(const GeometryPair::ProjectionPoint1DTo3D<double>&
183183
integration_point,
184184
Core::LinAlg::Matrix<3, 1, double>& r_beam, bool reference) const
185185
{
186186
if (reference)
187-
GEOMETRYPAIR::evaluate_position<Beam>(integration_point.get_eta(), ele1posref_, r_beam);
187+
GeometryPair::evaluate_position<Beam>(integration_point.get_eta(), ele1posref_, r_beam);
188188
else
189-
GEOMETRYPAIR::evaluate_position<Beam>(integration_point.get_eta(),
190-
GEOMETRYPAIR::ElementDataToDouble<Beam>::to_double(ele1pos_), r_beam);
189+
GeometryPair::evaluate_position<Beam>(integration_point.get_eta(),
190+
GeometryPair::ElementDataToDouble<Beam>::to_double(ele1pos_), r_beam);
191191
}
192192

193193

@@ -196,7 +196,7 @@ void BeamInteraction::BeamToSolidPairBase<ScalarType, SegmentsScalarType, Beam,
196196
*/
197197
namespace BeamInteraction
198198
{
199-
using namespace GEOMETRYPAIR;
199+
using namespace GeometryPair;
200200

201201
// Beam-to-volume pairs
202202
template class BeamToSolidPairBase<double, double, t_hermite, t_hex8>;

‎src/beaminteraction/src/4C_beaminteraction_beam_to_solid_pair_base.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ namespace BeamInteraction
2424
* \brief Base class for beam to solid interactions.
2525
* @tparam scalar_type Scalar FAD type to be used in this pair.
2626
* @tparam segments_scalar_type Scalar FAD type to be used for the beam-to-solid segments.
27-
* @tparam beam Type from GEOMETRYPAIR::ElementDiscretization... representing the beam.
28-
* @tparam solid Type from GEOMETRYPAIR::ElementDiscretization... representing the solid.
27+
* @tparam beam Type from GeometryPair::ElementDiscretization... representing the beam.
28+
* @tparam solid Type from GeometryPair::ElementDiscretization... representing the solid.
2929
*/
3030
template <typename ScalarType, typename SegmentsScalarType, typename Beam, typename Solid>
3131
class BeamToSolidPairBase : public BeamContactPair
@@ -172,18 +172,18 @@ namespace BeamInteraction
172172
* position is calculated.
173173
*/
174174
virtual void evaluate_beam_position_double(
175-
const GEOMETRYPAIR::ProjectionPoint1DTo3D<double>& integration_point,
175+
const GeometryPair::ProjectionPoint1DTo3D<double>& integration_point,
176176
Core::LinAlg::Matrix<3, 1, double>& r_beam, bool reference) const;
177177

178178
protected:
179179
//! Vector with the segments of the line to 3D pair.
180-
std::vector<GEOMETRYPAIR::LineSegment<SegmentsScalarType>> line_to_3D_segments_;
180+
std::vector<GeometryPair::LineSegment<SegmentsScalarType>> line_to_3D_segments_;
181181

182182
//! Current nodal positions (and tangents) of the beam.
183-
GEOMETRYPAIR::ElementData<Beam, ScalarType> ele1pos_;
183+
GeometryPair::ElementData<Beam, ScalarType> ele1pos_;
184184

185185
//! Reference nodal positions (and tangents) of the beam.
186-
GEOMETRYPAIR::ElementData<Beam, double> ele1posref_;
186+
GeometryPair::ElementData<Beam, double> ele1posref_;
187187
};
188188
} // namespace BeamInteraction
189189

‎src/beaminteraction/src/4C_beaminteraction_beam_to_solid_params_base.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void BeamInteraction::BeamToSolidParamsBase::set_base_params(
6161
FOUR_C_THROW("beam-to-volume-meshtying penalty parameter must not be negative!");
6262

6363
// Gauss rule for integration along the beam (segments).
64-
gauss_rule_ = Inpar::GEOMETRYPAIR::int_to_gauss_rule1_d(
64+
gauss_rule_ = Inpar::GeometryPair::int_to_gauss_rule1_d(
6565
beam_to_solid_params_list.get<int>("GAUSS_POINTS"));
6666
}
6767

0 commit comments

Comments
 (0)