From 8d810d15374d80685ac90e378f66e537227519b7 Mon Sep 17 00:00:00 2001
From: Rene Milk <rene.milk@uni-muenster.de>
Date: Wed, 7 Oct 2015 14:30:14 +0200
Subject: [PATCH] [clang-format] applied
---
dune/stuff/functions.hh | 3 ---
dune/stuff/functions/ESV2007.hh | 8 ------
dune/stuff/functions/affine.hh | 2 --
dune/stuff/functions/checkerboard.hh | 2 --
dune/stuff/functions/combined.hh | 12 ---------
dune/stuff/functions/constant.hh | 7 ------
dune/stuff/functions/default.hh | 2 --
dune/stuff/functions/derived.hh | 8 ------
dune/stuff/functions/expression.hh | 2 --
dune/stuff/functions/expression/base.hh | 2 --
dune/stuff/functions/femadapter.hh | 2 --
dune/stuff/functions/flattop.hh | 3 ---
dune/stuff/functions/global.hh | 2 --
dune/stuff/functions/indicator.hh | 3 ---
dune/stuff/functions/interfaces.hh | 25 -------------------
.../functions/random_ellipsoids_function.hh | 1 -
dune/stuff/functions/spe10.hh | 9 -------
dune/stuff/test/functions.hh | 2 --
dune/stuff/test/functions_ESV2007.cc | 2 --
dune/stuff/test/functions_checkerboard.cc | 2 --
dune/stuff/test/functions_combined.cc | 4 ---
dune/stuff/test/functions_constant.cc | 1 -
dune/stuff/test/functions_expression.cc | 2 --
dune/stuff/test/functions_flattop.cc | 4 ---
dune/stuff/test/functions_functions.cc | 2 --
dune/stuff/test/functions_global.cc | 2 --
dune/stuff/test/functions_indicator.cc | 2 --
dune/stuff/test/functions_spe10.cc | 1 -
28 files changed, 117 deletions(-)
diff --git a/dune/stuff/functions.hh b/dune/stuff/functions.hh
index 73c01129c..3ff12d3b3 100644
--- a/dune/stuff/functions.hh
+++ b/dune/stuff/functions.hh
@@ -25,7 +25,6 @@
namespace Dune {
namespace Stuff {
-
/**
* \note If you want to add a new function FooBar, do the following: provide a definition that is available for all
* template arguments, like:
@@ -237,9 +236,7 @@ public:
} // ... create(...)
}; // class FunctionsProvider
-
} // namespace Stuff
} // namespace Dune
-
#endif // DUNE_STUFF_FUNCTIONS_HH
diff --git a/dune/stuff/functions/ESV2007.hh b/dune/stuff/functions/ESV2007.hh
index 2c6a33c1e..c8210b717 100644
--- a/dune/stuff/functions/ESV2007.hh
+++ b/dune/stuff/functions/ESV2007.hh
@@ -28,7 +28,6 @@ namespace Stuff {
namespace Functions {
namespace ESV2007 {
-
template <class E, class D, size_t d, class R, size_t r, size_t rC = 1>
class Testcase1Force : public LocalizableFunctionInterface<E, D, d, R, r, rC>
{
@@ -38,7 +37,6 @@ class Testcase1Force : public LocalizableFunctionInterface<E, D, d, R, r, rC>
}
};
-
template <class EntityImp, class DomainFieldImp, class RangeFieldImp>
class Testcase1Force<EntityImp, DomainFieldImp, 2, RangeFieldImp, 1, 1>
: public GlobalFunctionInterface<EntityImp, DomainFieldImp, 2, RangeFieldImp, 1>
@@ -136,7 +134,6 @@ private:
const std::string name_;
}; // class Testcase1Force
-
template <class E, class D, size_t d, class R, size_t r, size_t rC = 1>
class Testcase1ExactSolution : public LocalizableFunctionInterface<E, D, d, R, r, rC>
{
@@ -146,7 +143,6 @@ class Testcase1ExactSolution : public LocalizableFunctionInterface<E, D, d, R, r
}
};
-
template <class EntityImp, class DomainFieldImp, class RangeFieldImp>
class Testcase1ExactSolution<EntityImp, DomainFieldImp, 2, RangeFieldImp, 1, 1>
: public GlobalFunctionInterface<EntityImp, DomainFieldImp, 2, RangeFieldImp, 1, 1>
@@ -244,11 +240,9 @@ private:
const std::string name_;
}; // class Testcase1ExactSolution
-
template <class DiffusionFactorType, class DiffusionTensorType = void>
class Cutoff;
-
template <class DiffusionType>
class Cutoff<DiffusionType, void>
: public LocalizableFunctionInterface<typename DiffusionType::EntityType, typename DiffusionType::DomainFieldType,
@@ -390,7 +384,6 @@ private:
std::string name_;
}; // class Cutoff
-
template <class DiffusionFactorType, class DiffusionTensorType>
class Cutoff
: public LocalizableFunctionInterface<typename DiffusionFactorType::EntityType,
@@ -614,7 +607,6 @@ private:
std::string name_;
}; // class Cutoff
-
} // namespace ESV2007
} // namespace Functions
} // namespace Stuff
diff --git a/dune/stuff/functions/affine.hh b/dune/stuff/functions/affine.hh
index cd3570636..7edd2647b 100644
--- a/dune/stuff/functions/affine.hh
+++ b/dune/stuff/functions/affine.hh
@@ -32,7 +32,6 @@ class Affine
}
};
-
template <class EntityImp, class DomainFieldImp, size_t domainDim, class RangeFieldImp, size_t rangeDim>
class Affine<EntityImp, DomainFieldImp, domainDim, RangeFieldImp, rangeDim, 1>
: public GlobalFunctionInterface<EntityImp, DomainFieldImp, domainDim, RangeFieldImp, rangeDim, 1>
@@ -123,7 +122,6 @@ private:
const std::string name_;
};
-
} // namespace Functions
} // namespace Stuff
} // namespace Dune
diff --git a/dune/stuff/functions/checkerboard.hh b/dune/stuff/functions/checkerboard.hh
index 0c4ca8210..6d9294978 100644
--- a/dune/stuff/functions/checkerboard.hh
+++ b/dune/stuff/functions/checkerboard.hh
@@ -22,7 +22,6 @@ namespace Dune {
namespace Stuff {
namespace Functions {
-
template <class EntityImp, class DomainFieldImp, size_t domainDim, class RangeFieldImp, size_t rangeDim,
size_t rangeDimCols = 1>
class Checkerboard
@@ -224,7 +223,6 @@ private:
std::string name_;
}; // class Checkerboard
-
} // namespace Functions
} // namespace Stuff
} // namespace Dune
diff --git a/dune/stuff/functions/combined.hh b/dune/stuff/functions/combined.hh
index e6ea00da1..37ccf93b5 100644
--- a/dune/stuff/functions/combined.hh
+++ b/dune/stuff/functions/combined.hh
@@ -20,7 +20,6 @@ namespace Stuff {
namespace Functions {
namespace internal {
-
enum class Combination
{
difference,
@@ -28,7 +27,6 @@ enum class Combination
product
}; // enum class Combination
-
/**
* \brief Helper class defining types of combined functions, if available.
*
@@ -225,7 +223,6 @@ public:
}
}; // class SelectCombined
-
/**
* \brief Generic combined local function.
*
@@ -282,7 +279,6 @@ private:
mutable JacobianRangeType tmp_jacobian_;
}; // class CombinedLocalFunction
-
/**
* \brief Generic combined function.
*
@@ -405,10 +401,8 @@ private:
const std::string name_;
}; // class Combined
-
} // namespace internal
-
/**
* \brief Function representing the difference between two functions.
*
@@ -427,7 +421,6 @@ public:
}
}; // class Difference
-
/**
* \brief Function representing the sum of two functions.
*
@@ -446,7 +439,6 @@ public:
}
}; // class Sum
-
/**
* \brief Function representing the product of two functions.
*
@@ -465,7 +457,6 @@ public:
}
}; // class Product
-
template <class T1, class T2, class... Args>
std::shared_ptr<Difference<T1, T2>> make_difference(const T1& left, const T2& right, Args&&... args)
{
@@ -478,7 +469,6 @@ std::shared_ptr<Difference<T1, T2>> make_difference(std::shared_ptr<T1> left, st
return std::make_shared<Difference<T1, T2>>(left, right, std::forward<Args>(args)...);
}
-
template <class T1, class T2, class... Args>
std::shared_ptr<Sum<T1, T2>> make_sum(const T1& left, const T2& right, Args&&... args)
{
@@ -491,7 +481,6 @@ std::shared_ptr<Sum<T1, T2>> make_sum(std::shared_ptr<T1> left, std::shared_ptr<
return std::make_shared<Sum<T1, T2>>(left, right, std::forward<Args>(args)...);
}
-
template <class T1, class T2, class... Args>
std::shared_ptr<Product<T1, T2>> make_product(const T1& left, const T2& right, Args&&... args)
{
@@ -504,7 +493,6 @@ std::shared_ptr<Product<T1, T2>> make_product(std::shared_ptr<T1> left, std::sha
return std::make_shared<Product<T1, T2>>(left, right, std::forward<Args>(args)...);
}
-
} // namespace Functions
} // namespace Stuff
} // namespace Dune
diff --git a/dune/stuff/functions/constant.hh b/dune/stuff/functions/constant.hh
index 6939149ae..33642e758 100644
--- a/dune/stuff/functions/constant.hh
+++ b/dune/stuff/functions/constant.hh
@@ -19,7 +19,6 @@ namespace Stuff {
namespace Functions {
namespace internal {
-
template <class K, int dim>
struct UnitMatrix
{
@@ -34,7 +33,6 @@ struct UnitMatrix
}
}; // struct UnitMatrix
-
template <class K>
struct UnitMatrix<K, 1>
{
@@ -46,14 +44,12 @@ struct UnitMatrix<K, 1>
}
}; // struct UnitMatrix
-
template <class K, int dim>
typename UnitMatrix<K, dim>::type unit_matrix()
{
return UnitMatrix<K, dim>::value();
}
-
template <class R, size_t r, size_t rC>
struct Get
{
@@ -111,10 +107,8 @@ struct Get<R, 1, 1>
}
};
-
} // namespace internal
-
template <class EntityImp, class DomainFieldImp, size_t domainDim, class RangeFieldImp, size_t rangeDim,
size_t rangeDimCols = 1>
class Constant
@@ -217,7 +211,6 @@ private:
const std::string name_;
};
-
} // namespace Functions
} // namespace Stuff
} // namespace Dune
diff --git a/dune/stuff/functions/default.hh b/dune/stuff/functions/default.hh
index 010a39a53..f70105ce3 100644
--- a/dune/stuff/functions/default.hh
+++ b/dune/stuff/functions/default.hh
@@ -22,7 +22,6 @@ namespace Functions {
#if HAVE_DUNE_GRID
-
template <class GridViewType, size_t dimRange, size_t dimRangeCols>
class VisualizationAdapter : public VTKFunction<GridViewType>
{
@@ -103,7 +102,6 @@ private:
const std::string name_;
}; // class VisualizationAdapter
-
#endif // HAVE_DUNE_GRID
} // namespace Functions
diff --git a/dune/stuff/functions/derived.hh b/dune/stuff/functions/derived.hh
index d02749a19..26c30418b 100644
--- a/dune/stuff/functions/derived.hh
+++ b/dune/stuff/functions/derived.hh
@@ -23,13 +23,11 @@ namespace Stuff {
namespace Functions {
namespace internal {
-
enum class Derivative
{
divergence
};
-
template <class FunctionType, Derivative derivative>
class SelectDerived
{
@@ -132,7 +130,6 @@ public:
}
}; // class SelectDerived
-
template <class FunctionType, Derivative derivative>
class DerivedLocalFunction
: public LocalfunctionInterface<
@@ -178,7 +175,6 @@ private:
const std::unique_ptr<const typename FunctionType::LocalfunctionType> func_local_;
}; // class DerivedLocalFunction
-
template <class FunctionType, Derivative derivative>
class Derived
: public LocalizableFunctionInterface<
@@ -244,10 +240,8 @@ private:
const std::string name_;
}; // class Derived
-
} // namespace internal
-
template <class FunctionType>
class Divergence : public internal::Derived<FunctionType, internal::Derivative::divergence>
{
@@ -261,7 +255,6 @@ public:
}
}; // class Divergence
-
template <class T, class... Args>
std::shared_ptr<Divergence<T>> make_divergence(const T& func, Args&&... args)
{
@@ -274,7 +267,6 @@ std::shared_ptr<Divergence<T>> make_divergence(std::shared_ptr<T> func, Args&&..
return std::make_shared<Divergence<T>>(func, std::forward<Args>(args)...);
}
-
} // namespace Functions
} // namespace Stuff
} // namespace Dune
diff --git a/dune/stuff/functions/expression.hh b/dune/stuff/functions/expression.hh
index ebfd6c2b1..4ad330248 100644
--- a/dune/stuff/functions/expression.hh
+++ b/dune/stuff/functions/expression.hh
@@ -25,7 +25,6 @@ namespace Dune {
namespace Stuff {
namespace Functions {
-
template <class EntityImp, class DomainFieldImp, size_t domainDim, class RangeFieldImp, size_t rangeDim,
size_t rangeDimCols = 1>
class Expression
@@ -388,7 +387,6 @@ private:
std::vector<std::vector<std::shared_ptr<const MathExpressionGradientType>>> gradients_;
}; // class Expression
-
} // namespace Functions
} // namespace Stuff
} // namespace Dune
diff --git a/dune/stuff/functions/expression/base.hh b/dune/stuff/functions/expression/base.hh
index 1c570e111..ec66a4c3b 100644
--- a/dune/stuff/functions/expression/base.hh
+++ b/dune/stuff/functions/expression/base.hh
@@ -24,7 +24,6 @@ namespace Dune {
namespace Stuff {
namespace Functions {
-
/**
* \brief base class that makes a function out of the stuff from mathexpr.hh
* \attention Most surely you do not want to use this class directly, but Functions::Expression!
@@ -211,7 +210,6 @@ private:
ROperation* op_[dimRange];
}; // class MathExpressionBase
-
} // namespace Functions
} // namespace Stuff
} // namespace Dune
diff --git a/dune/stuff/functions/femadapter.hh b/dune/stuff/functions/femadapter.hh
index a13debcab..2ca280534 100644
--- a/dune/stuff/functions/femadapter.hh
+++ b/dune/stuff/functions/femadapter.hh
@@ -16,7 +16,6 @@ namespace Dune {
namespace Stuff {
namespace Functions {
-
template <class DiscreteFunctionType>
class FemAdapter
: public LocalizableFunctionInterface<
@@ -117,7 +116,6 @@ private:
const DiscreteFunctionType& df_;
}; // class Checkerboard
-
} // namespace Functions
} // namespace Stuff
} // namespace Dune
diff --git a/dune/stuff/functions/flattop.hh b/dune/stuff/functions/flattop.hh
index f25b66bc0..d6102db0e 100644
--- a/dune/stuff/functions/flattop.hh
+++ b/dune/stuff/functions/flattop.hh
@@ -18,7 +18,6 @@ namespace Dune {
namespace Stuff {
namespace Functions {
-
/**
* Based on: Brenner, S. C. and Davis, C. B. and Sung, L.-y.
* A partition of unity method for the displacement obstacle problem of clamped Kirchhoff plates
@@ -34,7 +33,6 @@ class FlatTop : public LocalizableFunctionInterface<E, D, d, R, r, rC>
}
};
-
template <class E, class D, size_t d, class R>
class FlatTop<E, D, d, R, 1, 1> : public GlobalFunctionInterface<E, D, d, R, 1, 1>
{
@@ -210,7 +208,6 @@ private:
const std::string name_;
}; // class FlatTop< ..., 1, 1 >
-
} // namespace Functions
} // namespace Stuff
} // namespace Dune
diff --git a/dune/stuff/functions/global.hh b/dune/stuff/functions/global.hh
index 5eee35a18..7892df9f6 100644
--- a/dune/stuff/functions/global.hh
+++ b/dune/stuff/functions/global.hh
@@ -16,7 +16,6 @@
namespace Dune {
namespace Stuff {
-
/**
* Global-valued function you can pass a lambda expression to that gets evaluated
* \example LambdaType lambda([](DomainType x) { return x;}, 1 );
@@ -74,7 +73,6 @@ private:
const std::string name_;
};
-
} // namespace Stuff
} // namespace Dune
diff --git a/dune/stuff/functions/indicator.hh b/dune/stuff/functions/indicator.hh
index 5fe128ba4..6c8e9a890 100644
--- a/dune/stuff/functions/indicator.hh
+++ b/dune/stuff/functions/indicator.hh
@@ -23,7 +23,6 @@ namespace Dune {
namespace Stuff {
namespace Functions {
-
template <class E, class D, size_t d, class R, size_t r, size_t rC = 1>
class Indicator : public LocalizableFunctionInterface<E, D, d, R, r, rC>
{
@@ -33,7 +32,6 @@ class Indicator : public LocalizableFunctionInterface<E, D, d, R, r, rC>
}
};
-
template <class E, class D, size_t d, class R>
class Indicator<E, D, d, R, 1> : public LocalizableFunctionInterface<E, D, d, R, 1>
{
@@ -185,7 +183,6 @@ private:
const std::string name_;
}; // class Indicator
-
} // namespace Functions
} // namespace Stuff
} // namespace Dune
diff --git a/dune/stuff/functions/interfaces.hh b/dune/stuff/functions/interfaces.hh
index 71406637f..4bf875009 100644
--- a/dune/stuff/functions/interfaces.hh
+++ b/dune/stuff/functions/interfaces.hh
@@ -45,7 +45,6 @@ namespace Dune {
namespace Stuff {
namespace internal {
-
template <class F>
struct is_localizable_function_helper
{
@@ -59,19 +58,15 @@ struct is_localizable_function_helper
&& DSC_has_static_member(dimRange)<F>::value && DSC_has_static_member(dimRangeCols)<F>::value;
}; // class is_localizable_function_helper
-
} // namespace internal
-
// forwards, includes are below
template <class F, bool candidate = internal::is_localizable_function_helper<F>::is_candidate>
struct is_localizable_function;
-
namespace Functions {
namespace internal {
-
// additional argument for member functions to differentiate between dimRangeCols = 1 and dimRangeCols > 1 by
// overloading
template <size_t rangeDimCols>
@@ -79,20 +74,15 @@ struct ChooseVariant
{
};
-
} // namespace internal
-
#if HAVE_DUNE_GRID
-
template <class GridViewType, size_t dimRange, size_t dimRangeCols = 1>
class VisualizationAdapter;
-
#endif // HAVE_DUNE_GRID
-
template <class MinuendType, class SubtrahendType>
class Difference;
@@ -105,19 +95,15 @@ class Product;
template <class FunctionImp>
class Divergence;
-
} // namespace Functions
namespace Tags {
-
class LocalizableFunction
{
};
-
} // namespace Tags
-
/**
* \brief Interface for a set of globalvalued functions, which can be evaluated locally on one Entity.
*/
@@ -230,7 +216,6 @@ protected:
const EntityType& entity_;
}; // class LocalfunctionSetInterface
-
/**
* \brief Interface for functions, which can be evaluated locally on one Entity.
*/
@@ -329,12 +314,10 @@ public:
/* @} */
}; // class LocalfunctionInterface
-
class IsLocalizableFunction
{
};
-
/**
* \brief Interface for functions which provide a LocalfunctionInterface for an entity.
*/
@@ -455,7 +438,6 @@ private:
friend std::ostream& operator<<(std::ostream& /*out*/, const ThisType& /*function*/);
}; // class LocalizableFunctionInterface
-
template <class E, class D, size_t d, class R, size_t r, size_t rC>
std::ostream& operator<<(std::ostream& out, const LocalizableFunctionInterface<E, D, d, R, r, rC>& function)
{
@@ -463,11 +445,9 @@ std::ostream& operator<<(std::ostream& out, const LocalizableFunctionInterface<E
return out;
} // ... operator<<(...)
-
template <class OtherEntityImp, class GlobalFunctionImp>
class TransferredGlobalFunction;
-
/**
* base class for global matrix-valued valued functions that provides automatic local functions via
* LocalizableFunctionInterface
@@ -580,7 +560,6 @@ public:
}
}; // class GlobalFunctionInterface
-
/**
* base class for global valued functions that provides automatic local functions via LocalizableFunctionInterface
*/
@@ -742,7 +721,6 @@ private:
const GlobalFunctionImp& function_;
}; // class TransferredGlobalFunction
-
//! Utility to generate a complete Function Type from an existing one and a template
template <class FunctionImp, template <class, class, size_t, class, size_t, size_t> class OutTemplate>
struct FunctionTypeGenerator
@@ -751,7 +729,6 @@ struct FunctionTypeGenerator
typename FunctionImp::RangeFieldType, FunctionImp::dimRange, FunctionImp::dimRangeCols> type;
};
-
template <class F>
struct is_localizable_function<F, true>
: public std::is_base_of<LocalizableFunctionInterface<typename F::EntityType, typename F::DomainFieldType,
@@ -761,13 +738,11 @@ struct is_localizable_function<F, true>
{
};
-
template <class F>
struct is_localizable_function<F, false> : public std::false_type
{
};
-
} // namespace Stuff
} // namespace Dune
diff --git a/dune/stuff/functions/random_ellipsoids_function.hh b/dune/stuff/functions/random_ellipsoids_function.hh
index a0036cb17..57591efed 100644
--- a/dune/stuff/functions/random_ellipsoids_function.hh
+++ b/dune/stuff/functions/random_ellipsoids_function.hh
@@ -297,7 +297,6 @@ private:
std::vector<EllipsoidType> ellipsoids_;
}; // class RandomEllipsoidsFunction
-
} // namespace Functions
} // namespace Stuff
} // namespace Dune
diff --git a/dune/stuff/functions/spe10.hh b/dune/stuff/functions/spe10.hh
index 4b798b5fb..1341a6fa1 100644
--- a/dune/stuff/functions/spe10.hh
+++ b/dune/stuff/functions/spe10.hh
@@ -18,23 +18,19 @@
#include "checkerboard.hh"
-
namespace Dune {
namespace Stuff {
namespace Exceptions {
-
class spe10_data_file_missing : public Dune::IOError
{
};
-
} // namespace Exceptions
namespace Functions {
namespace Spe10 {
namespace internal {
-
static const std::string model1_filename = "perm_case1.dat";
static const size_t model1_x_elements = 100;
static const size_t model1_y_elements = 1;
@@ -45,7 +41,6 @@ static const double model_1_length_z = 15.24;
static const double model1_min_value = 0.001;
static const double model1_max_value = 998.915;
-
template <class EntityImp, class DomainFieldImp, class RangeFieldImp, size_t r, size_t rC>
class Model1Base : public Checkerboard<EntityImp, DomainFieldImp, 2, RangeFieldImp, r, rC>
{
@@ -144,10 +139,8 @@ public:
}
}; // class Model1Base
-
} // namespace internal
-
// default, to allow for specialization
template <class E, class D, size_t d, class R, size_t r, size_t rC = 1>
class Model1 : public LocalizableFunctionInterface<E, D, d, R, r, rC>
@@ -158,7 +151,6 @@ class Model1 : public LocalizableFunctionInterface<E, D, d, R, r, rC>
}
};
-
/**
* We read only the Kx values from file and scale the unit matrix atm.
*/
@@ -217,7 +209,6 @@ private:
}
}; // class Model1< ..., 2, ..., r, r >
-
} // namespace Spe10
} // namespace Functions
} // namespace Stuff
diff --git a/dune/stuff/test/functions.hh b/dune/stuff/test/functions.hh
index bc7d4d28e..3e4029fe3 100644
--- a/dune/stuff/test/functions.hh
+++ b/dune/stuff/test/functions.hh
@@ -18,7 +18,6 @@
namespace Dune {
namespace Stuff {
-
template <class FunctionImp>
class FunctionTest : public ::testing::Test
{
@@ -73,7 +72,6 @@ protected:
}; // class FunctionTest
-
} // namespace Stuff
} // namespace Dune
diff --git a/dune/stuff/test/functions_ESV2007.cc b/dune/stuff/test/functions_ESV2007.cc
index 2a447a382..255ce5dd7 100644
--- a/dune/stuff/test/functions_ESV2007.cc
+++ b/dune/stuff/test/functions_ESV2007.cc
@@ -12,7 +12,6 @@
#include <dune/stuff/functions/interfaces.hh>
#include <dune/stuff/functions/ESV2007.hh>
-
// we need this nasty code generation because the testing::Types< ... > only accepts 50 arguments
// and all combinations of functions and entities and dimensions and fieldtypes would be way too much
#define TEST_STRUCT_GENERATOR(ftype, etype) \
@@ -38,7 +37,6 @@
};
// TEST_STRUCT_GENERATOR
-
#if HAVE_DUNE_GRID
#include <dune/grid/yaspgrid.hh>
diff --git a/dune/stuff/test/functions_checkerboard.cc b/dune/stuff/test/functions_checkerboard.cc
index a8c923e9a..db645e67f 100644
--- a/dune/stuff/test/functions_checkerboard.cc
+++ b/dune/stuff/test/functions_checkerboard.cc
@@ -12,7 +12,6 @@
#include <dune/stuff/functions/interfaces.hh>
#include <dune/stuff/functions/checkerboard.hh>
-
// we need this nasty code generation because the testing::Types< ... > only accepts 50 arguments
// and all combinations of functions and entities and dimensions and fieldtypes would be way too much
#define TEST_STRUCT_GENERATOR(ftype, etype) \
@@ -38,7 +37,6 @@
};
// TEST_STRUCT_GENERATOR
-
#if HAVE_DUNE_GRID
#include <dune/grid/yaspgrid.hh>
diff --git a/dune/stuff/test/functions_combined.cc b/dune/stuff/test/functions_combined.cc
index ed77358e6..02242ebb6 100644
--- a/dune/stuff/test/functions_combined.cc
+++ b/dune/stuff/test/functions_combined.cc
@@ -27,7 +27,6 @@
using namespace Dune;
using namespace Stuff;
-
template <class G>
class DifferenceFunctionType
{
@@ -43,7 +42,6 @@ public:
typedef Functions::Difference<ConstantFunctionType, ConstantFunctionType> value;
}; // struct DifferenceFunctionType
-
template <class DimDomain>
class DifferenceFunctionTest
: public FunctionTest<
@@ -70,7 +68,6 @@ protected:
} // ... create(...)
}; // class DifferenceFunctionTest
-
typedef testing::Types<Int<1>, Int<2>, Int<3>> DimDomains;
TYPED_TEST_CASE(DifferenceFunctionTest, DimDomains);
@@ -99,7 +96,6 @@ TYPED_TEST(DifferenceFunctionTest, evaluate_check)
}
} // DifferenceFunctionTest, evaluate_check
-
#else // HAVE_DUNE_GRID
// no-compile placeholders to mark disabled tests in test-binary output
diff --git a/dune/stuff/test/functions_constant.cc b/dune/stuff/test/functions_constant.cc
index 327170815..82c5e510c 100644
--- a/dune/stuff/test/functions_constant.cc
+++ b/dune/stuff/test/functions_constant.cc
@@ -12,7 +12,6 @@
#include <dune/stuff/functions/interfaces.hh>
#include <dune/stuff/functions/constant.hh>
-
// we need this nasty code generation because the testing::Types< ... > only accepts 50 arguments
// and all combinations of functions and entities and dimensions and fieldtypes would be way too much
#define TEST_STRUCT_GENERATOR(ftype, etype) \
diff --git a/dune/stuff/test/functions_expression.cc b/dune/stuff/test/functions_expression.cc
index cb9dfe26f..0041c7896 100644
--- a/dune/stuff/test/functions_expression.cc
+++ b/dune/stuff/test/functions_expression.cc
@@ -12,7 +12,6 @@
#include <dune/stuff/functions/interfaces.hh>
#include <dune/stuff/functions/expression.hh>
-
// we need this nasty code generation because the testing::Types< ... > only accepts 50 arguments
// and all combinations of functions and entities and dimensions and fieldtypes would be way too much
#define TEST_STRUCT_GENERATOR(ftype, etype) \
@@ -45,7 +44,6 @@
};
// TEST_STRUCT_GENERATOR
-
#if HAVE_DUNE_GRID
#include <dune/grid/yaspgrid.hh>
diff --git a/dune/stuff/test/functions_flattop.cc b/dune/stuff/test/functions_flattop.cc
index ad5389f50..ad1182113 100644
--- a/dune/stuff/test/functions_flattop.cc
+++ b/dune/stuff/test/functions_flattop.cc
@@ -32,7 +32,6 @@
using namespace Dune;
using namespace Stuff;
-
template <class G>
class FlatTopFunctionType
{
@@ -47,7 +46,6 @@ public:
typedef Functions::FlatTop<E, D, d, R, r, rC> value;
}; // struct FlatTopFunctionType
-
template <class DimDomain>
class FlatTopFunctionTest
: public FunctionTest<
@@ -85,7 +83,6 @@ protected:
} // ... check(...)
}; // class FlatTopFunctionTest
-
typedef testing::Types<Int<1>, Int<2>, Int<3>> DimDomains;
TYPED_TEST_CASE(FlatTopFunctionTest, DimDomains);
@@ -124,7 +121,6 @@ TYPED_TEST(FlatTopFunctionTest, evaluate_check)
}
}
-
#else // HAVE_DUNE_GRID
// no-compile placeholders to mark disabled tests in test-binary output
diff --git a/dune/stuff/test/functions_functions.cc b/dune/stuff/test/functions_functions.cc
index 9b6755486..84a22735d 100644
--- a/dune/stuff/test/functions_functions.cc
+++ b/dune/stuff/test/functions_functions.cc
@@ -11,7 +11,6 @@
#include <dune/stuff/functions.hh>
-
// we need this nasty code generation because the testing::Types< ... > only accepts 50 arguments
// and all combinations of functions and entities and dimensions and fieldtypes would be way too much
#define TEST_STRUCT_GENERATOR(ftype, etype) \
@@ -42,7 +41,6 @@
};
// TEST_STRUCT_GENERATOR
-
#if HAVE_DUNE_GRID
#include <dune/grid/yaspgrid.hh>
diff --git a/dune/stuff/test/functions_global.cc b/dune/stuff/test/functions_global.cc
index b4ccfa5c0..67a2fe8d8 100644
--- a/dune/stuff/test/functions_global.cc
+++ b/dune/stuff/test/functions_global.cc
@@ -12,7 +12,6 @@
#include <dune/stuff/functions/interfaces.hh>
#include <dune/stuff/functions/global.hh>
-
// we need this nasty code generation because the testing::Types< ... > only accepts 50 arguments
// and all combinations of functions and entities and dimensions and fieldtypes would be way too much
#define TEST_STRUCT_GENERATOR(ftype, etype) \
@@ -42,7 +41,6 @@
};
// TEST_STRUCT_GENERATOR
-
#if HAVE_DUNE_GRID
#include <dune/grid/yaspgrid.hh>
diff --git a/dune/stuff/test/functions_indicator.cc b/dune/stuff/test/functions_indicator.cc
index c3a051abf..e6d96de99 100644
--- a/dune/stuff/test/functions_indicator.cc
+++ b/dune/stuff/test/functions_indicator.cc
@@ -12,7 +12,6 @@
#include <dune/stuff/functions/interfaces.hh>
#include <dune/stuff/functions/indicator.hh>
-
// we need this nasty code generation because the testing::Types< ... > only accepts 50 arguments
// and all combinations of functions and entities and dimensions and fieldtypes would be way too much
#define TEST_STRUCT_GENERATOR(ftype, etype) \
@@ -38,7 +37,6 @@
};
// TEST_STRUCT_GENERATOR
-
#if HAVE_DUNE_GRID
#include <dune/grid/yaspgrid.hh>
diff --git a/dune/stuff/test/functions_spe10.cc b/dune/stuff/test/functions_spe10.cc
index 818a6096c..867ad3247 100644
--- a/dune/stuff/test/functions_spe10.cc
+++ b/dune/stuff/test/functions_spe10.cc
@@ -37,7 +37,6 @@
};
// TEST_STRUCT_GENERATOR
-
#if HAVE_DUNE_GRID
//# include <dune/grid/yaspgrid.hh>
--
GitLab