Merge pull request #690 from sebproell/tsi-input

Clean up TSI input and define flags

Author: sebproell

src/inpar/4C_inpar_plasticity.cpp

@@ -8,11 +8,10 @@
 #include "4C_inpar_plasticity.hpp"
 
 #include "4C_inpar_structure.hpp"
-#include "4C_inpar_tsi.hpp"
 #include "4C_io_input_spec_builders.hpp"
-FOUR_C_NAMESPACE_OPEN
-
+#include "4C_tsi_input.hpp"
 
+FOUR_C_NAMESPACE_OPEN
 
 void Inpar::Plasticity::set_valid_parameters(std::map<std::string, Core::IO::InputSpec>& list)
 {
@@ -81,14 +80,14 @@ void Inpar::Plasticity::set_valid_parameters(std::map<std::string, Core::IO::Inp
               {.description = "tolerance in the EAS increment norm for the Newton iteration",
                   .default_value = 1.0E-8}),
 
-          deprecated_selection<Inpar::TSI::DissipationMode>("DISSIPATION_MODE",
+          deprecated_selection<TSI::DissipationMode>("DISSIPATION_MODE",
               {
-                  {"pl_multiplier", Inpar::TSI::pl_multiplier},
-                  {"pl_flow", Inpar::TSI::pl_flow},
-                  {"Taylor_Quinney", Inpar::TSI::Taylor_Quinney},
+                  {"pl_multiplier", TSI::pl_multiplier},
+                  {"pl_flow", TSI::pl_flow},
+                  {"Taylor_Quinney", TSI::Taylor_Quinney},
               },
               {.description = "method to calculate the plastic dissipation",
-                  .default_value = Inpar::TSI::pl_multiplier})},
+                  .default_value = TSI::pl_multiplier})},
       {.defaultable = true});
 }
 

src/inpar/4C_inpar_tsi.hpp

@@ -53,7 +53,6 @@
 #include "4C_inpar_ssti.hpp"
 #include "4C_inpar_sti.hpp"
 #include "4C_inpar_structure.hpp"
-#include "4C_inpar_tsi.hpp"
 #include "4C_inpar_volmortar.hpp"
 #include "4C_inpar_wear.hpp"
 #include "4C_inpar_xfem.hpp"
@@ -65,6 +64,7 @@
 #include "4C_porofluid_pressure_based_elast_scatra_input.hpp"
 #include "4C_porofluid_pressure_based_input.hpp"
 #include "4C_thermo_input.hpp"
+#include "4C_tsi_input.hpp"
 
 #include <Teuchos_any.hpp>
 #include <Teuchos_Array.hpp>
@@ -195,7 +195,7 @@ std::map<std::string, Core::IO::InputSpec> Input::valid_parameters()
   Inpar::Plasticity::set_valid_parameters(specs);
 
   Thermo::set_valid_parameters(specs);
-  Inpar::TSI::set_valid_parameters(specs);
+  TSI::set_valid_parameters(specs);
 
   Inpar::FLUID::set_valid_parameters(specs);
   Inpar::LowMach::set_valid_parameters(specs);