Skip to content

Commit a8eb88a

Browse files
committed
Merge POROMULTIPHASE with POROFLUIDMULTIPHASE
Namespaces only
1 parent 633c5af commit a8eb88a

File tree

58 files changed

+549
-650
lines changed

Some content is hidden

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

58 files changed

+549
-650
lines changed

src/adapter/4C_adapter_porofluid_pressure_based.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace Core::FE
2626
class Discretization;
2727
} // namespace Core::FE
2828

29-
namespace POROFLUIDMULTIPHASE
29+
namespace PoroPressureBased
3030
{
3131
class TimIntImpl;
3232
}

src/adapter/4C_adapter_porofluid_pressure_based_wrapper.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace Core::FE
2222
class Discretization;
2323
} // namespace Core::FE
2424

25-
namespace POROFLUIDMULTIPHASE
25+
namespace PoroPressureBased
2626
{
2727
class TimIntImpl;
2828
}

src/inpar/4C_inpar_validparameters.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ std::map<std::string, Core::IO::InputSpec> Input::valid_parameters()
201201
Inpar::FS3I::set_valid_parameters(specs);
202202
Inpar::PoroElast::set_valid_parameters(specs);
203203
Inpar::PoroScaTra::set_valid_parameters(specs);
204-
POROMULTIPHASE::set_valid_parameters(specs);
204+
PoroPressureBased::set_valid_parameters_porofluid(specs);
205205
PoroMultiPhaseScaTra::set_valid_parameters(specs);
206-
POROFLUIDMULTIPHASE::set_valid_parameters(specs);
206+
PoroPressureBased::set_valid_parameters_porofluid_elast(specs);
207207
EHL::set_valid_parameters(specs);
208208
Inpar::SSI::set_valid_parameters(specs);
209209
Inpar::SSTI::set_valid_parameters(specs);

