Skip to content

Commit 93d7507

Browse files
bwirthlbwirthl
committed
Merge into PoroMultiPhaseScaTra
Namespaces only
1 parent a8eb88a commit 93d7507

File tree

48 files changed

+594
-747
lines changed

Some content is hidden

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

48 files changed

+594
-747
lines changed

‎src/global_legacy_module/4C_global_legacy_module.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ namespace
289289
Discret::Utils::add_valid_combust_functions(function_manager);
290290
Discret::Utils::add_valid_xfluid_functions(function_manager);
291291
add_valid_library_functions(function_manager);
292-
PoroMultiPhaseScaTra::add_valid_poro_functions(function_manager);
292+
PoroPressureBased::add_valid_poro_functions(function_manager);
293293
ScaTra::add_valid_scatra_functions(function_manager);
294294
}
295295

‎src/inpar/4C_inpar_validconditions.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ std::vector<Core::Conditions::ConditionDefinition> Input::valid_conditions()
846846
Inpar::RveMpc::set_valid_conditions(condlist);
847847
Inpar::BeamInteraction::set_valid_conditions(condlist);
848848
EHL::set_valid_conditions(condlist);
849-
PoroMultiPhaseScaTra::set_valid_conditions(condlist);
849+
PoroPressureBased::set_valid_conditions_porofluid_elast_scatra(condlist);
850850

851851
// finally some conditions that do not have their own files yet are problem-specific
852852
set_miscellaneous_conditions(condlist);

‎src/inpar/4C_inpar_validparameters.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ std::map<std::string, Core::IO::InputSpec> Input::valid_parameters()
202202
Inpar::PoroElast::set_valid_parameters(specs);
203203
Inpar::PoroScaTra::set_valid_parameters(specs);
204204
PoroPressureBased::set_valid_parameters_porofluid(specs);
205-
PoroMultiPhaseScaTra::set_valid_parameters(specs);
205+
PoroPressureBased::set_valid_parameters_porofluid_elast_scatra(specs);
206206
PoroPressureBased::set_valid_parameters_porofluid_elast(specs);
207207
EHL::set_valid_parameters(specs);
208208
Inpar::SSI::set_valid_parameters(specs);

‎src/porofluid_pressure_based/4C_porofluid_pressure_based_dyn.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ void porofluidmultiphase_dyn(int restart)
4141
// print problem type and logo
4242
if (Core::Communication::my_mpi_rank(comm) == 0)
4343
{
44-
PoroPressureBased::print_logo();
4544
std::cout << "###################################################" << std::endl;
4645
std::cout << "# YOUR PROBLEM TYPE: " << Global::Problem::instance()->problem_name()
4746
<< std::endl;

‎src/porofluid_pressure_based/4C_porofluid_pressure_based_meshtying_strategy_artery.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ PoroPressureBased::MeshtyingStrategyArtery::MeshtyingStrategyArtery(
8686
});
8787

8888
// initialize mesh tying object
89-
arttoporofluidcoupling_ = PoroMultiPhaseScaTra::create_and_init_artery_coupling_strategy(
90-
arterydis_, porofluidmultitimint->discretization(), poroparams.sublist("ARTERY COUPLING"),
89+
arttoporofluidcoupling_ = PoroPressureBased::create_and_init_artery_coupling_strategy(arterydis_,
90+
porofluidmultitimint->discretization(), poroparams.sublist("ARTERY COUPLING"),
9191
couplingcondname, "COUPLEDDOFS_ART", "COUPLEDDOFS_PORO", evaluate_on_lateral_surface);
9292

9393
// Initialize rhs vector

‎src/porofluid_pressure_based/4C_porofluid_pressure_based_meshtying_strategy_artery.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
FOUR_C_NAMESPACE_OPEN
1616

1717
// forward declaration
18-
namespace PoroMultiPhaseScaTra
18+
namespace PoroPressureBased
1919
{
2020
class PoroMultiPhaseScaTraArtCouplBase;
2121
}
@@ -110,7 +110,7 @@ namespace PoroPressureBased
110110
std::shared_ptr<Core::FE::Discretization> arterydis_;
111111

112112
//! the mesh tying object
113-
std::shared_ptr<PoroMultiPhaseScaTra::PoroMultiPhaseScaTraArtCouplBase> arttoporofluidcoupling_;
113+
std::shared_ptr<PoroPressureBased::PoroMultiPhaseScaTraArtCouplBase> arttoporofluidcoupling_;
114114

115115
//! block systemmatrix
116116
std::shared_ptr<Core::LinAlg::BlockSparseMatrixBase> comb_systemmatrix_;

‎src/porofluid_pressure_based/4C_porofluid_pressure_based_utils.cpp‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -539,32 +539,7 @@ double PoroPressureBased::calculate_vector_norm(
539539
{
540540
FOUR_C_THROW("Cannot handle vector norm");
541541
return 0;
542-
}
543-
} // calculate_vector_norm()
544-
545-
/*----------------------------------------------------------------------*
546-
| kremheller 03/17 |
547-
*----------------------------------------------------------------------*/
548-
void PoroPressureBased::print_logo()
549-
{
550-
std::cout << "This is a Porous Media problem with multiphase flow" << std::endl;
551-
std::cout << "" << std::endl;
552-
std::cout << " +----------+" << std::endl;
553-
std::cout << " | Krebs- |" << std::endl;
554-
std::cout << " | Model |" << std::endl;
555-
std::cout << " +----------+" << std::endl;
556-
std::cout << " | |" << std::endl;
557-
std::cout << " | |" << std::endl;
558-
std::cout << " /\\ | /\\" << std::endl;
559-
std::cout << "( / @ @ (|) ( / @ @ ()" << std::endl;
560-
std::cout << " \\ __| |__ / \\ __| |__ /" << std::endl;
561-
std::cout << " \\/ \" \\/ \\/ \" \\/" << std::endl;
562-
std::cout << " /-| |-\\ /-| |-\\" << std::endl;
563-
std::cout << "/ /-\\ /-\\ \\ / /-\\ /-\\ \\" << std::endl;
564-
std::cout << " / /-`---'-\\ \\ / /-`---'-\\ \\" << std::endl;
565-
std::cout << " / \\ / \\" << std::endl;
566-
567-
return;
542+
} // calculate_vector_norm()
568543
}
569544

