Skip to content

Commit e527607

Browse files
bwirthlbwirthl
authored
Merge pull request #689 from bwirthl/rename-porofluidmultiphase
Rename PoroMultiPhase classes to PorofluidElast
2 parents 93e0024 + f5f3fd0 commit e527607

File tree

27 files changed

+2572
-2846
lines changed

27 files changed

+2572
-2846
lines changed

‎apps/global_full/4C_global_full_cal_control.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ void ntacal()
142142
porofluidmultiphase_dyn(restart);
143143
break;
144144
case Core::ProblemType::poromultiphase:
145-
poromultiphase_dyn(restart);
145+
porofluid_elast_dyn(restart);
146146
break;
147147
case Core::ProblemType::poromultiphasescatra:
148148
poromultiphasescatra_dyn(restart);

‎src/adapter/4C_adapter_algorithmbase.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ namespace Adapter
9090
//@}
9191

9292
/// print time step header
93-
void print_header();
93+
virtual void print_header();
9494

9595
/// return printscreen_
9696
int print_screen_every() { return printscreen_; }

src/porofluid_pressure_based_elast/4C_porofluid_pressure_based_elast_base.cpp renamed to src/porofluid_pressure_based_elast/4C_porofluid_pressure_based_elast.cpp

Lines changed: 31 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//
66
// SPDX-License-Identifier: LGPL-3.0-or-later
77

8-
#include "4C_porofluid_pressure_based_elast_base.hpp"
8+
#include "4C_porofluid_pressure_based_elast.hpp"
99

