Merge pull request #564 from bwirthl/move-poro-pressurebased-input

Move porofluid pressure-based input to physics

Author: bwirthl

src/inpar/4C_inpar_porofluid_pressure_based.hpp

@@ -23,7 +23,6 @@
 #include "4C_inpar_mortar.hpp"
 #include "4C_inpar_mpc_rve.hpp"
 #include "4C_inpar_particle.hpp"
-#include "4C_inpar_porofluid_pressure_based_elast_scatra.hpp"
 #include "4C_inpar_s2i.hpp"
 #include "4C_inpar_scatra.hpp"
 #include "4C_inpar_ssi.hpp"
@@ -32,6 +31,7 @@
 #include "4C_inpar_structure.hpp"
 #include "4C_inpar_xfem.hpp"
 #include "4C_io_input_spec_builders.hpp"
+#include "4C_porofluid_pressure_based_elast_scatra_input.hpp"
 #include "4C_thermo_input.hpp"
 
 FOUR_C_NAMESPACE_OPEN
@@ -855,7 +855,7 @@ std::vector<Core::Conditions::ConditionDefinition> Input::valid_conditions()
   Inpar::RveMpc::set_valid_conditions(condlist);
   Inpar::BeamInteraction::set_valid_conditions(condlist);
   EHL::set_valid_conditions(condlist);
-  Inpar::PoroMultiPhaseScaTra::set_valid_conditions(condlist);
+  PoroMultiPhaseScaTra::set_valid_conditions(condlist);
 
   // finally some conditions that do not have their own files yet are problem-specific
   set_miscellaneous_conditions(condlist);

src/inpar/4C_inpar_porofluid_pressure_based_elast.hpp

@@ -41,9 +41,6 @@
 #include "4C_inpar_pasi.hpp"
 #include "4C_inpar_plasticity.hpp"
 #include "4C_inpar_poroelast.hpp"
-#include "4C_inpar_porofluid_pressure_based.hpp"
-#include "4C_inpar_porofluid_pressure_based_elast.hpp"
-#include "4C_inpar_porofluid_pressure_based_elast_scatra.hpp"
 #include "4C_inpar_poroscatra.hpp"
 #include "4C_inpar_problemtype.hpp"
 #include "4C_inpar_rebalance.hpp"
@@ -63,6 +60,9 @@
 #include "4C_io_input_file_utils.hpp"
 #include "4C_io_pstream.hpp"
 #include "4C_lubrication_input.hpp"
+#include "4C_porofluid_pressure_based_elast_input.hpp"
+#include "4C_porofluid_pressure_based_elast_scatra_input.hpp"
+#include "4C_porofluid_pressure_based_input.hpp"
 #include "4C_thermo_input.hpp"
 #include "4C_utils_parameter_list.hpp"
 
@@ -194,9 +194,9 @@ std::map<std::string, Core::IO::InputSpec> Input::valid_parameters()
   Inpar::FS3I::set_valid_parameters(list);
   Inpar::PoroElast::set_valid_parameters(list);
   Inpar::PoroScaTra::set_valid_parameters(list);
-  Inpar::POROMULTIPHASE::set_valid_parameters(list);
-  Inpar::PoroMultiPhaseScaTra::set_valid_parameters(list);
-  Inpar::POROFLUIDMULTIPHASE::set_valid_parameters(list);
+  POROMULTIPHASE::set_valid_parameters(list);
+  PoroMultiPhaseScaTra::set_valid_parameters(list);
+  POROFLUIDMULTIPHASE::set_valid_parameters(list);
   EHL::set_valid_parameters(list);
   Inpar::SSI::set_valid_parameters(list);
   Inpar::SSTI::set_valid_parameters(list);

src/inpar/4C_inpar_porofluid_pressure_based_elast_scatra.hpp

@@ -119,8 +119,8 @@ void porofluidmultiphase_dyn(int restart)
   // algorithm construction depending on
   // time-integration (or stationary) scheme
   // -------------------------------------------------------------------
