added missing file

This commit is contained in:
Joachim Schoeberl 2009-02-25 16:06:34 +00:00
parent 78736845ca
commit 22e83bf294
8 changed files with 48 additions and 18 deletions

View File

@ -329,6 +329,7 @@ namespace netgen
const OneSurfacePrimitive * sp = dynamic_cast< const OneSurfacePrimitive * > (GetSurface(i));
const ExtrusionFace * ef = dynamic_cast< const ExtrusionFace * > (GetSurface(i));
const RevolutionFace * rf = dynamic_cast< const RevolutionFace * > (GetSurface(i));
const DummySurface * dummyf = dynamic_cast< const DummySurface * > (GetSurface(i));
if(sp)
@ -347,6 +348,11 @@ namespace netgen
out << "revolutionface ";
rf->GetRawData(coeffs);
}
else if(dummyf)
{
out << "dummy ";
coeffs.SetSize(0);
}
else
throw NgException ("Cannot write csg surface. Please, contact developers!");
@ -438,6 +444,15 @@ namespace netgen
AddSurface(rf);
delete_them.Append(rf);
}
else if(classname == "dummy")
{
Surface * surf = new DummySurface();
AddSurface(surf);
delete_them.Append(surf);
}
}
}

View File

@ -664,14 +664,8 @@ namespace netgen
perfstepsstart = MESHCONST_MESHVOLUME;
}
if (perfstepsstart <= MESHCONST_ANALYSE)
{
/*
delete mesh;
mesh = new Mesh();
*/
if (mesh)
mesh -> DeleteMesh();
else

View File

@ -189,10 +189,6 @@ public:
const Box<3> & /* boundingbox */,
double /* facets */ ) const { };
#ifdef MYGRAPH
///
virtual void Plot (const class ROT3D & /* rot */) const { };
#endif
string GetBCName() const { return bcname; }
@ -214,6 +210,29 @@ INSOLID_TYPE;
class DummySurface : public Surface
{
virtual double CalcFunctionValue (const Point<3> & point) const
{ return 0; }
virtual void CalcGradient (const Point<3> & point, Vec<3> & grad) const
{ grad = Vec<3> (0,0,0); }
virtual Point<3> GetSurfacePoint () const
{ return Point<3> (0,0,0); }
virtual double HesseNorm () const
{ return 0; }
virtual void Project (Point<3> & p) const
{ ; }
virtual void Print (ostream & ost) const
{ ost << "dummy surface"; }
};
class Primitive
{

View File

@ -2477,8 +2477,7 @@ namespace netgen
GetNSE(), " Surface Elements");
int i;
for (i = 0; i < GetNSE(); i++)
for (int i = 0; i < GetNSE(); i++)
{
const Element2d & el = surfelements[i];
int j;
@ -2532,7 +2531,7 @@ namespace netgen
}
}
for (i = 0; i < GetNSeg(); i++)
for (int i = 0; i < GetNSeg(); i++)
{
const Segment & seg = segments[i];
const Point3d & p1 = points[seg.p1];

View File

@ -22,6 +22,8 @@ namespace netgen
Array<INDEX_2> connectednodes;
if (&mesh3d.LocalHFunction() == NULL) mesh3d.CalcLocalH();
mesh3d.Compress();
// mesh3d.PrintMemInfo (cout);
@ -157,7 +159,7 @@ namespace netgen
mesh3d.VolumeElement(i).SetIndex (k);
(*testout)
<< "mesh has " << mesh3d.GetNE() << " prism/pyramid elements" << endl;
<< "mesh has " << mesh3d.GetNE() << " prism/pyramid elements" << endl;
mesh3d.FindOpenElements(k);
}

View File

@ -4,7 +4,7 @@ Partition_Loop3d.hxx Partition_Spliter.hxx Partition_Inter2d.ixx \
Partition_Loop2d.ixx Partition_Loop.ixx Partition_Inter3d.ixx \
Partition_Loop3d.ixx Partition_Spliter.ixx Partition_Inter2d.jxx \
Partition_Loop2d.jxx Partition_Loop.jxx Partition_Inter3d.jxx \
Partition_Loop3d.jxx Partition_Spliter.jxx
Partition_Loop3d.jxx Partition_Spliter.jxx utilities.h
AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(OCCFLAGS)

View File

@ -1188,7 +1188,7 @@ namespace netgen
for (int iy = 0, ii = 0; iy <= n; iy++)
for (int ix = 0; ix <= n; ix++, ii++)
pref[ii] = Point<2> (double(ix)/n, double(iy/n));
pref[ii] = Point<2> (double(ix)/n, double(iy)/n);
int npt = (n+1)*(n+1);
if (curved)
@ -1217,6 +1217,7 @@ namespace netgen
nvs[ii] = nv;
}
if (sol && sol->draw_surface)
{
if (usetexture == 2)

View File

@ -286,8 +286,8 @@ catch {
if { [catch { load libngsolve.so ngsolve } result ] } {
# puts "cannot load ngsolve"
# puts "error: $result"
puts "cannot load ngsolve"
puts "error: $result"
} {
catch { source ${ngdir}/ngsolve.tcl }
}