Move setting of convective velocity

c-p-schmidt · c-p-schmidt · commit e329f50ea96e · 2025-05-02T10:50:35.000+02:00
to dedicated method and use const reference instead of shared pointer
diff --git a/src/adapter/4C_adapter_scatra_fluid_coupling_algorithm.cpp b/src/adapter/4C_adapter_scatra_fluid_coupling_algorithm.cpp
@@ -84,11 +84,14 @@ void Adapter::ScaTraFluidCouplingAlgorithm::setup()
   // 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);
+  {
+    scatra_field()->set_convective_velocity(*fluid_field()->convective_vel());
+  }
   else
-    scatra_field()->set_velocity_field(
-        volcoupl_fluidscatra_->apply_vector_mapping21(*fluid_field()->convective_vel()), nullptr,
-        nullptr, nullptr);
+  {
+    scatra_field()->set_convective_velocity(
+        *volcoupl_fluidscatra_->apply_vector_mapping21(*fluid_field()->convective_vel()));
+  }
 
   // ensure that both single field solvers use the same
   // time integration scheme
diff --git a/src/elch/4C_elch_moving_boundary_algorithm.cpp b/src/elch/4C_elch_moving_boundary_algorithm.cpp
@@ -111,8 +111,9 @@ void ElCh::MovingBoundaryAlgorithm::time_loop()
   if (not pseudotransient_)
   {
     // transfer convective velocity = fluid velocity - grid velocity
-    scatra_field()->set_velocity_field(fluid_field()->convective_vel(),  // = velnp - grid velocity
-        fluid_field()->hist(), nullptr, nullptr);
+    scatra_field()->set_convective_velocity(*fluid_field()->convective_vel());
+    scatra_field()->set_velocity_field(
+        fluid_field()->hist(), fluid_field()->convective_vel(), nullptr);
   }
 
   // transfer moving mesh data
@@ -248,33 +249,31 @@ void ElCh::MovingBoundaryAlgorithm::solve_scatra()
 {
   if (Core::Communication::my_mpi_rank(get_comm()) == 0)
   {
-    std::cout << std::endl;
-    std::cout << "************************" << std::endl;
-    std::cout << "       ELCH SOLVER      " << std::endl;
-    std::cout << "************************" << std::endl;
+    std::cout << '\n';
+    std::cout << "************************" << '\n';
+    std::cout << "       ELCH SOLVER      " << '\n';
+    std::cout << "************************" << '\n';
   }
 
   switch (fluid_field()->tim_int_scheme())
   {
     case Inpar::FLUID::timeint_npgenalpha:
     case Inpar::FLUID::timeint_afgenalpha:
       FOUR_C_THROW("ConvectiveVel() not implemented for Gen.Alpha versions");
-      break;
     case Inpar::FLUID::timeint_one_step_theta:
     case Inpar::FLUID::timeint_bdf2:
     {
       if (not pseudotransient_)
       {
         // transfer convective velocity = fluid velocity - grid velocity
+        scatra_field()->set_convective_velocity(*fluid_field()->convective_vel());
         scatra_field()->set_velocity_field(
-            fluid_field()->convective_vel(),  // = velnp - grid velocity
-            fluid_field()->hist(), nullptr, nullptr);
+            fluid_field()->hist(), fluid_field()->convective_vel(), nullptr);
       }
     }
     break;
     default:
       FOUR_C_THROW("Time integration scheme not supported");
-      break;
   }
 
   // transfer moving mesh data
diff --git a/src/fs3i/4C_fs3i_fps3i_partitioned.cpp b/src/fs3i/4C_fs3i_fps3i_partitioned.cpp
@@ -651,8 +651,8 @@ void FS3I::PartFPS3I::set_velocity_fields()
 
       for (unsigned i = 0; i < scatravec_.size(); ++i)
       {
-        std::shared_ptr<Adapter::ScaTraBaseAlgorithm> scatra = scatravec_[i];
-        scatra->scatra_field()->set_velocity_field(convel[i], nullptr, vel[i], nullptr);
+        scatravec_[i]->scatra_field()->set_convective_velocity(*convel[i]);
+        scatravec_[i]->scatra_field()->set_velocity_field(nullptr, vel[i], nullptr);
       }
       break;
     }