src/mat/4C_mat_fluidporo_multiphase.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ void Mat::FluidPoroMultiPhase::evaluate_gen_pressure(
311311
{
312312
// get the single phase material
313313
const Mat::FluidPoroSinglePhase& singlephasemat =
314-
POROFLUIDMULTIPHASE::ElementUtils::get_single_phase_mat_from_multi_material(*this, iphase);
314+
PoroPressureBased::ElementUtils::get_single_phase_mat_from_multi_material(*this, iphase);
315315

316316
// evaluate generalized pressure (i.e. some kind of linear combination of the true pressures)
317317
genpressure[iphase] = singlephasemat.evaluate_gen_pressure(iphase, phinp);
@@ -336,8 +336,7 @@ void Mat::FluidPoroMultiPhase::evaluate_saturation(std::vector<double>& saturati
336336
{
337337
// get the single phase material
338338
const Mat::FluidPoroSinglePhase& singlephasemat =
339-
POROFLUIDMULTIPHASE::ElementUtils::get_single_phase_mat_from_multi_material(
340-
*this, iphase);
339+
PoroPressureBased::ElementUtils::get_single_phase_mat_from_multi_material(*this, iphase);
341340

342341
saturation[iphase] = singlephasemat.evaluate_saturation(iphase, phinp, pressure);
343342
// the saturation of the last phase is 1.0- (sum of all saturations)

src/porofluid_pressure_based/4C_porofluid_pressure_based_dyn.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void porofluidmultiphase_dyn(int restart)
4141
// print problem type and logo
4242
if (Core::Communication::my_mpi_rank(comm) == 0)
4343
{
44-
POROFLUIDMULTIPHASE::print_logo();
44+
PoroPressureBased::print_logo();
4545
std::cout << "###################################################" << std::endl;
4646
std::cout << "# YOUR PROBLEM TYPE: " << Global::Problem::instance()->problem_name()
4747
<< std::endl;
@@ -86,7 +86,7 @@ void porofluidmultiphase_dyn(int restart)
8686
case Inpar::ArteryNetwork::ArteryPoroMultiphaseScatraCouplingMethod::ntp:
8787
{
8888
actdis->fill_complete();
89-
nearbyelepairs = POROFLUIDMULTIPHASE::extended_ghosting_artery_discretization(
89+
nearbyelepairs = PoroPressureBased::extended_ghosting_artery_discretization(
9090
*actdis, arterydis, evaluate_on_lateral_surface, arterycoupl);
9191
break;
9292
}
@@ -120,10 +120,10 @@ void porofluidmultiphase_dyn(int restart)
120120
// time-integration (or stationary) scheme
121121
// -------------------------------------------------------------------
122122
auto timintscheme =
123-
Teuchos::getIntegralValue<POROFLUIDMULTIPHASE::TimeIntegrationScheme>(porodyn, "TIMEINTEGR");
123+
Teuchos::getIntegralValue<PoroPressureBased::TimeIntegrationScheme>(porodyn, "TIMEINTEGR");
124124

125125
// build poro fluid time integrator
126-
std::shared_ptr<Adapter::PoroFluidMultiphase> algo = POROFLUIDMULTIPHASE::create_algorithm(
126+
std::shared_ptr<Adapter::PoroFluidMultiphase> algo = PoroPressureBased::create_algorithm(
127127
timintscheme, actdis, linsolvernumber, porodyn, porodyn, output);
128128

129129
// initialize
@@ -140,7 +140,7 @@ void porofluidmultiphase_dyn(int restart)
140140
// assign poro material for evaluation of porosity
141141
// note: to be done after potential restart, as in read_restart()
142142
// the secondary material is destroyed
143-
POROFLUIDMULTIPHASE::setup_material(comm, struct_disname, fluid_disname);
143+
PoroPressureBased::setup_material(comm, struct_disname, fluid_disname);
144144

145145
// 4.- Run of the actual problem.
146146
algo->time_loop();

src/porofluid_pressure_based/4C_porofluid_pressure_based_input.cpp

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212

1313
FOUR_C_NAMESPACE_OPEN
1414

15-
void POROFLUIDMULTIPHASE::set_valid_parameters(std::map<std::string, Core::IO::InputSpec>& list)
15+
void PoroPressureBased::set_valid_parameters_porofluid(
16+
std::map<std::string, Core::IO::InputSpec>& list)
1617
{
1718
using namespace Core::IO::InputSpecBuilders;
1819

@@ -114,25 +115,25 @@ void POROFLUIDMULTIPHASE::set_valid_parameters(std::map<std::string, Core::IO::I
114115

115116
deprecated_selection<VectorNorm>("VECTORNORM_RESF",
116117
{
117-
{"L1", POROFLUIDMULTIPHASE::norm_l1},
118-
{"L1_Scaled", POROFLUIDMULTIPHASE::norm_l1_scaled},
119-
{"L2", POROFLUIDMULTIPHASE::norm_l2},
120-
{"Rms", POROFLUIDMULTIPHASE::norm_rms},
121-
{"Inf", POROFLUIDMULTIPHASE::norm_inf},
118+
{"L1", PoroPressureBased::norm_l1},
119+
{"L1_Scaled", PoroPressureBased::norm_l1_scaled},
120+
{"L2", PoroPressureBased::norm_l2},
121+
{"Rms", PoroPressureBased::norm_rms},
122+
{"Inf", PoroPressureBased::norm_inf},
122123
},
123124
{.description = "type of norm to be applied to residuals",
124-
.default_value = POROFLUIDMULTIPHASE::norm_l2}),
125+
.default_value = PoroPressureBased::norm_l2}),
125126

126127
deprecated_selection<VectorNorm>("VECTORNORM_INC",
127128
{
128-
{"L1", POROFLUIDMULTIPHASE::norm_l1},
129-
{"L1_Scaled", POROFLUIDMULTIPHASE::norm_l1_scaled},
130-
{"L2", POROFLUIDMULTIPHASE::norm_l2},
131-
{"Rms", POROFLUIDMULTIPHASE::norm_rms},
132-
{"Inf", POROFLUIDMULTIPHASE::norm_inf},
129+
{"L1", PoroPressureBased::norm_l1},
130+
{"L1_Scaled", PoroPressureBased::norm_l1_scaled},
131+
{"L2", PoroPressureBased::norm_l2},
132+
{"Rms", PoroPressureBased::norm_rms},
133+
{"Inf", PoroPressureBased::norm_inf},
133134
},
134135
{.description = "type of norm to be applied to residuals",
135-
.default_value = POROFLUIDMULTIPHASE::norm_l2}),
136+
.default_value = PoroPressureBased::norm_l2}),
136137

137138
// Iterationparameters
138139
parameter<double>(

src/porofluid_pressure_based/4C_porofluid_pressure_based_input.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FOUR_C_NAMESPACE_OPEN
2121
| |
2222
*----------------------------------------------------------------------*/
2323

24-
namespace POROFLUIDMULTIPHASE
24+
namespace PoroPressureBased
2525
{
2626
/// time integration schemes
2727
enum TimeIntegrationScheme
@@ -85,10 +85,10 @@ namespace POROFLUIDMULTIPHASE
8585
gradreco_l2
8686
};
8787

88-
/// set the lubrication parameters
89-
void set_valid_parameters(std::map<std::string, Core::IO::InputSpec>& list);
88+
/// set the valid parameters
89+
void set_valid_parameters_porofluid(std::map<std::string, Core::IO::InputSpec>& list);
9090

91-
} // namespace POROFLUIDMULTIPHASE
91+
} // namespace PoroPressureBased
9292

9393

9494

src/porofluid_pressure_based/4C_porofluid_pressure_based_meshtying_strategy_artery.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ FOUR_C_NAMESPACE_OPEN
2828
/*----------------------------------------------------------------------*
2929
| constructor (public) kremheller 04/18 |
3030
*----------------------------------------------------------------------*/
31-
POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::MeshtyingStrategyArtery(
32-
POROFLUIDMULTIPHASE::TimIntImpl* porofluidmultitimint, const Teuchos::ParameterList& probparams,
31+
PoroPressureBased::MeshtyingStrategyArtery::MeshtyingStrategyArtery(
32+
PoroPressureBased::TimIntImpl* porofluidmultitimint, const Teuchos::ParameterList& probparams,
3333
const Teuchos::ParameterList& poroparams)
3434
: MeshtyingStrategyBase(porofluidmultitimint, probparams, poroparams)
3535
{
@@ -114,7 +114,7 @@ POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::MeshtyingStrategyArtery(
114114
/*----------------------------------------------------------------------*
115115
| prepare time loop kremheller 04/18 |
116116
*----------------------------------------------------------------------*/
117-
void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::prepare_time_loop()
117+
void PoroPressureBased::MeshtyingStrategyArtery::prepare_time_loop()
118118
{
119119
artnettimint_->prepare_time_loop();
120120
return;
@@ -123,7 +123,7 @@ void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::prepare_time_loop()
123123
/*----------------------------------------------------------------------*
124124
| setup the variables to do a new time step (public) kremheller 04/18 |
125125
*----------------------------------------------------------------------*/
126-
void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::prepare_time_step()
126+
void PoroPressureBased::MeshtyingStrategyArtery::prepare_time_step()
127127
{
128128
artnettimint_->prepare_time_step();
129129
return;
@@ -133,7 +133,7 @@ void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::prepare_time_step()
133133
| current solution becomes most recent solution of next timestep |
134134
| kremheller 04/18 |
135135
*----------------------------------------------------------------------*/
136-
void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::update()
136+
void PoroPressureBased::MeshtyingStrategyArtery::update()
137137
{
138138
artnettimint_->time_update();
139139
return;
@@ -142,7 +142,7 @@ void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::update()
142142
/*--------------------------------------------------------------------------*
143143
| initialize the linear solver kremheller 07/20 |
144144
*--------------------------------------------------------------------------*/
145-
void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::initialize_linear_solver(
145+
void PoroPressureBased::MeshtyingStrategyArtery::initialize_linear_solver(
146146
std::shared_ptr<Core::LinAlg::Solver> solver)
147147
{
148148
const Teuchos::ParameterList& porofluidparams =
@@ -188,7 +188,7 @@ void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::initialize_linear_solver(
188188
/*--------------------------------------------------------------------------*
189189
| solve linear system of equations kremheller 04/18 |
190190
*--------------------------------------------------------------------------*/
191-
void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::linear_solve(
191+
void PoroPressureBased::MeshtyingStrategyArtery::linear_solve(
192192
std::shared_ptr<Core::LinAlg::Solver> solver,
193193
std::shared_ptr<Core::LinAlg::SparseOperator> sysmat,
194194
std::shared_ptr<Core::LinAlg::Vector<double>> increment,
@@ -211,7 +211,7 @@ void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::linear_solve(
211211
/*----------------------------------------------------------------------*
212212
| Calculate problem specific norm kremheller 03/18 |
213213
*----------------------------------------------------------------------*/
214-
void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::calculate_norms(std::vector<double>& preresnorm,
214+
void PoroPressureBased::MeshtyingStrategyArtery::calculate_norms(std::vector<double>& preresnorm,
215215
std::vector<double>& incprenorm, std::vector<double>& prenorm,
216216
const std::shared_ptr<const Core::LinAlg::Vector<double>> increment)
217217
{
@@ -245,7 +245,7 @@ void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::calculate_norms(std::vector<d
245245
/*----------------------------------------------------------------------*
246246
| create result test for this field kremheller 04/18 |
247247
*----------------------------------------------------------------------*/
248-
void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::create_field_test()
248+
void PoroPressureBased::MeshtyingStrategyArtery::create_field_test()
249249
{
250250
std::shared_ptr<Core::Utils::ResultTest> arteryresulttest = artnettimint_->create_field_test();
251251
Global::Problem::instance()->add_field_test(arteryresulttest);
@@ -255,7 +255,7 @@ void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::create_field_test()
255255
/*----------------------------------------------------------------------*
256256
| read restart data kremheller 04/18 |
257257
-----------------------------------------------------------------------*/
258-
void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::read_restart(const int step)
258+
void PoroPressureBased::MeshtyingStrategyArtery::read_restart(const int step)
259259
{
260260
artnettimint_->read_restart(step);
261261

@@ -265,7 +265,7 @@ void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::read_restart(const int step)
265265
/*----------------------------------------------------------------------*
266266
| output of solution vector to BINIO kremheller 04/18 |
267267
*----------------------------------------------------------------------*/
268-
void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::output()
268+
void PoroPressureBased::MeshtyingStrategyArtery::output()
269269
{
270270
if (porofluidmultitimint_->step() != 0) artnettimint_->output(false, nullptr);
271271

@@ -275,7 +275,7 @@ void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::output()
275275
/*----------------------------------------------------------------------*
276276
| evaluate matrix and rhs kremheller 04/18 |
277277
*----------------------------------------------------------------------*/
278-
void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::evaluate()
278+
void PoroPressureBased::MeshtyingStrategyArtery::evaluate()
279279
{
280280
arttoporofluidcoupling_->set_solution_vectors(
281281
porofluidmultitimint_->phinp(), porofluidmultitimint_->phin(), artnettimint_->pressurenp());
@@ -301,7 +301,7 @@ void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::evaluate()
301301
| extract and update kremheller 04/18 |
302302
*----------------------------------------------------------------------*/
303303
std::shared_ptr<const Core::LinAlg::Vector<double>>
304-
POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::extract_and_update_iter(
304+
PoroPressureBased::MeshtyingStrategyArtery::extract_and_update_iter(
305305
const std::shared_ptr<const Core::LinAlg::Vector<double>> inc)
306306
{
307307
std::shared_ptr<const Core::LinAlg::Vector<double>> arterypressinc;
@@ -318,7 +318,7 @@ POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::extract_and_update_iter(
318318
| artery dof row map kremheller 04/18 |
319319
*----------------------------------------------------------------------*/
320320
std::shared_ptr<const Core::LinAlg::Map>
321-
POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::artery_dof_row_map() const
321+
PoroPressureBased::MeshtyingStrategyArtery::artery_dof_row_map() const
322322
{
323323
return arttoporofluidcoupling_->artery_dof_row_map();
324324
}
@@ -327,7 +327,7 @@ POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::artery_dof_row_map() const
327327
| access to block system matrix of artery poro problem kremheller 04/18 |
328328
*-----------------------------------------------------------------------*/
329329
std::shared_ptr<Core::LinAlg::BlockSparseMatrixBase>
330-
POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::artery_porofluid_sysmat() const
330+
PoroPressureBased::MeshtyingStrategyArtery::artery_porofluid_sysmat() const
331331
{
332332
return comb_systemmatrix_;
333333
}
@@ -336,7 +336,7 @@ POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::artery_porofluid_sysmat() const
336336
| return coupled residual kremheller 05/18 |
337337
*----------------------------------------------------------------------*/
338338
std::shared_ptr<const Core::LinAlg::Vector<double>>
339-
POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::artery_porofluid_rhs() const
339+
PoroPressureBased::MeshtyingStrategyArtery::artery_porofluid_rhs() const
340340
{
341341
return rhs_;
342342
}
@@ -345,7 +345,7 @@ POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::artery_porofluid_rhs() const
345345
| extract and update kremheller 04/18 |
346346
*----------------------------------------------------------------------*/
347347
std::shared_ptr<const Core::LinAlg::Vector<double>>
348-
POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::combined_increment(
348+
PoroPressureBased::MeshtyingStrategyArtery::combined_increment(
349349
const std::shared_ptr<const Core::LinAlg::Vector<double>> inc) const
350350
{
351351
return comb_increment_;
@@ -354,7 +354,7 @@ POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::combined_increment(
354354
/*----------------------------------------------------------------------*
355355
| check initial fields kremheller 06/18 |
356356
*----------------------------------------------------------------------*/
357-
void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::check_initial_fields(
357+
void PoroPressureBased::MeshtyingStrategyArtery::check_initial_fields(
358358
std::shared_ptr<const Core::LinAlg::Vector<double>> vec_cont) const
359359
{
360360
arttoporofluidcoupling_->check_initial_fields(vec_cont, artnettimint_->pressurenp());
@@ -364,7 +364,7 @@ void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::check_initial_fields(
364364
/*-------------------------------------------------------------------------*
365365
| set element pairs that are close kremheller 03/19 |
366366
*------------------------------------------------------------------------ */
367-
void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::set_nearby_ele_pairs(
367+
void PoroPressureBased::MeshtyingStrategyArtery::set_nearby_ele_pairs(
368368
const std::map<int, std::set<int>>* nearbyelepairs)
369369
{
370370
arttoporofluidcoupling_->set_nearby_ele_pairs(nearbyelepairs);
@@ -374,7 +374,7 @@ void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::set_nearby_ele_pairs(
374374
/*-------------------------------------------------------------------------*
375375
| setup the strategy kremheller 03/19 |
376376
*------------------------------------------------------------------------ */
377-
void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::setup()
377+
void PoroPressureBased::MeshtyingStrategyArtery::setup()
378378
{
379379
arttoporofluidcoupling_->setup();
380380
return;
@@ -383,7 +383,7 @@ void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::setup()
383383
/*----------------------------------------------------------------------*
384384
| apply mesh movement kremheller 06/18 |
385385
*----------------------------------------------------------------------*/
386-
void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::apply_mesh_movement() const
386+
void PoroPressureBased::MeshtyingStrategyArtery::apply_mesh_movement() const
387387
{
388388
arttoporofluidcoupling_->apply_mesh_movement();
389389
return;
@@ -393,7 +393,7 @@ void POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::apply_mesh_movement() const
393393
| access to blood vessel volume fraction kremheller 10/19 |
394394
*----------------------------------------------------------------------*/
395395
std::shared_ptr<const Core::LinAlg::Vector<double>>
396-
POROFLUIDMULTIPHASE::MeshtyingStrategyArtery::blood_vessel_volume_fraction()
396+
PoroPressureBased::MeshtyingStrategyArtery::blood_vessel_volume_fraction()
397397
{
398398
return arttoporofluidcoupling_->blood_vessel_volume_fraction();
399399
}

src/porofluid_pressure_based/4C_porofluid_pressure_based_meshtying_strategy_artery.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ namespace PoroMultiPhaseScaTra
2020
class PoroMultiPhaseScaTraArtCouplBase;
2121
}
2222

23-
namespace POROFLUIDMULTIPHASE
23+
namespace PoroPressureBased
2424
{
2525
class MeshtyingStrategyArtery : public MeshtyingStrategyBase
2626
{
2727
public:
2828
//! constructor
29-
explicit MeshtyingStrategyArtery(POROFLUIDMULTIPHASE::TimIntImpl* porofluidmultitimint,
29+
explicit MeshtyingStrategyArtery(PoroPressureBased::TimIntImpl* porofluidmultitimint,
3030
const Teuchos::ParameterList& probparams, const Teuchos::ParameterList& poroparams);
3131

3232

@@ -125,7 +125,7 @@ namespace POROFLUIDMULTIPHASE
125125
std::shared_ptr<Core::LinAlg::Vector<double>> comb_phinp_;
126126
};
127127

128-
} // namespace POROFLUIDMULTIPHASE
128+
} // namespace PoroPressureBased
129129

130130

131131

0 commit comments

Comments
 (0)