First refactoring of set_velocity_field

- rename method that takes no arguments to what it actually does,
  i.e. set_velocity_field_from_function
- remove unused set_velocity_field method from levelset algorithm
- remove unused argument setpressure from set_velocity_field method

Author: c-p-schmidt

src/elch/4C_elch_dyn.cpp

@@ -108,10 +108,10 @@ void elch_dyn(int restart)
       if (restart) scatraonly.scatra_field()->read_restart(restart);
 
       // set velocity field
-      // note: The order read_restart() before set_velocity_field() is important here!!
-      // for time-dependent velocity fields, set_velocity_field() is additionally called in each
-      // prepare_time_step()-call
-      scatraonly.scatra_field()->set_velocity_field();
+      // note: The order read_restart() before set_velocity_field_from_function() is important
+      // here!! for time-dependent velocity fields, set_velocity_field_from_function() is
+      // additionally called in each prepare_time_step()-call
+      scatraonly.scatra_field()->set_velocity_field_from_function();
 
       // enter time loop to solve problem with given convective velocity
       scatraonly.scatra_field()->time_loop();

src/fs3i/4C_fs3i_fps3i_partitioned.cpp

@@ -637,10 +637,9 @@ void FS3I::PartFPS3I::set_velocity_fields()
     case Inpar::ScaTra::velocity_zero:
     case Inpar::ScaTra::velocity_function:
     {
-      for (unsigned i = 0; i < scatravec_.size(); ++i)
+      for (auto scatra : scatravec_)
       {
-        std::shared_ptr<Adapter::ScaTraBaseAlgorithm> scatra = scatravec_[i];
-        scatra->scatra_field()->set_velocity_field();
+        scatra->scatra_field()->set_velocity_field_from_function();
       }
       break;
     }

src/levelset/4C_levelset_algorithm.hpp

@@ -66,15 +66,6 @@ namespace ScaTra
     //! set the velocity field (zero or field by function) (pure level-set problems)
     void set_velocity_field(bool init = false);
 
-    /// set convective velocity field (+ pressure and acceleration field as
-    /// well as fine-scale velocity field, if required) (function for coupled fluid problems)
-    void set_velocity_field(std::shared_ptr<const Core::LinAlg::Vector<double>> convvel,
-        std::shared_ptr<const Core::LinAlg::Vector<double>> acc,
-        std::shared_ptr<const Core::LinAlg::Vector<double>> vel,
-        std::shared_ptr<const Core::LinAlg::Vector<double>> fsvel, bool setpressure = false,
-        bool init = false);
-
-
     // output position of center of mass assuming a smoothed interfaces
     void mass_center_using_smoothing();
 

src/levelset/4C_levelset_algorithm_utils.cpp

@@ -29,7 +29,7 @@ FOUR_C_NAMESPACE_OPEN
 void ScaTra::LevelSetAlgorithm::set_velocity_field(bool init)
 {
   // call function of base class
-  ScaTraTimIntImpl::set_velocity_field();
+  ScaTraTimIntImpl::set_velocity_field_from_function();
 
   // note: This function is only called from the level-set dyn. This is ok, since
   //       we only want to initialize conveln_ at the beginning of the simulation.
@@ -38,29 +38,6 @@ void ScaTra::LevelSetAlgorithm::set_velocity_field(bool init)
 }
 
 
-/*----------------------------------------------------------------------*
- | set convective velocity field (+ pressure and acceleration field as  |
- | well as fine-scale velocity field, if required)      rasthofer 11/13 |
- *----------------------------------------------------------------------*/
-void ScaTra::LevelSetAlgorithm::set_velocity_field(
-    std::shared_ptr<const Core::LinAlg::Vector<double>> convvel,
-    std::shared_ptr<const Core::LinAlg::Vector<double>> acc,
-    std::shared_ptr<const Core::LinAlg::Vector<double>> vel,
-    std::shared_ptr<const Core::LinAlg::Vector<double>> fsvel, bool setpressure, bool init)
-{
-  // call routine of base class
-  ScaTraTimIntImpl::set_velocity_field(convvel, acc, vel, fsvel, setpressure);
-
-  // manipulate velocity field away from the interface
-  if (extract_interface_vel_) manipulate_fluid_field_for_gfunc();
-
-  // estimate velocity at contact points, i.e., intersection points of interface and (no-slip) walls
-  if (cpbc_) apply_contact_point_boundary_condition();
-
-  return;
-}
-
-
 /*----------------------------------------------------------------------*
  | add problem depended params for assemble_mat_and_rhs    rasthofer 09/13 |
  *----------------------------------------------------------------------*/

src/loma/4C_loma_algorithm.cpp

@@ -532,8 +532,6 @@ void LowMach::Algorithm::mono_loop()
     // check convergence and stop iteration loop if convergence is achieved
     stopnonliniter = convergence_check(itnum);
   }
-
-  return;
 }
 
 