diff --git a/src/fs3i/4C_fs3i_partitioned.cpp b/src/fs3i/4C_fs3i_partitioned.cpp
@@ -702,9 +702,10 @@ void FS3I::PartFS3I::set_velocity_fields() const
 
   for (unsigned i = 0; i < scatravec_.size(); ++i)
   {
-    std::shared_ptr<Adapter::ScaTraBaseAlgorithm> scatra = scatravec_[i];
-    scatra->scatra_field()->set_velocity_field(vol_mortar_master_to_slavei(i, convel[i]), nullptr,
-        vol_mortar_master_to_slavei(i, vel[i]), nullptr);
+    scatravec_[i]->scatra_field()->set_convective_velocity(
+        *vol_mortar_master_to_slavei(i, convel[i]));
+    scatravec_[i]->scatra_field()->set_velocity_field(
+        nullptr, vol_mortar_master_to_slavei(i, vel[i]), nullptr);
   }
 }
 
diff --git a/src/fs3i/4C_fs3i_partitioned_2wc.cpp b/src/fs3i/4C_fs3i_partitioned_2wc.cpp
@@ -103,8 +103,7 @@ void FS3I::PartFS3I2Wc::initial_calculations()
 {
   // set initial fluid velocity field for evaluation of initial scalar
   // time derivative in fluid-based scalar transport
-  scatravec_[0]->scatra_field()->set_velocity_field(
-      fsi_->fluid_field()->velnp(), nullptr, nullptr, nullptr);
+  scatravec_[0]->scatra_field()->set_convective_velocity(*fsi_->fluid_field()->velnp());
 
   // set initial value of thermodynamic pressure in fluid-based scalar
   // transport
diff --git a/src/loma/4C_loma_algorithm.cpp b/src/loma/4C_loma_algorithm.cpp
@@ -311,10 +311,9 @@ void LowMach::Algorithm::time_loop()
 /*----------------------------------------------------------------------*/
 void LowMach::Algorithm::initial_calculations()
 {
-  // set initial velocity field for evaluation of initial scalar time
-  // derivative in SCATRA
-  scatra_field()->set_velocity_field(
-      fluid_field()->velnp(), nullptr, nullptr, fluid_field()->fs_vel());
+  // set initial velocity field for evaluation of initial scalar time derivative in SCATRA
+  scatra_field()->set_convective_velocity(*fluid_field()->velnp());
+  scatra_field()->set_velocity_field(nullptr, fluid_field()->velnp(), fluid_field()->fs_vel());
 
   // set initial value of thermodynamic pressure in SCATRA
   std::dynamic_pointer_cast<ScaTra::ScaTraTimIntLoma>(scatra_field())->set_initial_therm_pressure();
@@ -328,11 +327,6 @@ void LowMach::Algorithm::initial_calculations()
   fluid_field()->set_scalar_fields(scatra_field()->phinp(),
       std::dynamic_pointer_cast<ScaTra::ScaTraTimIntLoma>(scatra_field())->therm_press_np(),
       nullptr, scatra_field()->discretization());
-
-  // write initial fields
-  // output();
-
-  return;
 }
 
 
@@ -545,15 +539,17 @@ void LowMach::Algorithm::set_fluid_values_in_scatra()
   {
     case Inpar::FLUID::timeint_afgenalpha:
     {
+      scatra_field()->set_convective_velocity(*fluid_field()->velaf());
       scatra_field()->set_velocity_field(
-          fluid_field()->velaf(), fluid_field()->accam(), nullptr, fluid_field()->fs_vel());
+          fluid_field()->accam(), fluid_field()->velaf(), fluid_field()->fs_vel());
     }
     break;
     case Inpar::FLUID::timeint_one_step_theta:
     case Inpar::FLUID::timeint_bdf2:
     {
+      scatra_field()->set_convective_velocity(*fluid_field()->velnp());
       scatra_field()->set_velocity_field(
-          fluid_field()->velnp(), fluid_field()->hist(), nullptr, fluid_field()->fs_vel());
+          fluid_field()->hist(), fluid_field()->velnp(), fluid_field()->fs_vel());
     }
     break;
     default:
diff --git a/src/poroelast_scatra/4C_poroelast_scatra_base.cpp b/src/poroelast_scatra/4C_poroelast_scatra_base.cpp
@@ -179,7 +179,8 @@ void PoroElastScaTra::PoroScatraBase::set_velocity_fields()
     velnp = volcoupl_fluidscatra_->apply_vector_mapping21(*poro_->fluid_field()->velnp());
   }
 