1010
#include "4C_adapter_porofluid_pressure_based_wrapper.hpp"
1111
#include "4C_adapter_str_factory.hpp"
@@ -25,7 +25,7 @@ FOUR_C_NAMESPACE_OPEN
2525
/*----------------------------------------------------------------------*
2626
| constructor vuong 08/16 |
2727
*----------------------------------------------------------------------*/
28-
PoroPressureBased::PoroMultiPhaseBase::PoroMultiPhaseBase(
28+
PoroPressureBased::PorofluidElast::PorofluidElast(
2929
MPI_Comm comm, const Teuchos::ParameterList& globaltimeparams)
3030
: AlgorithmBase(comm, globaltimeparams),
3131
structure_(nullptr),
@@ -39,7 +39,7 @@ PoroPressureBased::PoroMultiPhaseBase::PoroMultiPhaseBase(
3939
/*----------------------------------------------------------------------*
4040
| initialize algorithm vuong 08/16 |
4141
*----------------------------------------------------------------------*/
42-
void PoroPressureBased::PoroMultiPhaseBase::init(const Teuchos::ParameterList& globaltimeparams,
42+
void PoroPressureBased::PorofluidElast::init(const Teuchos::ParameterList& globaltimeparams,
4343
const Teuchos::ParameterList& algoparams, const Teuchos::ParameterList& structparams,
4444
const Teuchos::ParameterList& fluidparams, const std::string& struct_disname,
4545
const std::string& fluid_disname, bool isale, int nds_disp, int nds_vel, int nds_solidpressure,
@@ -101,14 +101,11 @@ void PoroPressureBased::PoroMultiPhaseBase::init(const Teuchos::ParameterList& g
101101
fluid_ = std::make_shared<Adapter::PoroFluidMultiphaseWrapper>(porofluid);
102102
// initialize it
103103
fluid_->init(isale, nds_disp, nds_vel, nds_solidpressure, ndsporofluid_scatra, nearbyelepairs);
104-
105-
// done.
106-
return;
107104
}
108105

109106
/*----------------------------------------------------------------------*
110107
----------------------------------------------------------------------*/
111-
void PoroPressureBased::PoroMultiPhaseBase::post_init()
108+
void PoroPressureBased::PorofluidElast::post_init()
112109
{
113110
// call post_setup routine of the structure field
114111
structure_->post_setup();
@@ -118,7 +115,7 @@ void PoroPressureBased::PoroMultiPhaseBase::post_init()
118115
/*----------------------------------------------------------------------*
119116
| read restart information for given time step (public) vuong 08/16 |
120117
*----------------------------------------------------------------------*/
121-
void PoroPressureBased::PoroMultiPhaseBase::read_restart(int restart)
118+
void PoroPressureBased::PorofluidElast::read_restart(const int restart)
122119
{
123120
if (restart)
124121
{
@@ -131,15 +128,12 @@ void PoroPressureBased::PoroMultiPhaseBase::read_restart(int restart)
131128
// reset time and step for the global algorithm
132129
set_time_step(structure_->time_old(), restart);
133130
}
134-
135-
136-
return;
137131
}
138132

139133
/*----------------------------------------------------------------------*
140134
| time loop kremheller 03/17 |
141135
*----------------------------------------------------------------------*/
142-
void PoroPressureBased::PoroMultiPhaseBase::timeloop()
136+
void PoroPressureBased::PorofluidElast::timeloop()
143137
{
144138
// prepare the loop
145139
prepare_time_loop();
@@ -153,14 +147,12 @@ void PoroPressureBased::PoroMultiPhaseBase::timeloop()
153147

154148
update_and_output();
155149
}
156-
157-
return;
158150
}
159151

160152
/*----------------------------------------------------------------------*
161153
| prepare the time loop vuong 08/16 |
162154
*----------------------------------------------------------------------*/
163-
void PoroPressureBased::PoroMultiPhaseBase::prepare_time_loop()
155+
void PoroPressureBased::PorofluidElast::prepare_time_loop()
164156
{
165157
// initial output
166158
if (solve_structure_)
@@ -178,14 +170,12 @@ void PoroPressureBased::PoroMultiPhaseBase::prepare_time_loop()
178170
set_struct_solution(struct_zeros_, struct_zeros_);
179171
}
180172
fluid_field()->prepare_time_loop();
181-
182-
return;
183173
}
184174

185175
/*----------------------------------------------------------------------*
186176
| prepare one time step vuong 08/16 |
187177
*----------------------------------------------------------------------*/
188-
void PoroPressureBased::PoroMultiPhaseBase::prepare_time_step()
178+
void PoroPressureBased::PorofluidElast::prepare_time_step()
189179
{
190180
increment_time_and_step();
191181

@@ -206,7 +196,7 @@ void PoroPressureBased::PoroMultiPhaseBase::prepare_time_step()
206196
/*----------------------------------------------------------------------*
207197
| Test the results of all subproblems vuong 08/16 |
208198
*----------------------------------------------------------------------*/
209-
void PoroPressureBased::PoroMultiPhaseBase::create_field_test()
199+
void PoroPressureBased::PorofluidElast::create_field_test()
210200
{
211201
Global::Problem* problem = Global::Problem::instance();
212202

@@ -217,9 +207,9 @@ void PoroPressureBased::PoroMultiPhaseBase::create_field_test()
217207
/*------------------------------------------------------------------------*
218208
| communicate the solution of the structure to the fluid vuong 08/16 |
219209
*------------------------------------------------------------------------*/
220-
void PoroPressureBased::PoroMultiPhaseBase::set_struct_solution(
210+
void PoroPressureBased::PorofluidElast::set_struct_solution(
221211
std::shared_ptr<const Core::LinAlg::Vector<double>> disp,
222-
std::shared_ptr<const Core::LinAlg::Vector<double>> vel)
212+
std::shared_ptr<const Core::LinAlg::Vector<double>> vel) const
223213
{
224214
set_mesh_disp(disp);
225215
set_velocity_fields(vel);
@@ -228,17 +218,17 @@ void PoroPressureBased::PoroMultiPhaseBase::set_struct_solution(
228218
/*------------------------------------------------------------------------*
229219
| communicate the structure velocity to the fluid vuong 08/16 |
230220
*------------------------------------------------------------------------*/
231-
void PoroPressureBased::PoroMultiPhaseBase::set_velocity_fields(
232-
std::shared_ptr<const Core::LinAlg::Vector<double>> vel)
221+
void PoroPressureBased::PorofluidElast::set_velocity_fields(
222+
std::shared_ptr<const Core::LinAlg::Vector<double>> vel) const
233223
{
234224
fluid_->set_velocity_field(vel);
235225
}
236226

237227
/*------------------------------------------------------------------------*
238228
| communicate the scatra solution to the fluid vuong 08/16 |
239229
*------------------------------------------------------------------------*/
240-
void PoroPressureBased::PoroMultiPhaseBase::set_scatra_solution(
241-
unsigned nds, std::shared_ptr<const Core::LinAlg::Vector<double>> scalars)
230+
void PoroPressureBased::PorofluidElast::set_scatra_solution(
231+
unsigned nds, std::shared_ptr<const Core::LinAlg::Vector<double>> scalars) const
242232
{
243233
fluid_->set_scatra_solution(nds, scalars);
244234
}
@@ -247,16 +237,16 @@ void PoroPressureBased::PoroMultiPhaseBase::set_scatra_solution(
247237
/*------------------------------------------------------------------------*
248238
| communicate the structure displacement to the fluid vuong 08/16 |
249239
*------------------------------------------------------------------------*/
250-
void PoroPressureBased::PoroMultiPhaseBase::set_mesh_disp(
251-
std::shared_ptr<const Core::LinAlg::Vector<double>> disp)
240+
void PoroPressureBased::PorofluidElast::set_mesh_disp(
241+
std::shared_ptr<const Core::LinAlg::Vector<double>> disp) const
252242
{
253243
fluid_->apply_mesh_movement(disp);
254244
}
255245

256246
/*----------------------------------------------------------------------*
257247
| update fields and output results vuong 08/16 |
258248
*----------------------------------------------------------------------*/
259-
void PoroPressureBased::PoroMultiPhaseBase::update_and_output()
249+
void PoroPressureBased::PorofluidElast::update_and_output()
260250
{
261251
// prepare the output
262252
constexpr bool force_prepare = false;
@@ -280,7 +270,7 @@ void PoroPressureBased::PoroMultiPhaseBase::update_and_output()
280270
/*------------------------------------------------------------------------*
281271
| dof map of vector of unknowns of structure field vuong 08/16 |
282272
*------------------------------------------------------------------------*/
283-
std::shared_ptr<const Core::LinAlg::Map> PoroPressureBased::PoroMultiPhaseBase::struct_dof_row_map()
273+
std::shared_ptr<const Core::LinAlg::Map> PoroPressureBased::PorofluidElast::struct_dof_row_map()
284274
const
285275
{
286276
return structure_->dof_row_map();
@@ -289,7 +279,7 @@ std::shared_ptr<const Core::LinAlg::Map> PoroPressureBased::PoroMultiPhaseBase::
289279
/*------------------------------------------------------------------------*
290280
| dof map of vector of unknowns of fluid field vuong 08/16 |
291281
*------------------------------------------------------------------------*/
292-
std::shared_ptr<const Core::LinAlg::Map> PoroPressureBased::PoroMultiPhaseBase::fluid_dof_row_map()
282+
std::shared_ptr<const Core::LinAlg::Map> PoroPressureBased::PorofluidElast::fluid_dof_row_map()
293283
const
294284
{
295285
return fluid_->dof_row_map();
@@ -299,15 +289,15 @@ std::shared_ptr<const Core::LinAlg::Map> PoroPressureBased::PoroMultiPhaseBase::
299289
| coupled artery-porofluid system matrix kremheller 05/18 |
300290
*------------------------------------------------------------------------*/
301291
std::shared_ptr<Core::LinAlg::BlockSparseMatrixBase>
302-
PoroPressureBased::PoroMultiPhaseBase::artery_porofluid_sysmat() const
292+
PoroPressureBased::PorofluidElast::artery_porofluid_sysmat() const
303293
{
304294
return fluid_->artery_porofluid_sysmat();
305295
}
306296

307297
/*------------------------------------------------------------------------*
308298
| dof map of vector of unknowns of artery field kremheller 05/18 |
309299
*------------------------------------------------------------------------*/
310-
std::shared_ptr<const Core::LinAlg::Map> PoroPressureBased::PoroMultiPhaseBase::artery_dof_row_map()
300+
std::shared_ptr<const Core::LinAlg::Map> PoroPressureBased::PorofluidElast::artery_dof_row_map()
311301
const
312302
{
313303
return fluid_->artery_dof_row_map();
@@ -317,7 +307,7 @@ std::shared_ptr<const Core::LinAlg::Map> PoroPressureBased::PoroMultiPhaseBase::
317307
| return structure displacements vuong 08/16 |
318308
*------------------------------------------------------------------------*/
319309
std::shared_ptr<const Core::LinAlg::Vector<double>>
320-
PoroPressureBased::PoroMultiPhaseBase::struct_dispnp() const
310+
PoroPressureBased::PorofluidElast::struct_dispnp() const
321311
{
322312
return structure_->dispnp();
323313
}
@@ -326,7 +316,7 @@ PoroPressureBased::PoroMultiPhaseBase::struct_dispnp() const
326316
| return structure velocities vuong 08/16 |
327317
*------------------------------------------------------------------------*/
328318
std::shared_ptr<const Core::LinAlg::Vector<double>>
329-
PoroPressureBased::PoroMultiPhaseBase::struct_velnp() const
319+
PoroPressureBased::PorofluidElast::struct_velnp() const
330320
{
331321
return structure_->velnp();
332322
}
@@ -335,16 +325,16 @@ PoroPressureBased::PoroMultiPhaseBase::struct_velnp() const
335325
| return fluid Flux vuong 08/16 |
336326
*------------------------------------------------------------------------*/
337327
std::shared_ptr<const Core::LinAlg::MultiVector<double>>
338-
PoroPressureBased::PoroMultiPhaseBase::fluid_flux() const
328+
PoroPressureBased::PorofluidElast::fluid_flux() const
339329
{
340330
return fluid_->flux();
341331
}
342332

343333
/*------------------------------------------------------------------------*
344334
| return fluid Flux vuong 08/16 |
345335
*------------------------------------------------------------------------*/
346-
std::shared_ptr<const Core::LinAlg::Vector<double>>
347-
PoroPressureBased::PoroMultiPhaseBase::fluid_phinp() const
336+
std::shared_ptr<const Core::LinAlg::Vector<double>> PoroPressureBased::PorofluidElast::fluid_phinp()
337+
const
348338
{
349339
return fluid_->phinp();
350340
}
@@ -353,7 +343,7 @@ PoroPressureBased::PoroMultiPhaseBase::fluid_phinp() const
353343
| return fluid Flux vuong 08/16 |
354344
*------------------------------------------------------------------------*/
355345
std::shared_ptr<const Core::LinAlg::Vector<double>>
356-
PoroPressureBased::PoroMultiPhaseBase::fluid_saturation() const
346+
PoroPressureBased::PorofluidElast::fluid_saturation() const
357347
{
358348
return fluid_->saturation();
359349
}
@@ -362,7 +352,7 @@ PoroPressureBased::PoroMultiPhaseBase::fluid_saturation() const
362352
| return fluid Flux vuong 08/16 |
363353
*------------------------------------------------------------------------*/
364354
std::shared_ptr<const Core::LinAlg::Vector<double>>
365-
PoroPressureBased::PoroMultiPhaseBase::fluid_pressure() const
355+
PoroPressureBased::PorofluidElast::fluid_pressure() const
366356
{
367357
return fluid_->pressure();
368358
}
@@ -371,15 +361,15 @@ PoroPressureBased::PoroMultiPhaseBase::fluid_pressure() const
371361
| return fluid Flux vuong 08/16 |
372362
*------------------------------------------------------------------------*/
373363
std::shared_ptr<const Core::LinAlg::Vector<double>>
374-
PoroPressureBased::PoroMultiPhaseBase::solid_pressure() const
364+
PoroPressureBased::PorofluidElast::solid_pressure() const
375365
{
376366
return fluid_->solid_pressure();
377367
}
378368

379369
/*----------------------------------------------------------------------*
380370
| inform user that structure is not solved kremheller 04/17 |
381371
*----------------------------------------------------------------------*/
382-
void PoroPressureBased::PoroMultiPhaseBase::print_structure_disabled_info()
372+
void PoroPressureBased::PorofluidElast::print_structure_disabled_info() const
383373
{
384374
// print out Info
385375
if (Core::Communication::my_mpi_rank(get_comm()) == 0)

0 commit comments

Comments
 (0)