mirror of
https://github.com/NGSolve/netgen.git
synced 2025-01-12 14:10:34 +05:00
legaltet
This commit is contained in:
parent
a7d92de0ef
commit
aa2fda0ae2
@ -3482,7 +3482,6 @@ namespace netgen
|
|||||||
{
|
{
|
||||||
// static int timer1 = NgProfiler::CreateTimer ("Legaltet2");
|
// static int timer1 = NgProfiler::CreateTimer ("Legaltet2");
|
||||||
|
|
||||||
|
|
||||||
// Test, whether 4 points have a common surface plus
|
// Test, whether 4 points have a common surface plus
|
||||||
// at least 4 edges at the boundary
|
// at least 4 edges at the boundary
|
||||||
|
|
||||||
|
44
ng/ngpkg.cpp
44
ng/ngpkg.cpp
@ -6,14 +6,6 @@ The interface between the GUI and the netgen library
|
|||||||
|
|
||||||
|
|
||||||
#include <mystdlib.h>
|
#include <mystdlib.h>
|
||||||
|
|
||||||
/*
|
|
||||||
#ifdef LINUX
|
|
||||||
#include <fenv.h>
|
|
||||||
#include <dlfcn.h>
|
|
||||||
#endif
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <myadt.hpp>
|
#include <myadt.hpp>
|
||||||
#include <linalg.hpp>
|
#include <linalg.hpp>
|
||||||
#include <csg.hpp>
|
#include <csg.hpp>
|
||||||
@ -22,6 +14,7 @@ The interface between the GUI and the netgen library
|
|||||||
#include <stlgeom.hpp>
|
#include <stlgeom.hpp>
|
||||||
#include <meshing.hpp>
|
#include <meshing.hpp>
|
||||||
|
|
||||||
|
|
||||||
#ifdef OCCGEOMETRY
|
#ifdef OCCGEOMETRY
|
||||||
#include <occgeom.hpp>
|
#include <occgeom.hpp>
|
||||||
#endif
|
#endif
|
||||||
@ -39,7 +32,6 @@ The interface between the GUI and the netgen library
|
|||||||
|
|
||||||
// #include <parallel.hpp>
|
// #include <parallel.hpp>
|
||||||
|
|
||||||
|
|
||||||
// to be sure to include the 'right' togl-version
|
// to be sure to include the 'right' togl-version
|
||||||
#include "togl_1_7.h"
|
#include "togl_1_7.h"
|
||||||
|
|
||||||
@ -234,9 +226,6 @@ namespace netgen
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifdef MODELLER
|
|
||||||
VisualScene * vsmodeller = NULL;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
VisualScene *vs = &vscross;
|
VisualScene *vs = &vscross;
|
||||||
|
|
||||||
@ -1343,14 +1332,6 @@ namespace netgen
|
|||||||
{
|
{
|
||||||
static char buf[100];
|
static char buf[100];
|
||||||
if (argc < 2) return TCL_ERROR;
|
if (argc < 2) return TCL_ERROR;
|
||||||
/*
|
|
||||||
if (strcmp (argv[1], "moveable") == 0)
|
|
||||||
{
|
|
||||||
sprintf (buf, "%6.1f", double(BaseMoveableMem::used)/1048576);
|
|
||||||
Tcl_SetResult (interp, buf, TCL_STATIC);
|
|
||||||
return TCL_OK;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (strcmp (argv[1], "usedmb") == 0)
|
if (strcmp (argv[1], "usedmb") == 0)
|
||||||
{ // returns string of 512 '0' or '1'
|
{ // returns string of 512 '0' or '1'
|
||||||
@ -1365,9 +1346,6 @@ namespace netgen
|
|||||||
return TCL_OK;
|
return TCL_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return TCL_ERROR;
|
return TCL_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1732,19 +1710,9 @@ namespace netgen
|
|||||||
ref = new RefinementSurfaces (*geometry);
|
ref = new RefinementSurfaces (*geometry);
|
||||||
}
|
}
|
||||||
|
|
||||||
// if (!mesh -> coarsemesh)
|
|
||||||
mesh -> GetCurvedElements().BuildCurvedElements (ref, mparam.elementorder);
|
mesh -> GetCurvedElements().BuildCurvedElements (ref, mparam.elementorder);
|
||||||
/*
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mesh -> coarsemesh -> GetCurvedElements().BuildCurvedElements (ref, mparam.elementorder);
|
|
||||||
mesh -> GetCurvedElements().SetHighOrder(mparam.elementorder);
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
delete ref;
|
|
||||||
|
|
||||||
//
|
delete ref;
|
||||||
// cout << "WARNING: Ng_HighOrder! ref is not deleted for edge projection visualization" << endl;
|
|
||||||
|
|
||||||
multithread.task = savetask;
|
multithread.task = savetask;
|
||||||
multithread.running = 0;
|
multithread.running = 0;
|
||||||
@ -1769,16 +1737,13 @@ namespace netgen
|
|||||||
return TCL_ERROR;
|
return TCL_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
multithread.running = 1;
|
multithread.running = 1;
|
||||||
multithread.terminate = 0;
|
multithread.terminate = 0;
|
||||||
|
|
||||||
mparam.elementorder = atoi(argv[1]);
|
mparam.elementorder = atoi(argv[1]);
|
||||||
|
|
||||||
// if(argc > 2 && strcmp(argv[2],"noparallel") == 0)
|
|
||||||
HighOrderDummy(NULL);
|
HighOrderDummy(NULL);
|
||||||
// else
|
|
||||||
// RunParallel (HighOrderDummy, NULL);
|
|
||||||
|
|
||||||
return TCL_OK;
|
return TCL_OK;
|
||||||
}
|
}
|
||||||
@ -1925,9 +1890,8 @@ namespace netgen
|
|||||||
Tcl_Interp * interp,
|
Tcl_Interp * interp,
|
||||||
int argc, tcl_const char *argv[])
|
int argc, tcl_const char *argv[])
|
||||||
{
|
{
|
||||||
int i;
|
|
||||||
double globh = mparam.maxh;
|
double globh = mparam.maxh;
|
||||||
for (i = 1; i <= geometry->singpoints.Size(); i++)
|
for (int i = 1; i <= geometry->singpoints.Size(); i++)
|
||||||
geometry->singpoints.Get(i)->SetMeshSize (*mesh, globh);
|
geometry->singpoints.Get(i)->SetMeshSize (*mesh, globh);
|
||||||
return TCL_OK;
|
return TCL_OK;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user