fix warnings, parallel

This commit is contained in:
Joachim Schoeberl 2011-05-13 11:41:53 +00:00
parent 53f1264340
commit 4b249a738f
4 changed files with 8 additions and 10 deletions

View File

@ -39,7 +39,7 @@ namespace netgen
cout << "bbox = " << bbox << endl; cout << "bbox = " << bbox << endl;
Point<3> mpc = bbox.Center(); // Point<3> mpc = bbox.Center();
bbox.Increase (bbox.Diam()/2); bbox.Increase (bbox.Diam()/2);
Box<3> meshbox = bbox; Box<3> meshbox = bbox;

View File

@ -323,7 +323,7 @@ namespace netgen
Point3d rpmid(root->xmid[0], root->xmid[1], root->xmid[2]); Point3d rpmid(root->xmid[0], root->xmid[1], root->xmid[2]);
Vec3d rv(root->h2, root->h2, root->h2); Vec3d rv(root->h2, root->h2, root->h2);
Point3d rx2 = rpmid + rv; Point3d rx2 = rpmid + rv;
Point3d rx1 = rpmid - rv; // Point3d rx1 = rpmid - rv;
root->flags.pinner = !adfront->SameSide (rpmid, rx2); root->flags.pinner = !adfront->SameSide (rpmid, rx2);
@ -477,7 +477,7 @@ namespace netgen
Point<2> rpmid(root->xmid[0], root->xmid[1], root->xmid[2]); Point<2> rpmid(root->xmid[0], root->xmid[1], root->xmid[2]);
Vec<2> rv(root->h2, root->h2); Vec<2> rv(root->h2, root->h2);
Point<2> rx2 = rpmid + rv; Point<2> rx2 = rpmid + rv;
Point<2> rx1 = rpmid - rv; // Point<2> rx1 = rpmid - rv;
root->flags.pinner = !adfront->SameSide (rpmid, rx2); root->flags.pinner = !adfront->SameSide (rpmid, rx2);

View File

@ -1,7 +1,6 @@
#include <mystdlib.h> #include <mystdlib.h>
#include "meshing.hpp" #include "meshing.hpp"
namespace netgen namespace netgen
{ {
@ -38,6 +37,7 @@ namespace netgen
geomtype = NO_GEOM; geomtype = NO_GEOM;
bcnames.SetSize(0); bcnames.SetSize(0);
#ifdef PARALLEL #ifdef PARALLEL
paralleltop = new ParallelMeshTopology (*this); paralleltop = new ParallelMeshTopology (*this);
#endif #endif

View File

@ -770,22 +770,20 @@ namespace netgen
return flags.deleted; return flags.deleted;
} }
#ifdef PARALLEL #ifdef PARALLEL
int GetPartition () const { return partitionNumber; } int GetPartition () const { return partitionNumber; }
void SetPartition (int nr) { partitionNumber = nr; }; void SetPartition (int nr) { partitionNumber = nr; };
#endif
int hp_elnr;
#ifdef PARALLEL
bool IsGhost () const { return isghost; } bool IsGhost () const { return isghost; }
void SetGhost ( const bool aisghost ) { isghost = aisghost; } void SetGhost ( const bool aisghost ) { isghost = aisghost; }
#else #else
bool IsGhost () const { return false; } bool IsGhost () const { return false; }
int GetPartition () const { return 0; }
#endif #endif
// friend class Mesh; int hp_elnr;
}; };
ostream & operator<<(ostream & s, const Element & el); ostream & operator<<(ostream & s, const Element & el);