Remove untested code related to the problem type

Fluid_XFEM_LevelSet.
- LevelSetTimIntStationary was also unused, as it would only be
  initialized by Fluid_XFEM_LevelSet and is removed as well.

Author: c-p-schmidt

apps/post_monitor/4C_post_monitor.cpp

@@ -1739,7 +1739,6 @@ int main(int argc, char** argv)
     }
     case Core::ProblemType::structure:
     case Core::ProblemType::loma:
-    case Core::ProblemType::fluid_xfem_ls:
     case Core::ProblemType::fluid:
     case Core::ProblemType::fluid_redmodels:
     case Core::ProblemType::fps3i:

apps/post_processor/4C_post_processor.cpp

@@ -277,7 +277,6 @@ namespace
       }
       case Core::ProblemType::fsi_xfem:
       case Core::ProblemType::fpsi_xfem:
-      case Core::ProblemType::fluid_xfem_ls:
       {
         std::cout
             << "|=============================================================================|"

src/adapter/4C_adapter_fld_base_algorithm.cpp

@@ -101,8 +101,7 @@ void Adapter::FluidBaseAlgorithm::setup_fluid(const Teuchos::ParameterList& prbd
   if (!actdis->have_dofs())
   {
     if (probtype == Core::ProblemType::fsi_xfem or probtype == Core::ProblemType::fluid_xfem or
-        (probtype == Core::ProblemType::fpsi_xfem and disname == "fluid") or
-        probtype == Core::ProblemType::fluid_xfem_ls)
+        (probtype == Core::ProblemType::fpsi_xfem and disname == "fluid"))
     {
       actdis->fill_complete(false, false, false);
     }
@@ -209,7 +208,7 @@ void Adapter::FluidBaseAlgorithm::setup_fluid(const Teuchos::ParameterList& prbd
 
   // compute null space information
   if (probtype != Core::ProblemType::fsi_xfem and probtype != Core::ProblemType::fpsi_xfem and
-      probtype != Core::ProblemType::fluid_xfem and probtype != Core::ProblemType::fluid_xfem_ls and
+      probtype != Core::ProblemType::fluid_xfem and
       !(probtype == Core::ProblemType::fsi and
           Global::Problem::instance()->x_fluid_dynamic_params().sublist("GENERAL").get<bool>(
               "XFLUIDFLUID")))
@@ -295,8 +294,7 @@ void Adapter::FluidBaseAlgorithm::setup_fluid(const Teuchos::ParameterList& prbd
               "XFLUIDFLUID")) or
       (probtype == Core::ProblemType::fsi and
           Global::Problem::instance()->x_fluid_dynamic_params().sublist("GENERAL").get<bool>(
-              "XFLUIDFLUID")) or
-      probtype == Core::ProblemType::fluid_xfem_ls)
+              "XFLUIDFLUID")))
   {
     // get also scatra stabilization sublist
     const Teuchos::ParameterList& xdyn = Global::Problem::instance()->xfem_general_params();
@@ -737,19 +735,6 @@ void Adapter::FluidBaseAlgorithm::setup_fluid(const Teuchos::ParameterList& prbd
               tmpfluid, condition_name, solver, fluidtimeparams, output);
       }
       break;
-      case Core::ProblemType::fluid_xfem_ls:
-      {
-        std::shared_ptr<Core::FE::Discretization> soliddis =
-            Global::Problem::instance()->get_dis("structure");
-        std::shared_ptr<Core::FE::Discretization> scatradis = nullptr;
-
-        if (Global::Problem::instance()->does_exist_dis("scatra"))
-          scatradis = Global::Problem::instance()->get_dis("scatra");
-
-        fluid_ = std::make_shared<FLD::XFluid>(
-            actdis, soliddis, scatradis, solver, fluidtimeparams, output);
-      }
-      break;
       case Core::ProblemType::fsi:
       case Core::ProblemType::gas_fsi:
       case Core::ProblemType::biofilm_fsi:

src/adapter/4C_adapter_scatra_base_algorithm.cpp

@@ -14,7 +14,6 @@
 #include "4C_io.hpp"
 #include "4C_io_control.hpp"
 #include "4C_levelset_timint_ost.hpp"
