Skip to content
Snippets Groups Projects
Commit a209c351 authored by Thimo Neubauer's avatar Thimo Neubauer
Browse files

- change verbose output to standard stream dverb

- convert memory manager to C++-style (no more casts, automagically
  throws error)

[[Imported from SVN: r1237]]
parent 8c7a3236
Branches
Tags
No related merge requests found
......@@ -6,6 +6,8 @@
#include <assert.h>
#include <dune/common/dlist.hh>
#include <dune/common/stdstreams.hh>
#include <dune/fem/common/dofmapperinterface.hh>
// here are the default grid index set defined
......@@ -204,24 +206,19 @@ namespace Dune {
}
};
class DefaultGHMM
{
public:
MemPointerType *Malloc (unsigned long n)
MemPointerType *Malloc (size_t n)
{
MemPointerType *p;
p = (MemPointerType *) std::malloc((size_t) n);
if (p==0) std::cerr << "Malloc: could not allocate " << n << " bytes\n";
assert(p != 0);
p = new MemPointerType[n];
return p;
}
void Free (MemPointerType *p)
{
assert(p != 0);
std::free(p);
return;
delete[] p;
}
};
......@@ -358,16 +355,18 @@ namespace Dune {
// the dofmanager belong to one grid only
GridType & grid_;
// verbose, true if output of messages
bool verbose_;
// index set for mapping
mutable IndexSetType indexSet_;
public:
//! Constructor, creates and index set
DofManager (GridType & grid, bool verbose = false)
: grid_(grid), verbose_ (verbose) , indexSet_ ( grid )
DofManager (GridType & grid)
: grid_(grid), indexSet_ ( grid )
{}
//! Constructor, creates and index set
DofManager (GridType & grid, bool verbose)
: grid_(grid), indexSet_ ( grid )
{}
//! Desctructor, removes all MemObjects
......@@ -385,10 +384,7 @@ namespace Dune {
//MemPointerType * mem = (*it)->myMem();
//ghmm_.Free(mem);
MemObjectType * mobj = (*it);
if(verbose_)
{
std::cout << "Removing " << count << " '" << mobj->name() << "' from DofManager!\n";
}
dverb << "Removing " << count << " '" << mobj->name() << "' from DofManager!\n";
memList_.erase( it );
if(mobj) delete mobj;
}
......@@ -401,8 +397,7 @@ namespace Dune {
MemObjectType & addDofSet(T * t, GridType &grid, MapperType & mapper, const char * name )
{
assert(&grid_ == &grid);
if(verbose_)
std::cout << "Adding '" << name << "' to DofManager! \n";
dverb << "Adding '" << name << "' to DofManager! \n";
MemObjectType * obj =
new MemObjectType( grid , mapper, name, ghmm_ , sizeof(T) );
......@@ -426,8 +421,7 @@ namespace Dune {
//ghmm_.Free(mem);
MemObjectType * mobj = (*it);
memList_.erase( it );
if(verbose_)
std::cout << "Removing '" << obj.name() << "' from DofManager!\n";
dverb << "Removing '" << obj.name() << "' from DofManager!\n";
if(mobj) delete mobj;
removed = true;
break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment