diff --git a/dune/solvers/common/boxconstraint.hh b/dune/solvers/common/boxconstraint.hh index 1fa119b384314c86501722a309f4f823d380f330..b91e3c811e0a9d9f79da4f738462c52e2ab8a46d 100644 --- a/dune/solvers/common/boxconstraint.hh +++ b/dune/solvers/common/boxconstraint.hh @@ -29,7 +29,7 @@ public: } //! Subtract vector from box - BoxConstraint<T,dim>& operator-= (const Dune::FieldVector<T, dim>& v) + BoxConstraint<T,dim>& operator-= (const Dune::FieldVector<T, dim>& v) { for (int i=0; i<dim; i++) { val[2*i] -= v[i]; @@ -55,9 +55,9 @@ public: std::ostream& operator<< (std::ostream& s, const BoxConstraint<T,dim>& v) { for (int i=0; i<dim; i++) - s << "Direction: " << i <<", val[0] = " << v.val[2*i] + s << "Direction: " << i <<", val[0] = " << v.val[2*i] << ", val[1] = " << v.val[2*i+1] << std::endl; - + return s; } diff --git a/dune/solvers/common/interval.hh b/dune/solvers/common/interval.hh index a3ff2a51fe57676aaef0a1e0752b63825c693a81..e3c3c93c5c5caf906155b518620cb99c443e0152 100644 --- a/dune/solvers/common/interval.hh +++ b/dune/solvers/common/interval.hh @@ -24,21 +24,21 @@ public: { return data_[i]; } - + /** \brief Const array-like access */ const field_type& operator[](int i) const { return data_[i]; } - + /** \brief Project a scalar onto the interval */ field_type projectIn(const field_type& x) const { return std::max(std::min(x,data_[1]), data_[0]); } - + /** \brief Fast projection onto the interval if you know that your value * is smaller than your upper bound */ @@ -64,7 +64,7 @@ public: }; private: - + /** \brief The actual data */ std::array<field_type,2> data_; }; @@ -80,5 +80,5 @@ inline std::ostream& operator<< (std::ostream& s, const Interval<field_type>& in } // namespace Solvers } // namespace Dune - + #endif diff --git a/dune/solvers/common/permutationmanager.hh b/dune/solvers/common/permutationmanager.hh index bfa45f8688bb5d1b9c6fcec921dc34f864530a2f..3505d0a70012597f8efb3f2a5b94fb73a106a3c8 100644 --- a/dune/solvers/common/permutationmanager.hh +++ b/dune/solvers/common/permutationmanager.hh @@ -15,7 +15,7 @@ //! Idea of implementation: define an ordering for the nodes (with respect to the axis of anisotropy) //! and then use a merge sort algorithm to renumerate the nodes along the lines which are parallel to this axis. //! to do so, we introduce a 'NodeList' class. -//! everything is handeled by the PermutationManager +//! everything is handeled by the PermutationManager // type of nodes: @@ -85,7 +85,7 @@ public: }; -template <class CoordinateImp, int dim_domain> +template <class CoordinateImp, int dim_domain> class AxisComparison { @@ -116,7 +116,7 @@ public: while ( current_axis >= 0 ) { if ( current_axis == primaryAxis_ ) - current_axis -= 1; + current_axis -= 1; if ( current_axis < 0 ) break; @@ -156,7 +156,7 @@ public: template< class GridViewImp > class PermutationManager{ -public: +public: @@ -368,7 +368,7 @@ public: if ( block_number < number_of_blocks_ ) { return block_sizes[block_number]; } else - { std :: cout << "Request for block number " << block_number << ", but there are only " << number_of_blocks_ << " blocks." << std :: endl; + { std :: cout << "Request for block number " << block_number << ", but there are only " << number_of_blocks_ << " blocks." << std :: endl; std :: cout << "Note that the numeration of the blocks starts with 0." << std :: endl; abort(); }