-#include "4C_levelset_timint_stat.hpp"
 #include "4C_linear_solver_method.hpp"
 #include "4C_linear_solver_method_linalg.hpp"
 #include "4C_scatra_resulttest_hdg.hpp"
@@ -257,86 +256,26 @@ Adapter::ScaTraBaseAlgorithm::ScaTraBaseAlgorithm(const Teuchos::ParameterList&
       }
       default:
         FOUR_C_THROW("Unknown time integration scheme for electrochemistry!");
-        break;
     }
   }
 
-  // levelset
-  else if (probtype == Core::ProblemType::level_set or probtype == Core::ProblemType::fluid_xfem_ls)
+  // level-set
+  else if (probtype == Core::ProblemType::level_set)
   {
-    std::shared_ptr<Teuchos::ParameterList> lsparams = nullptr;
-    switch (probtype)
-    {
-      case Core::ProblemType::level_set:
-        lsparams = std::make_shared<Teuchos::ParameterList>(prbdyn);
-        break;
-      default:
-      {
-        if (!lsparams)
-          lsparams = std::make_shared<Teuchos::ParameterList>(
-              Global::Problem::instance()->level_set_control());
-        // overrule certain parameters for coupled problems
-        // this has already been ensured for scatratimeparams, but has also been ensured for the
-        // level-set parameter in a hybrid approach time step size
-        lsparams->set<double>("TIMESTEP", prbdyn.get<double>("TIMESTEP"));
-        // maximum simulation time
-        lsparams->set<double>("MAXTIME", prbdyn.get<double>("MAXTIME"));
-        // maximum number of timesteps
-        lsparams->set<int>("NUMSTEP", prbdyn.get<int>("NUMSTEP"));
-        // restart
-        lsparams->set<int>("RESTARTEVERY", prbdyn.get<int>("RESTARTEVERY"));
-        // solution output
-        lsparams->set<int>("RESULTSEVERY", prbdyn.get<int>("RESULTSEVERY"));
-
-        break;
-      }
-    }
+    auto lsparams = std::make_shared<Teuchos::ParameterList>(prbdyn);
 
     switch (timintscheme)
     {
       case Inpar::ScaTra::timeint_one_step_theta:
       {
-        // create instance of time integration class (call the constructor)
+        // create an instance of time integration class
         scatra_ = std::make_shared<ScaTra::LevelSetTimIntOneStepTheta>(
             discret, solver, lsparams, scatratimeparams, extraparams, output);
         break;
       }
-      case Inpar::ScaTra::timeint_stationary:
-      {
-        // create instance of time integration class (call the constructor)
-        switch (probtype)
-        {
-          case Core::ProblemType::level_set:
-          {
-            FOUR_C_THROW(
-                "Stationary time integration scheme only supported for a selection of coupled "
-                "level-set problems!");
-            exit(EXIT_FAILURE);
-          }
-          default:
-          {
-            scatra_ = std::make_shared<ScaTra::LevelSetTimIntStationary>(
-                discret, solver, lsparams, scatratimeparams, extraparams, output);
-            break;
-          }
-        }
-        break;
-      }
-      case Inpar::ScaTra::timeint_gen_alpha:
-      {
-        switch (probtype)
-        {
-          default:
-            FOUR_C_THROW("Unknown time-integration scheme for level-set problem");
-            exit(EXIT_FAILURE);
-        }
-
-        break;
-      }
       default:
         FOUR_C_THROW("Unknown time-integration scheme for level-set problem");
-        break;
-    }  // switch(timintscheme)
+    }
   }
 
   // cardiac monodomain

src/adapter/4C_adapter_scatra_fluid_coupling_algorithm.cpp

@@ -81,18 +81,14 @@ void Adapter::ScaTraFluidCouplingAlgorithm::setup()
   // set also initial field
   set_initial_flow_field(Global::Problem::instance()->fluid_dynamic_params());
 