-  auto timintscheme = Teuchos::getIntegralValue<Inpar::POROFLUIDMULTIPHASE::TimeIntegrationScheme>(
-      porodyn, "TIMEINTEGR");
+  auto timintscheme =
+      Teuchos::getIntegralValue<POROFLUIDMULTIPHASE::TimeIntegrationScheme>(porodyn, "TIMEINTEGR");
 
   // build poro fluid time integrator
   std::shared_ptr<Adapter::PoroFluidMultiphase> algo = POROFLUIDMULTIPHASE::Utils::create_algorithm(

src/inpar/4C_inpar_validconditions.cpp

@@ -5,15 +5,14 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#include "4C_inpar_porofluid_pressure_based.hpp"
+#include "4C_porofluid_pressure_based_input.hpp"
 
 #include "4C_inpar_bio.hpp"
 #include "4C_utils_parameter_list.hpp"
 
 FOUR_C_NAMESPACE_OPEN
 
-void Inpar::POROFLUIDMULTIPHASE::set_valid_parameters(
-    std::map<std::string, Core::IO::InputSpec>& list)
+void POROFLUIDMULTIPHASE::set_valid_parameters(std::map<std::string, Core::IO::InputSpec>& list)
 {
   using Teuchos::tuple;
   using namespace Core::IO::InputSpecBuilders;
@@ -113,25 +112,25 @@ void Inpar::POROFLUIDMULTIPHASE::set_valid_parameters(
 
   porofluidmultiphasedyn.specs.emplace_back(deprecated_selection<VectorNorm>("VECTORNORM_RESF",
       {
-          {"L1", Inpar::POROFLUIDMULTIPHASE::norm_l1},
-          {"L1_Scaled", Inpar::POROFLUIDMULTIPHASE::norm_l1_scaled},
-          {"L2", Inpar::POROFLUIDMULTIPHASE::norm_l2},
-          {"Rms", Inpar::POROFLUIDMULTIPHASE::norm_rms},
-          {"Inf", Inpar::POROFLUIDMULTIPHASE::norm_inf},
+          {"L1", POROFLUIDMULTIPHASE::norm_l1},
+          {"L1_Scaled", POROFLUIDMULTIPHASE::norm_l1_scaled},
+          {"L2", POROFLUIDMULTIPHASE::norm_l2},
+          {"Rms", POROFLUIDMULTIPHASE::norm_rms},
+          {"Inf", POROFLUIDMULTIPHASE::norm_inf},
       },
       {.description = "type of norm to be applied to residuals",
-          .default_value = Inpar::POROFLUIDMULTIPHASE::norm_l2}));
+          .default_value = POROFLUIDMULTIPHASE::norm_l2}));
 
   porofluidmultiphasedyn.specs.emplace_back(deprecated_selection<VectorNorm>("VECTORNORM_INC",
       {
-          {"L1", Inpar::POROFLUIDMULTIPHASE::norm_l1},
-          {"L1_Scaled", Inpar::POROFLUIDMULTIPHASE::norm_l1_scaled},
-          {"L2", Inpar::POROFLUIDMULTIPHASE::norm_l2},
-          {"Rms", Inpar::POROFLUIDMULTIPHASE::norm_rms},
-          {"Inf", Inpar::POROFLUIDMULTIPHASE::norm_inf},
+          {"L1", POROFLUIDMULTIPHASE::norm_l1},
+          {"L1_Scaled", POROFLUIDMULTIPHASE::norm_l1_scaled},
+          {"L2", POROFLUIDMULTIPHASE::norm_l2},
+          {"Rms", POROFLUIDMULTIPHASE::norm_rms},
+          {"Inf", POROFLUIDMULTIPHASE::norm_inf},
       },
       {.description = "type of norm to be applied to residuals",
-          .default_value = Inpar::POROFLUIDMULTIPHASE::norm_l2}));
+          .default_value = POROFLUIDMULTIPHASE::norm_l2}));
 
   // Iterationparameters
   porofluidmultiphasedyn.specs.emplace_back(parameter<double>(