From 3e8f4d330af9d95b8996c29edaf706ea2773da06 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 14 Jun 2003 05:15:30 +0000
Subject: [PATCH] Shout if we try to generate second order meshes in
non-implemented cases.
---
Fltk/GUI.cpp | 5 ++---
Mesh/3D_Mesh.cpp | 12 +++++++++++-
doc/VERSIONS | 5 +++--
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 85979c5293..d1979f26fe 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.238 2003-06-13 22:41:41 geuzaine Exp $
+// $Id: GUI.cpp,v 1.239 2003-06-14 05:15:29 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -1634,11 +1634,10 @@ 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");
+ 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]->type(FL_TOGGLE_BUTTON);
mesh_butt[3]->down_box(TOGGLE_BOX);
mesh_butt[3]->selection_color(TOGGLE_COLOR);
- mesh_butt[3]->deactivate();
mesh_butt[5] = new Fl_Check_Button(2 * WB, 2 * WB + 6 * BH, BW, BH, "Constrain background mesh");
mesh_butt[5]->type(FL_TOGGLE_BUTTON);
diff --git a/Mesh/3D_Mesh.cpp b/Mesh/3D_Mesh.cpp
index 582204f318..9b35115232 100644
--- a/Mesh/3D_Mesh.cpp
+++ b/Mesh/3D_Mesh.cpp
@@ -1,4 +1,4 @@
-// $Id: 3D_Mesh.cpp,v 1.52 2003-06-14 04:37:42 geuzaine Exp $
+// $Id: 3D_Mesh.cpp,v 1.53 2003-06-14 05:15:29 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -896,8 +896,18 @@ void Maillage_Volume(void *data, void *dum)
}
if(Extrude_Mesh(v)) {
+
+ if(CTX.mesh.order == 2){
+ Msg(GERROR, "Second order 3D extruded meshes not implemented");
+ }
+
}
else if(MeshTransfiniteVolume(v)) {
+
+ if(CTX.mesh.order == 2){
+ Msg(GERROR, "Second order 3D transfinite meshes not implemented");
+ }
+
}
else if(v->Typ == 99999) {
diff --git a/doc/VERSIONS b/doc/VERSIONS
index d7663956c4..4cdfe7f137 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,9 +1,10 @@
-$Id: VERSIONS,v 1.146 2003-05-22 22:51:15 geuzaine Exp $
+$Id: VERSIONS,v 1.147 2003-06-14 05:15:30 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; documentation updates;
+speedup; partial support for second order elements (lines, triangles,
+quadrangles and tetrahedra only); documentation updates;
New in 1.44: new reference manual; added support for PNG output; fixed
small configure script bugs;
--
GitLab