-  if (Global::Problem::instance()->get_problem_type() != Core::ProblemType::fluid_xfem_ls)
-  {
-    // transfer the initial convective velocity from initial fluid field to scalar transport field
-    // subgrid scales not transferred since they are zero at time t=0.0
-    if (!volcoupl_fluidscatra_)
-      scatra_field()->set_velocity_field(
-          fluid_field()->convective_vel(), nullptr, nullptr, nullptr);
-    else
-      scatra_field()->set_velocity_field(
-          volcoupl_fluidscatra_->apply_vector_mapping21(*fluid_field()->convective_vel()), nullptr,
-          nullptr, nullptr);
-  }
+  // transfer the initial convective velocity from initial fluid field to scalar transport field
+  // subgrid scales not transferred since they are zero at time t=0.0
+  if (!volcoupl_fluidscatra_)
+    scatra_field()->set_velocity_field(fluid_field()->convective_vel(), nullptr, nullptr, nullptr);
+  else
+    scatra_field()->set_velocity_field(
+        volcoupl_fluidscatra_->apply_vector_mapping21(*fluid_field()->convective_vel()), nullptr,
+        nullptr, nullptr);
 
   // ensure that both single field solvers use the same
   // time integration scheme

src/core/legacy_enum_definitions/4C_legacy_enum_definitions_problem_type.hpp

@@ -31,7 +31,6 @@ namespace Core
     fbi,        // 3D fluid interacting with a 1D beam
     fluid_redmodels,  // fluid_redairways problem
     fluid_xfem,       // fluid problem including XFEM interfaces
-    fluid_xfem_ls,    // xfluid calculations using levelset for cut.
     fps3i,            // fluid porous structure scatra scatra interaction
     fpsi,             // fluid porous structure interaction problem
     fpsi_xfem,       // fluid poro structure interaction problem including XFEM interfaces (atm just

src/global_data/4C_global_data_read.cpp

@@ -523,18 +523,6 @@ std::unique_ptr<Core::IO::MeshReader> Global::read_discretization(
       break;
     }
 
-    case Core::ProblemType::fluid_xfem_ls:
-    {
-      // create empty discretizations
-      discretization_types["structure"] = {DiscretizationType::plain, "STRUCTURE"};
-      if (problem.get_problem_type() == Core::ProblemType::fluid_xfem_ls)
-        discretization_types["fluid"] = {DiscretizationType::xfem, "FLUID"};
-      else
-        discretization_types["fluid"] = {DiscretizationType::faces, "FLUID"};
-      discretization_types["scatra"] = {DiscretizationType::plain, "TRANSPORT"};
-      break;
-    }
-
     case Core::ProblemType::elch:
     {
       // create empty discretizations

src/inpar/4C_inpar_problemtype.cpp

@@ -63,7 +63,6 @@ std::map<std::string, Core::ProblemType> Inpar::PROBLEMTYPE::string_to_problem_t
     string2prbtype["Fluid_Structure_Interaction_RedModels"] = Core::ProblemType::fsi_redmodels;
     string2prbtype["Fluid_Structure_Interaction_XFEM"] = Core::ProblemType::fsi_xfem;
     string2prbtype["Fluid_XFEM"] = Core::ProblemType::fluid_xfem;
-    string2prbtype["Fluid_XFEM_LevelSet"] = Core::ProblemType::fluid_xfem_ls;
     string2prbtype["Gas_Fluid_Structure_Interaction"] = Core::ProblemType::gas_fsi;
     string2prbtype["Level_Set"] = Core::ProblemType::level_set;
     string2prbtype["Low_Mach_Number_Flow"] = Core::ProblemType::loma;

src/levelset/4C_levelset_algorithm.hpp

@@ -79,7 +79,7 @@ namespace ScaTra
     void mass_center_using_smoothing();
 
     /// redistribute the scatra discretization and vectors according to nodegraph
-    void redistribute(Core::LinAlg::Graph& nodegraph);
+    virtual void redistribute(Core::LinAlg::Graph& nodegraph);
 
     void test_results() override;
 

src/levelset/4C_levelset_timint_ost.cpp

@@ -242,8 +242,6 @@ void ScaTra::LevelSetTimIntOneStepTheta::redistribute(Core::LinAlg::Graph& nodeg
     fsphinp_ = Core::LinAlg::create_vector(*newdofrowmap, true);
     Core::LinAlg::export_to(*old, *fsphinp_);
   }
-
-  return;
 }