-  scatra_->scatra_field()->set_velocity_field(convel, nullptr, velnp, nullptr);
+  scatra_->scatra_field()->set_convective_velocity(*convel);
+  scatra_->scatra_field()->set_velocity_field(nullptr, velnp, nullptr);
 }
 
 /*----------------------------------------------------------------------*
diff --git a/src/scatra/4C_scatra_algorithm.cpp b/src/scatra/4C_scatra_algorithm.cpp
@@ -225,7 +225,6 @@ void ScaTra::ScaTraAlgorithm::prepare_time_step_convection()
     default:
     {
       FOUR_C_THROW("Selected time integration scheme is not available!");
-      break;
     }
   }
 
@@ -234,16 +233,17 @@ void ScaTra::ScaTraAlgorithm::prepare_time_step_convection()
   // transfer the initial(!!) convective velocity
   //(fluid initial field was set inside the constructor of fluid base class)
   if (step() == 1)
-    scatra_field()->set_velocity_field(
-        fluid_field()->velnp(), fluid_field()->hist(), nullptr, nullptr);
+  {
+    scatra_field()->set_convective_velocity(*fluid_field()->velnp());
+    scatra_field()->set_velocity_field(fluid_field()->hist(), fluid_field()->velnp(), nullptr);
+  }
 
   // prepare time step (+ initialize one-step-theta scheme correctly with
   // velocity given above)
   scatra_field()->prepare_time_step();
 }
 
 /*----------------------------------------------------------------------*
- | Print scatra solver type to screen                        fang 08/14 |
  *----------------------------------------------------------------------*/
 void ScaTra::ScaTraAlgorithm::print_scatra_solver()
 {
@@ -305,15 +305,17 @@ void ScaTra::ScaTraAlgorithm::set_velocity_field()
     case Inpar::FLUID::timeint_npgenalpha:
     case Inpar::FLUID::timeint_afgenalpha:
     {
-      scatra_field()->set_velocity_field(fluid_to_scatra(fluid_field()->velaf()),
+      scatra_field()->set_convective_velocity(*fluid_to_scatra(fluid_field()->velaf()));
+      scatra_field()->set_velocity_field(
           fluid_to_scatra(fluid_field()->accam()), fluid_to_scatra(fluid_field()->velaf()), fsvel);
       break;
     }
     case Inpar::FLUID::timeint_one_step_theta:
     case Inpar::FLUID::timeint_bdf2:
     case Inpar::FLUID::timeint_stationary:
     {
-      scatra_field()->set_velocity_field(fluid_to_scatra(fluid_field()->velnp()),
+      scatra_field()->set_convective_velocity(*fluid_to_scatra(fluid_field()->velnp()));
+      scatra_field()->set_velocity_field(
           fluid_to_scatra(fluid_field()->hist()), fluid_to_scatra(fluid_field()->velnp()), fsvel);
       break;
     }
diff --git a/src/scatra/4C_scatra_timint_implicit.cpp b/src/scatra/4C_scatra_timint_implicit.cpp
@@ -1461,28 +1461,38 @@ void ScaTra::ScaTraTimIntImpl::set_mean_concentration(
   mean_conc_ = MeanConc;
 }
 
+/*----------------------------------------------------------------------*
+ *----------------------------------------------------------------------*/
+void ScaTra::ScaTraTimIntImpl::set_convective_velocity(
+    const Core::LinAlg::Vector<double>& convective_velocity) const
+{
+  // time measurement
+  TEUCHOS_FUNC_TIME_MONITOR("SCATRA: set convective velocity field");
+
+  // checks
+  FOUR_C_ASSERT(velocity_field_type_ == Inpar::ScaTra::velocity_Navier_Stokes,
+      "Wrong set_velocity_field() called for velocity field type {}!", velocity_field_type_);
+  FOUR_C_ASSERT(nds_vel() < discret_->num_dof_sets(), "Too few dof sets on scatra discretization!");
+
+  // provide scatra discretization with convective velocity
+  discret_->set_state(nds_vel(), "convective velocity field", convective_velocity);
+}
+
+
 /*----------------------------------------------------------------------*
  *----------------------------------------------------------------------*/
 void ScaTra::ScaTraTimIntImpl::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)
 {
   // time measurement
-  TEUCHOS_FUNC_TIME_MONITOR("SCATRA: set convective velocity field");
+  TEUCHOS_FUNC_TIME_MONITOR("SCATRA: set velocity fields");
 
-  //---------------------------------------------------------------------------
-  // preliminaries
-  //---------------------------------------------------------------------------
-  if (convvel == nullptr) FOUR_C_THROW("Velocity state is nullptr");
-
-  if (velocity_field_type_ != Inpar::ScaTra::velocity_Navier_Stokes)
-    FOUR_C_THROW(
-        "Wrong set_velocity_field() called for velocity field type {}!", velocity_field_type_);
-
-  if (nds_vel() >= discret_->num_dof_sets())
-    FOUR_C_THROW("Too few dofsets on scatra discretization!");
+  // checks
+  FOUR_C_ASSERT(velocity_field_type_ == Inpar::ScaTra::velocity_Navier_Stokes,
+      "Wrong set_velocity_field() called for velocity field type {}!", velocity_field_type_);
+  FOUR_C_ASSERT(nds_vel() < discret_->num_dof_sets(), "Too few dof sets on scatra discretization!");
 
   // boolean indicating whether fine-scale velocity vector exists
   // -> if yes, multifractal subgrid-scale modeling is applied
@@ -1503,18 +1513,8 @@ void ScaTra::ScaTraTimIntImpl::set_velocity_field(
   if (turbmodel_ == Inpar::FLUID::no_model and fssgd_ == Inpar::ScaTra::fssugrdiff_no)
     fsvelswitch = false;
 
-  // provide scatra discretization with convective velocity
-  discret_->set_state(nds_vel(), "convective velocity field", *convvel);
-
   // provide scatra discretization with velocity
-  if (vel != nullptr)
-    discret_->set_state(nds_vel(), "velocity field", *vel);
-  else
-  {
-    // if velocity vector is not provided by the respective algorithm, we
-    // assume that it equals the given convective velocity:
-    discret_->set_state(nds_vel(), "velocity field", *convvel);
-  }
+  if (vel != nullptr) discret_->set_state(nds_vel(), "velocity field", *vel);
 
   // provide scatra discretization with acceleration field if required
   if (acc != nullptr) discret_->set_state(nds_vel(), "acceleration field", *acc);
diff --git a/src/scatra/4C_scatra_timint_implicit.hpp b/src/scatra/4C_scatra_timint_implicit.hpp
@@ -244,17 +244,18 @@ namespace ScaTra
      */
     void set_external_force() const;
 
+    //! set the @convective_velocity vector to the scalar transport discretization
+    void set_convective_velocity(const Core::LinAlg::Vector<double>& convective_velocity) const;
+
     /*!
-     * @brief set convective velocity field (+ pressure and acceleration field as well as fine-scale
-     * velocity field, if required)
+     * @brief set velocity field (+ pressure and acceleration field as well as fine-scale velocity
+     * field, if required)
      *
-     * @param convvel convective velocity/press. vector
      * @param acc     acceleration vector
      * @param vel     velocity vector
      * @param fsvel   fine-scale velocity vector
      */
-    void set_velocity_field(std::shared_ptr<const Core::LinAlg::Vector<double>> convvel,
-        std::shared_ptr<const Core::LinAlg::Vector<double>> acc,
+    void set_velocity_field(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);
 
diff --git a/src/ssi/4C_ssi_coupling.cpp b/src/ssi/4C_ssi_coupling.cpp
@@ -141,7 +141,8 @@ void SSI::SSICouplingMatchingVolume::set_velocity_fields(
     std::shared_ptr<const Core::LinAlg::Vector<double>> convvel,
     std::shared_ptr<const Core::LinAlg::Vector<double>> vel)
 {
-  scatra->scatra_field()->set_velocity_field(convvel, nullptr, vel, nullptr);
+  scatra->scatra_field()->set_convective_velocity(*convvel);
+  scatra->scatra_field()->set_velocity_field(nullptr, vel, nullptr);
 }
 
 /*----------------------------------------------------------------------*/
@@ -286,9 +287,10 @@ void SSI::SSICouplingNonMatchingBoundary::set_velocity_fields(
     std::shared_ptr<const Core::LinAlg::Vector<double>> convvel,
     std::shared_ptr<const Core::LinAlg::Vector<double>> vel)
 {
+  scatra->scatra_field()->set_convective_velocity(
+      *adaptermeshtying_->master_to_slave(*extractor_->extract_cond_vector(*convvel)));
   scatra->scatra_field()->set_velocity_field(
-      adaptermeshtying_->master_to_slave(*extractor_->extract_cond_vector(*convvel)), nullptr,
-      adaptermeshtying_->master_to_slave(*extractor_->extract_cond_vector(*vel)), nullptr);
+      nullptr, adaptermeshtying_->master_to_slave(*extractor_->extract_cond_vector(*vel)), nullptr);
 }
 
 /*----------------------------------------------------------------------*/
@@ -405,9 +407,10 @@ void SSI::SSICouplingNonMatchingVolume::set_velocity_fields(
     std::shared_ptr<const Core::LinAlg::Vector<double>> convvel,
     std::shared_ptr<const Core::LinAlg::Vector<double>> vel)
 {
+  scatra->scatra_field()->set_convective_velocity(
+      *volcoupl_structurescatra_->apply_vector_mapping21(*convvel));
   scatra->scatra_field()->set_velocity_field(
-      volcoupl_structurescatra_->apply_vector_mapping21(*convvel), nullptr,
-      volcoupl_structurescatra_->apply_vector_mapping21(*vel), nullptr);
+      nullptr, volcoupl_structurescatra_->apply_vector_mapping21(*vel), nullptr);
 }
 
 /*----------------------------------------------------------------------*/
@@ -602,7 +605,8 @@ void SSI::SSICouplingMatchingVolumeAndBoundary::set_velocity_fields(
     std::shared_ptr<const Core::LinAlg::Vector<double>> convvel,
     std::shared_ptr<const Core::LinAlg::Vector<double>> vel)
 {
-  scatra->scatra_field()->set_velocity_field(convvel, nullptr, vel, nullptr);
+  scatra->scatra_field()->set_convective_velocity(*convvel);
+  scatra->scatra_field()->set_velocity_field(nullptr, vel, nullptr);
 }
 
 /*----------------------------------------------------------------------*/
diff --git a/src/ssti/4C_ssti_algorithm.cpp b/src/ssti/4C_ssti_algorithm.cpp
@@ -289,8 +289,10 @@ void SSTI::SSTIAlgorithm::distribute_structure_solution() const
   // convective velocity is set to zero
   const auto convective_velocity = Core::LinAlg::create_vector(*structure_->dof_row_map());
 
-  scatra_field()->set_velocity_field(convective_velocity, nullptr, structure_->velnp(), nullptr);
-  thermo_field()->set_velocity_field(convective_velocity, nullptr, structure_->velnp(), nullptr);
+  scatra_field()->set_convective_velocity(*convective_velocity);
+  scatra_field()->set_velocity_field(nullptr, structure_->velnp(), nullptr);
+  thermo_field()->set_convective_velocity(*convective_velocity);
+  thermo_field()->set_velocity_field(nullptr, structure_->velnp(), nullptr);
 }
 
 /*----------------------------------------------------------------------*/

Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,9 @@ void ElCh::MovingBoundaryAlgorithm::time_loop()`
`111`	`111`	`if (not pseudotransient_)`
`112`	`112`	`{`
`113`	`113`	`// transfer convective velocity = fluid velocity - grid velocity`
`114`		`- scatra_field()->set_velocity_field(fluid_field()->convective_vel(), // = velnp - grid velocity`
`115`		`- fluid_field()->hist(), nullptr, nullptr);`
	`114`	`+ scatra_field()->set_convective_velocity(*fluid_field()->convective_vel());`
	`115`	`+ scatra_field()->set_velocity_field(`
	`116`	`+ fluid_field()->hist(), fluid_field()->convective_vel(), nullptr);`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`// transfer moving mesh data`
`@@ -248,33 +249,31 @@ void ElCh::MovingBoundaryAlgorithm::solve_scatra()`
`248`	`249`	`{`
`249`	`250`	`if (Core::Communication::my_mpi_rank(get_comm()) == 0)`
`250`	`251`	`{`
`251`		`- std::cout << std::endl;`
`252`		`- std::cout << "************************" << std::endl;`
`253`		`- std::cout << " ELCH SOLVER " << std::endl;`
`254`		`- std::cout << "************************" << std::endl;`
	`252`	`+ std::cout << '\n';`
	`253`	`+ std::cout << "************************" << '\n';`
	`254`	`+ std::cout << " ELCH SOLVER " << '\n';`
	`255`	`+ std::cout << "************************" << '\n';`
`255`	`256`	`}`
`256`	`257`
`257`	`258`	`switch (fluid_field()->tim_int_scheme())`
`258`	`259`	`{`
`259`	`260`	`case Inpar::FLUID::timeint_npgenalpha:`
`260`	`261`	`case Inpar::FLUID::timeint_afgenalpha:`
`261`	`262`	`FOUR_C_THROW("ConvectiveVel() not implemented for Gen.Alpha versions");`
`262`		`- break;`
`263`	`263`	`case Inpar::FLUID::timeint_one_step_theta:`
`264`	`264`	`case Inpar::FLUID::timeint_bdf2:`
`265`	`265`	`{`
`266`	`266`	`if (not pseudotransient_)`
`267`	`267`	`{`
`268`	`268`	`// transfer convective velocity = fluid velocity - grid velocity`
	`269`	`+ scatra_field()->set_convective_velocity(*fluid_field()->convective_vel());`
`269`	`270`	`scatra_field()->set_velocity_field(`
`270`		`- fluid_field()->convective_vel(), // = velnp - grid velocity`
`271`		`- fluid_field()->hist(), nullptr, nullptr);`
	`271`	`+ fluid_field()->hist(), fluid_field()->convective_vel(), nullptr);`
`272`	`272`	`}`
`273`	`273`	`}`
`274`	`274`	`break;`
`275`	`275`	`default:`
`276`	`276`	`FOUR_C_THROW("Time integration scheme not supported");`
`277`		`- break;`
`278`	`277`	`}`
`279`	`278`
`280`	`279`	`// transfer moving mesh data`
Original file line number	Diff line number	Diff line change
`@@ -651,8 +651,8 @@ void FS3I::PartFPS3I::set_velocity_fields()`
`651`	`651`
`652`	`652`	`for (unsigned i = 0; i < scatravec_.size(); ++i)`
`653`	`653`	`{`
`654`		`- std::shared_ptr<Adapter::ScaTraBaseAlgorithm> scatra = scatravec_[i];`
`655`		`- scatra->scatra_field()->set_velocity_field(convel[i], nullptr, vel[i], nullptr);`
	`654`	`+ scatravec_[i]->scatra_field()->set_convective_velocity(*convel[i]);`
	`655`	`+ scatravec_[i]->scatra_field()->set_velocity_field(nullptr, vel[i], nullptr);`
`656`	`656`	`}`
`657`	`657`	`break;`
`658`	`658`	`}`
Original file line number	Diff line number	Diff line change
`@@ -702,9 +702,10 @@ void FS3I::PartFS3I::set_velocity_fields() const`
`702`	`702`
`703`	`703`	`for (unsigned i = 0; i < scatravec_.size(); ++i)`
`704`	`704`	`{`
`705`		`- std::shared_ptr<Adapter::ScaTraBaseAlgorithm> scatra = scatravec_[i];`
`706`		`- scatra->scatra_field()->set_velocity_field(vol_mortar_master_to_slavei(i, convel[i]), nullptr,`
`707`		`- vol_mortar_master_to_slavei(i, vel[i]), nullptr);`
	`705`	`+ scatravec_[i]->scatra_field()->set_convective_velocity(`
	`706`	`+ *vol_mortar_master_to_slavei(i, convel[i]));`
	`707`	`+ scatravec_[i]->scatra_field()->set_velocity_field(`
	`708`	`+ nullptr, vol_mortar_master_to_slavei(i, vel[i]), nullptr);`
`708`	`709`	`}`
`709`	`710`	`}`
`710`	`711`
Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,7 @@ void FS3I::PartFS3I2Wc::initial_calculations()`
`103`	`103`	`{`
`104`	`104`	`// set initial fluid velocity field for evaluation of initial scalar`
`105`	`105`	`// time derivative in fluid-based scalar transport`
`106`		`- scatravec_[0]->scatra_field()->set_velocity_field(`
`107`		`- fsi_->fluid_field()->velnp(), nullptr, nullptr, nullptr);`
	`106`	`+ scatravec_[0]->scatra_field()->set_convective_velocity(*fsi_->fluid_field()->velnp());`
`108`	`107`
`109`	`108`	`// set initial value of thermodynamic pressure in fluid-based scalar`
`110`	`109`	`// transport`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,8 @@ void PoroElastScaTra::PoroScatraBase::set_velocity_fields()`
`179`	`179`	`velnp = volcoupl_fluidscatra_->apply_vector_mapping21(*poro_->fluid_field()->velnp());`
`180`	`180`	`}`
`181`	`181`
`182`		`- scatra_->scatra_field()->set_velocity_field(convel, nullptr, velnp, nullptr);`
	`182`	`+ scatra_->scatra_field()->set_convective_velocity(*convel);`
	`183`	`+ scatra_->scatra_field()->set_velocity_field(nullptr, velnp, nullptr);`
`183`	`184`	`}`
`184`	`185`
`185`	`186`	`/----------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,6 @@ void ScaTra::ScaTraAlgorithm::prepare_time_step_convection()`
`225`	`225`	`default:`
`226`	`226`	`{`
`227`	`227`	`FOUR_C_THROW("Selected time integration scheme is not available!");`
`228`		`- break;`
`229`	`228`	`}`
`230`	`229`	`}`
`231`	`230`
`@@ -234,16 +233,17 @@ void ScaTra::ScaTraAlgorithm::prepare_time_step_convection()`
`234`	`233`	`// transfer the initial(!!) convective velocity`
`235`	`234`	`//(fluid initial field was set inside the constructor of fluid base class)`
`236`	`235`	`if (step() == 1)`
`237`		`- scatra_field()->set_velocity_field(`
`238`		`- fluid_field()->velnp(), fluid_field()->hist(), nullptr, nullptr);`
	`236`	`+ {`
	`237`	`+ scatra_field()->set_convective_velocity(*fluid_field()->velnp());`
	`238`	`+ scatra_field()->set_velocity_field(fluid_field()->hist(), fluid_field()->velnp(), nullptr);`
	`239`	`+ }`
`239`	`240`
`240`	`241`	`// prepare time step (+ initialize one-step-theta scheme correctly with`
`241`	`242`	`// velocity given above)`
`242`	`243`	`scatra_field()->prepare_time_step();`
`243`	`244`	`}`
`244`	`245`
`245`	`246`	`/----------------------------------------------------------------------`
`246`		`- \| Print scatra solver type to screen fang 08/14 \|`
`247`	`247`	`----------------------------------------------------------------------/`
`248`	`248`	`void ScaTra::ScaTraAlgorithm::print_scatra_solver()`
`249`	`249`	`{`
`@@ -305,15 +305,17 @@ void ScaTra::ScaTraAlgorithm::set_velocity_field()`
`305`	`305`	`case Inpar::FLUID::timeint_npgenalpha:`
`306`	`306`	`case Inpar::FLUID::timeint_afgenalpha:`
`307`	`307`	`{`
`308`		`- scatra_field()->set_velocity_field(fluid_to_scatra(fluid_field()->velaf()),`
	`308`	`+ scatra_field()->set_convective_velocity(*fluid_to_scatra(fluid_field()->velaf()));`
	`309`	`+ scatra_field()->set_velocity_field(`
`309`	`310`	`fluid_to_scatra(fluid_field()->accam()), fluid_to_scatra(fluid_field()->velaf()), fsvel);`
`310`	`311`	`break;`
`311`	`312`	`}`
`312`	`313`	`case Inpar::FLUID::timeint_one_step_theta:`
`313`	`314`	`case Inpar::FLUID::timeint_bdf2:`
`314`	`315`	`case Inpar::FLUID::timeint_stationary:`
`315`	`316`	`{`
`316`		`- scatra_field()->set_velocity_field(fluid_to_scatra(fluid_field()->velnp()),`
	`317`	`+ scatra_field()->set_convective_velocity(*fluid_to_scatra(fluid_field()->velnp()));`
	`318`	`+ scatra_field()->set_velocity_field(`
`317`	`319`	`fluid_to_scatra(fluid_field()->hist()), fluid_to_scatra(fluid_field()->velnp()), fsvel);`
`318`	`320`	`break;`
`319`	`321`	`}`