ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-12 22:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

default material name

Browse Source
This commit is contained in:
Joachim Schöberl 2017-05-13 10:24:12 +02:00
parent ca8df788c8
commit b4f3107fef
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsrc/meshing/meshclass.cpp
View File

@ -5758,8 +5758,8 @@ namespace netgen
{
int olds = materials.Size();
materials.SetSize (domnr);
for (int i = olds; i < domnr; i++)
materials[i] = 0;
for (int i = olds; i < domnr-1; i++)
materials[i] = new string("default");
}
/*
materials.Elem(domnr) = new char[strlen(mat)+1];
@ -5772,7 +5772,7 @@ namespace netgen
{
if (domnr <= materials.Size())
return *materials.Get(domnr);
static string emptystring;
static string emptystring("default");
return emptystring;
}

5
libsrc/meshing/meshclass.hpp
View File

@ -594,7 +594,10 @@ namespace netgen
///
const string & GetMaterial (int domnr) const;
const string * GetMaterialPtr (int domnr) const // 1-based
{ return domnr <= materials.Size() ? materials.Get(domnr) : nullptr; }
{
static string defaultmat = "default";
return domnr <= materials.Size() ? materials.Get(domnr) : &defaultmat;
}
DLL_HEADER void SetNBCNames ( int nbcn );