diff --git a/Common/Visibility.cpp b/Common/Visibility.cpp
index c0ea178eb817f1b6c381af95bfdb493ae1e9664f..1dd93aa1fbd3bc8ba7589fb5bd1817a971d5efaa 100644
--- a/Common/Visibility.cpp
+++ b/Common/Visibility.cpp
@@ -1,4 +1,4 @@
-// $Id: Visibility.cpp,v 1.16 2006-08-13 14:43:54 geuzaine Exp $
+// $Id: Visibility.cpp,v 1.17 2006-08-18 02:22:40 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -176,6 +176,75 @@ std::string VisibilityManager::getStringForGEO()
return str;
}
+void VisibilityManager::setVisibilityByNumber(int type, int num, int all, bool val)
+{
+ switch(type){
+ case 0: // nodes
+ for(GModel::viter it = GMODEL->firstVertex(); it != GMODEL->lastVertex(); it++)
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ if(all || (*it)->mesh_vertices[i]->getNum() == num)
+ (*it)->mesh_vertices[i]->setVisibility(val);
+ for(GModel::eiter it = GMODEL->firstEdge(); it != GMODEL->lastEdge(); it++)
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ if(all || (*it)->mesh_vertices[i]->getNum() == num)
+ (*it)->mesh_vertices[i]->setVisibility(val);
+ for(GModel::fiter it = GMODEL->firstFace(); it != GMODEL->lastFace(); it++)
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ if(all || (*it)->mesh_vertices[i]->getNum() == num)
+ (*it)->mesh_vertices[i]->setVisibility(val);
+ for(GModel::riter it = GMODEL->firstRegion(); it != GMODEL->lastRegion(); it++)
+ for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
+ if(all || (*it)->mesh_vertices[i]->getNum() == num)
+ (*it)->mesh_vertices[i]->setVisibility(val);
+ break;
+ case 1: // elements
+ for(GModel::eiter it = GMODEL->firstEdge(); it != GMODEL->lastEdge(); it++){
+ for(unsigned int i = 0; i < (*it)->lines.size(); i++)
+ if(all || (*it)->lines[i]->getNum() == num)
+ (*it)->lines[i]->setVisibility(val);
+ }
+ for(GModel::fiter it = GMODEL->firstFace(); it != GMODEL->lastFace(); it++){
+ for(unsigned int i = 0; i < (*it)->triangles.size(); i++)
+ if(all || (*it)->triangles[i]->getNum() == num)
+ (*it)->triangles[i]->setVisibility(val);
+ for(unsigned int i = 0; i < (*it)->quadrangles.size(); i++)
+ if(all || (*it)->quadrangles[i]->getNum() == num)
+ (*it)->quadrangles[i]->setVisibility(val);
+ }
+ for(GModel::riter it = GMODEL->firstRegion(); it != GMODEL->lastRegion(); it++){
+ for(unsigned int i = 0; i < (*it)->tetrahedra.size(); i++)
+ if(all || (*it)->tetrahedra[i]->getNum() == num)
+ (*it)->tetrahedra[i]->setVisibility(val);
+ for(unsigned int i = 0; i < (*it)->hexahedra.size(); i++)
+ if(all || (*it)->hexahedra[i]->getNum() == num)
+ (*it)->hexahedra[i]->setVisibility(val);
+ for(unsigned int i = 0; i < (*it)->prisms.size(); i++)
+ if(all || (*it)->prisms[i]->getNum() == num)
+ (*it)->prisms[i]->setVisibility(val);
+ for(unsigned int i = 0; i < (*it)->pyramids.size(); i++)
+ if(all || (*it)->pyramids[i]->getNum() == num)
+ (*it)->pyramids[i]->setVisibility(val);
+ }
+ break;
+ case 2: // point
+ for(GModel::viter it = GMODEL->firstVertex(); it != GMODEL->lastVertex(); it++)
+ if(all || (*it)->tag() == num) (*it)->setVisibility(val);
+ break;
+ case 3: // line
+ for(GModel::eiter it = GMODEL->firstEdge(); it != GMODEL->lastEdge(); it++)
+ if(all || (*it)->tag() == num) (*it)->setVisibility(val);
+ break;
+ case 4: // surface
+ for(GModel::fiter it = GMODEL->firstFace(); it != GMODEL->lastFace(); it++)
+ if(all || (*it)->tag() == num) (*it)->setVisibility(val);
+ break;
+ case 5: // volume
+ for(GModel::riter it = GMODEL->firstRegion(); it != GMODEL->lastRegion(); it++)
+ if(all || (*it)->tag() == num) (*it)->setVisibility(val);
+ break;
+ }
+}
+
void VisElementary::setVisibility(char val, bool recursive)
{
_e->setVisibility(val, recursive);
diff --git a/Common/Visibility.h b/Common/Visibility.h
index e75dd2b7b19659d717a3be5b672e5b8a6017af14..cfd51714a9fd774083cac323b54ca42dbc5b8e76 100644
--- a/Common/Visibility.h
+++ b/Common/Visibility.h
@@ -134,6 +134,10 @@ class VisibilityManager {
// set all entities to be invisible
void setAllInvisible(int type);
+ // set the visibility of one or all entites of a given type (0=node,
+ // 1=element, 2=point, 3=line, 4=surface, 5=volume)
+ void setVisibilityByNumber(int type, int num, int all, bool val);
+
// get the tag of the nth entity in the manager
int getTag(int n){ return _entities[n]->getTag(); }
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index e0464f9f4460d46913cdad4a5afa28a1e75af213..f8d34a50e6db0a246a2dfc225931d8869b3739cb 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.438 2006-08-17 21:28:34 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.439 2006-08-18 02:22:40 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -1340,21 +1340,29 @@ void visibility_cb(CALLBACK_ARGS)
if(VisibilityManager::instance()->getVisibility(i))
WID->vis_browser->select(i + 1);
}
+ // active the delete button for physicals and partitions only!
+ if(WID->vis_type->value() == 1 || WID->vis_type->value() == 2)
+ WID->vis_push_butt[0]->activate();
+ else
+ WID->vis_push_butt[0]->deactivate();
}
void visibility_ok_cb(CALLBACK_ARGS)
{
- // get the selections made in the browser and apply them into the model
- CTX.mesh.changed = 1;
- VisibilityManager::instance()->setAllInvisible(WID->vis_type->value());
- for(int i = 0; i < VisibilityManager::instance()->getNumEntities(); i++)
- if(WID->vis_browser->selected(i + 1))
- VisibilityManager::instance()->setVisibility(i, true, WID->vis_butt[0]->value());
- // then refresh the browser to account for recursive selections
- for(int i = 0; i < VisibilityManager::instance()->getNumEntities(); i++)
- if(VisibilityManager::instance()->getVisibility(i))
- WID->vis_browser->select(i + 1);
- Draw();
+ // if the browser is not empty, get the selections made in the
+ // browser and apply them into the model
+ if(VisibilityManager::instance()->getNumEntities()){
+ CTX.mesh.changed = 1;
+ VisibilityManager::instance()->setAllInvisible(WID->vis_type->value());
+ for(int i = 0; i < VisibilityManager::instance()->getNumEntities(); i++)
+ if(WID->vis_browser->selected(i + 1))
+ VisibilityManager::instance()->setVisibility(i, true, WID->vis_butt[0]->value());
+ // then refresh the browser to account for recursive selections
+ for(int i = 0; i < VisibilityManager::instance()->getNumEntities(); i++)
+ if(VisibilityManager::instance()->getVisibility(i))
+ WID->vis_browser->select(i + 1);
+ Draw();
+ }
}
void visibility_save_cb(CALLBACK_ARGS)
@@ -1364,6 +1372,15 @@ void visibility_save_cb(CALLBACK_ARGS)
add_infile((char*)str.c_str(), CTX.filename);
}
+void visibility_delete_cb(CALLBACK_ARGS)
+{
+ if(WID->vis_type->value() == 1)
+ GMODEL->deletePhysicalGroups();
+ else if(WID->vis_type->value() == 2)
+ GMODEL->deleteMeshPartitions();
+ visibility_cb(NULL, NULL);
+}
+
void visibility_sort_cb(CALLBACK_ARGS)
{
char *str = (char*)data;
@@ -1438,73 +1455,7 @@ void visibility_number_cb(CALLBACK_ARGS)
char *str = (char *)WID->vis_input[type]->value();
int all = !strcmp(str, "all") || !strcmp(str, "*");
int num = all ? 0 : atoi(str);
-
- switch(type){
- case 0: // nodes
- for(GModel::viter it = GMODEL->firstVertex(); it != GMODEL->lastVertex(); it++)
- for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
- if(all || (*it)->mesh_vertices[i]->getNum() == num)
- (*it)->mesh_vertices[i]->setVisibility(val);
- for(GModel::eiter it = GMODEL->firstEdge(); it != GMODEL->lastEdge(); it++)
- for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
- if(all || (*it)->mesh_vertices[i]->getNum() == num)
- (*it)->mesh_vertices[i]->setVisibility(val);
- for(GModel::fiter it = GMODEL->firstFace(); it != GMODEL->lastFace(); it++)
- for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
- if(all || (*it)->mesh_vertices[i]->getNum() == num)
- (*it)->mesh_vertices[i]->setVisibility(val);
- for(GModel::riter it = GMODEL->firstRegion(); it != GMODEL->lastRegion(); it++)
- for(unsigned int i = 0; i < (*it)->mesh_vertices.size(); i++)
- if(all || (*it)->mesh_vertices[i]->getNum() == num)
- (*it)->mesh_vertices[i]->setVisibility(val);
- break;
- case 1: // elements
- for(GModel::eiter it = GMODEL->firstEdge(); it != GMODEL->lastEdge(); it++){
- for(unsigned int i = 0; i < (*it)->lines.size(); i++)
- if(all || (*it)->lines[i]->getNum() == num)
- (*it)->lines[i]->setVisibility(val);
- }
- for(GModel::fiter it = GMODEL->firstFace(); it != GMODEL->lastFace(); it++){
- for(unsigned int i = 0; i < (*it)->triangles.size(); i++)
- if(all || (*it)->triangles[i]->getNum() == num)
- (*it)->triangles[i]->setVisibility(val);
- for(unsigned int i = 0; i < (*it)->quadrangles.size(); i++)
- if(all || (*it)->quadrangles[i]->getNum() == num)
- (*it)->quadrangles[i]->setVisibility(val);
- }
- for(GModel::riter it = GMODEL->firstRegion(); it != GMODEL->lastRegion(); it++){
- for(unsigned int i = 0; i < (*it)->tetrahedra.size(); i++)
- if(all || (*it)->tetrahedra[i]->getNum() == num)
- (*it)->tetrahedra[i]->setVisibility(val);
- for(unsigned int i = 0; i < (*it)->hexahedra.size(); i++)
- if(all || (*it)->hexahedra[i]->getNum() == num)
- (*it)->hexahedra[i]->setVisibility(val);
- for(unsigned int i = 0; i < (*it)->prisms.size(); i++)
- if(all || (*it)->prisms[i]->getNum() == num)
- (*it)->prisms[i]->setVisibility(val);
- for(unsigned int i = 0; i < (*it)->pyramids.size(); i++)
- if(all || (*it)->pyramids[i]->getNum() == num)
- (*it)->pyramids[i]->setVisibility(val);
- }
- break;
- case 2: // point
- for(GModel::viter it = GMODEL->firstVertex(); it != GMODEL->lastVertex(); it++)
- if(all || (*it)->tag() == num) (*it)->setVisibility(val);
- break;
- case 3: // line
- for(GModel::eiter it = GMODEL->firstEdge(); it != GMODEL->lastEdge(); it++)
- if(all || (*it)->tag() == num) (*it)->setVisibility(val);
- break;
- case 4: // surface
- for(GModel::fiter it = GMODEL->firstFace(); it != GMODEL->lastFace(); it++)
- if(all || (*it)->tag() == num) (*it)->setVisibility(val);
- break;
- case 5: // volume
- for(GModel::riter it = GMODEL->firstRegion(); it != GMODEL->lastRegion(); it++)
- if(all || (*it)->tag() == num) (*it)->setVisibility(val);
- break;
- }
-
+ VisibilityManager::instance()->setVisibilityByNumber(type, num, all, val);
int pos = WID->vis_browser->position();
visibility_cb(NULL, NULL);
WID->vis_browser->position(pos);
@@ -1868,6 +1819,7 @@ void geometry_elementary_add_new_point_cb(CALLBACK_ARGS)
(char*)WID->context_geometry_input[3]->value(),
(char*)WID->context_geometry_input[4]->value(),
(char*)WID->context_geometry_input[5]->value());
+ WID->reset_visibility();
Draw();
}
if(ib == 'q'){
@@ -1876,7 +1828,6 @@ void geometry_elementary_add_new_point_cb(CALLBACK_ARGS)
}
}
- WID->reset_visibility();
Msg(ONSCREEN, "");
}
@@ -1925,6 +1876,7 @@ static void _new_multiline(int type)
break;
}
}
+ WID->reset_visibility();
ZeroHighlight();
Draw();
n = 0;
@@ -1943,7 +1895,6 @@ static void _new_multiline(int type)
}
}
- WID->reset_visibility();
Msg(ONSCREEN, "");
}
@@ -1993,13 +1944,13 @@ void geometry_elementary_add_new_line_cb(CALLBACK_ARGS)
}
if(n == 2) {
add_multline(2, p, CTX.filename);
+ WID->reset_visibility();
ZeroHighlight();
Draw();
n = 0;
}
}
- WID->reset_visibility();
Msg(ONSCREEN, "");
}
@@ -2057,13 +2008,13 @@ void geometry_elementary_add_new_circle_cb(CALLBACK_ARGS)
}
if(n == 3) {
add_circ(p[0], p[1], p[2], CTX.filename); // begin, center, end
+ WID->reset_visibility();
ZeroHighlight();
Draw();
n = 0;
}
}
- WID->reset_visibility();
Msg(ONSCREEN, "");
}
@@ -2114,13 +2065,13 @@ void geometry_elementary_add_new_ellipse_cb(CALLBACK_ARGS)
}
if(n == 4) {
add_ell(p[0], p[1], p[2], p[3], CTX.filename);
+ WID->reset_visibility();
ZeroHighlight();
Draw();
n = 0;
}
}
- WID->reset_visibility();
Msg(ONSCREEN, "");
}
@@ -2249,6 +2200,7 @@ static void _new_surface_volume(int mode)
case 1: add_surf(List2, CTX.filename, 0, 1); break;
case 2: add_vol(List2, CTX.filename); break;
}
+ WID->reset_visibility();
ZeroHighlight();
Draw();
break;
@@ -2262,7 +2214,6 @@ stopall:;
List_Delete(List1);
List_Delete(List2);
- WID->reset_visibility();
Msg(ONSCREEN, "");
}
@@ -2480,6 +2431,7 @@ static void _action_point_line_surface_volume(int action, int mode, char *what)
break;
}
List_Reset(List1);
+ WID->reset_visibility();
ZeroHighlight();
if(action <= 6) SetBoundingBox();
Draw();
@@ -2496,7 +2448,6 @@ static void _action_point_line_surface_volume(int action, int mode, char *what)
}
List_Delete(List1);
- WID->reset_visibility();
Msg(ONSCREEN, "");
}
@@ -4224,9 +4175,9 @@ void con_geometry_define_point_cb(CALLBACK_ARGS)
(char*)WID->context_geometry_input[3]->value(),
(char*)WID->context_geometry_input[4]->value(),
(char*)WID->context_geometry_input[5]->value());
+ WID->reset_visibility();
ZeroHighlight();
SetBoundingBox();
- WID->reset_visibility();
Draw();
}
diff --git a/Fltk/Callbacks.h b/Fltk/Callbacks.h
index 4770ca5fb5a13e1f2dafd8a5f582a7e4f67a8901..1881904c76bcb696759f88a98db374ac44c621c3 100644
--- a/Fltk/Callbacks.h
+++ b/Fltk/Callbacks.h
@@ -159,6 +159,7 @@ void visibility_sort_cb(CALLBACK_ARGS);
void visibility_number_cb(CALLBACK_ARGS);
void visibility_ok_cb(CALLBACK_ARGS);
void visibility_save_cb(CALLBACK_ARGS);
+void visibility_delete_cb(CALLBACK_ARGS);
// Clipping planes Menu
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index fc711b930d01b62e1bf6984b4ed317e372f18006..8980ca1521ef0256940da1533a3897b568eae970 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.529 2006-08-17 21:54:57 geuzaine Exp $
+// $Id: GUI.cpp,v 1.530 2006-08-18 02:22:40 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -3896,6 +3896,9 @@ void GUI::create_visibility_window()
Fl_Group::current()->resizable(o);
}
+ vis_push_butt[0] = new Fl_Button(width - 3 * BB - 4 * WB, height - 2 * BH - 3 * WB, BB, BH, "Delete");
+ vis_push_butt[0]->callback(visibility_delete_cb);
+
Fl_Return_Button *b1 = new Fl_Return_Button(width - 2 * BB - 3 * WB, height - 2 * BH - 3 * WB, BB, BH, "Apply");
b1->callback(visibility_ok_cb);
diff --git a/Fltk/GUI.h b/Fltk/GUI.h
index d348860208c68d08964ba5a0fe11f7ea4305d440..0d35b61913985145d3490d4f246d4a12db7e9ee5 100644
--- a/Fltk/GUI.h
+++ b/Fltk/GUI.h
@@ -228,7 +228,8 @@ public:
Fl_Window *vis_window ;
Fl_Choice *vis_type ;
Fl_Browser *vis_browser ;
- Fl_Check_Button *vis_butt[20] ;
+ Fl_Check_Button *vis_butt[2] ;
+ Fl_Button *vis_push_butt[2] ;
Fl_Input *vis_input[10];
// clipping planes window
diff --git a/Geo/GEdge.cpp b/Geo/GEdge.cpp
index 87d996091e469707bf1cb9bc4feccd2b62322561..c6af68835ec95c604408541346620ce437f61ce5 100644
--- a/Geo/GEdge.cpp
+++ b/Geo/GEdge.cpp
@@ -1,4 +1,4 @@
-// $Id: GEdge.cpp,v 1.12 2006-08-15 06:26:52 geuzaine Exp $
+// $Id: GEdge.cpp,v 1.13 2006-08-18 02:22:40 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -89,6 +89,12 @@ void GEdge::recomputeMeshPartitions()
}
}
+void GEdge::deleteMeshPartitions()
+{
+ for(unsigned int i = 0; i < lines.size(); i++)
+ lines[i]->setPartition(0);
+}
+
std::string GEdge::getAdditionalInfoString()
{
if(!v0 || !v1) return std::string("");
diff --git a/Geo/GEdge.h b/Geo/GEdge.h
index e06fef7dd6a630d11f2dc6b8fcf3af178d4821f1..f0e5f568d4123108c81015b7ffc874d5f168c596 100644
--- a/Geo/GEdge.h
+++ b/Geo/GEdge.h
@@ -76,6 +76,9 @@ class GEdge : public GEntity {
// Recompute the mesh partitions defined on this edge.
void recomputeMeshPartitions();
+ // Delete the mesh partitions defined on this edge.
+ void deleteMeshPartitions();
+
// Returns the minimum number of segments used for meshing the edge
virtual int minimumMeshSegments () const {return 1;}
diff --git a/Geo/GFace.cpp b/Geo/GFace.cpp
index 43e4d058c75b8eda798a86486078d5ab8751fc3b..e9a3cf1cf207914737926e96730afaa54e9a353e 100644
--- a/Geo/GFace.cpp
+++ b/Geo/GFace.cpp
@@ -1,4 +1,4 @@
-// $Id: GFace.cpp,v 1.12 2006-08-15 06:26:52 geuzaine Exp $
+// $Id: GFace.cpp,v 1.13 2006-08-18 02:22:40 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -107,6 +107,14 @@ void GFace::recomputeMeshPartitions()
}
}
+void GFace::deleteMeshPartitions()
+{
+ for(unsigned int i = 0; i < triangles.size(); i++)
+ triangles[i]->setPartition(0);
+ for(unsigned int i = 0; i < quadrangles.size(); i++)
+ quadrangles[i]->setPartition(0);
+}
+
void GFace::computeMeanPlane()
{
std::vector<SPoint3> pts;
diff --git a/Geo/GFace.h b/Geo/GFace.h
index bd79662d56a788be49d11898f0ddbb2e1ac3c307..adb7e3e4cba932370d1ed273cbeade52fb4a4ffc 100644
--- a/Geo/GFace.h
+++ b/Geo/GFace.h
@@ -99,6 +99,9 @@ class GFace : public GEntity
// Recompute the mesh partitions defined on this face.
void recomputeMeshPartitions();
+ // Delete the mesh partitions defined on this face.
+ void deleteMeshPartitions();
+
// Recompute the mean plane of the surface from a list of points
void computeMeanPlane(const std::vector<MVertex*> &points);
void computeMeanPlane(const std::vector<SPoint3> &points);
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 80c328c4e6b08db3315cf1fce6fd3fb2a4254fac..7afdac7eb2386e4af7da8fc9e2d0c5fb6a545b1a 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -1,4 +1,4 @@
-// $Id: GModel.cpp,v 1.11 2006-08-15 21:22:12 geuzaine Exp $
+// $Id: GModel.cpp,v 1.12 2006-08-18 02:22:40 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -128,6 +128,18 @@ void GModel::getPhysicalGroups(std::map<int, std::vector<GEntity*> > groups[4])
addInGroup(*it, groups[3]);
}
+void GModel::deletePhysicalGroups()
+{
+ for(viter it = firstVertex(); it != lastVertex(); ++it)
+ (*it)->physicals.clear();
+ for(eiter it = firstEdge(); it != lastEdge(); ++it)
+ (*it)->physicals.clear();
+ for(fiter it = firstFace(); it != lastFace(); ++it)
+ (*it)->physicals.clear();
+ for(riter it = firstRegion(); it != lastRegion(); ++it)
+ (*it)->physicals.clear();
+}
+
SBoundingBox3d GModel::bounds()
{
SBoundingBox3d bb;
@@ -171,3 +183,14 @@ std::set<int> &GModel::recomputeMeshPartitions()
(*it)->recomputeMeshPartitions();
return meshPartitions;
}
+
+void GModel::deleteMeshPartitions()
+{
+ for(eiter it = firstEdge(); it != lastEdge(); ++it)
+ (*it)->deleteMeshPartitions();
+ for(fiter it = firstFace(); it != lastFace(); ++it)
+ (*it)->deleteMeshPartitions();
+ for(riter it = firstRegion(); it != lastRegion(); ++it)
+ (*it)->deleteMeshPartitions();
+ meshPartitions.clear();
+}
diff --git a/Geo/GModel.h b/Geo/GModel.h
index d9987ed3ace1a885fe78fbcec34c20f4afb0d70f..2fe07200ce40d80f1d6d1507fa7386c0653d1334 100644
--- a/Geo/GModel.h
+++ b/Geo/GModel.h
@@ -97,6 +97,9 @@ class GModel
// Returns all physical groups (one map per dimension: 0-D to 3-D)
void getPhysicalGroups(std::map<int, std::vector<GEntity*> > groups[4]);
+ // Deletes all physical groups in the model
+ void deletePhysicalGroups();
+
// The bounding box
virtual SBoundingBox3d bounds();
@@ -107,6 +110,9 @@ class GModel
virtual std::set<int> &getMeshPartitions() { return meshPartitions; }
virtual std::set<int> &recomputeMeshPartitions();
+ // deletes all the partitions
+ virtual void deleteMeshPartitions();
+
// IO routines
int readMSH(const std::string &name);
int writeMSH(const std::string &name, double version=1.0, bool saveAll=false,
diff --git a/Geo/GModelIO.cpp b/Geo/GModelIO.cpp
index 6af3d8f5ed633cc1575bf7f986cad56f6ed41b06..bd643e548ef0956f04f5ea15aa4f2ebe856c6b00 100644
--- a/Geo/GModelIO.cpp
+++ b/Geo/GModelIO.cpp
@@ -1,4 +1,4 @@
-// $Id: GModelIO.cpp,v 1.20 2006-08-17 19:19:14 geuzaine Exp $
+// $Id: GModelIO.cpp,v 1.21 2006-08-18 02:22:40 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -440,7 +440,7 @@ static void writeElementsMSH(FILE *fp, const std::vector<T*> &ele, int saveAll,
{
for(unsigned int i = 0; i < ele.size(); i++)
if(saveAll)
- ele[i]->writeMSH(fp, version, ++num, elementary, elementary);
+ ele[i]->writeMSH(fp, version, ++num, elementary, 0);
else
for(unsigned int j = 0; j < physicals.size(); j++)
ele[i]->writeMSH(fp, version, ++num, elementary, physicals[j]);
diff --git a/Geo/GRegion.cpp b/Geo/GRegion.cpp
index e71324817e709c8f84cc9afadd6dfca1e22aa60a..c8a2b7dfbd0ec1669204ff482d388be72a1c441a 100644
--- a/Geo/GRegion.cpp
+++ b/Geo/GRegion.cpp
@@ -1,4 +1,4 @@
-// $Id: GRegion.cpp,v 1.8 2006-08-15 06:26:52 geuzaine Exp $
+// $Id: GRegion.cpp,v 1.9 2006-08-18 02:22:40 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -96,3 +96,14 @@ void GRegion::recomputeMeshPartitions()
}
}
+void GRegion::deleteMeshPartitions()
+{
+ for(unsigned int i = 0; i < tetrahedra.size(); i++)
+ tetrahedra[i]->setPartition(0);
+ for(unsigned int i = 0; i < hexahedra.size(); i++)
+ hexahedra[i]->setPartition(0);
+ for(unsigned int i = 0; i < prisms.size(); i++)
+ prisms[i]->setPartition(0);
+ for(unsigned int i = 0; i < pyramids.size(); i++)
+ pyramids[i]->setPartition(0);
+}
diff --git a/Geo/GRegion.h b/Geo/GRegion.h
index 9a31897795b207aac9f99a22439e02a7496de5ec..e975a888211f0dba549e0e6b5a2b6f1d03f49063 100644
--- a/Geo/GRegion.h
+++ b/Geo/GRegion.h
@@ -42,6 +42,9 @@ class GRegion : public GEntity {
// Recompute the mesh partitions defined on this region.
void recomputeMeshPartitions();
+ // Delete the mesh partitions defined on this region.
+ void deleteMeshPartitions();
+
std::vector<MTetrahedron*> tetrahedra;
std::vector<MHexahedron*> hexahedra;
std::vector<MPrism*> prisms;
diff --git a/Geo/MElement.h b/Geo/MElement.h
index 4f7d738f68fa44e5e08f296258195020b2164547..c7d21f6278434a7679ade77c340cf8b0d293627d 100644
--- a/Geo/MElement.h
+++ b/Geo/MElement.h
@@ -74,8 +74,9 @@ class MElement
// returns the polynomial order the element
virtual int getPolynomialOrder(){ return 1; }
- // returns the partition to which the element belongs
+ // get/set the partition to which the element belongs
virtual int getPartition(){ return _partition; }
+ virtual void setPartition(int num){ _partition = num; }
// get/set the visibility flag
virtual char getVisibility(){ return _visible; }
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 026cb8548c8d92ab341dcb3964b900d7baf58686..88d500961eb58e27d74d464adf9aaed80beb280e 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
-@c $Id: gmsh.texi,v 1.209 2006-06-24 08:06:25 geuzaine Exp $
+@c $Id: gmsh.texi,v 1.210 2006-08-18 02:22:40 geuzaine Exp $
@c
@c Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
@c
@@ -1879,9 +1879,13 @@ surface meshes they are based on.
If only elementary geometrical entities are defined (or if the
@code{Mesh.SaveAll} option is set; see @ref{Mesh options}), the grid
produced by the mesh module will be saved ``as is''. That is, all the
-elements in the grid will be saved to disk using the identification number
-of the elementary entities they discretize as their region number
-(@pxref{Gmsh mesh file formats}). This can sometimes be inconvenient:
+elements in the grid will be saved to disk using the identification
+number of the elementary entities they discretize as their elementary
+region number (and 0 as their physical region number@footnote{This
+behaviour was introduced in Gmsh 2.0. In older versions, both the
+elementary and the physical region numbers would be set to the
+identification number of the elementary region.}; @ref{Gmsh mesh file
+formats}). This can sometimes be inconvenient:
@itemize @bullet
@item
@@ -1896,15 +1900,20 @@ being part of a larger group having a physical or mathematical meaning (like
`Left wing', `Metallic part', `Dirichlet boundary condition', @dots{}).
@end itemize
-To remedy these problems, the geometry module introduces the notion of
-``physical'' entities (@pxref{Geometry module}). The purpose of physical
-entities is to assemble elementary entities into larger, possibly
-overlapping groups, and to control the orientation of the elements in these
-groups. If physical entities are defined, the output mesh only contains
-those elements that belong to physical entities. The introduction of such
+To remedy these problems, the geometry module (@pxref{Geometry module})
+introduces the notion of ``physical'' entities (also called ``physical
+groups''). The purpose of physical entities is to assemble elementary
+entities into larger, possibly overlapping groups, and to control the
+orientation of the elements in these groups. The introduction of
physical entities in large models usually greatly facilitates the
-manipulation of the model (e.g., using `Tools->Visibility' in the GUI) and
-the interfacing with external solvers.
+manipulation of the model (e.g., using `Tools->Visibility' in the GUI)
+and the interfacing with external solvers.
+
+In the @file{.msh} file format (@pxref{Gmsh mesh file formats}), if
+physical entities are defined, the output mesh only contains those
+elements that belong to physical entities. Other file formats each treat
+physical entities in slightly different ways, depending on their
+capability to define groups.
@c -------------------------------------------------------------------------
@c Mesh commands