Skip to content
Snippets Groups Projects
Commit a99814d3 authored by Robert Klöfkorn's avatar Robert Klöfkorn
Browse files

parallel version works again. 

[[Imported from SVN: r1770]]
parent c2555824
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
grid/alu3dgrid.hh
+ 6
− 5
View file @ a99814d3
......@@ -1127,6 +1127,11 @@ namespace Dune
template <class DofManagerType>
bool communicate (DofManagerType & dm);
template <class T> T globalMin (T val) const ;
template <class T> T globalMax (T val) const ;
template <class T> T globalSum (T val) const ;
template <class T> void globalSum (T *, int , T *) const ;
//! returns if a least one entity was marked for coarsening
bool preAdapt ( );
......@@ -1162,10 +1167,6 @@ namespace Dune
//! return my rank (only parallel)
int myRank () const { return myRank_; }
double communicateValue (double val) const ;
double communicateSum (double val) const ;
int communicateInt (int val) const ;
//! no interface method, but has to be public
void updateStatus ();
......@@ -1211,7 +1212,7 @@ namespace Dune
// the real grid
ALU3DSPACE GitterImplType * mygrid_;
#ifdef _BSGRID_PARALLEL_
#ifdef _ALU3DGRID_PARALLEL_
ALU3DSPACE MpAccessMPI mpAccess_;
#endif
// save global_size of grid
......
grid/alu3dgrid/alu3dgrid.cc
+ 48
− 32
View file @ a99814d3
......@@ -292,7 +292,8 @@ namespace Dune {
for(int l=0; l<= maxlevel(); l++)
{
{
ALU3DSPACE BSLevelIterator<0>::IteratorType w ( myGrid().container() , l ) ;
typename ALU3DSPACE
ALU3dGridLevelIteratorWrapper<0> w ( *this, l ) ;
for (w.first () ; ! w.done () ; w.next ())
{
w.item ().resetRefinedTag();
......@@ -311,44 +312,48 @@ namespace Dune {
coarsenMark_ = false;
}
template <int dim, int dimworld>
inline double ALU3dGrid<dim,dimworld>::communicateValue(double val) const
template <int dim, int dimworld> template <class T>
inline T ALU3dGrid<dim,dimworld>::globalMin(T val) const
{
#ifdef _ALU3DGRID_PARALLEL_
//std::cout << "communicateValue " << val << " on proc " << mpAccess_.myrank() << " \n";
double ret = mpAccess_.gmin(val);
//std::cout << "got " << ret << " on proc " << mpAccess_.myrank() << " \n";
T ret = mpAccess_.gmin(val);
return ret;
#else
return val;
#endif
}
template <int dim, int dimworld>
inline double ALU3dGrid<dim,dimworld>::communicateSum(double val) const
template <int dim, int dimworld> template <class T>
inline T ALU3dGrid<dim,dimworld>::globalMax(T val) const
{
#ifdef _ALU3DGRID_PARALLEL_
//std::cout << "communicateValue " << val << " on proc " << mpAccess_.myrank() << " \n";
double ret = mpAccess_.gsum(val);
//std::cout << "got " << ret << " on proc " << mpAccess_.myrank() << " \n";
T ret = mpAccess_.gmax(val);
return ret;
#else
return val;
#endif
}
template <int dim, int dimworld>
inline int ALU3dGrid<dim,dimworld>::communicateInt(int val) const
template <int dim, int dimworld> template <class T>
inline T ALU3dGrid<dim,dimworld>::globalSum(T val) const
{
#ifdef _ALU3DGRID_PARALLEL_
//std::cout << "communicateInt " << val << " on proc " << mpAccess_.myrank() << " \n";
int ret = mpAccess_.gmin(val);
//std::cout << "got " << ret << " on proc " << mpAccess_.myrank() << " \n";
return ret;
T sum = mpAccess_.gsum(val);
return sum;
#else
return val;
#endif
}
template <int dim, int dimworld> template <class T>
inline void ALU3dGrid<dim,dimworld>::globalSum(T * send, int s , T * recv) const
{
#ifdef _ALU3DGRID_PARALLEL_
mpAccess_.gsum(send,s,recv);
return ;
#else
std::memcpy(recv,send,s*sizeof(T));
return ;
#endif
}
template <int dim, int dimworld>
inline bool ALU3dGrid<dim,dimworld>::loadBalance()
......@@ -371,8 +376,9 @@ namespace Dune {
inline bool ALU3dGrid<dim,dimworld>::loadBalance(DataCollectorType & dc)
{
#ifdef _ALU3DGRID_PARALLEL_
typedef ALU3dGridEntity<0,dim,GridImp> EntityType;
EntityType en (*this);
//typedef typename Traits::template codim<0>::Entity EntityType;
typedef EntityImp EntityType;
EntityType en ( *this, this->maxlevel() );
ALU3DSPACE GatherScatterImpl< ALU3dGrid<dim,dimworld> , EntityType ,
DataCollectorType > gs(*this,en,dc);
......@@ -395,8 +401,9 @@ namespace Dune {
inline bool ALU3dGrid<dim,dimworld>::communicate(DataCollectorType & dc)
{
#ifdef _ALU3DGRID_PARALLEL_
typedef ALU3dGridEntity<0,dim,GridImp> EntityType;
EntityType en (*this);
typedef EntityImp EntityType;
EntityType en ( *this, this->maxlevel() );
ALU3DSPACE GatherScatterImpl< ALU3dGrid<dim,dimworld> , EntityType ,
DataCollectorType > gs(*this,en,dc);
......@@ -451,6 +458,13 @@ namespace Dune {
assert(macroName);
sprintf(macroName,"%s.macro",filename);
{ //check if file exists
std::ifstream check ( macroName );
if( !check )
DUNE_THROW(ALU3dGridError,"cannot read file " << macroName << "\n");
}
mygrid_ = new ALU3DSPACE GitterImplType (macroName
#ifdef _ALU3DGRID_PARALLEL_
, mpAccess_
......@@ -732,7 +746,7 @@ namespace Dune {
ALU3dGridHierarchicIterator(const GridImp & grid ,
const ALU3DSPACE HElementType & elem, int maxlevel ,bool end)
: grid_(grid), elem_(elem) , item_(0) , maxlevel_(maxlevel)
, entity_ ( grid_.entityProvider_.getNewObjectEntity( grid_, maxlevel) )
, entity_ ( (!end) ? grid_.entityProvider_.getNewObjectEntity( grid_, maxlevel) : 0 )
{
if (!end)
{
......@@ -759,14 +773,15 @@ namespace Dune {
inline ALU3dGridHierarchicIterator<GridImp> ::
~ALU3dGridHierarchicIterator()
{
grid_.entityProvider_.freeObjectEntity ( entity_ );
if(entity_) grid_.entityProvider_.freeObjectEntity ( entity_ );
entity_ = 0;
}
template <class GridImp>
inline ALU3dGridHierarchicIterator<GridImp> ::
ALU3dGridHierarchicIterator(const ALU3dGridHierarchicIterator<GridImp> & org)
: grid_(org.grid_), elem_(org.elem_) , item_(org.item_) , maxlevel_(org.maxlevel_)
, entity_ ( grid_.entityProvider_.getNewObjectEntity( grid_, maxlevel_ ) )
, entity_ ( (org.entity_) ? grid_.entityProvider_.getNewObjectEntity( grid_, maxlevel_ ) : 0)
{
if(item_) (*entity_).setElement(*item_);
}
......@@ -884,7 +899,7 @@ namespace Dune {
ALU3DSPACE HElementType *el, int wLevel,bool end)
: grid_ ( grid )
, walkLevel_ (wLevel)
, entity_( grid_.entityProvider_.getNewObjectEntity( grid_ , wLevel ) )
, entity_( (!end) ? grid_.entityProvider_.getNewObjectEntity( grid_ , wLevel ) : 0)
, item_(0), neigh_(0), ghost_(0)
, index_(0) , numberInNeigh_ (-1)
, theSituation_ (false) , daOtherSituation_ (false)
......@@ -909,7 +924,7 @@ namespace Dune {
ALU3dGridIntersectionIterator(const ALU3dGridIntersectionIterator<GridImp> & org)
: grid_ ( org.grid_ )
, walkLevel_ ( org.walkLevel_ )
, entity_( grid_.entityProvider_.getNewObjectEntity( grid_ , walkLevel_ ) )
, entity_( (org.entity_) ? grid_.entityProvider_.getNewObjectEntity( grid_ , walkLevel_ ) : 0)
, item_(org.item_), neigh_(org.neigh_), ghost_(org.ghost_)
, index_(org.index_) , numberInNeigh_ (org.numberInNeigh_)
, theSituation_ (org.theSituation_)
......@@ -924,7 +939,8 @@ namespace Dune {
template<class GridImp>
inline ALU3dGridIntersectionIterator<GridImp> :: ~ALU3dGridIntersectionIterator()
{
grid_.entityProvider_.freeObjectEntity( entity_ );
if(entity_) grid_.entityProvider_.freeObjectEntity( entity_ );
entity_ = 0;
}
template<class GridImp>
......@@ -943,7 +959,7 @@ namespace Dune {
ghost_ = 0;
if(isBoundary_)
{
typename ALU3DSPACE PLLBndFaceType * bnd =
ALU3DSPACE PLLBndFaceType * bnd =
dynamic_cast<ALU3DSPACE PLLBndFaceType *> (item_->myneighbour(index_).first);
if(bnd->bndtype() == ALU3DSPACE ProcessorBoundary_t)
{
......@@ -1085,7 +1101,7 @@ namespace Dune {
daOtherSituation_ = false;
}
ghost_ = ghost_->up();
ghost_ = static_cast<ALU3DSPACE PLLBndFaceType *> ( ghost_->up() );
assert(ghost_->level() == ghost_->ghostLevel());
}
......@@ -1297,7 +1313,7 @@ namespace Dune {
inline void
ALU3dGridEntity<0,dim,GridImp> :: setGhost(ALU3DSPACE HElementType & element)
{
item_= static_cast<ALU3DSPACE GEOElementType *> (&element);
item_= static_cast<ALU3DSPACE IMPLElementType *> (&element);
isGhost_ = true;
ghost_ = 0;
builtgeometry_=false;
......
grid/alu3dgrid/alu3dgridcomm.hh
+ 10
− 12
View file @ a99814d3
......@@ -36,41 +36,40 @@ namespace Dune {
/*!
BSGridCommunicator organizes the communication of BSGrid on
ALU3dGridCommunicator organizes the communication of ALU3dGrid on
diffrent processors.
*/
template <class GridType>
class BSGridCommunicator
class ALU3dGridCommunicator
{
public:
//! Constructor
BSGridCommunicator(GridType &grid) : grid_(grid) {}
ALU3dGridCommunicator(GridType &grid) : grid_(grid) {}
template <class DataType>
bool communicate(DataType & data) const
{
//grid_.communicate(data);
grid_.communicate(data);
return false;
}
template <class DataType>
bool loadBalance(DataType & data) const
{
return false;
// return grid_.loadBalance(data);
return grid_.loadBalance(data);
}
bool loadBalance() const
{
return false; //return grid_.loadBalance();
return grid_.loadBalance();
}
//! minimize val over all processors
template <class T>
T globalMin (T val) const
{
T ret = val; // grid_.globalMin(val);
T ret = grid_.globalMin(val);
return ret;
}
......@@ -78,7 +77,7 @@ namespace Dune {
template <class T>
T globalMax (T val) const
{
T ret = val; //grid_.globalMax(val);
T ret = grid_.globalMax(val);
return ret;
}
......@@ -86,14 +85,13 @@ namespace Dune {
template <class T>
T globalSum (T val) const
{
return val; //grid_.globalSum(val);
return grid_.globalSum(val);
}
template <class T>
void globalSum (T *send, int s , T *recv) const
{
std::memcpy(recv,send,s * sizeof(T));
// grid_.globalSum(send,s,recv);
grid_.globalSum(send,s,recv);
return ;
}
......
grid/alu3dgrid/alu3dinclude.hh
+ 1
− 1
View file @ a99814d3
......@@ -15,10 +15,10 @@
// if this is defined in bsgrid some methods are added which we only need
// for the Dune interface
#define _DUNE_USES_ALU3DGRID_
#include <dune/common/fvector.hh>
// if MPI was found include all headers
#ifdef _ALU3DGRID_PARALLEL_
#include <mpi.h>
#include <alu3dgrid_parallel.h>
#else
// if not, include only headers for serial version
......
grid/alu3dgrid/alumemory.hh
+ 1
− 2
View file @ a99814d3
......@@ -4,13 +4,12 @@
#define __DUNE_ALUMEMORY_HH__
#include <stack>
#include "myautoptr.hh"
//! organize the memory management for entitys used by the NeighborIterator
template <class Object>
class MemoryProvider
{
std::stack < Object * > objStack_;
stack < Object * > objStack_;
typedef MemoryProvider < Object > MyType;
public:
......
grid/alu3dgrid/datahandle.hh
+ 10
− 6
View file @ a99814d3
......@@ -10,7 +10,11 @@ namespace ALU3dGridSpace {
class GatherScatterImpl : public GatherScatter
{
GridType & grid_;
EntityType & en_;
typedef typename GridType::template codim<0>::Entity Entity;
Entity & en_;
EntityType & realEntity_;
DataCollectorType & dc_;
typedef ObjectStream ObjectStreamType;
......@@ -18,7 +22,7 @@ namespace ALU3dGridSpace {
public:
//! Constructor
GatherScatterImpl(GridType & grid, EntityType & en, DataCollectorType & dc)
: grid_(grid), en_(en), dc_(dc) {}
: grid_(grid), en_(en), realEntity_(en) , dc_(dc) {}
//! this method is called from the dunePackAll method of the corresponding
//! Macro element class of the BSGrid, see gitter_dune_pll*.*
......@@ -26,7 +30,7 @@ namespace ALU3dGridSpace {
virtual void inlineData ( ObjectStreamType & str , HElemType & elem )
{
// set element and then start
en_.setElement(elem);
realEntity_.setElement(elem);
dc_.inlineData(str,en_);
}
......@@ -37,14 +41,14 @@ namespace ALU3dGridSpace {
{
// set element and then start
grid_.updateStatus();
en_.setElement(elem);
realEntity_.setElement(elem);
dc_.xtractData(str,en_);
}
//! write Data of one lement to stream
virtual void sendData ( ObjectStreamType & str , const HElementType & elem )
{
en_.setElement( const_cast<HElementType &> (elem) );
realEntity_.setElement( const_cast<HElementType &> (elem) );
dc_.scatter(str, en_);
}
......@@ -55,7 +59,7 @@ namespace ALU3dGridSpace {
//en_.setGhost( static_cast <PLLBndFaceType &> (ghost) );
PLLBndFaceType & gh = static_cast <PLLBndFaceType &> (ghost);
en_.setGhost( *(gh.getGhost()) );
realEntity_.setGhost( *(gh.getGhost()) );
dc_.gather(str, en_);
}
......
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