Skip to content

Commit 14fb0be

Browse files
bgoderbauerbgoderbauer
committed
Apply CamelCase to SUBMODELEVALUATOR namespace
1 parent 405967a commit 14fb0be

File tree

50 files changed

+371
-371
lines changed

Some content is hidden

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

50 files changed

+371
-371
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ BeamInteraction::BeamToSolidCondition::create_contact_pair(
111111
/**
112112
*
113113
*/
114-
std::shared_ptr<BeamInteraction::SUBMODELEVALUATOR::BeamContactAssemblyManager>
114+
std::shared_ptr<BeamInteraction::SubmodelEvaluator::BeamContactAssemblyManager>
115115
BeamInteraction::BeamToSolidCondition::create_indirect_assembly_manager(
116116
const std::shared_ptr<const Core::FE::Discretization>& discret)
117117
{
@@ -141,7 +141,7 @@ BeamInteraction::BeamToSolidCondition::create_indirect_assembly_manager(
141141
mortar_manager->set_local_maps(condition_contact_pairs_);
142142

143143
// Create the indirect assembly manager with the mortar manager
144-
return std::make_shared<SUBMODELEVALUATOR::BeamContactAssemblyManagerInDirect>(mortar_manager);
144+
return std::make_shared<SubmodelEvaluator::BeamContactAssemblyManagerInDirect>(mortar_manager);
145145
}
146146
return nullptr;
147147
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ namespace BeamInteraction
9090
* \brief Create the indirect assembly manager for this condition.
9191
* @param discret (in) discretization.
9292
*/
93-
std::shared_ptr<SUBMODELEVALUATOR::BeamContactAssemblyManager> create_indirect_assembly_manager(
93+
std::shared_ptr<SubmodelEvaluator::BeamContactAssemblyManager> create_indirect_assembly_manager(
9494
const std::shared_ptr<const Core::FE::Discretization>& discret) override;
9595

9696
/**

‎src/beaminteraction/src/4C_beaminteraction_beam_to_solid_surface_visualization_output_writer.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriter::
152152
*
153153
*/
154154
void BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriter::write_output_runtime(
155-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact) const
155+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact) const
156156
{
157157
// Get the time step and time for the output file. If output is desired at every iteration, the
158158
// values are padded. The runtime output is written when the time step is already set to the next
@@ -167,7 +167,7 @@ void BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriter::write_output_
167167
*
168168
*/
169169
void BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriter::write_output_runtime_iteration(
170-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact, int i_iteration) const
170+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact, int i_iteration) const
171171
{
172172
if (output_params_ptr_->get_output_every_iteration())
173173
{
@@ -183,7 +183,7 @@ void BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriter::write_output_
183183
*/
184184
void BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriter::
185185
write_output_beam_to_solid_surface(
186-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact, int i_step,
186+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact, int i_step,
187187
double time) const
188188
{
189189
// Parameter list that will be passed to all contact pairs when they create their visualization.
@@ -239,7 +239,7 @@ void BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriter::
239239
{
240240
// Add pair specific output for direct assembly managers.
241241
auto direct_assembly_manager = std::dynamic_pointer_cast<
242-
BeamInteraction::SUBMODELEVALUATOR::BeamContactAssemblyManagerDirect>(assembly_manager);
242+
BeamInteraction::SubmodelEvaluator::BeamContactAssemblyManagerDirect>(assembly_manager);
243243
if (not(direct_assembly_manager == nullptr))
244244
{
245245
for (const auto& pair : direct_assembly_manager->get_contact_pairs())
@@ -248,7 +248,7 @@ void BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriter::
248248

249249
// Add pair specific output for indirect assembly managers.
250250
auto indirect_assembly_manager = std::dynamic_pointer_cast<
251-
BeamInteraction::SUBMODELEVALUATOR::BeamContactAssemblyManagerInDirect>(assembly_manager);
251+
BeamInteraction::SubmodelEvaluator::BeamContactAssemblyManagerInDirect>(assembly_manager);
252252
if (not(indirect_assembly_manager == nullptr))
253253
{
254254
// If needed, setup the vector with the global moments around the origin.

‎src/beaminteraction/src/4C_beaminteraction_beam_to_solid_surface_visualization_output_writer.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace BeamInteraction
2323
{
2424
class BeamToSolidSurfaceVisualizationOutputParams;
2525
class BeamToSolidVisualizationOutputWriterBase;
26-
namespace SUBMODELEVALUATOR
26+
namespace SubmodelEvaluator
2727
{
2828
class BeamContact;
2929
}
@@ -63,7 +63,7 @@ namespace BeamInteraction
6363
* (and probably can not) have a RCP to itself.
6464
*/
6565
void write_output_runtime(
66-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact) const;
66+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact) const;
6767

6868
/**
6969
* \brief Setup post iteration output creation, and call WriteOutputData.
@@ -73,7 +73,7 @@ namespace BeamInteraction
7373
* @param i_iteration (in) current number of iteration.
7474
*/
7575
void write_output_runtime_iteration(
76-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact, int i_iteration) const;
76+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact, int i_iteration) const;
7777

7878
private:
7979
/**
@@ -85,7 +85,7 @@ namespace BeamInteraction
8585
* @param time (in) Scalar time value for this visualization step.
8686
*/
8787
void write_output_beam_to_solid_surface(
88-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact, int i_step,
88+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact, int i_step,
8989
double time) const;
9090

9191
private:

‎src/beaminteraction/src/4C_beaminteraction_beam_to_solid_surface_visualization_output_writer_contact.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriterContact::
135135
*
136136
*/
137137
void BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriterContact::write_output_runtime(
138-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact) const
138+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact) const
139139
{
140140
// Get the time step and time for the output file. If output is desired at every iteration, the
141141
// values are padded. The runtime output is written when the time step is already set to the next
@@ -151,7 +151,7 @@ void BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriterContact::write_
151151
*/
152152
void BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriterContact::
153153
write_output_runtime_iteration(
154-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact, int i_iteration) const
154+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact, int i_iteration) const
155155
{
156156
if (output_params_ptr_->get_output_every_iteration())
157157
{
@@ -167,7 +167,7 @@ void BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriterContact::
167167
*/
168168
void BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriterContact::
169169
write_output_beam_to_solid_surface(
170-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact, int i_step,
170+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact, int i_step,
171171
double time) const
172172
{
173173
// Parameter list that will be passed to all contact pairs when they create their visualization.
@@ -223,7 +223,7 @@ void BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriterContact::
223223
{
224224
// Add pair specific output for direct assembly managers.
225225
auto direct_assembly_manager = std::dynamic_pointer_cast<
226-
BeamInteraction::SUBMODELEVALUATOR::BeamContactAssemblyManagerDirect>(assembly_manager);
226+
BeamInteraction::SubmodelEvaluator::BeamContactAssemblyManagerDirect>(assembly_manager);
227227
if (not(direct_assembly_manager == nullptr))
228228
{
229229
for (const auto& pair : direct_assembly_manager->get_contact_pairs())
@@ -232,7 +232,7 @@ void BeamInteraction::BeamToSolidSurfaceVisualizationOutputWriterContact::
232232

233233
// Add pair specific output for indirect assembly managers.
234234
auto indirect_assembly_manager = std::dynamic_pointer_cast<
235-
BeamInteraction::SUBMODELEVALUATOR::BeamContactAssemblyManagerInDirect>(assembly_manager);
235+
BeamInteraction::SubmodelEvaluator::BeamContactAssemblyManagerInDirect>(assembly_manager);
236236
if (not(indirect_assembly_manager == nullptr))
237237
{
238238
// Get the global vector with the Lagrange Multiplier values and add it to the parameter list

‎src/beaminteraction/src/4C_beaminteraction_beam_to_solid_surface_visualization_output_writer_contact.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace BeamInteraction
2323
{
2424
class BeamToSolidSurfaceVisualizationOutputParams;
2525
class BeamToSolidVisualizationOutputWriterBase;
26-
namespace SUBMODELEVALUATOR
26+
namespace SubmodelEvaluator
2727
{
2828
class BeamContact;
2929
}
@@ -63,7 +63,7 @@ namespace BeamInteraction
6363
* (and probably can not) have a RCP to itself.
6464
*/
6565
void write_output_runtime(
66-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact) const;
66+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact) const;
6767

6868
/**
6969
* \brief Setup post iteration output creation, and call WriteOutputData.
@@ -73,7 +73,7 @@ namespace BeamInteraction
7373
* @param i_iteration (in) current number of iteration.
7474
*/
7575
void write_output_runtime_iteration(
76-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact, int i_iteration) const;
76+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact, int i_iteration) const;
7777

7878
private:
7979
/**
@@ -85,7 +85,7 @@ namespace BeamInteraction
8585
* @param time (in) Scalar time value for this visualization step.
8686
*/
8787
void write_output_beam_to_solid_surface(
88-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact, int i_step,
88+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact, int i_step,
8989
double time) const;
9090

9191
private:

‎src/beaminteraction/src/4C_beaminteraction_beam_to_solid_volume_meshtying_visualization_output_writer.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ BeamInteraction::BeamToSolidVolumeMeshtyingVisualizationOutputWriter::
131131
*
132132
*/
133133
void BeamInteraction::BeamToSolidVolumeMeshtyingVisualizationOutputWriter::write_output_runtime(
134-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact) const
134+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact) const
135135
{
136136
// Get the time step and time for the output file. If output is desired at every iteration, the
137137
// values are padded. The runtime output is written when the time step is already set to the
@@ -147,7 +147,7 @@ void BeamInteraction::BeamToSolidVolumeMeshtyingVisualizationOutputWriter::write
147147
*/
148148
void BeamInteraction::BeamToSolidVolumeMeshtyingVisualizationOutputWriter::
149149
write_output_runtime_iteration(
150-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact, int i_iteration) const
150+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact, int i_iteration) const
151151
{
152152
if (output_params_ptr_->get_output_every_iteration())
153153
{
@@ -163,7 +163,7 @@ void BeamInteraction::BeamToSolidVolumeMeshtyingVisualizationOutputWriter::
163163
*/
164164
void BeamInteraction::BeamToSolidVolumeMeshtyingVisualizationOutputWriter::
165165
write_output_beam_to_solid_volume_mesh_tying(
166-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact, int i_step,
166+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact, int i_step,
167167
double time) const
168168
{
169169
// Parameter list that will be passed to all contact pairs when they create their visualization.
@@ -191,7 +191,7 @@ void BeamInteraction::BeamToSolidVolumeMeshtyingVisualizationOutputWriter::
191191
{
192192
// Add pair specific output for direct assembly managers.
193193
auto direct_assembly_manager = std::dynamic_pointer_cast<
194-
BeamInteraction::SUBMODELEVALUATOR::BeamContactAssemblyManagerDirect>(assembly_manager);
194+
BeamInteraction::SubmodelEvaluator::BeamContactAssemblyManagerDirect>(assembly_manager);
195195
if (not(direct_assembly_manager == nullptr))
196196
{
197197
for (const auto& pair : direct_assembly_manager->get_contact_pairs())
@@ -200,7 +200,7 @@ void BeamInteraction::BeamToSolidVolumeMeshtyingVisualizationOutputWriter::
200200

201201
// Add pair specific output for indirect assembly managers.
202202
auto indirect_assembly_manager = std::dynamic_pointer_cast<
203-
BeamInteraction::SUBMODELEVALUATOR::BeamContactAssemblyManagerInDirect>(assembly_manager);
203+
BeamInteraction::SubmodelEvaluator::BeamContactAssemblyManagerInDirect>(assembly_manager);
204204
if (not(indirect_assembly_manager == nullptr))
205205
{
206206
// Get the global vector with the Lagrange Multiplier values and add it to the parameter

‎src/beaminteraction/src/4C_beaminteraction_beam_to_solid_volume_meshtying_visualization_output_writer.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace BeamInteraction
2323
{
2424
class BeamToSolidVolumeMeshtyingVisualizationOutputParams;
2525
class BeamToSolidVisualizationOutputWriterBase;
26-
namespace SUBMODELEVALUATOR
26+
namespace SubmodelEvaluator
2727
{
2828
class BeamContact;
2929
}
@@ -76,7 +76,7 @@ namespace BeamInteraction
7676
* (and probably can not) have a RCP to itself.
7777
*/
7878
void write_output_runtime(
79-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact) const;
79+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact) const;
8080

8181
/**
8282
* \brief Setup post iteration output creation, and call WriteOutputData.
@@ -86,7 +86,7 @@ namespace BeamInteraction
8686
* @param i_iteration (in) current number of iteration.
8787
*/
8888
void write_output_runtime_iteration(
89-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact, int i_iteration) const;
89+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact, int i_iteration) const;
9090

9191
private:
9292
/**
@@ -98,7 +98,7 @@ namespace BeamInteraction
9898
* @param time (in) Scalar time value for this visualization step.
9999
*/
100100
void write_output_beam_to_solid_volume_mesh_tying(
101-
const BeamInteraction::SUBMODELEVALUATOR::BeamContact* beam_contact, int i_step,
101+
const BeamInteraction::SubmodelEvaluator::BeamContact* beam_contact, int i_step,
102102
double time) const;
103103

104104
private:

‎src/beaminteraction/src/4C_beaminteraction_conditions.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,9 @@ void BeamInteraction::BeamInteractionConditions::create_contact_pairs(
293293
*/
294294
void BeamInteraction::BeamInteractionConditions::create_indirect_assembly_managers(
295295
const std::shared_ptr<const Core::FE::Discretization>& discret,
296-
std::vector<std::shared_ptr<SUBMODELEVALUATOR::BeamContactAssemblyManager>>& assembly_managers)
296+
std::vector<std::shared_ptr<SubmodelEvaluator::BeamContactAssemblyManager>>& assembly_managers)
297297
{
298-
std::shared_ptr<BeamInteraction::SUBMODELEVALUATOR::BeamContactAssemblyManager>
298+
std::shared_ptr<BeamInteraction::SubmodelEvaluator::BeamContactAssemblyManager>
299299
condition_assembly_manager = nullptr;
300300
for (auto& map_pair : condition_map_)
301301
{

‎src/beaminteraction/src/4C_beaminteraction_conditions.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace BeamInteraction
3737
{
3838
class BeamContactPair;
3939
class BeamContactParams;
40-
namespace SUBMODELEVALUATOR
40+
namespace SubmodelEvaluator
4141
{
4242
class BeamContactAssemblyManager;
4343
}
@@ -126,7 +126,7 @@ namespace BeamInteraction
126126
* @param discret (in) discretization.
127127
* @return Pointer to created assembly manager.
128128
*/
129-
virtual std::shared_ptr<SUBMODELEVALUATOR::BeamContactAssemblyManager>
129+
virtual std::shared_ptr<SubmodelEvaluator::BeamContactAssemblyManager>
130130
create_indirect_assembly_manager(const std::shared_ptr<const Core::FE::Discretization>& discret)
131131
{
132132
return nullptr;
@@ -217,7 +217,7 @@ namespace BeamInteraction
217217
void create_indirect_assembly_managers(
218218
const std::shared_ptr<const Core::FE::Discretization>& discret,
219219
std::vector<
220-
std::shared_ptr<BeamInteraction::SUBMODELEVALUATOR::BeamContactAssemblyManager>>&
220+
std::shared_ptr<BeamInteraction::SubmodelEvaluator::BeamContactAssemblyManager>>&
221221
assembly_managers);
222222

223223
/**

0 commit comments

Comments
 (0)