From ea6a2ed73175a4c193cbe5ce2cbff7625b205add Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Mon, 29 Aug 2016 14:40:36 +0200
Subject: [PATCH] [PL] Update usage of Parameter::getTuple().
---
.../NeumannBoundaryConditionLocalAssembler.h | 5 ++---
.../BoundaryCondition/RobinBoundaryConditionLocalAssembler.h | 4 ++--
ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h | 2 +-
ProcessLib/Process.cpp | 4 ++--
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/ProcessLib/BoundaryCondition/NeumannBoundaryConditionLocalAssembler.h b/ProcessLib/BoundaryCondition/NeumannBoundaryConditionLocalAssembler.h
index 390fa44daed..663e79d582b 100644
--- a/ProcessLib/BoundaryCondition/NeumannBoundaryConditionLocalAssembler.h
+++ b/ProcessLib/BoundaryCondition/NeumannBoundaryConditionLocalAssembler.h
@@ -58,9 +58,8 @@ public:
pos.setIntegrationPoint(ip);
auto const& sm = Base::_shape_matrices[ip];
auto const& wp = integration_method.getWeightedPoint(ip);
- _local_rhs.noalias() +=
- sm.N * _neumann_bc_parameter.getTuple(t, pos).front() *
- sm.detJ * wp.getWeight();
+ _local_rhs.noalias() += sm.N * _neumann_bc_parameter(t, pos)[0] *
+ sm.detJ * wp.getWeight();
}
auto const indices = NumLib::getIndices(id, dof_table_boundary);
diff --git a/ProcessLib/BoundaryCondition/RobinBoundaryConditionLocalAssembler.h b/ProcessLib/BoundaryCondition/RobinBoundaryConditionLocalAssembler.h
index 44fd7373eb1..cdeb1089c9f 100644
--- a/ProcessLib/BoundaryCondition/RobinBoundaryConditionLocalAssembler.h
+++ b/ProcessLib/BoundaryCondition/RobinBoundaryConditionLocalAssembler.h
@@ -64,8 +64,8 @@ public:
auto const& sm = Base::_shape_matrices[ip];
auto const& wp = integration_method.getWeightedPoint(ip);
- double const alpha = _data.alpha.getTuple(t, pos).front();
- double const u_0 = _data.u_0.getTuple(t, pos).front();
+ double const alpha = _data.alpha(t, pos)[0];
+ double const u_0 = _data.u_0(t, pos)[0];
// flux = alpha * ( u_0 - u )
// adding a alpha term to the diagonal of the stiffness matrix
diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
index 5adda111bec..870bfe7482a 100644
--- a/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
+++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
@@ -99,7 +99,7 @@ public:
pos.setIntegrationPoint(ip);
auto const& sm = _shape_matrices[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 *
sm.detJ * wp.getWeight();
diff --git a/ProcessLib/Process.cpp b/ProcessLib/Process.cpp
index d41463c125b..301edeb82ac 100644
--- a/ProcessLib/Process.cpp
+++ b/ProcessLib/Process.cpp
@@ -93,7 +93,7 @@ void Process::setInitialConditions(double const t, GlobalVector& x)
MeshLib::MeshItemType::Node, 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)
{
@@ -111,7 +111,7 @@ void Process::setInitialConditions(double const t, GlobalVector& x)
if (global_index == x.size())
global_index = 0;
#endif
- x.set(global_index, tup[comp_id]);
+ x.set(global_index, ic_value[comp_id]);
}
}
}
--
GitLab