@@ -548,21 +546,19 @@ void LowMach::Algorithm::set_fluid_values_in_scatra()
     case Inpar::FLUID::timeint_afgenalpha:
     {
       scatra_field()->set_velocity_field(
-          fluid_field()->velaf(), fluid_field()->accam(), nullptr, fluid_field()->fs_vel(), true);
+          fluid_field()->velaf(), fluid_field()->accam(), nullptr, fluid_field()->fs_vel());
     }
     break;
     case Inpar::FLUID::timeint_one_step_theta:
     case Inpar::FLUID::timeint_bdf2:
     {
       scatra_field()->set_velocity_field(
-          fluid_field()->velnp(), fluid_field()->hist(), nullptr, fluid_field()->fs_vel(), true);
+          fluid_field()->velnp(), fluid_field()->hist(), nullptr, fluid_field()->fs_vel());
     }
     break;
     default:
       FOUR_C_THROW("Time integration scheme not supported");
-      break;
   }
-  return;
 }
 
 

src/loma/4C_loma_dyn.cpp

@@ -104,10 +104,10 @@ void loma_dyn(int restart)
       if (restart) (scatraonly.scatra_field())->read_restart(restart);
 
       // set initial velocity field
-      // note: The order read_restart() before set_velocity_field() is important here!!
-      // for time-dependent velocity fields, set_velocity_field() is additionally called in each
-      // prepare_time_step()-call
-      (scatraonly.scatra_field())->set_velocity_field();
+      // note: The order read_restart() before set_velocity_field_from_function() is important
+      // here!! for time-dependent velocity fields, set_velocity_field_from_function() is
+      // additionally called in each prepare_time_step()-call
+      (scatraonly.scatra_field())->set_velocity_field_from_function();
 
       // enter time loop to solve problem with given convective velocity field
       (scatraonly.scatra_field())->time_loop();

src/mat/4C_mat_scatra_multiscale_gp.cpp

@@ -237,7 +237,9 @@ void Mat::ScatraMultiScaleGP::init()
     global_micro_state().microdisnum_microtimint_map_[microdisnum_]->setup();
 
     // set initial velocity field
-    global_micro_state().microdisnum_microtimint_map_[microdisnum_]->set_velocity_field();
+    global_micro_state()
+        .microdisnum_microtimint_map_[microdisnum_]
+        ->set_velocity_field_from_function();
 
     // create counter for number of macro-scale Gauss points associated with micro-scale time
     // integrator

src/poroelast_scatra/4C_poroelast_scatra_base.cpp

@@ -179,12 +179,7 @@ void PoroElastScaTra::PoroScatraBase::set_velocity_fields()
     velnp = volcoupl_fluidscatra_->apply_vector_mapping21(*poro_->fluid_field()->velnp());
   }
 
-  scatra_->scatra_field()->set_velocity_field(convel,  // convective vel.
-      nullptr,                                         // acceleration
-      velnp,                                           // velocity
-      nullptr,                                         // fsvel
-      true                                             // set pressure
-  );
+  scatra_->scatra_field()->set_velocity_field(convel, nullptr, velnp, nullptr);
 }
 
 /*----------------------------------------------------------------------*

src/scatra/4C_scatra_cardiac_monodomain_dyn.cpp

@@ -172,10 +172,10 @@ void scatra_cardiac_monodomain_dyn(int restart)
       if (restart) scatraonly.scatra_field()->read_restart(restart);
 
       // set initial velocity field
-      // note: The order read_restart() before set_velocity_field() is important here!!
-      // for time-dependent velocity fields, set_velocity_field() is additionally called in each
-      // prepare_time_step()-call
-      (scatraonly.scatra_field())->set_velocity_field();
+      // note: The order read_restart() before set_velocity_field_from_function() is important
+      // here!! for time-dependent velocity fields, set_velocity_field_from_function() is
+      // additionally called in each prepare_time_step()-call
+      (scatraonly.scatra_field())->set_velocity_field_from_function();
 
       // enter time loop to solve problem with given convective velocity
       (scatraonly.scatra_field())->time_loop();

src/scatra/4C_scatra_dyn.cpp

@@ -169,10 +169,10 @@ void scatra_dyn(int restart)
       if (restart) scatraonly.scatra_field()->read_restart(restart);
 
       // set initial velocity field
-      // note: The order read_restart() before set_velocity_field() is important here!!
-      // for time-dependent velocity fields, set_velocity_field() is additionally called in each
-      // prepare_time_step()-call
-      scatraonly.scatra_field()->set_velocity_field();
+      // note: The order read_restart() before set_velocity_field_from_function() is important
+      // here!! for time-dependent velocity fields, set_velocity_field_from_function() is
+      // additionally called in each prepare_time_step()-call
+      scatraonly.scatra_field()->set_velocity_field_from_function();
 
       // set external force
       if (scatraonly.scatra_field()->has_external_force())