Skip to content
Snippets Groups Projects
Commit 32534fb0 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

polish
parent 7ea58e31
No related branches found
No related tags found
No related merge requests found
// $Id: 3D_Mesh.cpp,v 1.54 2003-06-14 06:23:04 geuzaine Exp $ // $Id: 3D_Mesh.cpp,v 1.55 2003-06-14 16:41:12 geuzaine Exp $
// //
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
// //
...@@ -895,12 +895,6 @@ void Maillage_Volume(void *data, void *dum) ...@@ -895,12 +895,6 @@ void Maillage_Volume(void *data, void *dum)
return; return;
} }
if(CTX.mesh.order == 2){
// - hexes, prisms, prisms: not done (extrusion, transfinite)
// - tets: wrong if edge swaps!!
Msg(GERROR, "3D second order mesh not implemented yet");
}
if(Extrude_Mesh(v)) { if(Extrude_Mesh(v)) {
} }
else if(MeshTransfiniteVolume(v)) { else if(MeshTransfiniteVolume(v)) {
...@@ -1053,14 +1047,17 @@ void Maillage_Volume(void *data, void *dum) ...@@ -1053,14 +1047,17 @@ void Maillage_Volume(void *data, void *dum)
} }
#endif #endif
if(CTX.mesh.order == 2){
//Degre2(v->Simplexes, NULL, NULL);
}
List_Delete(Simplexes_New); List_Delete(Simplexes_New);
List_Delete(Simplexes_Destroyed); List_Delete(Simplexes_Destroyed);
} }
if(CTX.mesh.order == 2){
Msg(GERROR, "3D second order mesh not implemented yet");
// - hexa/prism/pyram: not done
// - tetra: wrong if edge swaps
//Degre2(v->Simplexes, NULL, NULL);
}
THEM->Statistics[6] += Tree_Nbr(v->Vertices); THEM->Statistics[6] += Tree_Nbr(v->Vertices);
THEM->Statistics[9] += Tree_Nbr(v->Simplexes); THEM->Statistics[9] += Tree_Nbr(v->Simplexes);
THEM->Statistics[10] += Tree_Nbr(v->Hexahedra); THEM->Statistics[10] += Tree_Nbr(v->Hexahedra);
......
// $Id: SecondOrder.cpp,v 1.16 2003-06-14 04:37:42 geuzaine Exp $ // $Id: SecondOrder.cpp,v 1.17 2003-06-14 16:41:12 geuzaine Exp $
// //
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
// //
...@@ -31,7 +31,7 @@ extern Mesh *THEM; ...@@ -31,7 +31,7 @@ extern Mesh *THEM;
static Surface *THES; static Surface *THES;
static Curve *THEC; static Curve *THEC;
Vertex *middlecurve(Vertex * v1, Vertex * v2) Vertex *oncurve(Vertex * v1, Vertex * v2)
{ {
Vertex v, *pv; Vertex v, *pv;
...@@ -128,11 +128,9 @@ void PutMiddlePoint(void *a, void *b) ...@@ -128,11 +128,9 @@ void PutMiddlePoint(void *a, void *b)
if(ed->newv){ if(ed->newv){
v = ed->newv; v = ed->newv;
} }
else if((v = middlecurve(ed->V[0], ed->V[1]))){ else if((v = oncurve(ed->V[0], ed->V[1]))){
;
} }
else if((v = onsurface(ed->V[0], ed->V[1]))){ else if((v = onsurface(ed->V[0], ed->V[1]))){
;
} }
else{ else{
v = Create_Vertex(++THEM->MaxPointNum, v = Create_Vertex(++THEM->MaxPointNum,
......
...@@ -110,7 +110,7 @@ View "comments" { ...@@ -110,7 +110,7 @@ View "comments" {
T3(0,0.11,0,0){"Hole"}; T3(0,0.11,0,0){"Hole"};
}; };
Color White{ Surface{ 22 }; } Color Grey70{ Surface{ 22 }; }
Color Purple{ Surface{ 24 }; } Color Purple{ Surface{ 24 }; }
Color Red{ Line{ 1:14 }; } Color Red{ Line{ 1:14 }; }
Color Yellow{ Line{ 15:20 }; } Color Yellow{ Line{ 15:20 }; }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment