[PL] n_integration_points, formatting, year fixed

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];

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);
 

ProcessLib/ProcessOutput.h

 /**
  * \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