570545
FOUR_C_NAMESPACE_CLOSE

‎src/porofluid_pressure_based/4C_porofluid_pressure_based_utils.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ namespace PoroPressureBased
142142
std::shared_ptr<Core::FE::Discretization> create_fully_overlapping_artery_discretization(
143143
Core::FE::Discretization& artdis, std::string disname, bool doboundaryconditions);
144144

145-
// Print the logo
146-
void print_logo();
147145
} // namespace PoroPressureBased
148146

149147

‎src/porofluid_pressure_based_elast/4C_porofluid_pressure_based_elast_dyn.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ void poromultiphase_dyn(int restart)
3737
// print problem type
3838
if (Core::Communication::my_mpi_rank(comm) == 0)
3939
{
40-
PoroPressureBased::print_logo();
4140
std::cout << "###################################################" << std::endl;
4241
std::cout << "# YOUR PROBLEM TYPE: " << problem->problem_name() << std::endl;
4342
std::cout << "###################################################" << std::endl;
@@ -50,7 +49,7 @@ void poromultiphase_dyn(int restart)
5049

5150
// Setup discretizations and coupling. Assign the dof sets and return the numbers
5251
std::map<int, std::set<int>> nearbyelepairs =
53-
PoroPressureBased::setup_discretizations_and_field_coupling(
52+
PoroPressureBased::setup_discretizations_and_field_coupling_porofluid_elast(
5453
comm, struct_disname, fluid_disname, nds_disp, nds_vel, nds_solidpressure);
5554

5655
// Parameter reading
@@ -64,11 +63,11 @@ void poromultiphase_dyn(int restart)
6463
// algorithm construction depending on
6564
// coupling scheme
6665
// -------------------------------------------------------------------
67-
auto solscheme = Teuchos::getIntegralValue<PoroPressureBased::SolutionSchemeOverFields>(
66+
auto solscheme = Teuchos::getIntegralValue<PoroPressureBased::SolutionSchemePorofluidElast>(
6867
poroparams, "COUPALGO");
6968

7069
std::shared_ptr<PoroPressureBased::PoroMultiPhase> algo =
71-
PoroPressureBased::create_poro_multi_phase_algorithm(solscheme, poroparams, comm);
70+
PoroPressureBased::create_algorithm_porofluid_elast(solscheme, poroparams, comm);
7271

7372
// initialize
7473
algo->init(poroparams, poroparams, structdyn, fluiddyn, struct_disname, fluid_disname, true,
@@ -89,7 +88,7 @@ void poromultiphase_dyn(int restart)
8988
// assign poro material for evaluation of porosity
9089
// note: to be done after potential restart, as in read_restart()
9190
// the secondary material is destroyed
92-
PoroPressureBased::assign_material_pointers(struct_disname, fluid_disname);
91+
PoroPressureBased::assign_material_pointers_porofluid_elast(struct_disname, fluid_disname);
9392

9493
// Setup the solver (only for the monolithic problem)
9594
algo->setup_solver();

‎src/porofluid_pressure_based_elast/4C_porofluid_pressure_based_elast_input.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ void PoroPressureBased::set_valid_parameters_porofluid_elast(
5050

5151

5252
// Coupling strategy for solvers
53-
deprecated_selection<SolutionSchemeOverFields>("COUPALGO",
53+
deprecated_selection<SolutionSchemePorofluidElast>("COUPALGO",
5454
{
55-
{"twoway_partitioned", solscheme_twoway_partitioned},
56-
{"twoway_monolithic", solscheme_twoway_monolithic},
55+
{"twoway_partitioned", SolutionSchemePorofluidElast::twoway_partitioned},
56+
{"twoway_monolithic", SolutionSchemePorofluidElast::twoway_monolithic},
5757
},
5858
{.description = "Coupling strategies for poro multiphase solvers",
59-
.default_value = solscheme_twoway_partitioned}),
59+
.default_value = SolutionSchemePorofluidElast::twoway_partitioned}),
6060

6161
// coupling with 1D artery network active
6262
parameter<bool>("ARTERY_COUPLING",

0 commit comments

Comments
 (0)