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

Merge branch 'store_ellipsoid_in_mesh' into 'master'

Browse Source 
Store Ellipsoid csg surface in mesh files

See merge request jschoeberl/netgen!309
This commit is contained in:
Joachim Schöberl 2020-01-15 14:32:47 +00:00
commit d9a322ed65
3 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libsrc/csg/algprim.cpp
View File

@ -642,6 +642,32 @@ namespace netgen
cz = v(2); cz = v(2);
} }
void Ellipsoid :: GetPrimitiveData (const char *& classname, NgArray<double> & coeffs) const
{
classname = "ellipsoid";
coeffs.SetSize (12);
for(auto i : Range(3))
{
coeffs[i] = a(i);
coeffs[3+i] = v1(i);
coeffs[6+i] = v2(i);
coeffs[9+i] = v3(i);
}
}
void Ellipsoid :: SetPrimitiveData (NgArray<double> & coeffs)
{
for(auto i : Range(3))
{
a(i) = coeffs[i];
v1(i) = coeffs[3+i];
v2(i) = coeffs[6+i];
v3(i) = coeffs[9+i];
}
CalcData();
}
INSOLID_TYPE Ellipsoid :: BoxInSolid (const BoxSphere<3> & box) const INSOLID_TYPE Ellipsoid :: BoxInSolid (const BoxSphere<3> & box) const
{ {

17
libsrc/csg/algprim.hpp
View File

@ -339,23 +339,26 @@ namespace netgen
// default constructor for archive // default constructor for archive
Ellipsoid() {} Ellipsoid() {}
virtual void DoArchive(Archive& ar) void DoArchive(Archive& ar) override
{ {
QuadraticSurface::DoArchive(ar); QuadraticSurface::DoArchive(ar);
ar & a & v1 & v2 & v3 & rmin; ar & a & v1 & v2 & v3 & rmin;
} }
/// ///
virtual INSOLID_TYPE BoxInSolid (const BoxSphere<3> & box) const; INSOLID_TYPE BoxInSolid (const BoxSphere<3> & box) const override;
/// ///
virtual double HesseNorm () const; double HesseNorm () const override;
/// ///
virtual double MaxCurvature () const; double MaxCurvature () const override;
/// ///
virtual Point<3> GetSurfacePoint () const; Point<3> GetSurfacePoint () const override;
virtual void GetTriangleApproximation (TriangleApproximation & tas, void GetTriangleApproximation (TriangleApproximation & tas,
const Box<3> & bbox, const Box<3> & bbox,
double facets) const; double facets) const override;
void GetPrimitiveData (const char *& classname, NgArray<double> & coeffs) const override;
void SetPrimitiveData (NgArray<double> & coeffs) override;
private: private:
void CalcData(); void CalcData();

9
libsrc/csg/csgeom.cpp
View File

@ -562,6 +562,15 @@ namespace netgen
delete_them.Append(cone); delete_them.Append(cone);
} }
else if(classname == "ellipsoid")
{
Ellipsoid * ellipsoid = new Ellipsoid(dummypoint,dummyvec,dummyvec,dummyvec);
ellipsoid->SetPrimitiveData(coeffs);
AddSurface(ellipsoid);
delete_them.Append(ellipsoid);
}
else if(classname == "ellipticcone") else if(classname == "ellipticcone")
{ {
EllipticCone * ellipticcone = new EllipticCone(dummypoint,dummyvec,dummyvec,dummydouble,dummydouble); EllipticCone * ellipticcone = new EllipticCone(dummypoint,dummyvec,dummyvec,dummydouble,dummydouble);