diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp index d1979f26fe8dd800a1958ba5937963d2822a8af0..6a92865a7b69814ce193e7c90f957fc9c43079e9 100644 --- a/Fltk/GUI.cpp +++ b/Fltk/GUI.cpp @@ -1,4 +1,4 @@ -// $Id: GUI.cpp,v 1.239 2003-06-14 05:15:29 geuzaine Exp $ +// $Id: GUI.cpp,v 1.240 2003-06-14 06:23:04 geuzaine Exp $ // // Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle // @@ -1634,7 +1634,7 @@ void GUI::create_option_window() mesh_value[i]->align(FL_ALIGN_RIGHT); } - mesh_butt[3] = new Fl_Check_Button(2 * WB, 2 * WB + 5 * BH, BW, BH, "Second order elements (simplices and quadrangles only)"); + mesh_butt[3] = new Fl_Check_Button(2 * WB, 2 * WB + 5 * BH, BW, BH, "Second order elements (1D and 2D mesh only)"); mesh_butt[3]->type(FL_TOGGLE_BUTTON); mesh_butt[3]->down_box(TOGGLE_BOX); mesh_butt[3]->selection_color(TOGGLE_COLOR); diff --git a/Mesh/3D_Mesh.cpp b/Mesh/3D_Mesh.cpp index 9b351152326023e1db2d1d029c2edd2e0dffcf80..b3a4a36929f9c4bd4e6e2f5fa32ea083b219a67c 100644 --- a/Mesh/3D_Mesh.cpp +++ b/Mesh/3D_Mesh.cpp @@ -1,4 +1,4 @@ -// $Id: 3D_Mesh.cpp,v 1.53 2003-06-14 05:15:29 geuzaine Exp $ +// $Id: 3D_Mesh.cpp,v 1.54 2003-06-14 06:23:04 geuzaine Exp $ // // Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle // @@ -895,19 +895,15 @@ void Maillage_Volume(void *data, void *dum) return; } - if(Extrude_Mesh(v)) { - - if(CTX.mesh.order == 2){ - Msg(GERROR, "Second order 3D extruded meshes not implemented"); - } + 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)) { - - if(CTX.mesh.order == 2){ - Msg(GERROR, "Second order 3D transfinite meshes not implemented"); - } - } else if(v->Typ == 99999) { @@ -1058,7 +1054,7 @@ void Maillage_Volume(void *data, void *dum) #endif if(CTX.mesh.order == 2){ - Degre2(v->Simplexes, NULL, NULL); + //Degre2(v->Simplexes, NULL, NULL); } List_Delete(Simplexes_New); diff --git a/doc/VERSIONS b/doc/VERSIONS index db13de7834712c006cd42fb8bb92e980940914ab..b816921a19b2f34159df92841f630f7d25e0e2ca 100644 --- a/doc/VERSIONS +++ b/doc/VERSIONS @@ -1,10 +1,10 @@ -$Id: VERSIONS,v 1.148 2003-06-14 05:35:52 geuzaine Exp $ +$Id: VERSIONS,v 1.149 2003-06-14 06:23:04 geuzaine Exp $ New in 1.45: small bug fixes (min/max computation for tensor views, missing physical points in read mesh, "jumping" geometry during interactive manipulation of large models, etc.); variable definition -speedup; partial support for second order elements (lines, triangles, -quadrangles and tetrahedra); documentation updates; +speedup; restored support for second order elements in one- and +two-dimensional meshes; documentation updates; New in 1.44: new reference manual; added support for PNG output; fixed small configure script bugs;