From b9f039c8f9da85b0069b80c62cccd4414931695e Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Mon, 24 Jul 2017 11:47:36 +0200
Subject: [PATCH] [PL] n_integration_points, formatting, year fixed
---
ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h | 8 ++++----
ProcessLib/HT/HTFEM.h | 8 +++-----
ProcessLib/ProcessOutput.h | 2 +-
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
index 64b7e28402c..55f965a7d7b 100644
--- a/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
+++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h
@@ -155,8 +155,8 @@ public:
NumLib::LocalToGlobalIndexMap const& dof_table,
std::vector<double>& cache) const override
{
- // auto const num_nodes = ShapeFunction_::NPOINTS;
- auto const num_intpts = _shape_matrices.size();
+ auto const n_integration_points =
+ _integration_method.getNumberOfPoints();
auto const indices = NumLib::getIndices(_element.getID(), dof_table);
assert(!indices.empty());
@@ -168,12 +168,12 @@ public:
cache.clear();
auto cache_mat = MathLib::createZeroedMatrix<
Eigen::Matrix<double, GlobalDim, Eigen::Dynamic, Eigen::RowMajor>>(
- cache, GlobalDim, num_intpts);
+ cache, GlobalDim, n_integration_points);
SpatialPosition pos;
pos.setElementID(_element.getID());
- for (unsigned i = 0; i < num_intpts; ++i)
+ for (unsigned i = 0; i < n_integration_points; ++i)
{
pos.setIntegrationPoint(i);
auto const k = _process_data.hydraulic_conductivity(t, pos)[0];
diff --git a/ProcessLib/HT/HTFEM.h b/ProcessLib/HT/HTFEM.h
index bb0a60d26d3..bf928cb0a57 100644
--- a/ProcessLib/HT/HTFEM.h
+++ b/ProcessLib/HT/HTFEM.h
@@ -273,7 +273,8 @@ public:
NumLib::LocalToGlobalIndexMap const& dof_table,
std::vector<double>& cache) const override
{
- auto const num_intpts = _ip_data.size();
+ auto const n_integration_points =
+ _integration_method.getNumberOfPoints();
auto const indices = NumLib::getIndices(_element.getID(), dof_table);
assert(!indices.empty());
@@ -282,16 +283,13 @@ public:
cache.clear();
auto cache_mat = MathLib::createZeroedMatrix<
Eigen::Matrix<double, GlobalDim, Eigen::Dynamic, Eigen::RowMajor>>(
- cache, GlobalDim, num_intpts);
+ cache, GlobalDim, n_integration_points);
SpatialPosition pos;
pos.setElementID(_element.getID());
MaterialLib::Fluid::FluidProperty::ArrayType vars;
- unsigned const n_integration_points =
- _integration_method.getNumberOfPoints();
-
auto const p_nodal_values = Eigen::Map<const NodalVectorType>(
&local_x[ShapeFunction::NPOINTS], ShapeFunction::NPOINTS);
diff --git a/ProcessLib/ProcessOutput.h b/ProcessLib/ProcessOutput.h
index b3c5daa476d..e1e983c7e1d 100644
--- a/ProcessLib/ProcessOutput.h
+++ b/ProcessLib/ProcessOutput.h
@@ -1,6 +1,6 @@
/**
* \copyright
- * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
+ * Copyright (c) 2012-2017, OpenGeoSys Community (http://www.opengeosys.org)
* Distributed under a Modified BSD License.
* See accompanying file LICENSE.txt or
* http://www.opengeosys.org/project/license
--
GitLab