Commit 6670d9d7 authored by Markus Holzer's avatar Markus Holzer
Browse files

Fix Small problem

parent 2cc4b063
Pipeline #38678 failed with stages
in 5 minutes and 22 seconds
......@@ -117,8 +117,7 @@ namespace field {
shared_ptr<FieldAllocator<T> > alloc = shared_ptr<FieldAllocator<T> >(),
uint_t innerGhostLayerSizeForAlignedAlloc = 0 );
void resize( uint_t xSize, uint_t ySize, uint_t zSize, uint_t fSize );
virtual void resize( uint_t xSize, uint_t ySize, uint_t zSize, uint_t fSize );
virtual Field<T> * clone() const;
virtual Field<T> * cloneUninitialized() const;
......@@ -395,7 +394,7 @@ template<typename T, uint_t fSize_>
class Field<T, fSize_> : public Field<T> {
public:
static const uint_t F_SIZE = fSize_;
static constexpr bool OLD = true;
......
......@@ -23,6 +23,7 @@
#include "field/iterators/IteratorMacros.h"
#include "core/math/Utility.h" // for equal() in operator==
#include "Field.h"
#include <algorithm> // std::copy
......@@ -319,7 +320,7 @@ namespace field {
template<typename T>
void Field<T>::init( uint_t _xSize, uint_t _ySize, uint_t _zSize, uint_t _fSize,
const Layout & l, shared_ptr<FieldAllocator<T> > alloc,
uint_t innerGhostLayerSizeForAlignedAlloc )
uint_t innerGhostLayerSizeForAlignedAlloc)
{
WALBERLA_ASSERT_NULLPTR( values_ )
WALBERLA_ASSERT_NULLPTR( valuesWithOffset_ )
......@@ -410,8 +411,8 @@ namespace field {
//*******************************************************************************************************************
/*! Destructor, using Allocator template parameter
*******************************************************************************************************************/
template<typename T>
Field<T>::~Field()
template< typename T >
Field< T >::~Field()
{
allocator_->decrementReferenceCount( values_ );
}
......
......@@ -100,7 +100,7 @@ class GhostLayerField<T> : public Field<T>
uint_t nrGhostLayers, const Layout& layout = zyxf,
const shared_ptr< FieldAllocator< T > >& alloc = shared_ptr< FieldAllocator< T > >());
void resize(uint_t xSize, uint_t ySize, uint_t zSize, uint_t _fSize);
void resize(uint_t xSize, uint_t ySize, uint_t zSize, uint_t _fSize) override;
void resize(uint_t xSize, uint_t ySize, uint_t zSize, uint_t _fSize, uint_t gl);
using Field< T >::resize;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment