diff --git a/Mesh/3D_Mesh.cpp b/Mesh/3D_Mesh.cpp index b3a4a36929f9c4bd4e6e2f5fa32ea083b219a67c..9a5978fba86f7416328c523d17ef139951e56b43 100644 --- a/Mesh/3D_Mesh.cpp +++ b/Mesh/3D_Mesh.cpp @@ -1,4 +1,4 @@ -// $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 // @@ -895,12 +895,6 @@ void Maillage_Volume(void *data, void *dum) 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)) { } else if(MeshTransfiniteVolume(v)) { @@ -1053,14 +1047,17 @@ void Maillage_Volume(void *data, void *dum) } #endif - if(CTX.mesh.order == 2){ - //Degre2(v->Simplexes, NULL, NULL); - } - List_Delete(Simplexes_New); 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[9] += Tree_Nbr(v->Simplexes); THEM->Statistics[10] += Tree_Nbr(v->Hexahedra); diff --git a/Mesh/SecondOrder.cpp b/Mesh/SecondOrder.cpp index a52d5ba528e122688ae4dda900eeb3f8f193f01c..6003a901fd7055a1c719e06d1ab2e0e0f8db5df8 100644 --- a/Mesh/SecondOrder.cpp +++ b/Mesh/SecondOrder.cpp @@ -1,4 +1,4 @@ -// $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 // @@ -31,7 +31,7 @@ extern Mesh *THEM; static Surface *THES; static Curve *THEC; -Vertex *middlecurve(Vertex * v1, Vertex * v2) +Vertex *oncurve(Vertex * v1, Vertex * v2) { Vertex v, *pv; @@ -128,11 +128,9 @@ void PutMiddlePoint(void *a, void *b) if(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{ v = Create_Vertex(++THEM->MaxPointNum, diff --git a/tutorial/t4.geo b/tutorial/t4.geo index b00fcfbfec2aa1b5b665dd4c7490f39a5f901a7b..743fb52afd815fa686a928d41ceef63f317c9e4e 100644 --- a/tutorial/t4.geo +++ b/tutorial/t4.geo @@ -110,7 +110,7 @@ View "comments" { T3(0,0.11,0,0){"Hole"}; }; -Color White{ Surface{ 22 }; } +Color Grey70{ Surface{ 22 }; } Color Purple{ Surface{ 24 }; } Color Red{ Line{ 1:14 }; } Color Yellow{ Line{ 15:20 }; }