From d2fd7086002770e846eab96ec01758e44a325979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Sch=C3=B6berl?= Date: Thu, 24 Mar 2016 00:52:02 +0100 Subject: [PATCH] fix bcname from recent commit --- libsrc/meshing/meshtype.cpp | 20 ++++++++++---------- libsrc/meshing/meshtype.hpp | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libsrc/meshing/meshtype.cpp b/libsrc/meshing/meshtype.cpp index 43740ada..0f59bf8f 100644 --- a/libsrc/meshing/meshtype.cpp +++ b/libsrc/meshing/meshtype.cpp @@ -2273,7 +2273,7 @@ namespace netgen // Initialise surface colour surfcolour = Vec3d(0.0,1.0,0.0); tlosurf = -1; - bcname = 0; + // bcname = 0; firstelement = -1; } @@ -2298,7 +2298,7 @@ namespace netgen tlosurf = tlosurfi; bcprop = surfnri; domin_singular = domout_singular = 0.; - bcname = 0; + // bcname = 0; firstelement = -1; } @@ -2313,7 +2313,7 @@ namespace netgen tlosurf = seg.tlosurf+1; bcprop = 0; domin_singular = domout_singular = 0.; - bcname = 0; + // bcname = 0; firstelement = -1; } @@ -2336,13 +2336,13 @@ namespace netgen } */ - /* - void FaceDescriptor :: SetBCName (string * bcn) - { - bcname = bcn; - } - */ - + void FaceDescriptor :: SetBCName (string * bcn) + { + if (bcn) + bcname = bcn; + else + bcn = &default_bcname; + } ostream & operator<<(ostream & s, const FaceDescriptor & fd) { diff --git a/libsrc/meshing/meshtype.hpp b/libsrc/meshing/meshtype.hpp index fee791a4..0bf701f0 100644 --- a/libsrc/meshing/meshtype.hpp +++ b/libsrc/meshing/meshtype.hpp @@ -976,7 +976,7 @@ namespace netgen void SetDomainIn (int di) { domin = di; } void SetDomainOut (int dom) { domout = dom; } void SetBCProperty (int bc) { bcprop = bc; } - void SetBCName (string * bcn) { bcname = bcn; } + void SetBCName (string * bcn); // { bcname = bcn; } // Philippose - 06/07/2009 // Set the surface colour void SetSurfColour (Vec3d colour) { surfcolour = colour; }