From 492b997f32006312edd9ad8854363e21c3b9da46 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 6 Aug 2006 22:58:49 +0000
Subject: [PATCH] *** empty log message ***
---
Common/Makefile | 12 +-
Common/Options.cpp | 12 +-
Fltk/Callbacks.cpp | 45 +------
Fltk/GUI.cpp | 19 ++-
Fltk/Main.cpp | 10 +-
Fltk/Message.cpp | 4 +-
Geo/GEdge.h | 16 +--
Geo/GEntity.h | 55 ++++----
Geo/GFace.cpp | 4 +-
Geo/GModel.cpp | 57 ++++++++
Geo/GModel.h | 14 +-
Geo/GModelIO.cpp | 279 ++++++++++++++++++++++++++++++++-------
Geo/GVertex.cpp | 10 +-
Geo/GVertex.h | 15 ++-
Geo/MElement.cpp | 97 +++++++++++++-
Geo/MElement.h | 167 ++++++++++++++++++++++-
Geo/MVertex.cpp | 35 +++++
Geo/MVertex.h | 20 +--
Geo/Makefile | 6 +-
Geo/gmshVertex.h | 27 +++-
Graphics/CreateFile.cpp | 18 ++-
Graphics/Geom.cpp | 4 +-
Mesh/DiscreteSurface.cpp | 4 +-
23 files changed, 730 insertions(+), 200 deletions(-)
diff --git a/Common/Makefile b/Common/Makefile
index 5af303006a..8c3794da9b 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.96 2006-08-04 14:28:01 geuzaine Exp $
+# $Id: Makefile,v 1.97 2006-08-06 22:58:47 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -133,7 +133,15 @@ CommandLine.o: CommandLine.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
../Common/SmoothNormals.h ../Common/GmshDefines.h ../Mesh/Metric.h \
../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
Views.h ColorTable.h VertexArray.h SmoothNormals.h GmshMatrix.h \
- AdaptiveViews.h ../Parser/OpenFile.h ../Parser/Parser.h OS.h
+ AdaptiveViews.h ../Parser/OpenFile.h ../Graphics/CreateFile.h \
+ ../Parser/Parser.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
+ ../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
+ ../Geo/SPoint3.h ../Geo/MVertex.h ../Geo/MVertex.h ../Geo/GPoint.h \
+ ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h \
+ ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/MElement.h \
+ ../Geo/MVertex.h ../Geo/GFace.h ../Geo/GPoint.h ../Geo/GEntity.h \
+ ../Geo/MElement.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
+ ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h OS.h
# 1 "/Users/geuzaine/.gmsh/Common//"
OS.o: OS.cpp Message.h
# 1 "/Users/geuzaine/.gmsh/Common//"
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 3dbf968f2f..7d2cde1fd8 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.282 2006-08-05 13:31:28 geuzaine Exp $
+// $Id: Options.cpp,v 1.283 2006-08-06 22:58:47 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -2777,11 +2777,11 @@ double opt_general_orthographic(OPT_ARGS_NUM)
if(WID && (action & GMSH_GUI)) {
if(CTX.ortho){
WID->gen_choice[2]->value(0);
- Msg(STATUS2N, "Orthographic projection");
+ if(!CTX.batch) Msg(STATUS2N, "Orthographic projection");
}
else{
WID->gen_choice[2]->value(1);
- Msg(STATUS2N, "Perspective projection");
+ if(!CTX.batch) Msg(STATUS2N, "Perspective projection");
}
}
#endif
@@ -2795,15 +2795,15 @@ double opt_general_mouse_selection(OPT_ARGS_NUM)
#if defined(HAVE_FLTK)
if(WID && (action & GMSH_GUI)) {
if(CTX.enable_mouse_selection == 0){
- Msg(STATUS2N, "Mouse selection OFF");
+ if(!CTX.batch) Msg(STATUS2N, "Mouse selection OFF");
WID->g_status_butt[9]->color(FL_RED);
}
else if(CTX.enable_mouse_selection == 1){
- Msg(STATUS2N, "Mouse hover OFF");
+ if(!CTX.batch) Msg(STATUS2N, "Mouse hover OFF");
WID->g_status_butt[9]->color(FL_GREEN);
}
else{
- Msg(STATUS2N, "Mouse selection ON");
+ if(!CTX.batch) Msg(STATUS2N, "Mouse selection ON");
WID->g_status_butt[9]->color(FL_BACKGROUND_COLOR);
}
WID->g_status_butt[9]->redraw();
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 615e755d7c..23f6e550ad 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.421 2006-08-05 10:05:44 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.422 2006-08-06 22:58:47 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -955,7 +955,6 @@ void general_options_rotation_center_select_cb(CALLBACK_ARGS)
opt_geometry_points(0, GMSH_SET | GMSH_GUI, 1);
Draw();
- Msg(STATUS2N, "Setting rotation center");
Msg(ONSCREEN, "Select point\n[Press 'q' to abort]");
char ib = SelectEntity(ENT_POINT, &ne, v, c, s);
if(ib == 'l') {
@@ -972,7 +971,6 @@ void general_options_rotation_center_select_cb(CALLBACK_ARGS)
}
ZeroHighlight();
Draw();
- Msg(STATUS2N, "");
Msg(ONSCREEN, "");
}
@@ -1891,7 +1889,6 @@ void geometry_elementary_add_new_point_cb(CALLBACK_ARGS)
WID->create_geometry_context_window(1);
while(1) {
- Msg(STATUS2N, "Creating point");
WID->g_opengl_window->AddPointMode = true;
Msg(ONSCREEN, "Move mouse and/or enter coordinates\n"
"[Press 'Shift' to hold position, 'e' to add point or 'q' to abort]");
@@ -1915,7 +1912,6 @@ void geometry_elementary_add_new_point_cb(CALLBACK_ARGS)
}
WID->reset_visibility();
- Msg(STATUS2N, "");
Msg(ONSCREEN, "");
}
@@ -1932,7 +1928,6 @@ static void _new_multiline(int type)
n = 0;
while(1) {
- Msg(STATUS2N, "Creating curve");
if(n == 0)
Msg(ONSCREEN, "Select control points\n"
"[Press 'e' to end selection or 'q' to abort]");
@@ -1983,7 +1978,6 @@ static void _new_multiline(int type)
}
WID->reset_visibility();
- Msg(STATUS2N, "");
Msg(ONSCREEN, "");
}
@@ -2005,7 +1999,6 @@ void geometry_elementary_add_new_line_cb(CALLBACK_ARGS)
n = 0;
while(1) {
- Msg(STATUS2N, "Creating straight line");
if(n == 0)
Msg(ONSCREEN, "Select start point\n"
"[Press 'q' to abort]");
@@ -2040,7 +2033,6 @@ void geometry_elementary_add_new_line_cb(CALLBACK_ARGS)
}
WID->reset_visibility();
- Msg(STATUS2N, "");
Msg(ONSCREEN, "");
}
@@ -2067,7 +2059,6 @@ void geometry_elementary_add_new_circle_cb(CALLBACK_ARGS)
n = 0;
while(1) {
- Msg(STATUS2N, "Creating circle");
if(n == 0)
Msg(ONSCREEN, "Select start point\n"
"[Press 'q' to abort]");
@@ -2105,7 +2096,6 @@ void geometry_elementary_add_new_circle_cb(CALLBACK_ARGS)
}
WID->reset_visibility();
- Msg(STATUS2N, "");
Msg(ONSCREEN, "");
}
@@ -2122,7 +2112,6 @@ void geometry_elementary_add_new_ellipse_cb(CALLBACK_ARGS)
n = 0;
while(1) {
- Msg(STATUS2N, "Creating ellipse");
if(n == 0)
Msg(ONSCREEN, "Select start point\n"
"[Press 'q' to abort]");
@@ -2163,7 +2152,6 @@ void geometry_elementary_add_new_ellipse_cb(CALLBACK_ARGS)
}
WID->reset_visibility();
- Msg(STATUS2N, "");
Msg(ONSCREEN, "");
}
@@ -2195,7 +2183,6 @@ static void _new_surface_volume(int mode)
while(1) {
if(type == ENT_LINE){
- Msg(STATUS2N, "Creating surface");
if(!List_Nbr(List1))
Msg(ONSCREEN, "Select surface boundary\n"
"[Press 'q' to abort]");
@@ -2204,7 +2191,6 @@ static void _new_surface_volume(int mode)
"[Press 'u' to undo last selection or 'q' to abort]");
}
else{
- Msg(STATUS2N, "Creating volume");
if(!List_Nbr(List1))
Msg(ONSCREEN, "Select volume boundary\n"
"[Press 'q' to abort]");
@@ -2305,7 +2291,6 @@ stopall:;
List_Delete(List2);
WID->reset_visibility();
- Msg(STATUS2N, "");
Msg(ONSCREEN, "");
}
@@ -2375,19 +2360,6 @@ static void _action_point_line_surface_volume(int action, int mode, char *what)
List_T *List1 = List_Create(5, 5, sizeof(int));
while(1) {
- if(action == 10)
- Msg(STATUS2N, "Adding new model edges");
- else if(action == 9)
- Msg(STATUS2N, "Defining surfaces to recombine");
- else if(action == 8)
- Msg(STATUS2N, "Setting characteristic length");
- else if(action == 7)
- Msg(STATUS2N, "Creating physical %s", str);
- else if(action == 6)
- Msg(STATUS2N, "Deleting %s", str);
- else
- Msg(STATUS2N, "Transforming %s", str);
-
if(!List_Nbr(List1))
Msg(ONSCREEN, "Select %s\n"
"[Press 'e' to end selection or 'q' to abort]", str);
@@ -2572,7 +2544,6 @@ static void _action_point_line_surface_volume(int action, int mode, char *what)
List_Delete(List1);
WID->reset_visibility();
- Msg(STATUS2N, "");
Msg(ONSCREEN, "");
}
@@ -2890,21 +2861,21 @@ void mesh_1d_cb(CALLBACK_ARGS)
{
mai3d(1);
Draw();
- Msg(STATUS2N, "");
+ Msg(STATUS2N, " ");
}
void mesh_2d_cb(CALLBACK_ARGS)
{
mai3d(2);
Draw();
- Msg(STATUS2N, "");
+ Msg(STATUS2N, " ");
}
void mesh_3d_cb(CALLBACK_ARGS)
{
mai3d(3);
Draw();
- Msg(STATUS2N, "");
+ Msg(STATUS2N, " ");
}
void mesh_stl_cb(CALLBACK_ARGS)
@@ -2925,7 +2896,7 @@ void mesh_degree_cb(CALLBACK_ARGS)
}
CTX.mesh.changed = 1;
Draw();
- Msg(STATUS2N, "");
+ Msg(STATUS2N, " ");
}
void mesh_optimize_cb(CALLBACK_ARGS)
@@ -2940,14 +2911,14 @@ void mesh_optimize_cb(CALLBACK_ARGS)
CTX.mesh.changed = 1;
Draw();
- Msg(STATUS2N, "");
+ Msg(STATUS2N, " ");
}
void mesh_remesh_cb(CALLBACK_ARGS)
{
ReMesh(THEM);
Draw();
- Msg(STATUS2N, "");
+ Msg(STATUS2N, " ");
}
void mesh_update_edges_cb(CALLBACK_ARGS)
@@ -2999,7 +2970,6 @@ static void _add_transfinite_elliptic(int type, int dim)
n = 0;
while(1) {
- Msg(STATUS2N, "Setting structured mesh contraints");
switch (dim) {
case 1:
if(n == 0)
@@ -3113,7 +3083,6 @@ static void _add_transfinite_elliptic(int type, int dim)
}
stopall:
- Msg(STATUS2N, "");
Msg(ONSCREEN, "");
}
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 8389fa3a1a..b093172867 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.503 2006-08-05 10:05:44 geuzaine Exp $
+// $Id: GUI.cpp,v 1.504 2006-08-06 22:58:48 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -1337,8 +1337,6 @@ int GUI::get_context()
void GUI::create_graphic_window()
{
- int i, x;
-
if(g_window) {
g_window->show();
return;
@@ -1358,7 +1356,7 @@ void GUI::create_graphic_window()
Fl_Box *bottom = new Fl_Box(0, glheight, width, sh);
bottom->box(FL_THIN_UP_BOX);
- x = 2;
+ int x = 2;
g_status_butt[0] = new Fl_Button(x, glheight + 2, sw, sh - 4, "X");
x += sw;
@@ -1421,18 +1419,19 @@ void GUI::create_graphic_window()
stop_bmp = new Fl_Bitmap(stop_bits, stop_width, stop_height);
g_status_butt[7]->deactivate();
- for(i = 0; i < 10; i++) {
+ for(int i = 0; i < 10; i++) {
g_status_butt[i]->box(FL_FLAT_BOX);
g_status_butt[i]->selection_color(FL_WHITE);
g_status_butt[i]->align(FL_ALIGN_CENTER | FL_ALIGN_INSIDE | FL_ALIGN_CLIP);
}
+ x += 2;
g_status_label[0] = new Fl_Box(x, glheight + 2,
- (width - x) / 2, sh - 4);
- g_status_label[1] = new Fl_Box(x + (width - x) / 2, glheight + 2,
- (width - x) / 2, sh - 4);
- for(i = 0; i < 2; i++) {
- g_status_label[i]->box(FL_FLAT_BOX);
+ (width - x) / 3, sh - 4);
+ g_status_label[1] = new Fl_Box(x + (width - x) / 3, glheight + 2,
+ 2 * (width - x - 1) / 3, sh - 4);
+ for(int i = 0; i < 2; i++) {
+ g_status_label[i]->box(FL_THIN_DOWN_BOX);
g_status_label[i]->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE | FL_ALIGN_CLIP);
}
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index 47eb418429..1022dbeb64 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -1,4 +1,4 @@
-// $Id: Main.cpp,v 1.92 2006-08-05 10:05:45 geuzaine Exp $
+// $Id: Main.cpp,v 1.93 2006-08-06 22:58:49 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -165,6 +165,10 @@ int main(int argc, char *argv[])
CTX.batch = 0;
+ // Say welcome!
+
+ Msg(STATUS2N, "Gmsh %s", Get_GmshVersion());
+
// Log the following for bug reports
Msg(INFO, "-------------------------------------------------------");
@@ -231,10 +235,6 @@ int main(int argc, char *argv[])
Msg(GERROR, "Invalid background mesh (no view)");
}
- // Say welcome!
-
- Msg(STATUS2N, "Gmsh %s", Get_GmshVersion());
-
// Draw the actual scene
Draw();
diff --git a/Fltk/Message.cpp b/Fltk/Message.cpp
index 92445f7a4e..b86fdce7cc 100644
--- a/Fltk/Message.cpp
+++ b/Fltk/Message.cpp
@@ -1,4 +1,4 @@
-// $Id: Message.cpp,v 1.74 2006-08-05 10:05:45 geuzaine Exp $
+// $Id: Message.cpp,v 1.75 2006-08-06 22:58:49 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -139,7 +139,7 @@ void Msg(int level, char *fmt, ...)
level != DEBUG2 &&
level != DEBUG3 &&
level != STATUS1N &&
- level != STATUS1N){
+ level != STATUS2N){
WID->check();
}
}
diff --git a/Geo/GEdge.h b/Geo/GEdge.h
index e7d87cf53f..8e242869dd 100644
--- a/Geo/GEdge.h
+++ b/Geo/GEdge.h
@@ -11,6 +11,10 @@
// A model edge.
class GEdge : public GEntity {
+ protected:
+ GVertex *v0, *v1;
+ std::list<GFace *> l_faces;
+
public:
GEdge(GModel *model,
int tag,
@@ -44,8 +48,8 @@ class GEdge : public GEntity {
void addFace(GFace *f);
void delFace(GFace *f);
- GVertex * getBeginVertex () const { return v0; }
- GVertex * getEndVertex () const { return v1; }
+ GVertex *getBeginVertex () const { return v0; }
+ GVertex *getEndVertex () const { return v1; }
struct {
char Method;
@@ -59,18 +63,12 @@ class GEdge : public GEntity {
virtual int minimumMeshSegments () const {return 1;}
virtual int minimumDrawSegments () const {return 1;}
- virtual std::string getSpecificInfoString()
+ virtual std::string getAdditionalInfoString()
{
char tmp[256];
sprintf(tmp, "{%d,%d}", v0->tag(), v1->tag());
return std::string(tmp);
}
-
- protected:
-
- GVertex *v0,*v1;
- std::list<GFace *> l_faces;
-
};
#endif
diff --git a/Geo/GEntity.h b/Geo/GEntity.h
index 681b47197e..c811ce0410 100644
--- a/Geo/GEntity.h
+++ b/Geo/GEntity.h
@@ -74,34 +74,6 @@ class GEntity {
return name[type];
}
- virtual std::string getSpecificInfoString()
- {
- return "";
- }
-
- virtual std::string getInfoString()
- {
- char str[256];
- sprintf(str, "%s %d", getTypeString().c_str(), tag());
- std::string specific = getSpecificInfoString();
- if(specific.size()){
- strcat(str, " ");
- strcat(str, specific.c_str());
- }
- if(physicals.size()){
- char str2[256] = " [";
- for(unsigned int i = 0; i < physicals.size(); i++){
- char str3[256];
- sprintf(str3, "%d", physicals[i]);
- if(i) strcat(str2, " ");
- strcat(str2, str3);
- }
- strcat(str2, "]");
- strcat(str, str2);
- }
- return std::string(str);
- }
-
GEntity(GModel *m, int t) : _model(m), _tag(t)
{
drawAttributes.Visible = VIS_GEOM | VIS_MESH;
@@ -177,6 +149,33 @@ class GEntity {
// Returns a renderable representation of the mesh
virtual MRep *meshRep(){ return _mesh; }
+
+ // Returns an information string for the entity
+ virtual std::string getInfoString()
+ {
+ char str[256];
+ sprintf(str, "%s %d", getTypeString().c_str(), tag());
+ std::string info = getAdditionalInfoString();
+ if(info.size()){
+ strcat(str, " ");
+ strcat(str, info.c_str());
+ }
+ if(physicals.size()){
+ char str2[256] = " [";
+ for(unsigned int i = 0; i < physicals.size(); i++){
+ char str3[256];
+ sprintf(str3, "%d", physicals[i]);
+ if(i) strcat(str2, " ");
+ strcat(str2, str3);
+ }
+ strcat(str2, "]");
+ strcat(str, str2);
+ }
+ return std::string(str);
+ }
+
+ // Returns a type-specific additional information string
+ virtual std::string getAdditionalInfoString() { return std::string(""); }
};
// A minimal, non-abstract entity that can be used for sorting
diff --git a/Geo/GFace.cpp b/Geo/GFace.cpp
index f33fd87a0a..1073024d7e 100644
--- a/Geo/GFace.cpp
+++ b/Geo/GFace.cpp
@@ -30,9 +30,9 @@ std::list<GVertex*> GFace::vertices() const
while (it != l_edges.end()){
GVertex *v1 = (*it)->getBeginVertex();
GVertex *v2 = (*it)->getEndVertex();
- if(std::find (ret.begin(),ret.end(),v1) == ret.end())
+ if(std::find(ret.begin(), ret.end(), v1) == ret.end())
ret.push_back(v1);
- if(std::find (ret.begin(),ret.end(),v2) == ret.end())
+ if(std::find(ret.begin(), ret.end(), v2) == ret.end())
ret.push_back(v2);
++it;
}
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 8edfab243b..5b891496c7 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -58,3 +58,60 @@ GVertex * GModel::vertexByTag(int n) const
else
return 0;
}
+
+int GModel::renumberMeshVertices()
+{
+ int numVertices = 0;
+ for(viter it = firstVertex(); it != lastVertex(); ++it)
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ (*it)->mesh_vertices[i]->setNum(++numVertices);
+ for(GModel::eiter it = firstEdge(); it != lastEdge(); ++it)
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ (*it)->mesh_vertices[i]->setNum(++numVertices);
+ for(GModel::fiter it = firstFace(); it != lastFace(); ++it)
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ (*it)->mesh_vertices[i]->setNum(++numVertices);
+ for(GModel::riter it = firstRegion(); it != lastRegion(); ++it)
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ (*it)->mesh_vertices[i]->setNum(++numVertices);
+ return numVertices;
+}
+
+bool GModel::noPhysicals()
+{
+ bool somePhysicals = false;
+ for(viter it = firstVertex(); it != lastVertex(); ++it)
+ if((*it)->physicals.size()){ somePhysicals = true; break; }
+ if(!somePhysicals)
+ for(eiter it = firstEdge(); it != lastEdge(); ++it)
+ if((*it)->physicals.size()){ somePhysicals = true; break; }
+ if(!somePhysicals)
+ for(fiter it = firstFace(); it != lastFace(); ++it)
+ if((*it)->physicals.size()){ somePhysicals = true; break; }
+ if(!somePhysicals)
+ for(riter it = firstRegion(); it != lastRegion(); ++it)
+ if((*it)->physicals.size()){ somePhysicals = true; break; }
+
+ return !somePhysicals;
+}
+
+static void addInGroup(GEntity* ge, std::map<int, std::vector<GEntity*> > &group)
+{
+ for(unsigned int i = 0; i < ge->physicals.size(); i++){
+ int p = ge->physicals[i];
+ if(std::find(group[p].begin(), group[p].end(), ge) == group[p].end())
+ group[p].push_back(ge);
+ }
+}
+
+void GModel::getPhysicalGroups(std::map<int, std::vector<GEntity*> > groups[4])
+{
+ for(viter it = firstVertex(); it != lastVertex(); ++it)
+ addInGroup(*it, groups[0]);
+ for(eiter it = firstEdge(); it != lastEdge(); ++it)
+ addInGroup(*it, groups[1]);
+ for(fiter it = firstFace(); it != lastFace(); ++it)
+ addInGroup(*it, groups[2]);
+ for(riter it = firstRegion(); it != lastRegion(); ++it)
+ addInGroup(*it, groups[3]);
+}
diff --git a/Geo/GModel.h b/Geo/GModel.h
index 77d30989b9..1d98c17bcd 100644
--- a/Geo/GModel.h
+++ b/Geo/GModel.h
@@ -56,11 +56,23 @@ public:
void remove(GEdge *e){edges.erase(std::find(firstEdge(),lastEdge(),e));}
void remove(GVertex *v){vertices.erase(std::find(firstVertex(),lastVertex(),v));}
+ // Renumber all the mesh vertices in a continuous sequence
+ int renumberMeshVertices();
+
+ // Checks if there are no physical entities in the model
+ bool noPhysicals();
+
+ // Returns all physical groups (one map per dimension: 0-D to 3-D)
+ void getPhysicalGroups(std::map<int, std::vector<GEntity*> > groups[4]);
+
// IO routines
int readMSH(const std::string &name);
int writeMSH(const std::string &name, double version=1.0, bool saveAll=false,
double scalingFactor=1.0);
- int writePOS(const std::string &name);
+ int writePOS(const std::string &name, double scalingFactor=1.0);
+ int writeSTL(const std::string &name, double scalingFactor=1.0);
+ int writeVRML(const std::string &name, double scalingFactor=1.0);
+ int writeUNV(const std::string &name, double scalingFactor=1.0);
protected:
std::string modelName;
diff --git a/Geo/GModelIO.cpp b/Geo/GModelIO.cpp
index 09f0509a2d..9ba813951a 100644
--- a/Geo/GModelIO.cpp
+++ b/Geo/GModelIO.cpp
@@ -8,7 +8,7 @@
#include "gmshEdge.h"
#include "MElement.h"
-static int getNumVerticesForElementType(int type)
+static int getNumVerticesForElementTypeMSH(int type)
{
switch (type) {
case PNT : return 1;
@@ -176,7 +176,7 @@ int GModel::readMSH(const std::string &name)
int num, type, physical = 1, elementary = 1, partition = 1, numVertices;
if(version <= 1.0){
fscanf(fp, "%d %d %d %d %d", &num, &type, &physical, &elementary, &numVertices);
- int check = getNumVerticesForElementType(type);
+ int check = getNumVerticesForElementTypeMSH(type);
if(!check){
Msg(GERROR, "Unknown type for element %d", num);
continue;
@@ -197,7 +197,7 @@ int GModel::readMSH(const std::string &name)
else if(j == 2) partition = tag;
// ignore any other tags for now
}
- numVertices = getNumVerticesForElementType(type);
+ numVertices = getNumVerticesForElementTypeMSH(type);
if(!numVertices){
Msg(GERROR, "Unknown type (%d) for element %d", type, num);
continue;
@@ -341,39 +341,6 @@ int GModel::readMSH(const std::string &name)
return 1;
}
-static void numVerticesAndElementsInModel(GModel *m, bool saveAll,
- int &numVertices, int &numElements)
-{
- // get the number of vertices and elements in the msh file and
- // renumber the nodes in a continuous sequence
- numVertices = numElements = 0;
- for(GModel::viter it = m->firstVertex(); it != m->lastVertex(); ++it){
- int n = (*it)->mesh_vertices.size();
- numElements += (saveAll ? 1 : (*it)->physicals.size()) * n;
- for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
- (*it)->mesh_vertices[i]->setNum(++numVertices);
- }
- for(GModel::eiter it = m->firstEdge(); it != m->lastEdge(); ++it){
- int n = (*it)->lines.size();
- numElements += (saveAll ? 1 : (*it)->physicals.size()) * n;
- for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
- (*it)->mesh_vertices[i]->setNum(++numVertices);
- }
- for(GModel::fiter it = m->firstFace(); it != m->lastFace(); ++it){
- int n = (*it)->triangles.size() + (*it)->quadrangles.size();
- numElements += (saveAll ? 1 : (*it)->physicals.size()) * n;
- for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
- (*it)->mesh_vertices[i]->setNum(++numVertices);
- }
- for(GModel::riter it = m->firstRegion(); it != m->lastRegion(); ++it){
- int n = (*it)->tetrahedra.size() + (*it)->hexahedra.size() +
- (*it)->prisms.size() + (*it)->pyramids.size();
- numElements += (saveAll ? 1 : (*it)->physicals.size()) * n;
- for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
- (*it)->mesh_vertices[i]->setNum(++numVertices);
- }
-}
-
template<class T>
static void writeElementsMSH(FILE *fp, const std::vector<T*> &ele, int saveAll,
double version, int &num, int elementary,
@@ -396,6 +363,29 @@ int GModel::writeMSH(const std::string &name, double version, bool saveAll,
return 0;
}
+ // if there are no physicals we save all the elements
+ if(noPhysicals()) saveAll = true;
+
+ // get the number of vertices and renumber the vertices in a
+ // continuous sequence
+ int numVertices = renumberMeshVertices();
+
+ // get the number of elements
+ int numElements = 0;
+ for(viter it = firstVertex(); it != lastVertex(); ++it)
+ numElements += (saveAll ? 1 : (*it)->physicals.size()) *
+ (*it)->mesh_vertices.size();
+ for(eiter it = firstEdge(); it != lastEdge(); ++it)
+ numElements += (saveAll ? 1 : (*it)->physicals.size()) *
+ (*it)->lines.size();
+ for(fiter it = firstFace(); it != lastFace(); ++it)
+ numElements += (saveAll ? 1 : (*it)->physicals.size()) *
+ ((*it)->triangles.size() + (*it)->quadrangles.size());
+ for(riter it = firstRegion(); it != lastRegion(); ++it)
+ numElements += (saveAll ? 1 : (*it)->physicals.size()) *
+ ((*it)->tetrahedra.size() + (*it)->hexahedra.size() +
+ (*it)->prisms.size() + (*it)->pyramids.size());
+
if(version > 2.0){
fprintf(fp, "$MeshFormat\n");
fprintf(fp, "%g %d %d\n", version, 0, (int)sizeof(double));
@@ -404,10 +394,7 @@ int GModel::writeMSH(const std::string &name, double version, bool saveAll,
}
else
fprintf(fp, "$NOD\n");
-
- int numVertices, numElements;
- numVerticesAndElementsInModel(this, saveAll, numVertices, numElements);
-
+
fprintf(fp, "%d\n", numVertices);
for(viter it = firstVertex(); it != lastVertex(); ++it)
for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
@@ -469,7 +456,7 @@ int GModel::writeMSH(const std::string &name, double version, bool saveAll,
return 1;
}
-int GModel::writePOS(const std::string &name)
+int GModel::writePOS(const std::string &name, double scalingFactor)
{
FILE *fp = fopen(name.c_str(), "w");
if(!fp){
@@ -483,13 +470,13 @@ int GModel::writePOS(const std::string &name)
"\"Gamma\", \"Eta\", \"Rho\"};\n", (1<<16)|(4<<8));
for(riter it = firstRegion(); it != lastRegion(); ++it) {
for(unsigned int i = 0; i < (*it)->tetrahedra.size(); i++)
- (*it)->tetrahedra[i]->writePOS(fp);
+ (*it)->tetrahedra[i]->writePOS(fp, scalingFactor);
for(unsigned int i = 0; i < (*it)->hexahedra.size(); i++)
- (*it)->hexahedra[i]->writePOS(fp);
+ (*it)->hexahedra[i]->writePOS(fp, scalingFactor);
for(unsigned int i = 0; i < (*it)->prisms.size(); i++)
- (*it)->prisms[i]->writePOS(fp);
+ (*it)->prisms[i]->writePOS(fp, scalingFactor);
for(unsigned int i = 0; i < (*it)->pyramids.size(); i++)
- (*it)->pyramids[i]->writePOS(fp);
+ (*it)->pyramids[i]->writePOS(fp, scalingFactor);
}
fprintf(fp, "};\n");
}
@@ -500,9 +487,9 @@ int GModel::writePOS(const std::string &name)
"\"Gamma\", \"Eta\", \"Rho\"};\n", (1<<16)|(4<<8));
for(fiter it = firstFace(); it != lastFace(); ++it) {
for(unsigned int i = 0; i < (*it)->triangles.size(); i++)
- (*it)->triangles[i]->writePOS(fp);
+ (*it)->triangles[i]->writePOS(fp, scalingFactor);
for(unsigned int i = 0; i < (*it)->quadrangles.size(); i++)
- (*it)->quadrangles[i]->writePOS(fp);
+ (*it)->quadrangles[i]->writePOS(fp, scalingFactor);
}
fprintf(fp, "};\n");
}
@@ -513,7 +500,7 @@ int GModel::writePOS(const std::string &name)
"\"Gamma\", \"Eta\", \"Rho\"};\n", (1<<16)|(4<<8));
for(eiter it = firstEdge(); it != lastEdge(); ++it) {
for(unsigned int i = 0; i < (*it)->lines.size(); i++)
- (*it)->lines[i]->writePOS(fp);
+ (*it)->lines[i]->writePOS(fp, scalingFactor);
}
fprintf(fp, "};\n");
}
@@ -521,3 +508,199 @@ int GModel::writePOS(const std::string &name)
fclose(fp);
return 1;
}
+
+int GModel::writeSTL(const std::string &name, double scalingFactor)
+{
+ FILE *fp = fopen(name.c_str(), "w");
+ if(!fp){
+ Msg(GERROR, "Unable to open file '%s'", name.c_str());
+ return 0;
+ }
+
+ fprintf(fp, "solid Created by Gmsh\n");
+ for(fiter it = firstFace(); it != lastFace(); ++it) {
+ for(unsigned int i = 0; i < (*it)->triangles.size(); i++)
+ (*it)->triangles[i]->writeSTL(fp, scalingFactor);
+ for(unsigned int i = 0; i < (*it)->quadrangles.size(); i++)
+ (*it)->quadrangles[i]->writeSTL(fp, scalingFactor);
+ }
+ fprintf(fp, "endsolid Created by Gmsh\n");
+
+ fclose(fp);
+ return 1;
+}
+
+int GModel::writeVRML(const std::string &name, double scalingFactor)
+{
+ FILE *fp = fopen(name.c_str(), "w");
+ if(!fp){
+ Msg(GERROR, "Unable to open file '%s'", name.c_str());
+ return 0;
+ }
+
+ renumberMeshVertices();
+
+ fprintf(fp, "#VRML V1.0 ascii\n");
+ fprintf(fp, "#created by Gmsh\n");
+ fprintf(fp, "Coordinate3 {\n");
+ fprintf(fp, " point [\n");
+
+ for(viter it = firstVertex(); it != lastVertex(); ++it)
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ (*it)->mesh_vertices[i]->writeVRML(fp, scalingFactor);
+ for(eiter it = firstEdge(); it != lastEdge(); ++it)
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ (*it)->mesh_vertices[i]->writeVRML(fp, scalingFactor);
+ for(fiter it = firstFace(); it != lastFace(); ++it)
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ (*it)->mesh_vertices[i]->writeVRML(fp, scalingFactor);
+
+ fprintf(fp, " ]\n");
+ fprintf(fp, "}\n");
+
+ for(eiter it = firstEdge(); it != lastEdge(); ++it){
+ fprintf(fp, "DEF Curve%d IndexedLineSet {\n", (*it)->tag());
+ fprintf(fp, " coordIndex [\n");
+ for(unsigned int i = 0; i < (*it)->lines.size(); i++)
+ (*it)->lines[i]->writeVRML(fp);
+ fprintf(fp, " ]\n");
+ fprintf(fp, "}\n");
+ }
+
+ for(fiter it = firstFace(); it != lastFace(); ++it){
+ fprintf(fp, "DEF Surface%d IndexedFaceSet {\n", (*it)->tag());
+ fprintf(fp, " coordIndex [\n");
+ for(unsigned int i = 0; i < (*it)->triangles.size(); i++)
+ (*it)->triangles[i]->writeVRML(fp);
+ for(unsigned int i = 0; i < (*it)->quadrangles.size(); i++)
+ (*it)->quadrangles[i]->writeVRML(fp);
+ fprintf(fp, " ]\n");
+ fprintf(fp, "}\n");
+ }
+
+ fclose(fp);
+ return 1;
+}
+
+static void addInGroupOfNodesUNV(FILE *fp, std::set<int> &nodes, int num)
+{
+ std::set<int>::iterator it = nodes.find(num);
+ if(it == nodes.end()){
+ nodes.insert(num);
+ fprintf(fp, "%10d%10d%2d%2d%2d%2d%2d%2d\n", num, 1, 0, 1, 0, 0, 0, 0);
+ fprintf(fp, " 0.0000000000000000D+00 1.0000000000000000D+00"
+ " 0.0000000000000000D+00\n");
+ fprintf(fp, " 0.0000000000000000D+00 0.0000000000000000D+00"
+ " 0.0000000000000000D+00\n");
+ fprintf(fp, "%10d%10d%10d%10d%10d%10d\n", 0, 0, 0, 0, 0, 0);
+ }
+}
+
+template<class T>
+static void addInGroupOfNodesUNV(FILE *fp, std::set<int> &nodes,
+ std::vector<T*> &elements)
+{
+ for(unsigned int i = 0; i < elements.size(); i++)
+ for(int j = 0; j < elements[i]->getNumVertices(); j++)
+ addInGroupOfNodesUNV(fp, nodes, elements[i]->getVertex(j)->getNum());
+}
+
+int GModel::writeUNV(const std::string &name, double scalingFactor)
+{
+ FILE *fp = fopen(name.c_str(), "w");
+ if(!fp){
+ Msg(GERROR, "Unable to open file '%s'", name.c_str());
+ return 0;
+ }
+
+ // IDEAS records
+ const int NODES=2411, ELEMENTS=2412, GROUPOFNODES=790;
+
+ // IDEAS elements
+ const int BEAM=21, THINSHLL=91, QUAD=94, SOLIDFEM=111, WEDGE=112, BRICK=115;
+ //const int BEAM2=24, THINSHLL2=92, QUAD2=95/*?*/, SOLIDFEM2=118;
+
+ renumberMeshVertices();
+
+ fprintf(fp, "%6d\n", -1);
+ fprintf(fp, "%6d\n", NODES);
+ for(viter it = firstVertex(); it != lastVertex(); ++it)
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ (*it)->mesh_vertices[i]->writeUNV(fp, scalingFactor);
+ for(eiter it = firstEdge(); it != lastEdge(); ++it)
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ (*it)->mesh_vertices[i]->writeUNV(fp, scalingFactor);
+ for(fiter it = firstFace(); it != lastFace(); ++it)
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ (*it)->mesh_vertices[i]->writeUNV(fp, scalingFactor);
+ for(riter it = firstRegion(); it != lastRegion(); ++it)
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ (*it)->mesh_vertices[i]->writeUNV(fp, scalingFactor);
+ fprintf(fp, "%6d\n", -1);
+
+ fprintf(fp, "%6d\n", -1);
+ fprintf(fp, "%6d\n", ELEMENTS);
+ for(eiter it = firstEdge(); it != lastEdge(); ++it){
+ for(unsigned int i = 0; i < (*it)->lines.size(); i++)
+ (*it)->lines[i]->writeUNV(fp, BEAM, (*it)->tag());
+ }
+ for(fiter it = firstFace(); it != lastFace(); ++it){
+ for(unsigned int i = 0; i < (*it)->triangles.size(); i++)
+ (*it)->triangles[i]->writeUNV(fp, THINSHLL, (*it)->tag());
+ for(unsigned int i = 0; i < (*it)->quadrangles.size(); i++)
+ (*it)->quadrangles[i]->writeUNV(fp, QUAD, (*it)->tag());
+ }
+ for(riter it = firstRegion(); it != lastRegion(); ++it){
+ for(unsigned int i = 0; i < (*it)->tetrahedra.size(); i++)
+ (*it)->tetrahedra[i]->writeUNV(fp, SOLIDFEM, (*it)->tag());
+ for(unsigned int i = 0; i < (*it)->hexahedra.size(); i++)
+ (*it)->hexahedra[i]->writeUNV(fp, BRICK, (*it)->tag());
+ for(unsigned int i = 0; i < (*it)->prisms.size(); i++)
+ (*it)->prisms[i]->writeUNV(fp, WEDGE, (*it)->tag());
+ }
+ fprintf(fp, "%6d\n", -1);
+
+ std::map<int, std::vector<GEntity*> > physicals[4];
+ getPhysicalGroups(physicals);
+
+ for(int dim = 0; dim < 4; dim++){
+ std::map<int, std::vector<GEntity*> >::const_iterator it = physicals[dim].begin();
+ std::map<int, std::vector<GEntity*> >::const_iterator ite = physicals[dim].end();
+ for(; it != ite; ++it){
+ fprintf(fp, "%6d\n", -1);
+ fprintf(fp, "%6d\n", GROUPOFNODES);
+ fprintf(fp, "%10d%10d\n", it->first, 1);
+ fprintf(fp, "LOAD SET %2d\n", 1);
+ std::set<int> nodes;
+ for(unsigned int i = 0; i < it->second.size(); i++){
+ // we could also do this using the mesh_vertices of the entity
+ // and all the entities in the closure
+ GVertex *v;
+ switch(dim){
+ case 0:
+ v = (GVertex*)it->second[i];
+ for(unsigned int j = 0; j < v->mesh_vertices.size(); j++)
+ addInGroupOfNodesUNV(fp, nodes, v->mesh_vertices[j]->getNum());
+ break;
+ case 1:
+ addInGroupOfNodesUNV(fp, nodes, ((GEdge*)it->second[i])->lines);
+ break;
+ case 2:
+ addInGroupOfNodesUNV(fp, nodes, ((GFace*)it->second[i])->triangles);
+ addInGroupOfNodesUNV(fp, nodes, ((GFace*)it->second[i])->quadrangles);
+ break;
+ case 3:
+ addInGroupOfNodesUNV(fp, nodes, ((GRegion*)it->second[i])->tetrahedra);
+ addInGroupOfNodesUNV(fp, nodes, ((GRegion*)it->second[i])->hexahedra);
+ addInGroupOfNodesUNV(fp, nodes, ((GRegion*)it->second[i])->prisms);
+ addInGroupOfNodesUNV(fp, nodes, ((GRegion*)it->second[i])->pyramids);
+ break;
+ }
+ }
+ fprintf(fp, "%6d\n", -1);
+ }
+ }
+
+ fclose(fp);
+ return 1;
+}
diff --git a/Geo/GVertex.cpp b/Geo/GVertex.cpp
index aa6526e6d1..80f878273c 100644
--- a/Geo/GVertex.cpp
+++ b/Geo/GVertex.cpp
@@ -1,10 +1,12 @@
#include "GVertex.h"
#include <algorithm>
-void GVertex::addEdge ( GEdge *e )
+
+void GVertex::addEdge(GEdge *e)
{
- l_edges.push_back (e);
+ l_edges.push_back(e);
}
-void GVertex::delEdge ( GEdge *e )
+
+void GVertex::delEdge(GEdge *e)
{
- l_edges.erase(std::find(l_edges.begin(),l_edges.end(),e));
+ l_edges.erase(std::find(l_edges.begin(), l_edges.end(), e));
}
diff --git a/Geo/GVertex.h b/Geo/GVertex.h
index 1d53a12ee2..80d8787554 100644
--- a/Geo/GVertex.h
+++ b/Geo/GVertex.h
@@ -26,11 +26,18 @@ public:
virtual int dim() const {return 0;}
virtual GeomType geomType() const {return Point;}
virtual double prescribedMeshSizeAtVertex() const {return 0;}
- virtual std::string getSpecificInfoString()
+ virtual std::string getAdditionalInfoString()
{
- char tmp[256];
- sprintf(tmp, "{%g,%g,%g}", x(), y(), z());
- return std::string(tmp);
+ char str[256];
+ sprintf(str, "{%g,%g,%g", x(), y(), z());
+ double lc = prescribedMeshSizeAtVertex();
+ if(lc > 0.){
+ char str2[256];
+ sprintf(str2, ",%g", lc);
+ strcat(str, str2);
+ }
+ strcat(str, "}");
+ return std::string(str);
}
protected:
diff --git a/Geo/MElement.cpp b/Geo/MElement.cpp
index 94e630fac9..dca8bb17c5 100644
--- a/Geo/MElement.cpp
+++ b/Geo/MElement.cpp
@@ -1,6 +1,7 @@
#include <math.h>
#include "MElement.h"
#include "GEntity.h"
+#include "Numeric.h"
int MElement::_globalNum = 0;
@@ -63,19 +64,41 @@ void MElement::writeMSH(FILE *fp, double version, int num, int elementary,
int physical)
{
int n = getNumVertices();
+ int type = getTypeForMSH();
- fprintf(fp, "%d %d", num ? num : _num, getTypeForMSH());
+ // if necessary, change the ordering of the vertices to get positive
+ // volume
+ setVolumePositive();
+
+ fprintf(fp, "%d %d", num ? num : _num, type);
if(version < 2.0)
fprintf(fp, " %d %d %d", physical, elementary, n);
else
fprintf(fp, " 3 %d %d %d", physical, elementary, _partition);
- for(int i = 0; i < n; i++){
- fprintf(fp, " %d", getVertex(i)->getNum());
+
+ if(physical >= 0){
+ for(int i = 0; i < n; i++)
+ fprintf(fp, " %d", getVertex(i)->getNum());
+ }
+ else{
+ int nn = n - getNumEdgeVertices() - getNumFaceVertices() - getNumVolumeVertices();
+ for(int i = 0; i < nn; i++)
+ fprintf(fp, " %d", getVertex(nn - i - 1)->getNum());
+ int ne = getNumEdgeVertices();
+ for(int i = 0; i < ne; i++)
+ fprintf(fp, " %d", getVertex(nn + ne - i - 1)->getNum());
+ int nf = getNumFaceVertices();
+ for(int i = 0; i < nf; i++)
+ fprintf(fp, " %d", getVertex(nn + ne + nf - i - 1)->getNum());
+ int nv = getNumVolumeVertices();
+ for(int i = 0; i < nv; i++)
+ fprintf(fp, " %d", getVertex(n - i - 1)->getNum());
}
+
fprintf(fp, " \n");
}
-void MElement::writePOS(FILE *fp)
+void MElement::writePOS(FILE *fp, double scalingFactor)
{
int n = getNumVertices();
double gamma = gammaShapeMeasure();
@@ -85,7 +108,8 @@ void MElement::writePOS(FILE *fp)
fprintf(fp, "%s(", getStringForPOS());
for(int i = 0; i < n; i++){
if(i) fprintf(fp, ",");
- fprintf(fp, "%g,%g,%g", getVertex(i)->x(), getVertex(i)->y(), getVertex(i)->z());
+ fprintf(fp, "%g,%g,%g", getVertex(i)->x() * scalingFactor,
+ getVertex(i)->y() * scalingFactor, getVertex(i)->z() * scalingFactor);
}
fprintf(fp, "){");
for(int i = 0; i < n; i++)
@@ -105,3 +129,66 @@ void MElement::writePOS(FILE *fp)
fprintf(fp, "};\n");
}
+void MElement::writeSTL(FILE *fp, double scalingFactor)
+{
+ int n = getNumVertices();
+ if(n < 3 || n > 4) return;
+
+ MVertex *v0 = getVertex(0);
+ MVertex *v1 = getVertex(1);
+ MVertex *v2 = getVertex(2);
+ double N[3];
+ normal3points(v0->x(), v0->y(), v0->z(),
+ v1->x(), v1->y(), v1->z(),
+ v2->x(), v2->y(), v2->z(), N);
+ fprintf(fp, "facet normal %g %g %g\n", N[0], N[1], N[2]);
+ fprintf(fp, " outer loop\n");
+ fprintf(fp, " vertex %g %g %g\n", v0->x() * scalingFactor,
+ v0->y() * scalingFactor, v0->z() * scalingFactor);
+ fprintf(fp, " vertex %g %g %g\n", v1->x() * scalingFactor,
+ v1->y() * scalingFactor, v1->z() * scalingFactor);
+ fprintf(fp, " vertex %g %g %g\n", v2->x() * scalingFactor,
+ v2->y() * scalingFactor, v2->z() * scalingFactor);
+ fprintf(fp, " endloop\n");
+ fprintf(fp, "endfacet\n");
+ if(n == 4){
+ MVertex *v3 = getVertex(3);
+ fprintf(fp, "facet normal %g %g %g\n", N[0], N[1], N[2]);
+ fprintf(fp, " outer loop\n");
+ fprintf(fp, " vertex %g %g %g\n", v0->x() * scalingFactor,
+ v0->y() * scalingFactor, v0->z() * scalingFactor);
+ fprintf(fp, " vertex %g %g %g\n", v2->x() * scalingFactor,
+ v2->y() * scalingFactor, v2->z() * scalingFactor);
+ fprintf(fp, " vertex %g %g %g\n", v3->x() * scalingFactor,
+ v3->y() * scalingFactor, v3->z() * scalingFactor);
+ fprintf(fp, " endloop\n");
+ fprintf(fp, "endfacet\n");
+ }
+}
+
+void MElement::writeVRML(FILE *fp)
+{
+ for(int i = 0; i < getNumVertices(); i++)
+ fprintf(fp, "%d,", getVertex(i)->getNum() - 1);
+ fprintf(fp, "-1,\n");
+}
+
+void MElement::writeUNV(FILE *fp, int type, int elementary)
+{
+ // if necessary, change the ordering of the vertices to get positive
+ // volume
+ setVolumePositive();
+
+ int n = getNumVertices();
+ fprintf(fp, "%10d%10d%10d%10d%10d%10d\n",
+ _num, type, elementary, elementary, 7, n);
+ if(type == 21 || type == 24) // BEAM or BEAM2
+ fprintf(fp, "%10d%10d%10d\n", 0, 0, 0);
+ for(int k = 0; k < n; k++) {
+ fprintf(fp, "%10d", getVertex(k)->getNum());
+ if(k % 8 == 7)
+ fprintf(fp, "\n");
+ }
+ if(n - 1 % 8 != 7)
+ fprintf(fp, "\n");
+}
diff --git a/Geo/MElement.h b/Geo/MElement.h
index e287e6d9ba..e464bb8185 100644
--- a/Geo/MElement.h
+++ b/Geo/MElement.h
@@ -5,6 +5,7 @@
#include <algorithm>
#include "GmshDefines.h"
#include "MVertex.h"
+#include "Numeric.h"
// the reference topology is defined in Mesh/{Edge,Face}.cpp
extern int edges_tetra[6][2];
@@ -57,6 +58,12 @@ class MElement
virtual int getNumVertices() = 0;
virtual MVertex *getVertex(int num) = 0;
+ // get the number of vertices associated with edges, faces and
+ // volumes (nonzero only for higher order elements)
+ virtual int getNumEdgeVertices(){ return 0; }
+ virtual int getNumFaceVertices(){ return 0; }
+ virtual int getNumVolumeVertices(){ return 0; }
+
// get the edges
virtual int getNumEdges() = 0;
virtual void getEdge(int num, MVertex *v[2]) = 0;
@@ -85,10 +92,18 @@ class MElement
// computes the barycenter
virtual void cog(double &x, double &y, double &z);
+ // compute and change the orientation of 3D elements to get
+ // positive volume
+ virtual int getVolumeSign(){ return 1; }
+ virtual void setVolumePositive(){}
+
// IO routines
virtual void writeMSH(FILE *fp, double version=1.0, int num=0,
int elementary=1, int physical=1);
- virtual void writePOS(FILE *fp);
+ virtual void writePOS(FILE *fp, double scalingFactor=1.0);
+ virtual void writeSTL(FILE *fp, double scalingFactor=1.0);
+ virtual void writeVRML(FILE *fp);
+ virtual void writeUNV(FILE *fp, int type, int elementary);
virtual char *getStringForPOS() = 0;
virtual int getTypeForMSH() = 0;
};
@@ -131,6 +146,7 @@ class MLine2 : public MLine {
~MLine2(){}
inline int getNumVertices(){ return 3; }
inline MVertex *getVertex(int num){ return num < 2 ? _v[num] : _vs[num - 2]; }
+ inline int getNumEdgeVertices(){ return 1; }
int getNumEdgesRep(){ return 2; }
void getEdgeRep(int num, MVertex *v[2])
{
@@ -187,6 +203,7 @@ class MTriangle2 : public MTriangle {
~MTriangle2(){}
inline int getNumVertices(){ return 6; }
inline MVertex *getVertex(int num){ return num < 3 ? _v[num] : _vs[num - 3]; }
+ inline int getNumEdgeVertices(){ return 3; }
int getNumEdgesRep(){ return 6; }
void getEdgeRep(int num, MVertex *v[2])
{
@@ -240,8 +257,8 @@ class MQuadrangle : public MElement {
v[0] = _v[edges_quad[num][0]];
v[1] = _v[edges_quad[num][1]];
}
- int getNumFaces(){ return 1; }
- void getFace(int num, MVertex *v[4])
+ virtual int getNumFaces(){ return 1; }
+ virtual void getFace(int num, MVertex *v[4])
{
v[0] = _v[0]; v[1] = _v[1]; v[2] = _v[2]; v[3] = _v[3];
}
@@ -263,6 +280,8 @@ class MQuadrangle2 : public MQuadrangle {
~MQuadrangle2(){}
inline int getNumVertices(){ return 9; }
inline MVertex *getVertex(int num){ return num < 4 ? _v[num] : _vs[num - 4]; }
+ inline int getNumEdgeVertices(){ return 4; }
+ inline int getNumFaceVertices(){ return 1; }
int getTypeForMSH(){ return QUA2; }
char *getStringForPOS(){ return "SQ2"; }
};
@@ -286,8 +305,8 @@ class MTetrahedron : public MElement {
v[0] = _v[edges_tetra[num][0]];
v[1] = _v[edges_tetra[num][1]];
}
- int getNumFaces(){ return 4; }
- void getFace(int num, MVertex *v[4])
+ virtual int getNumFaces(){ return 4; }
+ virtual void getFace(int num, MVertex *v[4])
{
v[0] = _v[trifaces_tetra[num][0]];
v[1] = _v[trifaces_tetra[num][1]];
@@ -296,8 +315,40 @@ class MTetrahedron : public MElement {
}
int getTypeForMSH(){ return TET1; }
char *getStringForPOS(){ return "SS"; }
+ virtual int getVolumeSign()
+ {
+ double mat[3][3];
+ mat[0][0] = _v[1]->x() - _v[0]->x();
+ mat[0][1] = _v[2]->x() - _v[0]->x();
+ mat[0][2] = _v[3]->x() - _v[0]->x();
+ mat[1][0] = _v[1]->y() - _v[0]->y();
+ mat[1][1] = _v[2]->y() - _v[0]->y();
+ mat[1][2] = _v[3]->y() - _v[0]->y();
+ mat[2][0] = _v[1]->z() - _v[0]->z();
+ mat[2][1] = _v[2]->z() - _v[0]->z();
+ mat[2][2] = _v[3]->z() - _v[0]->z();
+ return sign(det3x3(mat));
+ }
+ void setVolumePositive()
+ {
+ if(getVolumeSign() < 0){
+ MVertex *tmp;
+ tmp = _v[0]; _v[0] = _v[1]; _v[1] = tmp;
+ }
+ }
};
+// TODO: for MTetrahedron2
+// void setVolumePositive()
+// {
+// if(getVolumeSign() < 0){
+// MVertex *tmp;
+// tmp = _v[0]; _v[0] = _v[1]; _v[1] = tmp;
+// tmp = _vs[1]; _vs[1] = _vs[2]; _vs[2] = temp;
+// tmp = _vs[5]; _vs[5] = _vs[3]; _vs[3] = temp;
+// }
+// }
+
class MHexahedron : public MElement {
protected:
MVertex *_v[8];
@@ -329,8 +380,46 @@ class MHexahedron : public MElement {
}
int getTypeForMSH(){ return HEX1; }
char *getStringForPOS(){ return "SH"; }
+ virtual int getVolumeSign()
+ {
+ double mat[3][3];
+ mat[0][0] = _v[1]->x() - _v[0]->x();
+ mat[0][1] = _v[3]->x() - _v[0]->x();
+ mat[0][2] = _v[4]->x() - _v[0]->x();
+ mat[1][0] = _v[1]->y() - _v[0]->y();
+ mat[1][1] = _v[3]->y() - _v[0]->y();
+ mat[1][2] = _v[4]->y() - _v[0]->y();
+ mat[2][0] = _v[1]->z() - _v[0]->z();
+ mat[2][1] = _v[3]->z() - _v[0]->z();
+ mat[2][2] = _v[4]->z() - _v[0]->z();
+ return sign(det3x3(mat));
+ }
+ void setVolumePositive()
+ {
+ if(getVolumeSign() < 0){
+ MVertex *tmp;
+ tmp = _v[0]; _v[0] = _v[2]; _v[2] = tmp;
+ tmp = _v[4]; _v[4] = _v[6]; _v[6] = tmp;
+ }
+ }
};
+// TODO: for MHexahedron2
+// void setVolumePositive()
+// {
+// if(getVolumeSign() < 0){
+// MVertex *tmp;
+// tmp = _v[0]; _v[0] = _v[2]; _v[2] = tmp;
+// tmp = _v[4]; _v[4] = _v[6]; _v[6] = tmp;
+// MVertex *old[12];
+// for(int i = 0; i < 12; i++) old[i] = _vs[i];
+// _vs[0] = old[3]; _vs[1] = old[5]; _vs[2] = old[6];
+// _vs[3] = old[0]; _vs[4] = old[4]; _vs[5] = old[1];
+// _vs[6] = old[2]; _vs[7] = old[7]; _vs[8] = old[10];
+// _vs[9] = old[11]; _vs[10] = old[8]; _vs[11] = old[9];
+// }
+// }
+
class MPrism : public MElement {
protected:
MVertex *_v[6];
@@ -369,8 +458,43 @@ class MPrism : public MElement {
}
int getTypeForMSH(){ return PRI1; }
char *getStringForPOS(){ return "SI"; }
+ virtual int getVolumeSign()
+ {
+ double mat[3][3];
+ mat[0][0] = _v[1]->x() - _v[0]->x();
+ mat[0][1] = _v[2]->x() - _v[0]->x();
+ mat[0][2] = _v[3]->x() - _v[0]->x();
+ mat[1][0] = _v[1]->y() - _v[0]->y();
+ mat[1][1] = _v[2]->y() - _v[0]->y();
+ mat[1][2] = _v[3]->y() - _v[0]->y();
+ mat[2][0] = _v[1]->z() - _v[0]->z();
+ mat[2][1] = _v[2]->z() - _v[0]->z();
+ mat[2][2] = _v[3]->z() - _v[0]->z();
+ return sign(det3x3(mat));
+ }
+ void setVolumePositive()
+ {
+ if(getVolumeSign() < 0){
+ MVertex *tmp;
+ tmp = _v[0]; _v[0] = _v[1]; _v[1] = tmp;
+ tmp = _v[3]; _v[3] = _v[4]; _v[4] = tmp;
+ }
+ }
};
+// TODO: for MPrism2
+// void setVolumePositive()
+// {
+// if(getVolumeSign() < 0){
+// MVertex *tmp;
+// tmp = _v[0]; _v[0] = _v[1]; _v[1] = tmp;
+// tmp = _v[3]; _v[3] = _v[4]; _v[4] = tmp;
+// tmp = _vs[1]; _vs[1] = _vs[3]; _vs[3] = tmp;
+// tmp = _vs[2]; _vs[2] = _vs[4]; _vs[4] = tmp;
+// tmp = _vs[7]; _vs[7] = _vs[8]; _vs[8] = tmp;
+// }
+// }
+
class MPyramid : public MElement {
protected:
MVertex *_v[5];
@@ -408,6 +532,39 @@ class MPyramid : public MElement {
}
int getTypeForMSH(){ return PYR1; }
char *getStringForPOS(){ return "SY"; }
+ virtual int getVolumeSign()
+ {
+ double mat[3][3];
+ mat[0][0] = _v[1]->x() - _v[0]->x();
+ mat[0][1] = _v[3]->x() - _v[0]->x();
+ mat[0][2] = _v[4]->x() - _v[0]->x();
+ mat[1][0] = _v[1]->y() - _v[0]->y();
+ mat[1][1] = _v[3]->y() - _v[0]->y();
+ mat[1][2] = _v[4]->y() - _v[0]->y();
+ mat[2][0] = _v[1]->z() - _v[0]->z();
+ mat[2][1] = _v[3]->z() - _v[0]->z();
+ mat[2][2] = _v[4]->z() - _v[0]->z();
+ return sign(det3x3(mat));
+ }
+ void setVolumePositive()
+ {
+ if(getVolumeSign() < 0){
+ MVertex *tmp;
+ tmp = _v[0]; _v[0] = _v[2]; _v[2] = tmp;
+ }
+ }
};
+// TODO: for MPyramid2
+// void setVolumePositive()
+// {
+// if(getVolumeSign() < 0){
+// MVertex *tmp;
+// tmp = _v[0]; _v[0] = _v[2]; _v[2] = tmp;
+// tmp = _vs[0]; _vs[0] = _vs[3]; _vs[3] = tmp;
+// tmp = _vs[1]; _vs[1] = _vs[5]; _vs[5] = tmp;
+// tmp = _vs[2]; _vs[2] = _vs[6]; _vs[6] = tmp;
+// }
+// }
+
#endif
diff --git a/Geo/MVertex.cpp b/Geo/MVertex.cpp
index 538ab681f1..32a44fed3f 100644
--- a/Geo/MVertex.cpp
+++ b/Geo/MVertex.cpp
@@ -3,3 +3,38 @@
int MVertex::_globalNum = 0;
+void MVertex::writeMSH(FILE *fp, double scalingFactor)
+{
+ fprintf(fp, "%d %.16g %.16g %.16g\n", _num, x() * scalingFactor,
+ y() * scalingFactor, z() * scalingFactor);
+}
+
+void MVertex::writeMSH(FILE *fp, double version, int num,
+ int elementary, int physical)
+{
+ fprintf(fp, "%d 15", num);
+ if(version < 2.0)
+ fprintf(fp, " %d %d 1", physical, elementary);
+ else
+ fprintf(fp, " 2 %d %d", physical, elementary);
+ fprintf(fp, " %d\n", _num);
+}
+
+void MVertex::writeVRML(FILE *fp, double scalingFactor)
+{
+ fprintf(fp, "%.16g %.16g %.16g,\n",
+ x() * scalingFactor, y() * scalingFactor, z() * scalingFactor);
+}
+
+void MVertex::writeUNV(FILE *fp, double scalingFactor)
+{
+ fprintf(fp, "%10d%10d%10d%10d\n", _num, 1, 1, 11);
+ // hack to print the numbers with "D+XX" exponents
+ char tmp[128];
+ sprintf(tmp, "%25.16E%25.16E%25.16E\n", x() * scalingFactor,
+ y() * scalingFactor, z() * scalingFactor);
+ tmp[21] = 'D';
+ tmp[46] = 'D';
+ tmp[71] = 'D';
+ fprintf(fp, tmp);
+}
diff --git a/Geo/MVertex.h b/Geo/MVertex.h
index 53ef43b0af..4510bad51e 100644
--- a/Geo/MVertex.h
+++ b/Geo/MVertex.h
@@ -35,20 +35,12 @@ class MVertex{
inline void setEntity(GEntity *ge) { _ge = ge; }
inline int getNum() const {return _num;}
inline void setNum(int num) { _num = num; }
- void writeMSH(FILE *fp, double scalingFactor=1.0)
- {
- fprintf(fp, "%d %.16g %.16g %.16g\n", getNum(),
- x() * scalingFactor, y() * scalingFactor, z() * scalingFactor);
- }
- void writeMSH(FILE *fp, double version, int num, int elementary, int physical)
- {
- fprintf(fp, "%d 15", num);
- if(version < 2.0)
- fprintf(fp, " %d %d 1", physical, elementary);
- else
- fprintf(fp, " 2 %d %d", physical, elementary);
- fprintf(fp, " %d\n", _num);
- }
+
+ // IO routines
+ void writeMSH(FILE *fp, double scalingFactor=1.0);
+ void writeMSH(FILE *fp, double version, int num, int elementary, int physical);
+ void writeVRML(FILE *fp, double scalingFactor=1.0);
+ void writeUNV(FILE *fp, double scalingFactor=1.0);
};
class MEdgeVertex : public MVertex{
diff --git a/Geo/Makefile b/Geo/Makefile
index cb7f187959..69ab0e8c9a 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.81 2006-08-04 14:28:02 geuzaine Exp $
+# $Id: Makefile,v 1.82 2006-08-06 22:58:49 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -166,8 +166,8 @@ GModelIO.o: GModelIO.cpp ../Common/Message.h ../Common/GmshDefines.h \
# 1 "/Users/geuzaine/.gmsh/Geo//"
MVertex.o: MVertex.cpp MVertex.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
-MElement.o: MElement.cpp MElement.h MVertex.h GEntity.h Range.h SPoint3.h \
- SBoundingBox3d.h ../Common/GmshDefines.h
+MElement.o: MElement.cpp MElement.h ../Common/GmshDefines.h MVertex.h \
+ GEntity.h Range.h SPoint3.h SBoundingBox3d.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
gmshModel.o: gmshModel.cpp gmshModel.h GModel.h GVertex.h GEntity.h \
Range.h SPoint3.h SBoundingBox3d.h MVertex.h ../Common/GmshDefines.h \
diff --git a/Geo/gmshVertex.h b/Geo/gmshVertex.h
index b3057c3412..0ca9540863 100644
--- a/Geo/gmshVertex.h
+++ b/Geo/gmshVertex.h
@@ -17,14 +17,29 @@ public:
virtual ~gmshVertex() {}
virtual GPoint point() const
{
- if(!v) return GPoint(0., 0., 0., this);
- return GPoint(v->Pos.X, v->Pos.Y, v->Pos.Z, this);
+ if(v)
+ return GPoint(v->Pos.X, v->Pos.Y, v->Pos.Z, this);
+ else if(mesh_vertices.size())
+ return GPoint(mesh_vertices[0]->x(),
+ mesh_vertices[0]->y(),
+ mesh_vertices[0]->z(), this);
+ else
+ return GPoint(0., 0., 0., this);
+ }
+ virtual double x() const
+ {
+ return v ? v->Pos.X : mesh_vertices.size() ? mesh_vertices[0]->x() : 0.;
+ }
+ virtual double y() const
+ {
+ return v ? v->Pos.Y : mesh_vertices.size() ? mesh_vertices[0]->y() : 0.;
+ }
+ virtual double z() const
+ {
+ return v ? v->Pos.Z : mesh_vertices.size() ? mesh_vertices[0]->z() : 0.;
}
- virtual double x() const {return v ? v->Pos.X : 0.;}
- virtual double y() const {return v ? v->Pos.Y : 0.;}
- virtual double z() const {return v ? v->Pos.Z : 0.;}
void * getNativePtr() const {return v;}
- virtual double prescribedMeshSizeAtVertex () const {return v ? v->lc : 0.;}
+ virtual double prescribedMeshSizeAtVertex() const {return v ? v->lc : 0.;}
protected:
Vertex *v;
};
diff --git a/Graphics/CreateFile.cpp b/Graphics/CreateFile.cpp
index a6b7e6ae22..21aa08bac5 100644
--- a/Graphics/CreateFile.cpp
+++ b/Graphics/CreateFile.cpp
@@ -1,4 +1,4 @@
-// $Id: CreateFile.cpp,v 1.85 2006-08-05 10:05:45 geuzaine Exp $
+// $Id: CreateFile.cpp,v 1.86 2006-08-06 22:58:49 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -153,15 +153,25 @@ void CreateOutputFile(char *filename, int format)
break;
case FORMAT_MSH:
- GMODEL->writeMSH(name);
+ GMODEL->writeMSH(name, CTX.mesh.msh_file_version, CTX.mesh.save_all,
+ CTX.mesh.scaling_factor);
+ break;
+
+ case FORMAT_STL:
+ GMODEL->writeSTL(name, CTX.mesh.scaling_factor);
+ break;
+
+ case FORMAT_VRML:
+ GMODEL->writeVRML(name, CTX.mesh.scaling_factor);
break;
case FORMAT_UNV:
+ GMODEL->writeUNV(name, CTX.mesh.scaling_factor);
+ break;
+
case FORMAT_P3D:
case FORMAT_DMG:
- case FORMAT_STL:
case FORMAT_GREF:
- case FORMAT_VRML:
Print_Mesh(name, format);
break;
diff --git a/Graphics/Geom.cpp b/Graphics/Geom.cpp
index dee0ea5daa..f63c4289f1 100644
--- a/Graphics/Geom.cpp
+++ b/Graphics/Geom.cpp
@@ -1,4 +1,4 @@
-// $Id: Geom.cpp,v 1.103 2006-08-05 10:05:45 geuzaine Exp $
+// $Id: Geom.cpp,v 1.104 2006-08-06 22:58:49 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -288,7 +288,7 @@ void HighlightEntity(GVertex *v, GEdge *c, GFace *s, int permanent)
if(v) HighlightEntity(v, permanent);
else if(c) HighlightEntity(c, permanent);
else if(s) HighlightEntity(s, permanent);
- else if(!permanent) Msg(STATUS2N, "");
+ else if(!permanent) Msg(STATUS2N, " ");
}
void HighlightEntityNum(int v, int c, int s, int permanent)
diff --git a/Mesh/DiscreteSurface.cpp b/Mesh/DiscreteSurface.cpp
index 3b1ce9061a..ce8db9341d 100644
--- a/Mesh/DiscreteSurface.cpp
+++ b/Mesh/DiscreteSurface.cpp
@@ -1,4 +1,4 @@
-// $Id: DiscreteSurface.cpp,v 1.41 2006-08-05 10:05:45 geuzaine Exp $
+// $Id: DiscreteSurface.cpp,v 1.42 2006-08-06 22:58:49 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -309,7 +309,7 @@ void BDS_To_Mesh_2(Mesh *M)
}
}
- Msg(STATUS2N, "");
+ Msg(STATUS2N, " ");
}
void BDS_To_Mesh(Mesh *M)
--
GitLab