From b12f968c129c5bb8087253f9b3dc764faf34ff77 Mon Sep 17 00:00:00 2001
From: Adrian Burri <burriad@dune-project.org>
Date: Thu, 12 May 2005 08:11:16 +0000
Subject: [PATCH] Enabled parallel compilation
[[Imported from SVN: r2047]]
---
grid/alu3dgrid/alu3dgrid.cc | 20 ++++++++------------
grid/alu3dgrid/datahandle.hh | 2 ++
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/grid/alu3dgrid/alu3dgrid.cc b/grid/alu3dgrid/alu3dgrid.cc
index dc7a709b9..c87832514 100644
--- a/grid/alu3dgrid/alu3dgrid.cc
+++ b/grid/alu3dgrid/alu3dgrid.cc
@@ -707,20 +707,16 @@ namespace Dune {
template <int dim, int dimworld, ALU3dGridElementType elType>
template <GrapeIOFileFormatType ftype>
inline bool ALU3dGrid<dim, dimworld, elType>::
- writeGrid( std::string filename, alu3d_ctype time ) const
+ writeGrid(const std::string& filename, alu3d_ctype time ) const
{
ALU3DSPACE GitterImplType & mygrd = const_cast<ALU3dGrid<dim, dimworld, elType> &> (*this).myGrid();
mygrd.duneBackup(filename.c_str());
// write time and maxlevel
{
- typedef std::ostringstream StreamType;
- StreamType eName;
-
- eName << filename;
- eName << ".extra";
- const char * extraName = eName.str().c_str();
- std::ofstream out (extraName);
+ std::string extraName(filename);
+ extraName += ".extra";
+ std::ofstream out (extraName.c_str());
if(out)
{
out.precision (16);
@@ -739,7 +735,7 @@ namespace Dune {
template <int dim, int dimworld, ALU3dGridElementType elType>
template <GrapeIOFileFormatType ftype>
inline bool ALU3dGrid<dim,dimworld, elType>::
- readGrid( const std::basic_string<char> filename, alu3d_ctype & time )
+ readGrid( const std::string& filename, alu3d_ctype & time )
{
{
typedef std::ostringstream StreamType;
@@ -1326,8 +1322,8 @@ namespace Dune {
ghost_ = 0;
if(isBoundary_)
{
- ALU3DSPACE PLLBndFaceType * bnd =
- dynamic_cast<ALU3DSPACE PLLBndFaceType *> (getNeighPair(index_).first);
+ PLLBndFaceType * bnd =
+ dynamic_cast<PLLBndFaceType *> (getNeighPair(index_).first);
if(bnd->bndtype() == ALU3DSPACE ProcessorBoundary_t)
{
isBoundary_ = false;
@@ -1773,7 +1769,7 @@ namespace Dune {
inline void
ALU3dGridEntity<0,dim,GridImp> :: setGhost(ALU3DSPACE HElementType & element)
{
- item_= static_cast<ALU3DSPACE IMPLElementType *> (&element);
+ item_= static_cast<IMPLElementType *> (&element);
isGhost_ = true;
ghost_ = 0;
builtgeometry_=false;
diff --git a/grid/alu3dgrid/datahandle.hh b/grid/alu3dgrid/datahandle.hh
index dd3cb46c4..85958807e 100644
--- a/grid/alu3dgrid/datahandle.hh
+++ b/grid/alu3dgrid/datahandle.hh
@@ -4,6 +4,7 @@
#define __DUNE_ALU3DGRID_DATAHANDLE_HH__
#include <iostream>
+#include "../alu3dgrid.hh"
using std::endl;
using std::cout;
@@ -17,6 +18,7 @@ namespace ALU3dGridSpace {
{
GridType & grid_;
typedef typename GridType::template codim<0>::Entity Entity;
+ typedef Dune::ALU3dImplTraits<GridType::elementType>::PLLBndFaceType PLLBndFaceType;
Entity & en_;
EntityType & realEntity_;
--
GitLab