Skip to content
Snippets Groups Projects
Commit ea6a2ed7 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

[PL] Update usage of Parameter::getTuple().

parent 7394bbcc
No related branches found
No related tags found
No related merge requests found
...@@ -58,9 +58,8 @@ public: ...@@ -58,9 +58,8 @@ public:
pos.setIntegrationPoint(ip); pos.setIntegrationPoint(ip);
auto const& sm = Base::_shape_matrices[ip]; auto const& sm = Base::_shape_matrices[ip];
auto const& wp = integration_method.getWeightedPoint(ip); auto const& wp = integration_method.getWeightedPoint(ip);
_local_rhs.noalias() += _local_rhs.noalias() += sm.N * _neumann_bc_parameter(t, pos)[0] *
sm.N * _neumann_bc_parameter.getTuple(t, pos).front() * sm.detJ * wp.getWeight();
sm.detJ * wp.getWeight();
} }
auto const indices = NumLib::getIndices(id, dof_table_boundary); auto const indices = NumLib::getIndices(id, dof_table_boundary);
......
...@@ -64,8 +64,8 @@ public: ...@@ -64,8 +64,8 @@ public:
auto const& sm = Base::_shape_matrices[ip]; auto const& sm = Base::_shape_matrices[ip];
auto const& wp = integration_method.getWeightedPoint(ip); auto const& wp = integration_method.getWeightedPoint(ip);
double const alpha = _data.alpha.getTuple(t, pos).front(); double const alpha = _data.alpha(t, pos)[0];
double const u_0 = _data.u_0.getTuple(t, pos).front(); double const u_0 = _data.u_0(t, pos)[0];
// flux = alpha * ( u_0 - u ) // flux = alpha * ( u_0 - u )
// adding a alpha term to the diagonal of the stiffness matrix // adding a alpha term to the diagonal of the stiffness matrix
......
...@@ -99,7 +99,7 @@ public: ...@@ -99,7 +99,7 @@ public:
pos.setIntegrationPoint(ip); pos.setIntegrationPoint(ip);
auto const& sm = _shape_matrices[ip]; auto const& sm = _shape_matrices[ip];
auto const& wp = integration_method.getWeightedPoint(ip); auto const& wp = integration_method.getWeightedPoint(ip);
auto const k = _process_data.hydraulic_conductivity.getTuple(t, pos).front(); auto const k = _process_data.hydraulic_conductivity(t, pos)[0];
_localA.noalias() += sm.dNdx.transpose() * k * sm.dNdx * _localA.noalias() += sm.dNdx.transpose() * k * sm.dNdx *
sm.detJ * wp.getWeight(); sm.detJ * wp.getWeight();
......
...@@ -93,7 +93,7 @@ void Process::setInitialConditions(double const t, GlobalVector& x) ...@@ -93,7 +93,7 @@ void Process::setInitialConditions(double const t, GlobalVector& x)
MeshLib::MeshItemType::Node, node_id); MeshLib::MeshItemType::Node, node_id);
pos.setNodeID(node_id); pos.setNodeID(node_id);
auto const& tup = ic.getTuple(t, pos); auto const& ic_value = ic(t, pos);
for (int comp_id = 0; comp_id < num_comp; ++comp_id) for (int comp_id = 0; comp_id < num_comp; ++comp_id)
{ {
...@@ -111,7 +111,7 @@ void Process::setInitialConditions(double const t, GlobalVector& x) ...@@ -111,7 +111,7 @@ void Process::setInitialConditions(double const t, GlobalVector& x)
if (global_index == x.size()) if (global_index == x.size())
global_index = 0; global_index = 0;
#endif #endif
x.set(global_index, tup[comp_id]); x.set(global_index, ic_value[comp_id]);
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment