diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 2173d69915a52b597dc075f4db0cc47eee4e9588..286eb8cea952f5d4274e0de6b1f13c73c6bbedd5 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.575 2008-03-28 22:18:47 remacle Exp $
+// $Id: Callbacks.cpp,v 1.576 2008-03-29 10:19:35 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -4428,6 +4428,11 @@ void view_save_msh_cb(CALLBACK_ARGS)
_view_save_as((int)(long)data, "Save As Gmsh Mesh", 5);
}
+void view_save_med_cb(CALLBACK_ARGS)
+{
+ _view_save_as((int)(long)data, "Save As MED file", 6);
+}
+
void view_alias_cb(CALLBACK_ARGS)
{
new PView(PView::list[(int)(long)data], false);
diff --git a/Fltk/Callbacks.h b/Fltk/Callbacks.h
index 462eaf79059595f7f6b2f221e22b358b1c8e9f1c..ddf32052643e653edb93b15b730097287da34044 100644
--- a/Fltk/Callbacks.h
+++ b/Fltk/Callbacks.h
@@ -123,6 +123,7 @@ void view_save_parsed_cb(CALLBACK_ARGS);
void view_save_stl_cb(CALLBACK_ARGS);
void view_save_txt_cb(CALLBACK_ARGS);
void view_save_msh_cb(CALLBACK_ARGS);
+void view_save_med_cb(CALLBACK_ARGS);
void view_alias_cb(CALLBACK_ARGS);
void view_alias_with_options_cb(CALLBACK_ARGS);
void view_combine_space_all_cb(CALLBACK_ARGS);
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index f7bc1499b3c0e097b2966483458ddd5310254700..11bb9f24e46aeab45e6c86be5244635d9857c1f8 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.669 2008-03-28 22:18:48 remacle Exp $
+// $Id: GUI.cpp,v 1.670 2008-03-29 10:19:36 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -1314,6 +1314,8 @@ void GUI::set_context(Context_Item * menu_asked, int flag)
(Fl_Callback *) view_save_txt_cb, (void *)nb, 0);
p[j]->add("Save As/Gmsh Mesh...", 0,
(Fl_Callback *) view_save_msh_cb, (void *)nb, 0);
+ p[j]->add("Save As/MED file...", 0,
+ (Fl_Callback *) view_save_med_cb, (void *)nb, 0);
p[j]->add("Apply As Background Mesh", 0,
(Fl_Callback *) view_applybgmesh_cb, (void *)nb, FL_MENU_DIVIDER);
p[j]->add("Options...", 'o',
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 0d420918fa1011fe18a6e478472f753d31794055..a9f94deec3161f7c2fe7bf2a66710241f859f6f6 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -1,4 +1,4 @@
-// $Id: GModel.cpp,v 1.77 2008-03-23 21:42:57 geuzaine Exp $
+// $Id: GModel.cpp,v 1.78 2008-03-29 10:19:36 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -424,7 +424,8 @@ MVertex *GModel::getMeshVertexByTag(int n)
_vertexMapCache.clear();
bool dense = (getNumMeshVertices() == MVertex::getGlobalNumber());
if(dense){
- _vertexVectorCache.resize(MVertex::getGlobalNumber());
+ // numbering starts at 1
+ _vertexVectorCache.resize(MVertex::getGlobalNumber() + 1);
for(viter it = firstVertex(); it != lastVertex(); ++it)
insertMeshVertices((*it)->mesh_vertices, _vertexVectorCache);
for(eiter it = firstEdge(); it != lastEdge(); ++it)
diff --git a/Geo/GModelIO_MED.cpp b/Geo/GModelIO_MED.cpp
index 263c483d4510585e5a8cdf82d3a47aeaba445e77..9984c6069d963bfa8f4889d5270b03b2a9fd6964 100644
--- a/Geo/GModelIO_MED.cpp
+++ b/Geo/GModelIO_MED.cpp
@@ -1,4 +1,4 @@
-// $Id: GModelIO_MED.cpp,v 1.17 2008-03-25 20:48:32 geuzaine Exp $
+// $Id: GModelIO_MED.cpp,v 1.18 2008-03-29 10:19:36 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -59,6 +59,173 @@ static int getTypeForMED(int msh, med_geometrie_element &med)
}
}
+int GModel::readMED(const std::string &name)
+{
+ med_idt fid = MEDouvrir((char*)name.c_str(), MED_LECTURE);
+ if(fid < 0) {
+ Msg(GERROR, "Unable to open file '%s'", name.c_str());
+ return 0;
+ }
+
+ int numMeshes = MEDnMaa(fid);
+ if(!numMeshes){
+ Msg(INFO, "No mesh found in MED file");
+ return 0;
+ }
+ if(numMeshes > 1)
+ Msg(WARNING, "Reading mesh 1 of %d (ignoring the others)", numMeshes);
+
+ // read mesh info
+ char meshName[MED_TAILLE_NOM + 1], meshDesc[MED_TAILLE_DESC + 1];
+ med_int meshDim;
+ med_maillage meshType;
+ if(MEDmaaInfo(fid, 1, meshName, &meshDim, &meshType, meshDesc) < 0){
+ Msg(GERROR, "Unable to read mesh information");
+ return 0;
+ }
+
+ if(meshType == MED_NON_STRUCTURE){
+ Msg(INFO, "Reading %d-D unstructured mesh <<%s>>", meshDim, meshName);
+ }
+ else{
+ Msg(GERROR, "Cannot read structured mesh");
+ return 0;
+ }
+
+ // read nodes
+ med_int numNodes = MEDnEntMaa(fid, meshName, MED_COOR, MED_NOEUD, MED_NONE,
+ MED_NOD);
+ if(numNodes < 0){
+ Msg(GERROR, "Could not read number of MED nodes");
+ return 0;
+ }
+ if(numNodes == 0){
+ Msg(GERROR, "No nodes in MED mesh");
+ return 0;
+ }
+ std::vector<MVertex*> verts(numNodes);
+ std::vector<med_float> coord(meshDim * numNodes);
+ std::vector<char> coordName(meshDim * MED_TAILLE_PNOM + 1);
+ std::vector<char> coordUnit(meshDim * MED_TAILLE_PNOM + 1);
+ med_repere rep;
+ if(MEDcoordLire(fid, meshName, meshDim, &coord[0], MED_FULL_INTERLACE,
+ MED_ALL, 0, 0, &rep, &coordName[0], &coordUnit[0]) < 0){
+ Msg(GERROR, "Could not read MED node coordinates");
+ return 0;
+ }
+ std::vector<med_int> nodeTags(numNodes);
+ if(MEDnumLire(fid, meshName, &nodeTags[0], numNodes, MED_NOEUD, MED_NONE) < 0)
+ nodeTags.clear();
+ for(int i = 0; i < numNodes; i++)
+ verts[i] = new MVertex(coord[meshDim * i],
+ (meshDim > 1) ? coord[meshDim * i + 1] : 0.,
+ (meshDim > 2) ? coord[meshDim * i + 2] : 0.,
+ 0, nodeTags.empty() ? 0 : nodeTags[i]);
+ // read elements
+ for(int mshType = 0; mshType < 50; mshType++){ // loop over all possible MSH types
+ med_geometrie_element type;
+ int numNodPerEle = getTypeForMED(mshType, type);
+ if(type == MED_NONE) continue;
+ med_int numEle = MEDnEntMaa(fid, meshName, MED_CONN, MED_MAILLE, type, MED_NOD);
+ if(numEle <= 0) continue;
+ std::vector<med_int> conn(numEle * numNodPerEle);
+ if(MEDconnLire(fid, meshName, meshDim, &conn[0], MED_FULL_INTERLACE, 0, MED_ALL,
+ MED_MAILLE, type, MED_NOD) < 0) {
+ Msg(GERROR, "Could not read MED elements");
+ return 0;
+ }
+ std::vector<med_int> fam(numEle);
+ if(MEDfamLire(fid, meshName, &fam[0], numEle, MED_MAILLE, type) < 0) {
+ Msg(GERROR, "Could not read MED families");
+ return 0;
+ }
+ std::vector<med_int> eleTags(numEle);
+ if(MEDnumLire(fid, meshName, &eleTags[0], numEle, MED_MAILLE, type) < 0)
+ eleTags.clear();
+ if(numNodPerEle == 1){ // special case for points
+ for(int j = 0; j < numEle; j++){
+ GVertex *v = getVertexByTag(-fam[j]);
+ if(!v){
+ v = new discreteVertex(this, -fam[j]);
+ add(v);
+ }
+ v->mesh_vertices.push_back(verts[conn[j] - 1]);
+ }
+ }
+ else{
+ std::map<int, std::vector<MElement*> > elements;
+ MElementFactory factory;
+ for(int j = 0; j < numEle; j++){
+ std::vector<MVertex*> v(numNodPerEle);
+ for(int k = 0; k < numNodPerEle; k++)
+ v[k] = verts[conn[numNodPerEle * j + k] - 1];
+ MElement *e = factory.create(mshType, v, eleTags.empty() ? 0 : eleTags[j]);
+ if(e) elements[-fam[j]].push_back(e);
+ }
+ _storeElementsInEntities(elements);
+ }
+ }
+ _associateEntityWithMeshVertices();
+ for(unsigned int i = 0; i < verts.size(); i++){
+ GEntity *ge = verts[i]->onWhat();
+ if(ge && ge->dim() > 0) ge->mesh_vertices.push_back(verts[i]);
+ if(!ge) delete verts[i]; // delete unused vertices
+ }
+
+ // read family info
+ med_int numFamilies = MEDnFam(fid, meshName);
+ if(numFamilies < 0) {
+ Msg(GERROR, "Could not read MED families");
+ return 0;
+ }
+ for(int i = 0; i < numFamilies; i++) {
+ med_int numAttrib = MEDnAttribut(fid, meshName, i + 1);
+ med_int numGroups = MEDnGroupe(fid, meshName, i + 1);
+ if(numAttrib < 0 || numGroups < 0){
+ Msg(GERROR, "Could not read MED groups or attributes");
+ return 0;
+ }
+ if(numGroups > 0){ // get physicals
+ std::vector<med_int> attribId(numAttrib + 1);
+ std::vector<med_int> attribVal(numAttrib + 1);
+ std::vector<char> attribDes(MED_TAILLE_DESC * numAttrib + 1);
+ std::vector<char> groupNames(MED_TAILLE_LNOM * numGroups + 1);
+ char familyName[MED_TAILLE_NOM + 1];
+ med_int familyNum;
+ if(MEDfamInfo(fid, meshName, i + 1, familyName, &familyNum, &attribId[0],
+ &attribVal[0], &attribDes[0], &numAttrib, &groupNames[0],
+ &numGroups) < 0) {
+ Msg(GERROR, "Could not read info for MED family %d", i + 1);
+ }
+ else{
+ GEntity *ge; // family tags are unique (for all dims)
+ if((ge = getRegionByTag(-familyNum))){}
+ else if((ge = getFaceByTag(-familyNum))){}
+ else if((ge = getEdgeByTag(-familyNum))){}
+ else ge = getVertexByTag(-familyNum);
+ if(ge){
+ for(int j = 0; j < numGroups; j++) {
+ char tmp[MED_TAILLE_LNOM + 1];
+ strncpy(tmp, &groupNames[j * MED_TAILLE_LNOM], MED_TAILLE_LNOM);
+ tmp[MED_TAILLE_LNOM] = '\0';
+ ge->physicals.push_back(setPhysicalName(tmp));
+ }
+ }
+ }
+ }
+ }
+
+ // check if we need to read some post-processing data later
+ bool postpro = (MEDnChamp(fid, 0) > 0) ? true : false;
+
+ if(MEDfermer(fid) < 0){
+ Msg(GERROR, "Unable to close file '%s'", (char*)name.c_str());
+ return 0;
+ }
+
+ return postpro ? 2 : 1;
+}
+
template<class T>
static void fillElementsMED(med_int family, std::vector<T*> &elements, med_int &ele,
std::vector<med_int> &num, std::vector<med_int> &conn,
@@ -93,8 +260,7 @@ int GModel::writeMED(const std::string &name, bool saveAll, double scalingFactor
}
// write header
- char des[MED_TAILLE_DESC + 1] = "MED file generated by Gmsh";
- if(MEDfichDesEcr(fid, des) < 0) {
+ if(MEDfichDesEcr(fid, (char*)"MED file generated by Gmsh") < 0) {
Msg(GERROR, "Unable to write MED descriptor");
return 0;
}
@@ -178,7 +344,7 @@ int GModel::writeMED(const std::string &name, bool saveAll, double scalingFactor
char coordName[3 * MED_TAILLE_PNOM + 1] =
"x y z ";
char coordUnit[3 * MED_TAILLE_PNOM + 1] =
- "inconnu inconnu inconnu ";
+ "unknown unknown unknown ";
if(MEDnoeudsEcr(fid, meshName, (med_int)3, &coord[0], MED_FULL_INTERLACE,
MED_CART, coordName, coordUnit, 0, MED_FAUX, &num[0],
MED_VRAI, &fam[0], (med_int)num.size()) < 0)
@@ -260,183 +426,18 @@ int GModel::writeMED(const std::string &name, bool saveAll, double scalingFactor
return 1;
}
-int GModel::readMED(const std::string &name)
-{
- med_idt fid = MEDouvrir((char*)name.c_str(), MED_LECTURE);
- if(fid < 0) {
- Msg(GERROR, "Unable to open file '%s'", name.c_str());
- return 0;
- }
-
- int numMeshes = MEDnMaa(fid);
- if(!numMeshes){
- Msg(INFO, "No mesh found in MED file");
- return 0;
- }
- if(numMeshes > 1)
- Msg(WARNING, "Reading mesh 1 of %d (ignoring the others)", numMeshes);
-
- // read mesh info
- char meshName[MED_TAILLE_NOM + 1], meshDesc[MED_TAILLE_DESC + 1];
- med_int meshDim;
- med_maillage meshType;
- if(MEDmaaInfo(fid, 1, meshName, &meshDim, &meshType, meshDesc) < 0){
- Msg(GERROR, "Unable to read mesh information");
- return 0;
- }
-
- if(meshType == MED_NON_STRUCTURE){
- Msg(INFO, "Reading %d-D unstructured mesh <<%s>>", meshDim, meshName);
- }
- else{
- Msg(GERROR, "Cannot read structured mesh");
- return 0;
- }
-
- // read nodes
- med_int numNodes = MEDnEntMaa(fid, meshName, MED_COOR, MED_NOEUD,
- (med_geometrie_element)0, (med_connectivite)0);
- if(numNodes < 0){
- Msg(GERROR, "Could not read number of MED nodes");
- return 0;
- }
- if(numNodes == 0){
- Msg(GERROR, "No nodes in MED mesh");
- return 0;
- }
- std::vector<MVertex*> verts(numNodes);
- std::vector<med_float> coord(meshDim * numNodes);
- std::vector<char> coordName(meshDim * MED_TAILLE_PNOM + 1);
- std::vector<char> coordUnit(meshDim * MED_TAILLE_PNOM + 1);
- med_repere rep;
- if(MEDcoordLire(fid, meshName, meshDim, &coord[0], MED_FULL_INTERLACE,
- MED_ALL, 0, 0, &rep, &coordName[0], &coordUnit[0]) < 0){
- Msg(GERROR, "Could not read MED node coordinates");
- return 0;
- }
- std::vector<med_int> nodeTags(numNodes);
- if(MEDnumLire(fid, meshName, &nodeTags[0], numNodes, MED_NOEUD,
- (med_geometrie_element)0) < 0)
- nodeTags.clear();
- for(int i = 0; i < numNodes; i++)
- verts[i] = new MVertex(coord[meshDim * i],
- (meshDim > 1) ? coord[meshDim * i + 1] : 0.,
- (meshDim > 2) ? coord[meshDim * i + 2] : 0.,
- 0, nodeTags.empty() ? 0 : nodeTags[i]);
- // read elements
- for(int mshType = 0; mshType < 50; mshType++){ // loop over all possible MSH types
- med_geometrie_element type;
- int numNodPerEle = getTypeForMED(mshType, type);
- if(type == MED_NONE) continue;
- med_int numEle = MEDnEntMaa(fid, meshName, MED_CONN, MED_MAILLE, type, MED_NOD);
- if(numEle <= 0) continue;
- std::vector<med_int> conn(numEle * numNodPerEle);
- if(MEDconnLire(fid, meshName, meshDim, &conn[0], MED_FULL_INTERLACE, 0, MED_ALL,
- MED_MAILLE, type, MED_NOD) < 0) {
- Msg(GERROR, "Could not read MED elements");
- return 0;
- }
- std::vector<med_int> fam(numEle);
- if(MEDfamLire(fid, meshName, &fam[0], numEle, MED_MAILLE, type) < 0) {
- Msg(GERROR, "Could not read MED families");
- return 0;
- }
- std::vector<med_int> eleTags(numEle);
- if(MEDnumLire(fid, meshName, &eleTags[0], numEle, MED_MAILLE, type) < 0)
- eleTags.clear();
- if(numNodPerEle == 1){ // special case for points
- for(int j = 0; j < numEle; j++){
- GVertex *v = getVertexByTag(-fam[j]);
- if(!v){
- v = new discreteVertex(this, -fam[j]);
- add(v);
- }
- v->mesh_vertices.push_back(verts[conn[j] - 1]);
- }
- }
- else{
- std::map<int, std::vector<MElement*> > elements;
- MElementFactory factory;
- for(int j = 0; j < numEle; j++){
- std::vector<MVertex*> v(numNodPerEle);
- for(int k = 0; k < numNodPerEle; k++)
- v[k] = verts[conn[numNodPerEle * j + k] - 1];
- MElement *e = factory.create(mshType, v, eleTags.empty() ? 0 : eleTags[j]);
- if(e) elements[-fam[j]].push_back(e);
- }
- _storeElementsInEntities(elements);
- }
- }
- _associateEntityWithMeshVertices();
- for(unsigned int i = 0; i < verts.size(); i++){
- GEntity *ge = verts[i]->onWhat();
- if(ge && ge->dim() > 0) ge->mesh_vertices.push_back(verts[i]);
- if(!ge) delete verts[i]; // delete unused vertices
- }
-
- // read family info
- med_int numFamilies = MEDnFam(fid, meshName);
- if(numFamilies < 0) {
- Msg(GERROR, "Could not read MED families");
- return 0;
- }
- for(int i = 0; i < numFamilies; i++) {
- med_int numAttrib = MEDnAttribut(fid, meshName, i + 1);
- med_int numGroups = MEDnGroupe(fid, meshName, i + 1);
- if(numAttrib < 0 || numGroups < 0){
- Msg(GERROR, "Could not read MED groups or attributes");
- return 0;
- }
- if(numGroups > 0){ // get physicals
- std::vector<med_int> attribId(numAttrib + 1);
- std::vector<med_int> attribVal(numAttrib + 1);
- std::vector<char> attribDes(MED_TAILLE_DESC * numAttrib + 1);
- std::vector<char> groupNames(MED_TAILLE_LNOM * numGroups + 1);
- char familyName[MED_TAILLE_NOM + 1];
- med_int familyNum;
- if(MEDfamInfo(fid, meshName, i + 1, familyName, &familyNum, &attribId[0],
- &attribVal[0], &attribDes[0], &numAttrib, &groupNames[0],
- &numGroups) < 0) {
- Msg(GERROR, "Could not read info for MED family %d", i + 1);
- }
- else{
- GEntity *ge; // family tags are unique (for all dims)
- if((ge = getRegionByTag(-familyNum))){}
- else if((ge = getFaceByTag(-familyNum))){}
- else if((ge = getEdgeByTag(-familyNum))){}
- else ge = getVertexByTag(-familyNum);
- if(ge){
- for(int j = 0; j < numGroups; j++) {
- char tmp[MED_TAILLE_LNOM + 1];
- strncpy(tmp, &groupNames[j * MED_TAILLE_LNOM], MED_TAILLE_LNOM);
- tmp[MED_TAILLE_LNOM] = '\0';
- ge->physicals.push_back(setPhysicalName(tmp));
- }
- }
- }
- }
- }
-
- if(MEDfermer(fid) < 0){
- Msg(GERROR, "Unable to close file '%s'", (char*)name.c_str());
- return 0;
- }
-
- return 1;
-}
-
#else
-int GModel::writeMED(const std::string &name, bool saveAll, double scalingFactor)
+int GModel::readMED(const std::string &name)
{
- Msg(GERROR, "Gmsh has to be compiled with MED support to write '%s'",
+ Msg(GERROR, "Gmsh has to be compiled with MED support to read '%s'",
name.c_str());
return 0;
}
-int GModel::readMED(const std::string &name)
+int GModel::writeMED(const std::string &name, bool saveAll, double scalingFactor)
{
- Msg(GERROR, "Gmsh has to be compiled with MED support to read '%s'",
+ Msg(GERROR, "Gmsh has to be compiled with MED support to write '%s'",
name.c_str());
return 0;
}
diff --git a/Graphics/Post.cpp b/Graphics/Post.cpp
index 89e43ec783fd597595f4c6513bb792d5e385a630..f916d97d3bf3703abb56002914d7825b9f841f48 100644
--- a/Graphics/Post.cpp
+++ b/Graphics/Post.cpp
@@ -1,4 +1,4 @@
-// $Id: Post.cpp,v 1.158 2008-03-20 11:44:07 geuzaine Exp $
+// $Id: Post.cpp,v 1.159 2008-03-29 10:19:36 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -1270,8 +1270,10 @@ class drawPView {
{
PViewData *data = p->getData();
PViewOptions *opt = p->getOptions();
-
+
if(!opt->Visible || opt->Type != PViewOptions::Plot3D) return;
+
+ if(data->getDirty()) return;
glPointSize(opt->PointSize);
gl2psPointSize(opt->PointSize * CTX.print.eps_point_size_factor);
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 08584fa6dc1ae605d3204cbedaad5a60b22433e3..a6a9c18ab4c179e7e15476ca025dd2a43b9df0db 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.210 2008-03-19 17:34:56 geuzaine Exp $
+# $Id: Makefile,v 1.211 2008-03-29 10:19:36 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -219,7 +219,7 @@ meshGFaceDelaunayInsertion.o: meshGFaceDelaunayInsertion.cpp BDS.h \
../Geo/MVertex.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
meshGFaceOptimize.h meshGFace.h ../Numeric/Numeric.h \
- ../Numeric/NumericEmbedded.h ../Common/Message.h
+ ../Numeric/NumericEmbedded.h ../Common/Message.h ../Common/Context.h
meshGFaceOptimize.o: meshGFaceOptimize.cpp meshGFaceOptimize.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h ../Geo/SVector3.h \
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 6530b9d3f69cd117617c9a5899cc04b4daba5d78..bd9f5e63c963173f2485dd68eaeca10c94298133 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -324,7 +324,7 @@
/* Copy the first part of user declarations. */
#line 1 "Gmsh.y"
-// $Id: Gmsh.tab.cpp,v 1.356 2008-03-23 21:42:58 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.357 2008-03-29 10:19:36 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -989,32 +989,32 @@ static const yytype_uint16 yyrline[] =
777, 795, 821, 848, 862, 879, 894, 912, 932, 955,
964, 969, 988, 1007, 1031, 1041, 1056, 1060, 1073, 1095,
1111, 1133, 1151, 1169, 1187, 1213, 1231, 1257, 1277, 1295,
- 1313, 1339, 1356, 1375, 1393, 1431, 1437, 1443, 1450, 1474,
- 1498, 1514, 1534, 1551, 1568, 1589, 1594, 1599, 1604, 1609,
- 1620, 1626, 1635, 1636, 1641, 1644, 1648, 1671, 1694, 1717,
- 1745, 1754, 1758, 1771, 1787, 1802, 1816, 1822, 1828, 1837,
- 1851, 1899, 1915, 1928, 1947, 1957, 1979, 1983, 1988, 1993,
- 2005, 2022, 2039, 2066, 2093, 2124, 2132, 2138, 2145, 2149,
- 2158, 2166, 2174, 2183, 2182, 2195, 2194, 2207, 2206, 2219,
- 2218, 2230, 2229, 2245, 2252, 2259, 2266, 2273, 2280, 2287,
- 2294, 2301, 2309, 2308, 2320, 2319, 2331, 2330, 2342, 2341,
- 2353, 2352, 2364, 2363, 2375, 2374, 2386, 2385, 2397, 2396,
- 2411, 2414, 2420, 2429, 2449, 2472, 2476, 2500, 2518, 2536,
- 2554, 2583, 2618, 2623, 2650, 2664, 2677, 2694, 2700, 2706,
- 2709, 2718, 2728, 2729, 2730, 2731, 2732, 2733, 2734, 2735,
- 2736, 2743, 2744, 2745, 2746, 2747, 2748, 2749, 2750, 2751,
- 2752, 2753, 2754, 2755, 2756, 2757, 2758, 2759, 2760, 2761,
- 2762, 2763, 2764, 2765, 2766, 2767, 2768, 2769, 2770, 2771,
- 2772, 2773, 2774, 2776, 2777, 2778, 2779, 2780, 2781, 2782,
- 2783, 2784, 2785, 2786, 2787, 2788, 2789, 2790, 2791, 2792,
- 2793, 2794, 2795, 2796, 2805, 2806, 2807, 2808, 2809, 2810,
- 2811, 2815, 2831, 2846, 2866, 2879, 2892, 2915, 2933, 2951,
- 2969, 2987, 2995, 2999, 3003, 3007, 3011, 3018, 3022, 3026,
- 3030, 3037, 3042, 3050, 3055, 3059, 3064, 3068, 3076, 3087,
- 3095, 3103, 3109, 3120, 3140, 3150, 3160, 3177, 3204, 3209,
- 3213, 3217, 3230, 3234, 3246, 3253, 3274, 3278, 3293, 3298,
- 3305, 3309, 3316, 3320, 3328, 3336, 3350, 3364, 3368, 3387,
- 3410
+ 1313, 1339, 1356, 1375, 1393, 1431, 1437, 1443, 1450, 1475,
+ 1500, 1516, 1536, 1554, 1571, 1592, 1597, 1602, 1607, 1612,
+ 1623, 1629, 1638, 1639, 1644, 1647, 1651, 1674, 1697, 1720,
+ 1748, 1757, 1761, 1774, 1790, 1805, 1819, 1825, 1831, 1840,
+ 1854, 1902, 1918, 1931, 1950, 1960, 1982, 1986, 1991, 1996,
+ 2008, 2025, 2042, 2069, 2096, 2127, 2135, 2141, 2148, 2152,
+ 2161, 2169, 2177, 2186, 2185, 2198, 2197, 2210, 2209, 2222,
+ 2221, 2233, 2232, 2248, 2255, 2262, 2269, 2276, 2283, 2290,
+ 2297, 2304, 2312, 2311, 2323, 2322, 2334, 2333, 2345, 2344,
+ 2356, 2355, 2367, 2366, 2378, 2377, 2389, 2388, 2400, 2399,
+ 2414, 2417, 2423, 2432, 2452, 2475, 2479, 2503, 2521, 2539,
+ 2557, 2586, 2621, 2626, 2653, 2667, 2680, 2697, 2703, 2709,
+ 2712, 2721, 2731, 2732, 2733, 2734, 2735, 2736, 2737, 2738,
+ 2739, 2746, 2747, 2748, 2749, 2750, 2751, 2752, 2753, 2754,
+ 2755, 2756, 2757, 2758, 2759, 2760, 2761, 2762, 2763, 2764,
+ 2765, 2766, 2767, 2768, 2769, 2770, 2771, 2772, 2773, 2774,
+ 2775, 2776, 2777, 2779, 2780, 2781, 2782, 2783, 2784, 2785,
+ 2786, 2787, 2788, 2789, 2790, 2791, 2792, 2793, 2794, 2795,
+ 2796, 2797, 2798, 2799, 2808, 2809, 2810, 2811, 2812, 2813,
+ 2814, 2818, 2834, 2849, 2869, 2882, 2895, 2918, 2936, 2954,
+ 2972, 2990, 2998, 3002, 3006, 3010, 3014, 3021, 3025, 3029,
+ 3033, 3040, 3045, 3053, 3058, 3062, 3067, 3071, 3079, 3090,
+ 3098, 3106, 3112, 3123, 3143, 3153, 3163, 3180, 3207, 3212,
+ 3216, 3220, 3233, 3237, 3249, 3256, 3277, 3281, 3296, 3301,
+ 3308, 3312, 3319, 3323, 3331, 3339, 3353, 3367, 3371, 3390,
+ 3413
};
#endif
@@ -5184,19 +5184,20 @@ yyreduce:
Vertex *v2 = FindPoint((int)p2);
if(!v1) yymsg(GERROR, "Sphere %d : unknown point %d", num, (int)p1);
if(!v2) yymsg(GERROR, "Sphere %d : unknown point %d", num, (int)p2);
- myGmshSurface = gmshSphere::NewSphere
- (num, v1->Pos.X, v1->Pos.Y, v1->Pos.Z,
- sqrt((v2->Pos.X - v1->Pos.X) * (v2->Pos.X - v1->Pos.X) +
- (v2->Pos.Y - v1->Pos.Y) * (v2->Pos.Y - v1->Pos.Y) +
- (v2->Pos.Z - v1->Pos.Z) * (v2->Pos.Z - v1->Pos.Z)));
- }
+ if(v1 && v2)
+ myGmshSurface = gmshSphere::NewSphere
+ (num, v1->Pos.X, v1->Pos.Y, v1->Pos.Z,
+ sqrt((v2->Pos.X - v1->Pos.X) * (v2->Pos.X - v1->Pos.X) +
+ (v2->Pos.Y - v1->Pos.Y) * (v2->Pos.Y - v1->Pos.Y) +
+ (v2->Pos.Z - v1->Pos.Z) * (v2->Pos.Z - v1->Pos.Z)));
+ }
(yyval.s).Type = 0;
(yyval.s).Num = num;
;}
break;
case 109:
-#line 1475 "Gmsh.y"
+#line 1476 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
if (List_Nbr((yyvsp[(6) - (7)].l)) != 2){
@@ -5211,19 +5212,20 @@ yyreduce:
Vertex *v2 = FindPoint((int)p2);
if(!v1) yymsg(GERROR, "PolarSphere %d : unknown point %d", num, (int)p1);
if(!v2) yymsg(GERROR, "PolarSphere %d : unknown point %d", num, (int)p2);
- myGmshSurface = gmshPolarSphere::NewPolarSphere
- (num, v1->Pos.X, v1->Pos.Y, v1->Pos.Z,
- sqrt((v2->Pos.X - v1->Pos.X) * (v2->Pos.X - v1->Pos.X) +
- (v2->Pos.Y - v1->Pos.Y) * (v2->Pos.Y - v1->Pos.Y) +
- (v2->Pos.Z - v1->Pos.Z) * (v2->Pos.Z - v1->Pos.Z)));
- }
+ if(v1 && v2)
+ myGmshSurface = gmshPolarSphere::NewPolarSphere
+ (num, v1->Pos.X, v1->Pos.Y, v1->Pos.Z,
+ sqrt((v2->Pos.X - v1->Pos.X) * (v2->Pos.X - v1->Pos.X) +
+ (v2->Pos.Y - v1->Pos.Y) * (v2->Pos.Y - v1->Pos.Y) +
+ (v2->Pos.Z - v1->Pos.Z) * (v2->Pos.Z - v1->Pos.Z)));
+ }
(yyval.s).Type = 0;
(yyval.s).Num = num;
;}
break;
case 110:
-#line 1499 "Gmsh.y"
+#line 1501 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (8)].d);
if(FindSurfaceLoop(num)){
@@ -5242,7 +5244,7 @@ yyreduce:
break;
case 111:
-#line 1515 "Gmsh.y"
+#line 1517 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (8)].i);
if(FindPhysicalGroup(num, MSH_PHYSICAL_SURFACE)){
@@ -5261,8 +5263,9 @@ yyreduce:
break;
case 112:
-#line 1535 "Gmsh.y"
+#line 1537 "Gmsh.y"
{
+ yymsg(GERROR, "'Complex Volume' command is deprecated: use 'Volume' instead");
int num = (int)(yyvsp[(4) - (8)].d);
if(FindVolume(num)){
yymsg(GERROR, "Volume %d already exists", num);
@@ -5281,7 +5284,7 @@ yyreduce:
break;
case 113:
-#line 1552 "Gmsh.y"
+#line 1555 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
if(FindVolume(num)){
@@ -5301,7 +5304,7 @@ yyreduce:
break;
case 114:
-#line 1569 "Gmsh.y"
+#line 1572 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (8)].i);
if(FindPhysicalGroup(num, MSH_PHYSICAL_VOLUME)){
@@ -5320,7 +5323,7 @@ yyreduce:
break;
case 115:
-#line 1590 "Gmsh.y"
+#line 1593 "Gmsh.y"
{
TranslateShapes((yyvsp[(2) - (5)].v)[0], (yyvsp[(2) - (5)].v)[1], (yyvsp[(2) - (5)].v)[2], (yyvsp[(4) - (5)].l));
(yyval.l) = (yyvsp[(4) - (5)].l);
@@ -5328,7 +5331,7 @@ yyreduce:
break;
case 116:
-#line 1595 "Gmsh.y"
+#line 1598 "Gmsh.y"
{
RotateShapes((yyvsp[(3) - (11)].v)[0], (yyvsp[(3) - (11)].v)[1], (yyvsp[(3) - (11)].v)[2], (yyvsp[(5) - (11)].v)[0], (yyvsp[(5) - (11)].v)[1], (yyvsp[(5) - (11)].v)[2], (yyvsp[(7) - (11)].d), (yyvsp[(10) - (11)].l));
(yyval.l) = (yyvsp[(10) - (11)].l);
@@ -5336,7 +5339,7 @@ yyreduce:
break;
case 117:
-#line 1600 "Gmsh.y"
+#line 1603 "Gmsh.y"
{
SymmetryShapes((yyvsp[(2) - (5)].v)[0], (yyvsp[(2) - (5)].v)[1], (yyvsp[(2) - (5)].v)[2], (yyvsp[(2) - (5)].v)[3], (yyvsp[(4) - (5)].l));
(yyval.l) = (yyvsp[(4) - (5)].l);
@@ -5344,7 +5347,7 @@ yyreduce:
break;
case 118:
-#line 1605 "Gmsh.y"
+#line 1608 "Gmsh.y"
{
DilatShapes((yyvsp[(3) - (9)].v)[0], (yyvsp[(3) - (9)].v)[1], (yyvsp[(3) - (9)].v)[2], (yyvsp[(5) - (9)].d), (yyvsp[(8) - (9)].l));
(yyval.l) = (yyvsp[(8) - (9)].l);
@@ -5352,7 +5355,7 @@ yyreduce:
break;
case 119:
-#line 1610 "Gmsh.y"
+#line 1613 "Gmsh.y"
{
(yyval.l) = List_Create(3, 3, sizeof(Shape));
for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
@@ -5366,7 +5369,7 @@ yyreduce:
break;
case 120:
-#line 1621 "Gmsh.y"
+#line 1624 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
IntersectCurvesWithSurface((yyvsp[(4) - (9)].l), (int)(yyvsp[(8) - (9)].d), (yyval.l));
@@ -5375,7 +5378,7 @@ yyreduce:
break;
case 121:
-#line 1627 "Gmsh.y"
+#line 1630 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
BoundaryShapes((yyvsp[(3) - (4)].l), (yyval.l));
@@ -5384,31 +5387,31 @@ yyreduce:
break;
case 122:
-#line 1635 "Gmsh.y"
+#line 1638 "Gmsh.y"
{ (yyval.l) = (yyvsp[(1) - (1)].l); ;}
break;
case 123:
-#line 1636 "Gmsh.y"
+#line 1639 "Gmsh.y"
{ (yyval.l) = (yyvsp[(1) - (1)].l); ;}
break;
case 124:
-#line 1641 "Gmsh.y"
+#line 1644 "Gmsh.y"
{
(yyval.l) = List_Create(3, 3, sizeof(Shape));
;}
break;
case 125:
-#line 1645 "Gmsh.y"
+#line 1648 "Gmsh.y"
{
List_Add((yyval.l), &(yyvsp[(2) - (2)].s));
;}
break;
case 126:
-#line 1649 "Gmsh.y"
+#line 1652 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
double d;
@@ -5434,7 +5437,7 @@ yyreduce:
break;
case 127:
-#line 1672 "Gmsh.y"
+#line 1675 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
double d;
@@ -5460,7 +5463,7 @@ yyreduce:
break;
case 128:
-#line 1695 "Gmsh.y"
+#line 1698 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
double d;
@@ -5486,7 +5489,7 @@ yyreduce:
break;
case 129:
-#line 1718 "Gmsh.y"
+#line 1721 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
double d;
@@ -5512,7 +5515,7 @@ yyreduce:
break;
case 130:
-#line 1746 "Gmsh.y"
+#line 1749 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
Shape TheShape;
@@ -5524,14 +5527,14 @@ yyreduce:
break;
case 131:
-#line 1755 "Gmsh.y"
+#line 1758 "Gmsh.y"
{
GModel::current()->getFields()->delete_field((int)(yyvsp[(4) - (6)].d));
;}
break;
case 132:
-#line 1759 "Gmsh.y"
+#line 1762 "Gmsh.y"
{
if(!strcmp((yyvsp[(2) - (6)].c), "View")){
int index = (int)(yyvsp[(4) - (6)].d);
@@ -5547,7 +5550,7 @@ yyreduce:
break;
case 133:
-#line 1772 "Gmsh.y"
+#line 1775 "Gmsh.y"
{
if(!strcmp((yyvsp[(2) - (3)].c), "Meshes") || !strcmp((yyvsp[(2) - (3)].c), "All")){
GModel::current()->destroy();
@@ -5566,7 +5569,7 @@ yyreduce:
break;
case 134:
-#line 1788 "Gmsh.y"
+#line 1791 "Gmsh.y"
{
if(!strcmp((yyvsp[(2) - (4)].c), "Empty") && !strcmp((yyvsp[(3) - (4)].c), "Views")){
for(int i = PView::list.size() - 1; i >= 0; i--)
@@ -5579,7 +5582,7 @@ yyreduce:
break;
case 135:
-#line 1803 "Gmsh.y"
+#line 1806 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
Shape TheShape;
@@ -5591,7 +5594,7 @@ yyreduce:
break;
case 136:
-#line 1817 "Gmsh.y"
+#line 1820 "Gmsh.y"
{
for(int i = 0; i < 4; i++)
VisibilityShape((yyvsp[(2) - (3)].c), i, 1);
@@ -5600,7 +5603,7 @@ yyreduce:
break;
case 137:
-#line 1823 "Gmsh.y"
+#line 1826 "Gmsh.y"
{
for(int i = 0; i < 4; i++)
VisibilityShape((yyvsp[(2) - (3)].c), i, 0);
@@ -5609,7 +5612,7 @@ yyreduce:
break;
case 138:
-#line 1829 "Gmsh.y"
+#line 1832 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
Shape TheShape;
@@ -5621,7 +5624,7 @@ yyreduce:
break;
case 139:
-#line 1838 "Gmsh.y"
+#line 1841 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
Shape TheShape;
@@ -5633,7 +5636,7 @@ yyreduce:
break;
case 140:
-#line 1852 "Gmsh.y"
+#line 1855 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (3)].c), "Include")){
char tmpstring[1024];
@@ -5684,7 +5687,7 @@ yyreduce:
break;
case 141:
-#line 1900 "Gmsh.y"
+#line 1903 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (7)].c), "Save") && !strcmp((yyvsp[(2) - (7)].c), "View")){
int index = (int)(yyvsp[(4) - (7)].d);
@@ -5703,7 +5706,7 @@ yyreduce:
break;
case 142:
-#line 1916 "Gmsh.y"
+#line 1919 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (7)].c), "Background") && !strcmp((yyvsp[(2) - (7)].c), "Mesh") && !strcmp((yyvsp[(3) - (7)].c), "View")){
int index = (int)(yyvsp[(5) - (7)].d);
@@ -5719,7 +5722,7 @@ yyreduce:
break;
case 143:
-#line 1929 "Gmsh.y"
+#line 1932 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (3)].c), "Sleep")){
SleepInSeconds((yyvsp[(2) - (3)].d));
@@ -5741,7 +5744,7 @@ yyreduce:
break;
case 144:
-#line 1948 "Gmsh.y"
+#line 1951 "Gmsh.y"
{
try {
GMSH_PluginManager::instance()->action((yyvsp[(3) - (7)].c), (yyvsp[(6) - (7)].c), 0);
@@ -5754,7 +5757,7 @@ yyreduce:
break;
case 145:
-#line 1958 "Gmsh.y"
+#line 1961 "Gmsh.y"
{
if(!strcmp((yyvsp[(2) - (3)].c), "ElementsFromAllViews"))
PView::combine(false, 1, CTX.post.combine_remove_orig);
@@ -5779,14 +5782,14 @@ yyreduce:
break;
case 146:
-#line 1980 "Gmsh.y"
+#line 1983 "Gmsh.y"
{
exit(0);
;}
break;
case 147:
-#line 1984 "Gmsh.y"
+#line 1987 "Gmsh.y"
{
CTX.forced_bbox = 0;
SetBoundingBox();
@@ -5794,7 +5797,7 @@ yyreduce:
break;
case 148:
-#line 1989 "Gmsh.y"
+#line 1992 "Gmsh.y"
{
CTX.forced_bbox = 1;
SetBoundingBox((yyvsp[(3) - (15)].d), (yyvsp[(5) - (15)].d), (yyvsp[(7) - (15)].d), (yyvsp[(9) - (15)].d), (yyvsp[(11) - (15)].d), (yyvsp[(13) - (15)].d));
@@ -5802,7 +5805,7 @@ yyreduce:
break;
case 149:
-#line 1994 "Gmsh.y"
+#line 1997 "Gmsh.y"
{
#if defined(HAVE_FLTK)
Draw();
@@ -5811,7 +5814,7 @@ yyreduce:
break;
case 150:
-#line 2006 "Gmsh.y"
+#line 2009 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(3) - (6)].d);
LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(5) - (6)].d);
@@ -5831,7 +5834,7 @@ yyreduce:
break;
case 151:
-#line 2023 "Gmsh.y"
+#line 2026 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(3) - (8)].d);
LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(5) - (8)].d);
@@ -5851,7 +5854,7 @@ yyreduce:
break;
case 152:
-#line 2040 "Gmsh.y"
+#line 2043 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(5) - (8)].d);
LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(7) - (8)].d);
@@ -5881,7 +5884,7 @@ yyreduce:
break;
case 153:
-#line 2067 "Gmsh.y"
+#line 2070 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(5) - (10)].d);
LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(7) - (10)].d);
@@ -5911,7 +5914,7 @@ yyreduce:
break;
case 154:
-#line 2094 "Gmsh.y"
+#line 2097 "Gmsh.y"
{
if(ImbricatedLoop <= 0){
yymsg(GERROR, "Invalid For/EndFor loop");
@@ -5945,7 +5948,7 @@ yyreduce:
break;
case 155:
-#line 2125 "Gmsh.y"
+#line 2128 "Gmsh.y"
{
if(!FunctionManager::Instance()->createFunction((yyvsp[(2) - (2)].c), gmsh_yyin, gmsh_yyname,
gmsh_yylineno))
@@ -5956,7 +5959,7 @@ yyreduce:
break;
case 156:
-#line 2133 "Gmsh.y"
+#line 2136 "Gmsh.y"
{
if(!FunctionManager::Instance()->leaveFunction(&gmsh_yyin, gmsh_yyname,
gmsh_yylineno))
@@ -5965,7 +5968,7 @@ yyreduce:
break;
case 157:
-#line 2139 "Gmsh.y"
+#line 2142 "Gmsh.y"
{
if(!FunctionManager::Instance()->enterFunction((yyvsp[(2) - (3)].c), &gmsh_yyin, gmsh_yyname,
gmsh_yylineno))
@@ -5975,20 +5978,20 @@ yyreduce:
break;
case 158:
-#line 2146 "Gmsh.y"
+#line 2149 "Gmsh.y"
{
if(!(yyvsp[(3) - (4)].d)) skip_until("If", "EndIf");
;}
break;
case 159:
-#line 2150 "Gmsh.y"
+#line 2153 "Gmsh.y"
{
;}
break;
case 160:
-#line 2159 "Gmsh.y"
+#line 2162 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE, (yyvsp[(4) - (5)].l),
@@ -5999,7 +6002,7 @@ yyreduce:
break;
case 161:
-#line 2167 "Gmsh.y"
+#line 2170 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(ROTATE, (yyvsp[(10) - (11)].l),
@@ -6010,7 +6013,7 @@ yyreduce:
break;
case 162:
-#line 2175 "Gmsh.y"
+#line 2178 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE_ROTATE, (yyvsp[(12) - (13)].l),
@@ -6021,14 +6024,14 @@ yyreduce:
break;
case 163:
-#line 2183 "Gmsh.y"
+#line 2186 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
case 164:
-#line 2187 "Gmsh.y"
+#line 2190 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE, (yyvsp[(4) - (7)].l),
@@ -6039,14 +6042,14 @@ yyreduce:
break;
case 165:
-#line 2195 "Gmsh.y"
+#line 2198 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
case 166:
-#line 2199 "Gmsh.y"
+#line 2202 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(ROTATE, (yyvsp[(10) - (13)].l),
@@ -6057,14 +6060,14 @@ yyreduce:
break;
case 167:
-#line 2207 "Gmsh.y"
+#line 2210 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
case 168:
-#line 2211 "Gmsh.y"
+#line 2214 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE_ROTATE, (yyvsp[(12) - (15)].l),
@@ -6075,14 +6078,14 @@ yyreduce:
break;
case 169:
-#line 2219 "Gmsh.y"
+#line 2222 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
case 170:
-#line 2223 "Gmsh.y"
+#line 2226 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(BOUNDARY_LAYER, (yyvsp[(3) - (6)].l), 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,
@@ -6092,14 +6095,14 @@ yyreduce:
break;
case 171:
-#line 2230 "Gmsh.y"
+#line 2233 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
case 172:
-#line 2234 "Gmsh.y"
+#line 2237 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
extr.mesh.ViewIndex = (int)(yyvsp[(4) - (10)].d);
@@ -6112,7 +6115,7 @@ yyreduce:
break;
case 173:
-#line 2246 "Gmsh.y"
+#line 2249 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_POINT, (int)(yyvsp[(4) - (8)].d),
@@ -6122,7 +6125,7 @@ yyreduce:
break;
case 174:
-#line 2253 "Gmsh.y"
+#line 2256 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (8)].d),
@@ -6132,7 +6135,7 @@ yyreduce:
break;
case 175:
-#line 2260 "Gmsh.y"
+#line 2263 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (8)].d),
@@ -6142,7 +6145,7 @@ yyreduce:
break;
case 176:
-#line 2267 "Gmsh.y"
+#line 2270 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_POINT, (int)(yyvsp[(4) - (12)].d),
@@ -6152,7 +6155,7 @@ yyreduce:
break;
case 177:
-#line 2274 "Gmsh.y"
+#line 2277 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (12)].d),
@@ -6162,7 +6165,7 @@ yyreduce:
break;
case 178:
-#line 2281 "Gmsh.y"
+#line 2284 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (12)].d),
@@ -6172,7 +6175,7 @@ yyreduce:
break;
case 179:
-#line 2288 "Gmsh.y"
+#line 2291 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)(yyvsp[(4) - (14)].d),
@@ -6182,7 +6185,7 @@ yyreduce:
break;
case 180:
-#line 2295 "Gmsh.y"
+#line 2298 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (14)].d),
@@ -6192,7 +6195,7 @@ yyreduce:
break;
case 181:
-#line 2302 "Gmsh.y"
+#line 2305 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (14)].d),
@@ -6202,14 +6205,14 @@ yyreduce:
break;
case 182:
-#line 2309 "Gmsh.y"
+#line 2312 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
case 183:
-#line 2313 "Gmsh.y"
+#line 2316 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_POINT, (int)(yyvsp[(4) - (12)].d),
@@ -6219,14 +6222,14 @@ yyreduce:
break;
case 184:
-#line 2320 "Gmsh.y"
+#line 2323 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
case 185:
-#line 2324 "Gmsh.y"
+#line 2327 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (12)].d),
@@ -6236,14 +6239,14 @@ yyreduce:
break;
case 186:
-#line 2331 "Gmsh.y"
+#line 2334 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
case 187:
-#line 2335 "Gmsh.y"
+#line 2338 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (12)].d),
@@ -6253,14 +6256,14 @@ yyreduce:
break;
case 188:
-#line 2342 "Gmsh.y"
+#line 2345 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
case 189:
-#line 2346 "Gmsh.y"
+#line 2349 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_POINT, (int)(yyvsp[(4) - (16)].d),
@@ -6270,14 +6273,14 @@ yyreduce:
break;
case 190:
-#line 2353 "Gmsh.y"
+#line 2356 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
case 191:
-#line 2357 "Gmsh.y"
+#line 2360 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (16)].d),
@@ -6287,14 +6290,14 @@ yyreduce:
break;
case 192:
-#line 2364 "Gmsh.y"
+#line 2367 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
case 193:
-#line 2368 "Gmsh.y"
+#line 2371 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (16)].d),
@@ -6304,14 +6307,14 @@ yyreduce:
break;
case 194:
-#line 2375 "Gmsh.y"
+#line 2378 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
case 195:
-#line 2379 "Gmsh.y"
+#line 2382 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)(yyvsp[(4) - (18)].d),
@@ -6321,14 +6324,14 @@ yyreduce:
break;
case 196:
-#line 2386 "Gmsh.y"
+#line 2389 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
case 197:
-#line 2390 "Gmsh.y"
+#line 2393 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (18)].d),
@@ -6338,14 +6341,14 @@ yyreduce:
break;
case 198:
-#line 2397 "Gmsh.y"
+#line 2400 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
case 199:
-#line 2401 "Gmsh.y"
+#line 2404 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (18)].d),
@@ -6355,19 +6358,19 @@ yyreduce:
break;
case 200:
-#line 2412 "Gmsh.y"
+#line 2415 "Gmsh.y"
{
;}
break;
case 201:
-#line 2415 "Gmsh.y"
+#line 2418 "Gmsh.y"
{
;}
break;
case 202:
-#line 2421 "Gmsh.y"
+#line 2424 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = true;
extr.mesh.NbLayer = 1;
@@ -6379,7 +6382,7 @@ yyreduce:
break;
case 203:
-#line 2430 "Gmsh.y"
+#line 2433 "Gmsh.y"
{
double d;
extr.mesh.ExtrudeMesh = true;
@@ -6402,7 +6405,7 @@ yyreduce:
break;
case 204:
-#line 2450 "Gmsh.y"
+#line 2453 "Gmsh.y"
{
yymsg(GERROR, "Explicit region numbers in layers are deprecated");
double d;
@@ -6428,14 +6431,14 @@ yyreduce:
break;
case 205:
-#line 2473 "Gmsh.y"
+#line 2476 "Gmsh.y"
{
extr.mesh.Recombine = true;
;}
break;
case 206:
-#line 2477 "Gmsh.y"
+#line 2480 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (9)].d);
if(FindSurface(num)){
@@ -6457,7 +6460,7 @@ yyreduce:
break;
case 207:
-#line 2501 "Gmsh.y"
+#line 2504 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
double d;
@@ -6478,7 +6481,7 @@ yyreduce:
break;
case 208:
-#line 2519 "Gmsh.y"
+#line 2522 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (9)].l)); i++){
double d;
@@ -6499,7 +6502,7 @@ yyreduce:
break;
case 209:
-#line 2537 "Gmsh.y"
+#line 2540 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (9)].l)); i++){
double d;
@@ -6520,7 +6523,7 @@ yyreduce:
break;
case 210:
-#line 2555 "Gmsh.y"
+#line 2558 "Gmsh.y"
{
Surface *s = FindSurface((int)(yyvsp[(4) - (8)].d));
if(!s)
@@ -6552,7 +6555,7 @@ yyreduce:
break;
case 211:
-#line 2584 "Gmsh.y"
+#line 2587 "Gmsh.y"
{
Surface *s = FindSurface((int)(yyvsp[(4) - (9)].d));
if(!s)
@@ -6590,7 +6593,7 @@ yyreduce:
break;
case 212:
-#line 2619 "Gmsh.y"
+#line 2622 "Gmsh.y"
{
yymsg(WARNING, "Elliptic Surface is deprecated: use Transfinite instead (with smoothing)");
List_Delete((yyvsp[(7) - (8)].l));
@@ -6598,7 +6601,7 @@ yyreduce:
break;
case 213:
-#line 2624 "Gmsh.y"
+#line 2627 "Gmsh.y"
{
Volume *v = FindVolume((int)(yyvsp[(4) - (8)].d));
if(!v)
@@ -6628,7 +6631,7 @@ yyreduce:
break;
case 214:
-#line 2651 "Gmsh.y"
+#line 2654 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
double d;
@@ -6645,7 +6648,7 @@ yyreduce:
break;
case 215:
-#line 2665 "Gmsh.y"
+#line 2668 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
double d;
@@ -6661,7 +6664,7 @@ yyreduce:
break;
case 216:
-#line 2678 "Gmsh.y"
+#line 2681 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
double d;
@@ -6675,7 +6678,7 @@ yyreduce:
break;
case 217:
-#line 2695 "Gmsh.y"
+#line 2698 "Gmsh.y"
{
Surface *s = FindSurface((int)(yyvsp[(8) - (10)].d));
if(s)
@@ -6684,7 +6687,7 @@ yyreduce:
break;
case 218:
-#line 2701 "Gmsh.y"
+#line 2704 "Gmsh.y"
{
Surface *s = FindSurface((int)(yyvsp[(8) - (10)].d));
if(s)
@@ -6693,66 +6696,66 @@ yyreduce:
break;
case 219:
-#line 2707 "Gmsh.y"
+#line 2710 "Gmsh.y"
{
;}
break;
case 220:
-#line 2710 "Gmsh.y"
+#line 2713 "Gmsh.y"
{
;}
break;
case 221:
-#line 2719 "Gmsh.y"
+#line 2722 "Gmsh.y"
{
ReplaceAllDuplicates();
;}
break;
case 222:
-#line 2728 "Gmsh.y"
+#line 2731 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (1)].d); ;}
break;
case 223:
-#line 2729 "Gmsh.y"
+#line 2732 "Gmsh.y"
{ (yyval.d) = (yyvsp[(2) - (3)].d); ;}
break;
case 224:
-#line 2730 "Gmsh.y"
+#line 2733 "Gmsh.y"
{ (yyval.d) = -(yyvsp[(2) - (2)].d); ;}
break;
case 225:
-#line 2731 "Gmsh.y"
+#line 2734 "Gmsh.y"
{ (yyval.d) = (yyvsp[(2) - (2)].d); ;}
break;
case 226:
-#line 2732 "Gmsh.y"
+#line 2735 "Gmsh.y"
{ (yyval.d) = !(yyvsp[(2) - (2)].d); ;}
break;
case 227:
-#line 2733 "Gmsh.y"
+#line 2736 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) - (yyvsp[(3) - (3)].d); ;}
break;
case 228:
-#line 2734 "Gmsh.y"
+#line 2737 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) + (yyvsp[(3) - (3)].d); ;}
break;
case 229:
-#line 2735 "Gmsh.y"
+#line 2738 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) * (yyvsp[(3) - (3)].d); ;}
break;
case 230:
-#line 2737 "Gmsh.y"
+#line 2740 "Gmsh.y"
{
if(!(yyvsp[(3) - (3)].d))
yymsg(GERROR, "Division by zero in '%g / %g'", (yyvsp[(1) - (3)].d), (yyvsp[(3) - (3)].d));
@@ -6762,307 +6765,307 @@ yyreduce:
break;
case 231:
-#line 2743 "Gmsh.y"
+#line 2746 "Gmsh.y"
{ (yyval.d) = (int)(yyvsp[(1) - (3)].d) % (int)(yyvsp[(3) - (3)].d); ;}
break;
case 232:
-#line 2744 "Gmsh.y"
+#line 2747 "Gmsh.y"
{ (yyval.d) = pow((yyvsp[(1) - (3)].d), (yyvsp[(3) - (3)].d)); ;}
break;
case 233:
-#line 2745 "Gmsh.y"
+#line 2748 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) < (yyvsp[(3) - (3)].d); ;}
break;
case 234:
-#line 2746 "Gmsh.y"
+#line 2749 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) > (yyvsp[(3) - (3)].d); ;}
break;
case 235:
-#line 2747 "Gmsh.y"
+#line 2750 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) <= (yyvsp[(3) - (3)].d); ;}
break;
case 236:
-#line 2748 "Gmsh.y"
+#line 2751 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) >= (yyvsp[(3) - (3)].d); ;}
break;
case 237:
-#line 2749 "Gmsh.y"
+#line 2752 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) == (yyvsp[(3) - (3)].d); ;}
break;
case 238:
-#line 2750 "Gmsh.y"
+#line 2753 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) != (yyvsp[(3) - (3)].d); ;}
break;
case 239:
-#line 2751 "Gmsh.y"
+#line 2754 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) && (yyvsp[(3) - (3)].d); ;}
break;
case 240:
-#line 2752 "Gmsh.y"
+#line 2755 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) || (yyvsp[(3) - (3)].d); ;}
break;
case 241:
-#line 2753 "Gmsh.y"
+#line 2756 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (5)].d)? (yyvsp[(3) - (5)].d) : (yyvsp[(5) - (5)].d); ;}
break;
case 242:
-#line 2754 "Gmsh.y"
+#line 2757 "Gmsh.y"
{ (yyval.d) = exp((yyvsp[(3) - (4)].d)); ;}
break;
case 243:
-#line 2755 "Gmsh.y"
+#line 2758 "Gmsh.y"
{ (yyval.d) = log((yyvsp[(3) - (4)].d)); ;}
break;
case 244:
-#line 2756 "Gmsh.y"
+#line 2759 "Gmsh.y"
{ (yyval.d) = log10((yyvsp[(3) - (4)].d)); ;}
break;
case 245:
-#line 2757 "Gmsh.y"
+#line 2760 "Gmsh.y"
{ (yyval.d) = sqrt((yyvsp[(3) - (4)].d)); ;}
break;
case 246:
-#line 2758 "Gmsh.y"
+#line 2761 "Gmsh.y"
{ (yyval.d) = sin((yyvsp[(3) - (4)].d)); ;}
break;
case 247:
-#line 2759 "Gmsh.y"
+#line 2762 "Gmsh.y"
{ (yyval.d) = asin((yyvsp[(3) - (4)].d)); ;}
break;
case 248:
-#line 2760 "Gmsh.y"
+#line 2763 "Gmsh.y"
{ (yyval.d) = cos((yyvsp[(3) - (4)].d)); ;}
break;
case 249:
-#line 2761 "Gmsh.y"
+#line 2764 "Gmsh.y"
{ (yyval.d) = acos((yyvsp[(3) - (4)].d)); ;}
break;
case 250:
-#line 2762 "Gmsh.y"
+#line 2765 "Gmsh.y"
{ (yyval.d) = tan((yyvsp[(3) - (4)].d)); ;}
break;
case 251:
-#line 2763 "Gmsh.y"
+#line 2766 "Gmsh.y"
{ (yyval.d) = atan((yyvsp[(3) - (4)].d)); ;}
break;
case 252:
-#line 2764 "Gmsh.y"
+#line 2767 "Gmsh.y"
{ (yyval.d) = atan2((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d));;}
break;
case 253:
-#line 2765 "Gmsh.y"
+#line 2768 "Gmsh.y"
{ (yyval.d) = sinh((yyvsp[(3) - (4)].d)); ;}
break;
case 254:
-#line 2766 "Gmsh.y"
+#line 2769 "Gmsh.y"
{ (yyval.d) = cosh((yyvsp[(3) - (4)].d)); ;}
break;
case 255:
-#line 2767 "Gmsh.y"
+#line 2770 "Gmsh.y"
{ (yyval.d) = tanh((yyvsp[(3) - (4)].d)); ;}
break;
case 256:
-#line 2768 "Gmsh.y"
+#line 2771 "Gmsh.y"
{ (yyval.d) = fabs((yyvsp[(3) - (4)].d)); ;}
break;
case 257:
-#line 2769 "Gmsh.y"
+#line 2772 "Gmsh.y"
{ (yyval.d) = floor((yyvsp[(3) - (4)].d)); ;}
break;
case 258:
-#line 2770 "Gmsh.y"
+#line 2773 "Gmsh.y"
{ (yyval.d) = ceil((yyvsp[(3) - (4)].d)); ;}
break;
case 259:
-#line 2771 "Gmsh.y"
+#line 2774 "Gmsh.y"
{ (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
case 260:
-#line 2772 "Gmsh.y"
+#line 2775 "Gmsh.y"
{ (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
case 261:
-#line 2773 "Gmsh.y"
+#line 2776 "Gmsh.y"
{ (yyval.d) = sqrt((yyvsp[(3) - (6)].d)*(yyvsp[(3) - (6)].d)+(yyvsp[(5) - (6)].d)*(yyvsp[(5) - (6)].d)); ;}
break;
case 262:
-#line 2774 "Gmsh.y"
+#line 2777 "Gmsh.y"
{ (yyval.d) = (yyvsp[(3) - (4)].d)*(double)rand()/(double)RAND_MAX; ;}
break;
case 263:
-#line 2776 "Gmsh.y"
+#line 2779 "Gmsh.y"
{ (yyval.d) = exp((yyvsp[(3) - (4)].d)); ;}
break;
case 264:
-#line 2777 "Gmsh.y"
+#line 2780 "Gmsh.y"
{ (yyval.d) = log((yyvsp[(3) - (4)].d)); ;}
break;
case 265:
-#line 2778 "Gmsh.y"
+#line 2781 "Gmsh.y"
{ (yyval.d) = log10((yyvsp[(3) - (4)].d)); ;}
break;
case 266:
-#line 2779 "Gmsh.y"
+#line 2782 "Gmsh.y"
{ (yyval.d) = sqrt((yyvsp[(3) - (4)].d)); ;}
break;
case 267:
-#line 2780 "Gmsh.y"
+#line 2783 "Gmsh.y"
{ (yyval.d) = sin((yyvsp[(3) - (4)].d)); ;}
break;
case 268:
-#line 2781 "Gmsh.y"
+#line 2784 "Gmsh.y"
{ (yyval.d) = asin((yyvsp[(3) - (4)].d)); ;}
break;
case 269:
-#line 2782 "Gmsh.y"
+#line 2785 "Gmsh.y"
{ (yyval.d) = cos((yyvsp[(3) - (4)].d)); ;}
break;
case 270:
-#line 2783 "Gmsh.y"
+#line 2786 "Gmsh.y"
{ (yyval.d) = acos((yyvsp[(3) - (4)].d)); ;}
break;
case 271:
-#line 2784 "Gmsh.y"
+#line 2787 "Gmsh.y"
{ (yyval.d) = tan((yyvsp[(3) - (4)].d)); ;}
break;
case 272:
-#line 2785 "Gmsh.y"
+#line 2788 "Gmsh.y"
{ (yyval.d) = atan((yyvsp[(3) - (4)].d)); ;}
break;
case 273:
-#line 2786 "Gmsh.y"
+#line 2789 "Gmsh.y"
{ (yyval.d) = atan2((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d));;}
break;
case 274:
-#line 2787 "Gmsh.y"
+#line 2790 "Gmsh.y"
{ (yyval.d) = sinh((yyvsp[(3) - (4)].d)); ;}
break;
case 275:
-#line 2788 "Gmsh.y"
+#line 2791 "Gmsh.y"
{ (yyval.d) = cosh((yyvsp[(3) - (4)].d)); ;}
break;
case 276:
-#line 2789 "Gmsh.y"
+#line 2792 "Gmsh.y"
{ (yyval.d) = tanh((yyvsp[(3) - (4)].d)); ;}
break;
case 277:
-#line 2790 "Gmsh.y"
+#line 2793 "Gmsh.y"
{ (yyval.d) = fabs((yyvsp[(3) - (4)].d)); ;}
break;
case 278:
-#line 2791 "Gmsh.y"
+#line 2794 "Gmsh.y"
{ (yyval.d) = floor((yyvsp[(3) - (4)].d)); ;}
break;
case 279:
-#line 2792 "Gmsh.y"
+#line 2795 "Gmsh.y"
{ (yyval.d) = ceil((yyvsp[(3) - (4)].d)); ;}
break;
case 280:
-#line 2793 "Gmsh.y"
+#line 2796 "Gmsh.y"
{ (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
case 281:
-#line 2794 "Gmsh.y"
+#line 2797 "Gmsh.y"
{ (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
case 282:
-#line 2795 "Gmsh.y"
+#line 2798 "Gmsh.y"
{ (yyval.d) = sqrt((yyvsp[(3) - (6)].d)*(yyvsp[(3) - (6)].d)+(yyvsp[(5) - (6)].d)*(yyvsp[(5) - (6)].d)); ;}
break;
case 283:
-#line 2796 "Gmsh.y"
+#line 2799 "Gmsh.y"
{ (yyval.d) = (yyvsp[(3) - (4)].d)*(double)rand()/(double)RAND_MAX; ;}
break;
case 284:
-#line 2805 "Gmsh.y"
+#line 2808 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (1)].d); ;}
break;
case 285:
-#line 2806 "Gmsh.y"
+#line 2809 "Gmsh.y"
{ (yyval.d) = 3.141592653589793; ;}
break;
case 286:
-#line 2807 "Gmsh.y"
+#line 2810 "Gmsh.y"
{ (yyval.d) = ParUtil::Instance()->rank(); ;}
break;
case 287:
-#line 2808 "Gmsh.y"
+#line 2811 "Gmsh.y"
{ (yyval.d) = ParUtil::Instance()->size(); ;}
break;
case 288:
-#line 2809 "Gmsh.y"
+#line 2812 "Gmsh.y"
{ (yyval.d) = Get_GmshMajorVersion(); ;}
break;
case 289:
-#line 2810 "Gmsh.y"
+#line 2813 "Gmsh.y"
{ (yyval.d) = Get_GmshMinorVersion(); ;}
break;
case 290:
-#line 2811 "Gmsh.y"
+#line 2814 "Gmsh.y"
{ (yyval.d) = Get_GmshPatchVersion(); ;}
break;
case 291:
-#line 2816 "Gmsh.y"
+#line 2819 "Gmsh.y"
{
Symbol TheSymbol;
TheSymbol.Name = (yyvsp[(1) - (1)].c);
@@ -7078,7 +7081,7 @@ yyreduce:
break;
case 292:
-#line 2832 "Gmsh.y"
+#line 2835 "Gmsh.y"
{
char tmpstring[1024];
sprintf(tmpstring, "%s_%d", (yyvsp[(1) - (5)].c), (int)(yyvsp[(4) - (5)].d)) ;
@@ -7096,7 +7099,7 @@ yyreduce:
break;
case 293:
-#line 2847 "Gmsh.y"
+#line 2850 "Gmsh.y"
{
Symbol TheSymbol;
TheSymbol.Name = (yyvsp[(1) - (4)].c);
@@ -7119,7 +7122,7 @@ yyreduce:
break;
case 294:
-#line 2867 "Gmsh.y"
+#line 2870 "Gmsh.y"
{
Symbol TheSymbol;
TheSymbol.Name = (yyvsp[(2) - (4)].c);
@@ -7135,7 +7138,7 @@ yyreduce:
break;
case 295:
-#line 2880 "Gmsh.y"
+#line 2883 "Gmsh.y"
{
Symbol TheSymbol;
TheSymbol.Name = (yyvsp[(1) - (2)].c);
@@ -7151,7 +7154,7 @@ yyreduce:
break;
case 296:
-#line 2893 "Gmsh.y"
+#line 2896 "Gmsh.y"
{
Symbol TheSymbol;
TheSymbol.Name = (yyvsp[(1) - (5)].c);
@@ -7174,7 +7177,7 @@ yyreduce:
break;
case 297:
-#line 2916 "Gmsh.y"
+#line 2919 "Gmsh.y"
{
double (*pNumOpt)(int num, int action, double value);
StringXNumber *pNumCat;
@@ -7195,7 +7198,7 @@ yyreduce:
break;
case 298:
-#line 2934 "Gmsh.y"
+#line 2937 "Gmsh.y"
{
double (*pNumOpt)(int num, int action, double value);
StringXNumber *pNumCat;
@@ -7216,7 +7219,7 @@ yyreduce:
break;
case 299:
-#line 2952 "Gmsh.y"
+#line 2955 "Gmsh.y"
{
double (*pNumOpt)(int num, int action, double value);
StringXNumber *pNumCat;
@@ -7237,7 +7240,7 @@ yyreduce:
break;
case 300:
-#line 2970 "Gmsh.y"
+#line 2973 "Gmsh.y"
{
double (*pNumOpt)(int num, int action, double value);
StringXNumber *pNumCat;
@@ -7258,7 +7261,7 @@ yyreduce:
break;
case 301:
-#line 2988 "Gmsh.y"
+#line 2991 "Gmsh.y"
{
(yyval.d) = GetValue((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].d));
Free((yyvsp[(3) - (6)].c));
@@ -7266,70 +7269,70 @@ yyreduce:
break;
case 302:
-#line 2996 "Gmsh.y"
+#line 2999 "Gmsh.y"
{
memcpy((yyval.v), (yyvsp[(1) - (1)].v), 5*sizeof(double));
;}
break;
case 303:
-#line 3000 "Gmsh.y"
+#line 3003 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = -(yyvsp[(2) - (2)].v)[i];
;}
break;
case 304:
-#line 3004 "Gmsh.y"
+#line 3007 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(2) - (2)].v)[i];
;}
break;
case 305:
-#line 3008 "Gmsh.y"
+#line 3011 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(1) - (3)].v)[i] - (yyvsp[(3) - (3)].v)[i];
;}
break;
case 306:
-#line 3012 "Gmsh.y"
+#line 3015 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(1) - (3)].v)[i] + (yyvsp[(3) - (3)].v)[i];
;}
break;
case 307:
-#line 3019 "Gmsh.y"
+#line 3022 "Gmsh.y"
{
(yyval.v)[0] = (yyvsp[(2) - (11)].d); (yyval.v)[1] = (yyvsp[(4) - (11)].d); (yyval.v)[2] = (yyvsp[(6) - (11)].d); (yyval.v)[3] = (yyvsp[(8) - (11)].d); (yyval.v)[4] = (yyvsp[(10) - (11)].d);
;}
break;
case 308:
-#line 3023 "Gmsh.y"
+#line 3026 "Gmsh.y"
{
(yyval.v)[0] = (yyvsp[(2) - (9)].d); (yyval.v)[1] = (yyvsp[(4) - (9)].d); (yyval.v)[2] = (yyvsp[(6) - (9)].d); (yyval.v)[3] = (yyvsp[(8) - (9)].d); (yyval.v)[4] = 1.0;
;}
break;
case 309:
-#line 3027 "Gmsh.y"
+#line 3030 "Gmsh.y"
{
(yyval.v)[0] = (yyvsp[(2) - (7)].d); (yyval.v)[1] = (yyvsp[(4) - (7)].d); (yyval.v)[2] = (yyvsp[(6) - (7)].d); (yyval.v)[3] = 0.0; (yyval.v)[4] = 1.0;
;}
break;
case 310:
-#line 3031 "Gmsh.y"
+#line 3034 "Gmsh.y"
{
(yyval.v)[0] = (yyvsp[(2) - (7)].d); (yyval.v)[1] = (yyvsp[(4) - (7)].d); (yyval.v)[2] = (yyvsp[(6) - (7)].d); (yyval.v)[3] = 0.0; (yyval.v)[4] = 1.0;
;}
break;
case 311:
-#line 3038 "Gmsh.y"
+#line 3041 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(List_T*));
List_Add((yyval.l), &((yyvsp[(1) - (1)].l)));
@@ -7337,14 +7340,14 @@ yyreduce:
break;
case 312:
-#line 3043 "Gmsh.y"
+#line 3046 "Gmsh.y"
{
List_Add((yyval.l), &((yyvsp[(3) - (3)].l)));
;}
break;
case 313:
-#line 3051 "Gmsh.y"
+#line 3054 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
List_Add((yyval.l), &((yyvsp[(1) - (1)].d)));
@@ -7352,14 +7355,14 @@ yyreduce:
break;
case 314:
-#line 3056 "Gmsh.y"
+#line 3059 "Gmsh.y"
{
(yyval.l) = (yyvsp[(1) - (1)].l);
;}
break;
case 315:
-#line 3060 "Gmsh.y"
+#line 3063 "Gmsh.y"
{
// creates an empty list
(yyval.l) = List_Create(2, 1, sizeof(double));
@@ -7367,14 +7370,14 @@ yyreduce:
break;
case 316:
-#line 3065 "Gmsh.y"
+#line 3068 "Gmsh.y"
{
(yyval.l) = (yyvsp[(2) - (3)].l);
;}
break;
case 317:
-#line 3069 "Gmsh.y"
+#line 3072 "Gmsh.y"
{
(yyval.l) = (yyvsp[(3) - (4)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -7385,7 +7388,7 @@ yyreduce:
break;
case 318:
-#line 3077 "Gmsh.y"
+#line 3080 "Gmsh.y"
{
(yyval.l) = (yyvsp[(4) - (5)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -7396,7 +7399,7 @@ yyreduce:
break;
case 319:
-#line 3088 "Gmsh.y"
+#line 3091 "Gmsh.y"
{
(yyval.l) = (yyvsp[(2) - (2)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -7407,7 +7410,7 @@ yyreduce:
break;
case 320:
-#line 3096 "Gmsh.y"
+#line 3099 "Gmsh.y"
{
(yyval.l) = (yyvsp[(3) - (3)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -7418,7 +7421,7 @@ yyreduce:
break;
case 321:
-#line 3104 "Gmsh.y"
+#line 3107 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
for(double d = (yyvsp[(1) - (3)].d); ((yyvsp[(1) - (3)].d) < (yyvsp[(3) - (3)].d)) ? (d <= (yyvsp[(3) - (3)].d)) : (d >= (yyvsp[(3) - (3)].d)); ((yyvsp[(1) - (3)].d) < (yyvsp[(3) - (3)].d)) ? (d += 1.) : (d -= 1.))
@@ -7427,7 +7430,7 @@ yyreduce:
break;
case 322:
-#line 3110 "Gmsh.y"
+#line 3113 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
if(!(yyvsp[(5) - (5)].d) || ((yyvsp[(1) - (5)].d) < (yyvsp[(3) - (5)].d) && (yyvsp[(5) - (5)].d) < 0) || ((yyvsp[(1) - (5)].d) > (yyvsp[(3) - (5)].d) && (yyvsp[(5) - (5)].d) > 0)){
@@ -7441,7 +7444,7 @@ yyreduce:
break;
case 323:
-#line 3121 "Gmsh.y"
+#line 3124 "Gmsh.y"
{
// Returns the coordinates of a point and fills a list with it.
// This allows to ensure e.g. that relative point positions are
@@ -7464,7 +7467,7 @@ yyreduce:
break;
case 324:
-#line 3141 "Gmsh.y"
+#line 3144 "Gmsh.y"
{
(yyval.l) = List_Create(List_Nbr((yyvsp[(1) - (1)].l)), 1, sizeof(double));
for(int i = 0; i < List_Nbr((yyvsp[(1) - (1)].l)); i++){
@@ -7477,7 +7480,7 @@ yyreduce:
break;
case 325:
-#line 3151 "Gmsh.y"
+#line 3154 "Gmsh.y"
{
(yyval.l) = List_Create(List_Nbr((yyvsp[(1) - (1)].l)), 1, sizeof(double));
for(int i = 0; i < List_Nbr((yyvsp[(1) - (1)].l)); i++){
@@ -7490,7 +7493,7 @@ yyreduce:
break;
case 326:
-#line 3161 "Gmsh.y"
+#line 3164 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
Symbol TheSymbol;
@@ -7510,7 +7513,7 @@ yyreduce:
break;
case 327:
-#line 3178 "Gmsh.y"
+#line 3181 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
Symbol TheSymbol;
@@ -7537,7 +7540,7 @@ yyreduce:
break;
case 328:
-#line 3205 "Gmsh.y"
+#line 3208 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
List_Add((yyval.l), &((yyvsp[(1) - (1)].d)));
@@ -7545,21 +7548,21 @@ yyreduce:
break;
case 329:
-#line 3210 "Gmsh.y"
+#line 3213 "Gmsh.y"
{
(yyval.l) = (yyvsp[(1) - (1)].l);
;}
break;
case 330:
-#line 3214 "Gmsh.y"
+#line 3217 "Gmsh.y"
{
List_Add((yyval.l), &((yyvsp[(3) - (3)].d)));
;}
break;
case 331:
-#line 3218 "Gmsh.y"
+#line 3221 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (3)].l)); i++){
double d;
@@ -7571,21 +7574,21 @@ yyreduce:
break;
case 332:
-#line 3231 "Gmsh.y"
+#line 3234 "Gmsh.y"
{
(yyval.u) = CTX.PACK_COLOR((int)(yyvsp[(2) - (9)].d), (int)(yyvsp[(4) - (9)].d), (int)(yyvsp[(6) - (9)].d), (int)(yyvsp[(8) - (9)].d));
;}
break;
case 333:
-#line 3235 "Gmsh.y"
+#line 3238 "Gmsh.y"
{
(yyval.u) = CTX.PACK_COLOR((int)(yyvsp[(2) - (7)].d), (int)(yyvsp[(4) - (7)].d), (int)(yyvsp[(6) - (7)].d), 255);
;}
break;
case 334:
-#line 3247 "Gmsh.y"
+#line 3250 "Gmsh.y"
{
int flag;
(yyval.u) = Get_ColorForString(ColorString, -1, (yyvsp[(1) - (1)].c), &flag);
@@ -7595,7 +7598,7 @@ yyreduce:
break;
case 335:
-#line 3254 "Gmsh.y"
+#line 3257 "Gmsh.y"
{
unsigned int (*pColOpt)(int num, int action, unsigned int value);
StringXColor *pColCat;
@@ -7616,14 +7619,14 @@ yyreduce:
break;
case 336:
-#line 3275 "Gmsh.y"
+#line 3278 "Gmsh.y"
{
(yyval.l) = (yyvsp[(2) - (3)].l);
;}
break;
case 337:
-#line 3279 "Gmsh.y"
+#line 3282 "Gmsh.y"
{
(yyval.l) = List_Create(256, 10, sizeof(unsigned int));
GmshColorTable *ct = Get_ColorTable((int)(yyvsp[(3) - (6)].d));
@@ -7638,7 +7641,7 @@ yyreduce:
break;
case 338:
-#line 3294 "Gmsh.y"
+#line 3297 "Gmsh.y"
{
(yyval.l) = List_Create(256, 10, sizeof(unsigned int));
List_Add((yyval.l), &((yyvsp[(1) - (1)].u)));
@@ -7646,35 +7649,35 @@ yyreduce:
break;
case 339:
-#line 3299 "Gmsh.y"
+#line 3302 "Gmsh.y"
{
List_Add((yyval.l), &((yyvsp[(3) - (3)].u)));
;}
break;
case 340:
-#line 3306 "Gmsh.y"
+#line 3309 "Gmsh.y"
{
(yyval.c) = (yyvsp[(1) - (1)].c);
;}
break;
case 341:
-#line 3310 "Gmsh.y"
+#line 3313 "Gmsh.y"
{
Msg(WARNING, "Named string expressions not implemented yet");
;}
break;
case 342:
-#line 3317 "Gmsh.y"
+#line 3320 "Gmsh.y"
{
(yyval.c) = (yyvsp[(1) - (1)].c);
;}
break;
case 343:
-#line 3321 "Gmsh.y"
+#line 3324 "Gmsh.y"
{
(yyval.c) = (char *)Malloc(32*sizeof(char));
time_t now;
@@ -7685,7 +7688,7 @@ yyreduce:
break;
case 344:
-#line 3329 "Gmsh.y"
+#line 3332 "Gmsh.y"
{
(yyval.c) = (char *)Malloc((strlen((yyvsp[(3) - (6)].c))+strlen((yyvsp[(5) - (6)].c))+1)*sizeof(char));
strcpy((yyval.c), (yyvsp[(3) - (6)].c));
@@ -7696,7 +7699,7 @@ yyreduce:
break;
case 345:
-#line 3337 "Gmsh.y"
+#line 3340 "Gmsh.y"
{
(yyval.c) = (char *)Malloc((strlen((yyvsp[(3) - (4)].c))+1)*sizeof(char));
int i;
@@ -7713,7 +7716,7 @@ yyreduce:
break;
case 346:
-#line 3351 "Gmsh.y"
+#line 3354 "Gmsh.y"
{
(yyval.c) = (char *)Malloc((strlen((yyvsp[(3) - (4)].c))+1)*sizeof(char));
int i;
@@ -7730,14 +7733,14 @@ yyreduce:
break;
case 347:
-#line 3365 "Gmsh.y"
+#line 3368 "Gmsh.y"
{
(yyval.c) = (yyvsp[(3) - (4)].c);
;}
break;
case 348:
-#line 3369 "Gmsh.y"
+#line 3372 "Gmsh.y"
{
char tmpstring[1024];
int i = PrintListOfDouble((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].l), tmpstring);
@@ -7759,7 +7762,7 @@ yyreduce:
break;
case 349:
-#line 3388 "Gmsh.y"
+#line 3391 "Gmsh.y"
{
const char* (*pStrOpt)(int num, int action, const char *value);
StringXString *pStrCat;
@@ -7785,7 +7788,7 @@ yyreduce:
break;
case 350:
-#line 3411 "Gmsh.y"
+#line 3414 "Gmsh.y"
{
const char* (*pStrOpt)(int num, int action, const char *value);
StringXString *pStrCat;
@@ -7812,7 +7815,7 @@ yyreduce:
/* Line 1267 of yacc.c. */
-#line 7816 "Gmsh.tab.cpp"
+#line 7819 "Gmsh.tab.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -8026,7 +8029,7 @@ yyreturn:
}
-#line 3435 "Gmsh.y"
+#line 3438 "Gmsh.y"
void DeleteSymbol(void *a, void *b)
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index dff43642403c66f3fbaed5314affc79f854a5244..14a9321533c44686e754b4609a182a76c8e8ebfc 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,5 +1,5 @@
%{
-// $Id: Gmsh.y,v 1.307 2008-03-23 21:43:02 geuzaine Exp $
+// $Id: Gmsh.y,v 1.308 2008-03-29 10:19:41 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -1462,12 +1462,13 @@ Shape :
Vertex *v2 = FindPoint((int)p2);
if(!v1) yymsg(GERROR, "Sphere %d : unknown point %d", num, (int)p1);
if(!v2) yymsg(GERROR, "Sphere %d : unknown point %d", num, (int)p2);
- myGmshSurface = gmshSphere::NewSphere
- (num, v1->Pos.X, v1->Pos.Y, v1->Pos.Z,
- sqrt((v2->Pos.X - v1->Pos.X) * (v2->Pos.X - v1->Pos.X) +
- (v2->Pos.Y - v1->Pos.Y) * (v2->Pos.Y - v1->Pos.Y) +
- (v2->Pos.Z - v1->Pos.Z) * (v2->Pos.Z - v1->Pos.Z)));
- }
+ if(v1 && v2)
+ myGmshSurface = gmshSphere::NewSphere
+ (num, v1->Pos.X, v1->Pos.Y, v1->Pos.Z,
+ sqrt((v2->Pos.X - v1->Pos.X) * (v2->Pos.X - v1->Pos.X) +
+ (v2->Pos.Y - v1->Pos.Y) * (v2->Pos.Y - v1->Pos.Y) +
+ (v2->Pos.Z - v1->Pos.Z) * (v2->Pos.Z - v1->Pos.Z)));
+ }
$$.Type = 0;
$$.Num = num;
}
@@ -1486,12 +1487,13 @@ Shape :
Vertex *v2 = FindPoint((int)p2);
if(!v1) yymsg(GERROR, "PolarSphere %d : unknown point %d", num, (int)p1);
if(!v2) yymsg(GERROR, "PolarSphere %d : unknown point %d", num, (int)p2);
- myGmshSurface = gmshPolarSphere::NewPolarSphere
- (num, v1->Pos.X, v1->Pos.Y, v1->Pos.Z,
- sqrt((v2->Pos.X - v1->Pos.X) * (v2->Pos.X - v1->Pos.X) +
- (v2->Pos.Y - v1->Pos.Y) * (v2->Pos.Y - v1->Pos.Y) +
- (v2->Pos.Z - v1->Pos.Z) * (v2->Pos.Z - v1->Pos.Z)));
- }
+ if(v1 && v2)
+ myGmshSurface = gmshPolarSphere::NewPolarSphere
+ (num, v1->Pos.X, v1->Pos.Y, v1->Pos.Z,
+ sqrt((v2->Pos.X - v1->Pos.X) * (v2->Pos.X - v1->Pos.X) +
+ (v2->Pos.Y - v1->Pos.Y) * (v2->Pos.Y - v1->Pos.Y) +
+ (v2->Pos.Z - v1->Pos.Z) * (v2->Pos.Z - v1->Pos.Z)));
+ }
$$.Type = 0;
$$.Num = num;
}
@@ -1533,6 +1535,7 @@ Shape :
// for backward compatibility:
| tComplex tVolume '(' FExpr ')' tAFFECT ListOfDouble tEND
{
+ yymsg(GERROR, "'Complex Volume' command is deprecated: use 'Volume' instead");
int num = (int)$4;
if(FindVolume(num)){
yymsg(GERROR, "Volume %d already exists", num);
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index fdefba39819f98a8aacf3e32bfaa01917ac2406d..2a1e44ac922291ff4afda804886d90b7f36f8cc1 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -835,7 +835,7 @@ int gmsh_yy_flex_debug = 0;
char *gmsh_yytext;
#line 1 "Gmsh.l"
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.356 2008-03-23 21:43:02 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.357 2008-03-29 10:19:41 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
diff --git a/Parser/OpenFile.cpp b/Parser/OpenFile.cpp
index 0e5dc7527f9b0856112ca10cb0ae762d0d160b97..3d49e2731818676cb5b88e5517f0c2255c3d02f6 100644
--- a/Parser/OpenFile.cpp
+++ b/Parser/OpenFile.cpp
@@ -1,4 +1,4 @@
-// $Id: OpenFile.cpp,v 1.180 2008-03-23 21:43:03 geuzaine Exp $
+// $Id: OpenFile.cpp,v 1.181 2008-03-29 10:19:42 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -354,6 +354,7 @@ int MergeFile(const char *name, int warn_if_missing)
}
else if(!strcmp(ext, ".med") || !strcmp(ext, ".MED")){
status = m->readMED(name);
+ if(status > 1) status = PView::readMED(name);
}
else if(!strcmp(ext, ".bdf") || !strcmp(ext, ".BDF") ||
!strcmp(ext, ".nas") || !strcmp(ext, ".NAS")){
@@ -393,8 +394,7 @@ int MergeFile(const char *name, int warn_if_missing)
!strncmp(header, "$PARA", 5) || !strncmp(header, "$ELM", 4) ||
!strncmp(header, "$MeshFormat", 11)) {
status = m->readMSH(name);
- if(status > 1)
- status = PView::readMSH(name);
+ if(status > 1) status = PView::readMSH(name);
}
else if(!strncmp(header, "$PostFormat", 11) ||
!strncmp(header, "$View", 5)) {
diff --git a/Post/Makefile b/Post/Makefile
index aa3f6a7e7f585d909f3b9929cbbde8e846f07830..3c24561d829b2ac2808cc1b84633c9c608fa7d7f 100644
--- a/Post/Makefile
+++ b/Post/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.37 2008-03-21 09:55:43 geuzaine Exp $
+# $Id: Makefile,v 1.38 2008-03-29 10:19:43 geuzaine Exp $
#
# Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
#
@@ -30,7 +30,7 @@ INC = ${DASH}I../Common ${DASH}I../DataStr ${DASH}I../Geo ${DASH}I../Mesh\
CFLAGS =${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
-SRC = PView.cpp\
+SRC = PView.cpp PViewIO.cpp\
PViewData.cpp PViewDataIO.cpp\
PViewDataList.cpp PViewDataListIO.cpp\
PViewDataGModel.cpp PViewDataGModelIO.cpp\
@@ -63,6 +63,11 @@ depend:
# DO NOT DELETE THIS LINE
PView.o: PView.cpp PView.h PViewData.h ../Geo/SBoundingBox3d.h \
+ ../Geo/SPoint3.h PViewOptions.h ColorTable.h PViewDataList.h \
+ AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
+ ../Common/VertexArray.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Common/Context.h ../Common/SmoothData.h ../Common/Message.h
+PViewIO.o: PViewIO.cpp PView.h PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h PViewOptions.h ColorTable.h PViewDataList.h \
AdaptiveViews.h ../DataStr/List.h ../Common/GmshMatrix.h \
PViewDataGModel.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
@@ -72,7 +77,6 @@ PView.o: PView.cpp PView.h PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SBoundingBox3d.h \
- ../Common/VertexArray.h ../Common/Context.h ../Common/SmoothData.h \
../Common/StringUtils.h ../Common/Message.h
PViewData.o: PViewData.cpp PViewData.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h
diff --git a/Post/PView.cpp b/Post/PView.cpp
index 5044e2e35cfced0a74bafbfa739e97b31e4ed631..7efc380f1f17398923f78470b0b56c1e09c7a8ac 100644
--- a/Post/PView.cpp
+++ b/Post/PView.cpp
@@ -1,4 +1,4 @@
-// $Id: PView.cpp,v 1.25 2008-03-20 11:44:15 geuzaine Exp $
+// $Id: PView.cpp,v 1.26 2008-03-29 10:19:43 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -26,10 +26,8 @@
#include <algorithm>
#include "PView.h"
#include "PViewDataList.h"
-#include "PViewDataGModel.h"
#include "VertexArray.h"
#include "SmoothData.h"
-#include "StringUtils.h"
#include "Message.h"
int PView::_globalNum = 0;
@@ -223,180 +221,3 @@ PView *PView::getViewByName(std::string name, int timeStep, int partition)
return 0;
}
-bool PView::readPOS(std::string fileName, int fileIndex)
-{
- FILE *fp = fopen(fileName.c_str(), "rb");
- if(!fp){
- Msg(GERROR, "Unable to open file '%s'", fileName.c_str());
- return false;
- }
-
- char str[256] = "XXX";
- double version;
- int format, size, index = -1;
-
- while(1) {
-
- while(str[0] != '$'){
- if(!fgets(str, sizeof(str), fp) || feof(fp))
- break;
- }
-
- if(feof(fp))
- break;
-
- if(!strncmp(&str[1], "PostFormat", 10)) {
-
- if(!fscanf(fp, "%lf %d %d\n", &version, &format, &size)){
- Msg(GERROR, "Read error");
- return false;
- }
- if(version < 1.0) {
- Msg(GERROR, "Post-processing file too old (ver. %g < 1.0)", version);
- return false;
- }
- if(size == sizeof(double))
- Msg(DEBUG, "Data is in double precision format (size==%d)", size);
- else {
- Msg(GERROR, "Unknown data size (%d) in post-processing file", size);
- return false;
- }
- if(format == 0)
- format = LIST_FORMAT_ASCII;
- else if(format == 1)
- format = LIST_FORMAT_BINARY;
- else {
- Msg(GERROR, "Unknown format for view");
- return false;
- }
-
- }
- else if(!strncmp(&str[1], "View", 4)){
-
- index++;
- if(fileIndex < 0 || fileIndex == index){
- PViewDataList *d = new PViewDataList(false);
- if(!d->readPOS(fp, version, format, size)){
- Msg(GERROR, "Could not read data in list format");
- delete d;
- return false;
- }
- else{
- d->setFileName(fileName);
- d->setFileIndex(index);
- new PView(d);
- }
- }
-
- }
-
- do {
- if(!fgets(str, sizeof(str), fp) || feof(fp))
- break;
- } while(str[0] != '$');
-
- }
-
- fclose(fp);
-
- return true;
-}
-
-bool PView::readMSH(std::string fileName, int fileIndex)
-{
- FILE *fp = fopen(fileName.c_str(), "rb");
- if(!fp){
- Msg(GERROR, "Unable to open file '%s'", fileName.c_str());
- return false;
- }
-
- char str[256] = "XXX";
- int index = -1;
- bool binary = false, swap = false;
-
- while(1) {
-
- while(str[0] != '$'){
- if(!fgets(str, sizeof(str), fp) || feof(fp))
- break;
- }
-
- if(feof(fp))
- break;
-
- if(!strncmp(&str[1], "MeshFormat", 10)) {
- double version;
- if(!fgets(str, sizeof(str), fp)) return false;
- int format, size;
- if(sscanf(str, "%lf %d %d", &version, &format, &size) != 3) return false;
- if(format){
- binary = true;
- Msg(INFO, "Mesh is in binary format");
- int one;
- if(fread(&one, sizeof(int), 1, fp) != 1) return 0;
- if(one != 1){
- swap = true;
- Msg(INFO, "Swapping bytes from binary file");
- }
- }
- }
- else if(!strncmp(&str[1], "NodeData", 8)) {
- index++;
- if(fileIndex < 0 || fileIndex == index){
- // read data info
- if(!fgets(str, sizeof(str), fp)) return false;
- std::string name = extractDoubleQuotedString(str, sizeof(str));
- int timeStep, partition, interpolationScheme, numComp, numNodes;
- double time;
- if(!fgets(str, sizeof(str), fp)) return false;
- if(sscanf(str, "%d %lf %d %d %d %d", &timeStep, &time, &partition,
- &interpolationScheme, &numComp, &numNodes) != 6) return false;
- // either get existing viewData, or create new one
- PView *p = getViewByName(name, timeStep, partition);
- PViewDataGModel *d = 0;
- if(p) d = dynamic_cast<PViewDataGModel*>(p->getData());
- bool create = d ? false : true;
- if(create) d = new PViewDataGModel();
- if(!d->readMSH(fileName, fileIndex, fp, binary, swap, timeStep,
- time, partition, numComp, numNodes)){
- Msg(GERROR, "Could not read data in msh file");
- if(create) delete d;
- return false;
- }
- else{
- d->setName(name);
- d->setFileName(fileName);
- d->setFileIndex(index);
- if(create) new PView(d);
- }
- }
- }
-
- do {
- if(!fgets(str, sizeof(str), fp) || feof(fp))
- break;
- } while(str[0] != '$');
- }
-
- fclose(fp);
- return true;
-}
-
-bool PView::write(std::string fileName, int format, bool append)
-{
- Msg(STATUS2, "Writing '%s'", fileName.c_str());
-
- bool ret;
- switch(format){
- case 0: ret = _data->writePOS(fileName, false, false, append); break; // ASCII
- case 1: ret = _data->writePOS(fileName, true, false, append); break; // binary
- case 2: ret = _data->writePOS(fileName, false, true, append); break; // parsed
- case 3: ret = _data->writeSTL(fileName); break;
- case 4: ret = _data->writeTXT(fileName); break;
- case 5: ret = _data->writeMSH(fileName); break;
- default: ret = false; Msg(GERROR, "Unknown view format %d", format); break;
- }
-
- Msg(STATUS2, "Wrote '%s'", fileName.c_str());
- return ret;
-}
diff --git a/Post/PView.h b/Post/PView.h
index 319d11a92b01279fc7ae29a38cd03600aa4e0b8b..d2eaf2b6cb957ac754bcab055a2140741b50f8b0 100644
--- a/Post/PView.h
+++ b/Post/PView.h
@@ -86,12 +86,14 @@ class PView{
static PView *getViewByName(std::string name, int timeStep=-1,
int partition=-1);
- // read view(s) in list format from a file
+ // read view(s) from POS file
static bool readPOS(std::string fileName, int fileIndex=-1);
- // read view data from MSH file
+ // read view(s) from MSH file
static bool readMSH(std::string fileName, int fileIndex=-1);
+ // read view(s) from MED file
+ static bool readMED(std::string fileName, int fileIndex=-1);
- // write view to file in given format
+ // write view in given format
bool write(std::string fileName, int format, bool append=false);
// vertex arrays to draw the elements efficiently
diff --git a/Post/PViewData.h b/Post/PViewData.h
index c9f405a5959384da2ee6d85261813a3514188f78..e62f92e3b91a9f6e184ee67b5b75408c9f6b147c 100644
--- a/Post/PViewData.h
+++ b/Post/PViewData.h
@@ -114,11 +114,12 @@ class PViewData {
virtual bool hasMultipleMeshes(){ return false; }
// I/O routines
- virtual bool writeSTL(std::string name);
- virtual bool writeTXT(std::string name);
- virtual bool writePOS(std::string name, bool binary=false, bool parsed=true,
+ virtual bool writeSTL(std::string fileName);
+ virtual bool writeTXT(std::string fileName);
+ virtual bool writePOS(std::string fileName, bool binary=false, bool parsed=true,
bool append=false){ return false; }
- virtual bool writeMSH(std::string name, bool binary=false){ return false; }
+ virtual bool writeMSH(std::string fileName, bool binary=false){ return false; }
+ virtual bool writeMED(std::string fileName){ return false; }
};
class nameData{
diff --git a/Post/PViewDataGModel.h b/Post/PViewDataGModel.h
index adf6ed9f3f1615d2fa1e548779b48b1b0ba00357..26277053fa1c90a7818f3bd9ecf02f9b608b1978 100644
--- a/Post/PViewDataGModel.h
+++ b/Post/PViewDataGModel.h
@@ -96,7 +96,7 @@ class stepData{
void resizeData(int n)
{
if(!_data) _data = new std::vector<real*>(n, (real*)0);
- if(n < (int)_data->size()) _data->resize(n, (real*)0);
+ if(n > (int)_data->size()) _data->resize(n, (real*)0);
}
real *getData(int index, bool allocIfNeeded=false)
{
@@ -162,8 +162,9 @@ class PViewDataGModel : public PViewData {
bool readMSH(std::string fileName, int fileIndex, FILE *fp, bool binary,
bool swap, int step, double time, int partition,
int numComp, int numNodes);
- bool writeMSH(std::string name, bool binary=false);
- bool writeMED(std::string name);
+ bool writeMSH(std::string fileName, bool binary=false);
+ bool readMED(std::string fileName, int fileIndex);
+ bool writeMED(std::string fileName);
};
#endif
diff --git a/Post/PViewDataGModelIO.cpp b/Post/PViewDataGModelIO.cpp
index 13bb04c2e782b1f1b5b963cf36b20d630e84d413..3cf061869739227230fc4b1da3afd2eccdc5c040 100644
--- a/Post/PViewDataGModelIO.cpp
+++ b/Post/PViewDataGModelIO.cpp
@@ -1,4 +1,4 @@
-// $Id: PViewDataGModelIO.cpp,v 1.13 2008-03-25 20:48:32 geuzaine Exp $
+// $Id: PViewDataGModelIO.cpp,v 1.14 2008-03-29 10:19:43 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -92,7 +92,7 @@ bool PViewDataGModel::readMSH(std::string fileName, int fileIndex, FILE *fp,
return true;
}
-bool PViewDataGModel::writeMSH(std::string name, bool binary)
+bool PViewDataGModel::writeMSH(std::string fileName, bool binary)
{
if(_steps.empty()) return true;
@@ -105,12 +105,12 @@ bool PViewDataGModel::writeMSH(std::string name, bool binary)
binary = true;
- if(!model->writeMSH(name, 2.0, binary, true)) return false;
+ if(!model->writeMSH(fileName, 2.0, binary, true)) return false;
// append data
- FILE *fp = fopen(name.c_str(), binary ? "ab" : "a");
+ FILE *fp = fopen(fileName.c_str(), binary ? "ab" : "a");
if(!fp){
- Msg(GERROR, "Unable to open file '%s'", name.c_str());
+ Msg(GERROR, "Unable to open file '%s'", fileName.c_str());
return false;
}
@@ -155,7 +155,130 @@ bool PViewDataGModel::writeMSH(std::string name, bool binary)
return true;
}
-bool PViewDataGModel::writeMED(std::string name)
+#if defined(HAVE_MED)
+
+extern "C" {
+#include <med.h>
+}
+
+bool PViewDataGModel::readMED(std::string fileName, int fileIndex)
+{
+ med_idt fid = MEDouvrir((char*)fileName.c_str(), MED_LECTURE);
+ if(fid < 0) {
+ Msg(GERROR, "Unable to open file '%s'", fileName.c_str());
+ return false;
+ }
+
+ med_int numComp = MEDnChamp(fid, fileIndex + 1);
+ if(numComp <= 0){
+ Msg(GERROR, "Could not get number of components for MED field");
+ return false;
+ }
+
+ char name[MED_TAILLE_NOM + 1];
+ std::vector<char> compName(numComp * MED_TAILLE_PNOM + 1);
+ std::vector<char> compUnit(numComp * MED_TAILLE_PNOM + 1);
+ med_type_champ type;
+ if(MEDchampInfo(fid, fileIndex + 1, name, &type, &compName[0], &compUnit[0],
+ numComp) < 0){
+ Msg(GERROR, "Could not get MED field info");
+ return false;
+ }
+
+ Msg(INFO, "Reading %d-component field <<%s>>\n", numComp, name);
+ setName(name);
+
+ med_int numSteps = MEDnPasdetemps(fid, name, MED_NOEUD, MED_NONE);
+ if(numSteps <= 0){
+ Msg(GERROR, "Invalid umber of steps");
+ return false;
+ }
+
+ for(int step = 0; step < numSteps; step++){
+ med_int numdt, numo, ngauss, numMeshes;
+ char dtunit[MED_TAILLE_PNOM +1], meshName[MED_TAILLE_NOM + 1];
+ med_float dt;
+ med_booleen local;
+ if(MEDpasdetempsInfo(fid, name, MED_NOEUD, MED_NONE, step + 1,
+ &ngauss, &numdt, &numo, dtunit, &dt, meshName,
+ &local, &numMeshes) < 0){
+ Msg(GERROR, "Could not get step info");
+ return false;
+ }
+ med_int numNodes = MEDnVal(fid, name, MED_NOEUD, MED_NONE, numdt, numo,
+ meshName, MED_COMPACT);
+ if(numNodes <= 0) continue;
+
+ std::vector<double> val(numNodes * numComp);
+ char locname[MED_TAILLE_NOM + 1], profileName[MED_TAILLE_NOM + 1];
+ if(MEDchampLire(fid, meshName, name, (unsigned char*)&val[0], MED_FULL_INTERLACE,
+ MED_ALL, locname, profileName, MED_COMPACT, MED_NOEUD, MED_NONE,
+ numdt, numo) < 0){
+ Msg(GERROR, "Could not get field values");
+ return false;
+ }
+
+ stepData<double> *sd = new stepData<double>(GModel::current(),
+ stepData<double>::NodeData, numComp);
+ _steps.push_back(sd);
+ sd->setFileName(fileName);
+ sd->setFileIndex(fileIndex);
+ sd->setTime(dt);
+ sd->resizeData(numNodes);
+
+ std::vector<med_int> nodeTags(numNodes);
+ if(MEDnumLire(fid, meshName, &nodeTags[0], numNodes, MED_NOEUD, MED_NONE) < 0)
+ nodeTags.clear();
+
+ std::vector<med_int> profile;
+ if(std::string(profileName) != MED_NOPFL){
+ med_int n = MEDnValProfil(fid, profileName);
+ if(n > 0){
+ profile.resize(n);
+ if(MEDprofilLire(fid, &profile[0], profileName) < 0){
+ Msg(GERROR, "Could not read profile");
+ return false;
+ }
+ }
+ }
+ if(profile.empty()){
+ profile.resize(numNodes);
+ for(int i = 0; i < numNodes; i++)
+ profile[i] = i + 1;
+ }
+
+ for(unsigned int i = 0; i < profile.size(); i++){
+ int num = nodeTags.empty() ? profile[i] : nodeTags[profile[i] - 1];
+ MVertex *v = sd->getModel()->getMeshVertexByTag(num);
+ if(!v){
+ Msg(GERROR, "Unknown vertex %d in data", num);
+ return false;
+ }
+ if(v->getDataIndex() < 0){
+ int max = sd->getModel()->getMaxVertexDataIndex();
+ sd->getModel()->setMaxVertexDataIndex(max + 1);
+ v->setDataIndex(max + 1);
+ }
+ int index = v->getDataIndex();
+ double *d = sd->getData(index, true);
+ for(int j = 0; j < numComp; j++)
+ d[j] = val[numComp * i + j];
+ double s = ComputeScalarRep(numComp, d);
+ sd->setMin(std::min(sd->getMin(), s));
+ sd->setMax(std::max(sd->getMax(), s));
+ }
+ }
+
+ finalize();
+
+ if(MEDfermer(fid) < 0){
+ Msg(GERROR, "Unable to close file '%s'", (char*)fileName.c_str());
+ return false;
+ }
+ return true;
+}
+
+bool PViewDataGModel::writeMED(std::string fileName)
{
if(_steps.empty()) return true;
@@ -166,12 +289,15 @@ bool PViewDataGModel::writeMED(std::string name)
GModel *model = _steps[0]->getModel();
- // if(!model->writeMSH(name, 2.0, binary, true)) return false;
+ // save the mesh
+ if(!model->writeMED(fileName, true)) return false;
- // append data
- FILE *fp = fopen(name.c_str(), "ab");
- if(!fp){
- Msg(GERROR, "Unable to open file '%s'", name.c_str());
+ char *meshName = (char*)model->getName().c_str();
+ char *fieldName = (char*)getName().c_str();
+
+ med_idt fid = MEDouvrir((char*)fileName.c_str(), MED_LECTURE_AJOUT);
+ if(fid < 0) {
+ Msg(GERROR, "Unable to open file '%s'", fileName.c_str());
return false;
}
@@ -184,30 +310,78 @@ bool PViewDataGModel::writeMED(std::string name)
}
}
+ // compute profile
+ std::vector<med_int> prof;
+ for(int i = 0; i < _steps[0]->getNumData(); i++){
+ if(_steps[0]->getData(i))
+ prof.push_back(tags[i]);
+ }
+ char *profileName = (char*)"nodeProfile";
+ if(MEDprofilEcr(fid, &prof[0], (med_int)prof.size(), profileName) < 0){
+ Msg(GERROR, "Could not create MED profile");
+ return false;
+ }
+
+ int numComp = _steps[0]->getNumComp();
+ if(MEDchampCr(fid, fieldName, MED_FLOAT64, (char*)"unknown", (char*)"unknown",
+ (med_int)numComp) < 0){
+ Msg(GERROR, "Could not create MED field");
+ return false;
+ }
+
+ med_int numNodes = MEDnEntMaa(fid, meshName, MED_COOR, MED_NOEUD,
+ MED_NONE, (med_connectivite)0);
+ if(numNodes <= 0){
+ Msg(GERROR, "Could not get valid number of nodes in mesh");
+ return false;
+ }
+
for(unsigned int step = 0; step < _steps.size(); step++){
- int numNodes = 0, numComp = _steps[step]->getNumComp();
+ unsigned int n = 0;
for(int i = 0; i < _steps[step]->getNumData(); i++)
- if(_steps[step]->getData(i)) numNodes++;
-
- if(numNodes){
- /*
- fprintf(fp, "$NodeData\n");
- fprintf(fp, "\"%s\"\n", getName().c_str());
- fprintf(fp, "%d %.16g 0 0 %d %d\n", step, _steps[step]->getTime(),
- numComp, numNodes);
- for(int i = 0; i < _steps[step]->getNumData(); i++){
- if(_steps[step]->getData(i)){
- fprintf(fp, "%d", tags[i]);
- for(int k = 0; k < numComp; k++)
- fprintf(fp, " %.16g", _steps[step]->getData(i)[k]);
- fprintf(fp, "\n");
- }
+ if(_steps[step]->getData(i)) n++;
+ if(n != prof.size() || numComp != _steps[step]->getNumComp()){
+ Msg(GERROR, "Skipping incompatible step");
+ continue;
+ }
+ double time = _steps[step]->getTime();
+ std::vector<double> val(numNodes * numComp);
+ for(int i = 0; i < _steps[step]->getNumData(); i++){
+ if(_steps[step]->getData(i)){
+ for(int k = 0; k < numComp; k++)
+ val[i * numComp + k] = _steps[step]->getData(i)[k];
}
- fprintf(fp, "$EndNodeData\n");
- */
+ }
+ if(MEDchampEcr(fid, meshName, fieldName, (unsigned char*)&val[0],
+ MED_FULL_INTERLACE, numNodes, MED_NOGAUSS, MED_ALL,
+ profileName, MED_COMPACT, MED_NOEUD, MED_NONE, (med_int)step,
+ (char*)"unknown", time, MED_NONOR) < 0) {
+ Msg(GERROR, "Could not write MED field");
+ return false;
}
}
-
- fclose(fp);
+
+ if(MEDfermer(fid) < 0){
+ Msg(GERROR, "Unable to close file '%s'", (char*)fileName.c_str());
+ return false;
+ }
return true;
}
+
+#else
+
+bool PViewDataGModel::readMED(std::string fileName, int fileIndex)
+{
+ Msg(GERROR, "Gmsh must be compiled with MED support to read '%s'",
+ fileName.c_str());
+ return false;
+}
+
+bool PViewDataGModel::writeMED(std::string fileName)
+{
+ Msg(GERROR, "Gmsh must be compiled with MED support to write '%s'",
+ fileName.c_str());
+ return false;
+}
+
+#endif
diff --git a/Post/PViewDataIO.cpp b/Post/PViewDataIO.cpp
index c24384fc9a160a6cbea373c6c864ce7755795849..5cd5b9a347415b5812e60e8a2ddcdaed82b4c082 100644
--- a/Post/PViewDataIO.cpp
+++ b/Post/PViewDataIO.cpp
@@ -1,4 +1,4 @@
-// $Id: PViewDataIO.cpp,v 1.6 2008-03-20 11:44:15 geuzaine Exp $
+// $Id: PViewDataIO.cpp,v 1.7 2008-03-29 10:19:43 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -27,11 +27,11 @@
#include "Numeric.h"
#include "PViewData.h"
-bool PViewData::writeSTL(std::string name)
+bool PViewData::writeSTL(std::string fileName)
{
- FILE *fp = fopen(name.c_str(), "w");
+ FILE *fp = fopen(fileName.c_str(), "w");
if(!fp){
- Msg(GERROR, "Unable to open file '%s'", name.c_str());
+ Msg(GERROR, "Unable to open file '%s'", fileName.c_str());
return false;
}
@@ -85,11 +85,11 @@ bool PViewData::writeSTL(std::string name)
return true;
}
-bool PViewData::writeTXT(std::string name)
+bool PViewData::writeTXT(std::string fileName)
{
- FILE *fp = fopen(name.c_str(), "w");
+ FILE *fp = fopen(fileName.c_str(), "w");
if(!fp){
- Msg(GERROR, "Unable to open file '%s'", name.c_str());
+ Msg(GERROR, "Unable to open file '%s'", fileName.c_str());
return false;
}
diff --git a/Post/PViewDataList.h b/Post/PViewDataList.h
index 72d17e36d90eddd0133462ad4d23e5f5c9fd52ec..da16f8e14b0bbcd3d01f5560203bff90e895bb85 100644
--- a/Post/PViewDataList.h
+++ b/Post/PViewDataList.h
@@ -114,9 +114,9 @@ class PViewDataList : public PViewData {
// I/O routines
bool readPOS(FILE *fp, double version, int format, int size);
- bool writePOS(std::string name, bool binary=false, bool parsed=true,
+ bool writePOS(std::string fileName, bool binary=false, bool parsed=true,
bool append=false);
- bool writeMSH(std::string name, bool binary=false);
+ bool writeMSH(std::string fileName, bool binary=false);
};
#endif
diff --git a/Post/PViewDataListIO.cpp b/Post/PViewDataListIO.cpp
index 9c9eb050d86c336b9b00bb94274b7c84c2654992..9094400fa9e74bd06567b0e0e58dda194a61ffbe 100644
--- a/Post/PViewDataListIO.cpp
+++ b/Post/PViewDataListIO.cpp
@@ -1,4 +1,4 @@
-// $Id: PViewDataListIO.cpp,v 1.17 2008-03-20 11:44:15 geuzaine Exp $
+// $Id: PViewDataListIO.cpp,v 1.18 2008-03-29 10:19:43 geuzaine Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -316,12 +316,12 @@ static void writeTextPOS(FILE *fp, int nbc, int nb, List_T *TD, List_T *TC)
}
}
-bool PViewDataList::writePOS(std::string name, bool binary, bool parsed, bool append)
+bool PViewDataList::writePOS(std::string fileName, bool binary, bool parsed, bool append)
{
- FILE *fp = fopen(name.c_str(),
+ FILE *fp = fopen(fileName.c_str(),
append ? (binary ? "ab" : "a") : (binary ? "wb" : "w"));
if(!fp){
- Msg(GERROR, "Unable to open file '%s'", name.c_str());
+ Msg(GERROR, "Unable to open file '%s'", fileName.c_str());
return false;
}
@@ -509,11 +509,11 @@ static void writeElementsMSH(FILE *fp, int nbelm, List_T *list,
}
}
-bool PViewDataList::writeMSH(std::string name, bool binary)
+bool PViewDataList::writeMSH(std::string fileName, bool binary)
{
- FILE *fp = fopen(name.c_str(), "w");
+ FILE *fp = fopen(fileName.c_str(), "w");
if(!fp){
- Msg(GERROR, "Unable to open file '%s'", name.c_str());
+ Msg(GERROR, "Unable to open file '%s'", fileName.c_str());
return false;
}
diff --git a/Post/PViewIO.cpp b/Post/PViewIO.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..dee8e9bdfe7288fea6f143cb8d92a6afbee18e5a
--- /dev/null
+++ b/Post/PViewIO.cpp
@@ -0,0 +1,259 @@
+// $Id: PViewIO.cpp,v 1.3 2008-03-29 10:19:43 geuzaine Exp $
+//
+// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+// Please report all bugs and problems to <gmsh@geuz.org>.
+//
+// Contributor(s):
+//
+
+#include "PView.h"
+#include "PViewDataList.h"
+#include "PViewDataGModel.h"
+#include "StringUtils.h"
+#include "Message.h"
+
+bool PView::readPOS(std::string fileName, int fileIndex)
+{
+ FILE *fp = fopen(fileName.c_str(), "rb");
+ if(!fp){
+ Msg(GERROR, "Unable to open file '%s'", fileName.c_str());
+ return false;
+ }
+
+ char str[256] = "XXX";
+ double version;
+ int format, size, index = -1;
+
+ while(1) {
+
+ while(str[0] != '$'){
+ if(!fgets(str, sizeof(str), fp) || feof(fp))
+ break;
+ }
+
+ if(feof(fp))
+ break;
+
+ if(!strncmp(&str[1], "PostFormat", 10)) {
+
+ if(!fscanf(fp, "%lf %d %d\n", &version, &format, &size)){
+ Msg(GERROR, "Read error");
+ return false;
+ }
+ if(version < 1.0) {
+ Msg(GERROR, "Post-processing file too old (ver. %g < 1.0)", version);
+ return false;
+ }
+ if(size == sizeof(double))
+ Msg(DEBUG, "Data is in double precision format (size==%d)", size);
+ else {
+ Msg(GERROR, "Unknown data size (%d) in post-processing file", size);
+ return false;
+ }
+ if(format == 0)
+ format = LIST_FORMAT_ASCII;
+ else if(format == 1)
+ format = LIST_FORMAT_BINARY;
+ else {
+ Msg(GERROR, "Unknown format for view");
+ return false;
+ }
+
+ }
+ else if(!strncmp(&str[1], "View", 4)){
+
+ index++;
+ if(fileIndex < 0 || fileIndex == index){
+ PViewDataList *d = new PViewDataList(false);
+ if(!d->readPOS(fp, version, format, size)){
+ Msg(GERROR, "Could not read data in list format");
+ delete d;
+ return false;
+ }
+ else{
+ d->setFileName(fileName);
+ d->setFileIndex(index);
+ new PView(d);
+ }
+ }
+
+ }
+
+ do {
+ if(!fgets(str, sizeof(str), fp) || feof(fp))
+ break;
+ } while(str[0] != '$');
+
+ }
+
+ fclose(fp);
+
+ return true;
+}
+
+bool PView::readMSH(std::string fileName, int fileIndex)
+{
+ FILE *fp = fopen(fileName.c_str(), "rb");
+ if(!fp){
+ Msg(GERROR, "Unable to open file '%s'", fileName.c_str());
+ return false;
+ }
+
+ char str[256] = "XXX";
+ int index = -1;
+ bool binary = false, swap = false;
+
+ while(1) {
+
+ while(str[0] != '$'){
+ if(!fgets(str, sizeof(str), fp) || feof(fp))
+ break;
+ }
+
+ if(feof(fp))
+ break;
+
+ if(!strncmp(&str[1], "MeshFormat", 10)) {
+ double version;
+ if(!fgets(str, sizeof(str), fp)) return false;
+ int format, size;
+ if(sscanf(str, "%lf %d %d", &version, &format, &size) != 3) return false;
+ if(format){
+ binary = true;
+ Msg(INFO, "Mesh is in binary format");
+ int one;
+ if(fread(&one, sizeof(int), 1, fp) != 1) return 0;
+ if(one != 1){
+ swap = true;
+ Msg(INFO, "Swapping bytes from binary file");
+ }
+ }
+ }
+ else if(!strncmp(&str[1], "NodeData", 8)) {
+ index++;
+ if(fileIndex < 0 || fileIndex == index){
+ // read data info
+ if(!fgets(str, sizeof(str), fp)) return false;
+ std::string name = extractDoubleQuotedString(str, sizeof(str));
+ int timeStep, partition, interpolationScheme, numComp, numNodes;
+ double time;
+ if(!fgets(str, sizeof(str), fp)) return false;
+ if(sscanf(str, "%d %lf %d %d %d %d", &timeStep, &time, &partition,
+ &interpolationScheme, &numComp, &numNodes) != 6) return false;
+ // either get existing viewData, or create new one
+ PView *p = getViewByName(name, timeStep, partition);
+ PViewDataGModel *d = 0;
+ if(p) d = dynamic_cast<PViewDataGModel*>(p->getData());
+ bool create = d ? false : true;
+ if(create) d = new PViewDataGModel();
+ if(!d->readMSH(fileName, fileIndex, fp, binary, swap, timeStep,
+ time, partition, numComp, numNodes)){
+ Msg(GERROR, "Could not read data in msh file");
+ if(create) delete d;
+ return false;
+ }
+ else{
+ d->setName(name);
+ d->setFileName(fileName);
+ d->setFileIndex(index);
+ if(create) new PView(d);
+ }
+ }
+ }
+
+ do {
+ if(!fgets(str, sizeof(str), fp) || feof(fp))
+ break;
+ } while(str[0] != '$');
+ }
+
+ fclose(fp);
+ return true;
+}
+
+#if defined(HAVE_MED)
+
+extern "C" {
+#include <med.h>
+}
+
+bool PView::readMED(std::string fileName, int fileIndex)
+{
+ med_idt fid = MEDouvrir((char*)fileName.c_str(), MED_LECTURE);
+ if(fid < 0) {
+ Msg(GERROR, "Unable to open file '%s'", fileName.c_str());
+ return false;
+ }
+
+ med_int numFields = MEDnChamp(fid, 0);
+
+ if(MEDfermer(fid) < 0){
+ Msg(GERROR, "Unable to close file '%s'", (char*)fileName.c_str());
+ return false;
+ }
+
+ for(int index = 0; index < numFields; index++){
+ if(fileIndex < 0 || index == fileIndex){
+ PViewDataGModel *d = new PViewDataGModel();
+ if(!d->readMED(fileName, index)){
+ Msg(GERROR, "Could not read data in MED file");
+ delete d;
+ return false;
+ }
+ else{
+ d->setFileName(fileName);
+ d->setFileIndex(index);
+ new PView(d);
+ }
+ }
+ }
+
+ return true;
+}
+
+#else
+
+bool PView::readMED(std::string fileName, int fileIndex)
+{
+ Msg(GERROR, "Gmsh must be compiled with MED support to read '%s'",
+ fileName.c_str());
+ return false;
+}
+
+#endif
+
+bool PView::write(std::string fileName, int format, bool append)
+{
+ Msg(STATUS2, "Writing '%s'", fileName.c_str());
+
+ bool ret;
+ switch(format){
+ case 0: ret = _data->writePOS(fileName, false, false, append); break; // ASCII
+ case 1: ret = _data->writePOS(fileName, true, false, append); break; // binary
+ case 2: ret = _data->writePOS(fileName, false, true, append); break; // parsed
+ case 3: ret = _data->writeSTL(fileName); break;
+ case 4: ret = _data->writeTXT(fileName); break;
+ case 5: ret = _data->writeMSH(fileName); break;
+ case 6: ret = _data->writeMED(fileName); break;
+ default: ret = false; Msg(GERROR, "Unknown view format %d", format); break;
+ }
+
+ if(ret) Msg(STATUS2, "Wrote '%s'", fileName.c_str());
+ return ret;
+}
diff --git a/benchmarks/3d/brain.geo b/benchmarks/3d/brain.geo
index e42ba7b2511f172392a135c9524abc292481dc83..be6cc09f30ec2303f19e25e15deb191526c1ff9a 100644
--- a/benchmarks/3d/brain.geo
+++ b/benchmarks/3d/brain.geo
@@ -32,4 +32,4 @@ Plane Surface(12) = {11};
Line Loop(13) = {-1,10,6};
Plane Surface(14) = {13};
Surface Loop(15) = {12,9,-5,-14};
-Complex Volume(16) = {15};
+Volume(16) = {15};
diff --git a/benchmarks/3d/cas_pb.geo b/benchmarks/3d/cas_pb.geo
index 5bfd74607873b37d9b545a25b54aaa5876b277af..647952cb856eb00b5b85d7c18f8addbe6f7663e1 100644
--- a/benchmarks/3d/cas_pb.geo
+++ b/benchmarks/3d/cas_pb.geo
@@ -26,8 +26,8 @@ Plane Surface(34) = {33};
Extrude Surface { 34, {0,0,-1} };
Coherence;
Surface Loop(57) = {56,43,34,47,51,55};
-Complex Volume(58) = {57};
+Volume(58) = {57};
Surface Loop(58) = {28,15,6,19,23,27};
-Complex Volume(59) = {58};
+Volume(59) = {58};
diff --git a/benchmarks/3d/coin.geo b/benchmarks/3d/coin.geo
index fbd5204f0d91630bf88c09d41a270b749b3696b3..cc49a2b262181c7fda152c2d29f98b7aad684a01 100644
--- a/benchmarks/3d/coin.geo
+++ b/benchmarks/3d/coin.geo
@@ -70,4 +70,4 @@ Plane Surface(37) = {36};
Line Loop(38) = {-14,-13,-12,19};
Plane Surface(39) = {38};
Surface Loop(40) = {35,31,29,37,33,23,39,25,27};
-Complex Volume(41) = {40};
+Volume(41) = {40};
diff --git a/benchmarks/3d/contact3d.geo b/benchmarks/3d/contact3d.geo
index cfa96dad66c430dfa208e13819bf87a6635235f1..7c4319dc8cc4b26b46ca1dff00de72e91c8ae70f 100644
--- a/benchmarks/3d/contact3d.geo
+++ b/benchmarks/3d/contact3d.geo
@@ -258,16 +258,16 @@ Line Loop(277) = {188,-158,-187,161};
Ruled Surface(278) = {277};
Surface Loop(279) = {266,-268,270,264,-272,-220,226,-222,224,211,208,218,200,-202,194,-198,190,-192,-196,-204,-206,-274,276,-278};
-Complex Volume(280) = {279};
+Volume(280) = {279};
Surface Loop(281) = {258,-260,-253,248,250,-242,245,-224,-256,262};
-Complex Volume(282) = {281};
+Volume(282) = {281};
Surface Loop(283) = {214,-272,-216,-274,276,-278};
-Complex Volume(284) = {283};
+Volume(284) = {283};
Surface Loop(285) = {216,-220,-232,-236,-228,230,-240,238,234};
-Complex Volume(286) = {285};
+Volume(286) = {285};
diff --git a/benchmarks/3d/induction1.geo b/benchmarks/3d/induction1.geo
index a2cee0e0c245aecf7f6cecc4dc351b1fc1a07f70..5b3aa2eb3c89de45ca7ec2f2d93d62c04d655b07 100644
--- a/benchmarks/3d/induction1.geo
+++ b/benchmarks/3d/induction1.geo
@@ -277,22 +277,22 @@ Line Loop(1080) = {1038,1002,1003,1004,-1037,1007,1008,1009};
Plane Surface(1081) = {69,1079,1080};
Surface Loop(1067) = {1060,1066,-1052,-1064,-1050,-1056,1062};
-Complex Volume(1068) = {1067};
+Volume(1068) = {1067};
Surface Loop(1070) = {1060,1036,1034,-1040,-1052,-1050,-1056,-1054,1046,-1048,-1058,1032};
-Complex Volume(1071) = {1070};
+Volume(1071) = {1070};
Surface Loop(1072) = {89,101,-77,93,-99,91,95};
-Complex Volume(1073) = {1072};
+Volume(1073) = {1072};
Surface Loop(1074) = {95,-79,87,97,91,103,89,93,-75,81,83,-85};
-Complex Volume(1075) = {1074};
+Volume(1075) = {1074};
Surface Loop(1076) = {62,56,-58,54,-60,-73};
-Complex Volume(1077) = {1076};
+Volume(1077) = {1076};
Surface Loop(1082) = {1066,-1036,-1081,105,-64,66,-73,68,97,99,81,103,-101,87,-85,83,-1064,1040,1054,-1046,1048,1058};
-Complex Volume(1083) = {1082};
+Volume(1083) = {1082};
//Physical datas
diff --git a/benchmarks/3d/induction2.geo b/benchmarks/3d/induction2.geo
index eb95cd91474c50fbd1165af6f948918c6c9ca64b..7e1f2d497483051a4fe8bf1b48c6408ec2be1d9f 100644
--- a/benchmarks/3d/induction2.geo
+++ b/benchmarks/3d/induction2.geo
@@ -138,7 +138,7 @@ Plane Surface(79) = {78};
Line Loop(80) = {-47,39,45,28};
Plane Surface(81) = {80};
Surface Loop(82) = {79,71,-73,-81,-77,75};
-Complex Volume(83) = {82};
+Volume(83) = {82};
/* boite air */
@@ -157,7 +157,7 @@ Plane Surface(95) = {94};
Line Loop(96) = {16,68,13,14,15};
Plane Surface(97) = {96};
Surface Loop(98) = {95,-87,-85,-97,89,93,91};
-Complex Volume(99) = {98};
+Volume(99) = {98};
/* inducteur */
@@ -178,7 +178,7 @@ Plane Surface(113) = {112};
Line Loop(114) = {11,12,6,-24,-23,-22,-21,3,9,10};
Plane Surface(115) = {114};
Surface Loop(116) = {91,93,89,-109,107,-113,-105,115,-103,-101,-111,-85};
-Complex Volume(117) = {116};
+Volume(117) = {116};
/* air */
Line Loop(118) = {-35,-34,-33,30};
@@ -195,7 +195,7 @@ Line Loop(128) = {-37,-41,44,26};
Line Loop(129) = {8,68,1,2,3,69,6,7};
Plane Surface(130) = {128,129};
Surface Loop(131) = {97,-113,-130,127,125,79,-77,121,123,119,-101,-103,-105,107,115,-95};
-Complex Volume(132) = {131};
+Volume(132) = {131};
Physical Volume(500) = { 99 , 132 }; /* boite air + air */
Physical Volume(501) = { 83 }; /* tole */
diff --git a/benchmarks/3d/induction3.geo b/benchmarks/3d/induction3.geo
index d37aa6a130ec7267ec691d38ea48b92a74fe92df..c1e77792a872ef394bce9448484dfc248280c86f 100644
--- a/benchmarks/3d/induction3.geo
+++ b/benchmarks/3d/induction3.geo
@@ -1077,50 +1077,50 @@ Recombine Surface{6000315,6000319,6000323,6000317,6000321,6000325,6000333,600033
Surface Loop(6000276) = {6000240,2000154,-6000271,-6000269,-6000267,1000154};
-Complex Volume(6000277) = {6000276};
+Volume(6000277) = {6000276};
Transfinite Volume{6000277} = {2000013,1000013,1000006,2000006,2000015,1000015,1000008,2000008};
Surface Loop(6000278) = {6000234,-2000156,-6000273,6000275,-1000156,-6000271};
-Complex Volume(6000279) = {6000278};
+Volume(6000279) = {6000278};
Surface Loop(6000215) = {6000212,-2000144,6000203,6000201,6000199,-1000144};
-Complex Volume(6000216) = {6000215};
+Volume(6000216) = {6000215};
Surface Loop(6000217) = {1000142,6000214,6000205,6000212,2000142,-6000197};
-Complex Volume(6000218) = {6000217};
+Volume(6000218) = {6000217};
Surface Loop(6000219) = {6000214,6000207,-2000140,-6000209,-6000195,-1000140};
-Complex Volume(6000220) = {6000219};
+Volume(6000220) = {6000219};
Surface Loop(6000254) = {2000152,6000234,6000236,1000152,-6000251,-6000207};
-Complex Volume(6000255) = {6000254};
+Volume(6000255) = {6000254};
Surface Loop(6000256) = {1000150,6000230,2000150,-6000205,6000236,-6000232};
-Complex Volume(6000257) = {6000256};
+Volume(6000257) = {6000256};
Surface Loop(6000258) = {1000148,6000226,2000148,6000203,-6000230,6000228};
-Complex Volume(6000259) = {6000258};
+Volume(6000259) = {6000258};
Surface Loop(6000262) = {6000226,-2000146,6000222,-6000201,-1000146,6000261};
-Complex Volume(6000263) = {6000262};
+Volume(6000263) = {6000262};
Surface Loop(6000264) = {6000209,6000251,2000138,-6000240,6000242,1000138};
-Complex Volume(6000265) = {6000264};
+Volume(6000265) = {6000264};
Surface Loop(6000292) = {2000158,-6000281,6000275,1000158,-6000232,6000283};
-Complex Volume(6000293) = {6000292};
+Volume(6000293) = {6000292};
Surface Loop(6000294) = {1000162,-6000285,-6000291,2000162,-6000283,6000228};
-Complex Volume(6000295) = {6000294};
+Volume(6000295) = {6000294};
Surface Loop(6000296) = {1000164,-6000287,2000164,6000289,6000285,-6000261};
-Complex Volume(6000297) = {6000296};
+Volume(6000297) = {6000296};
Surface Loop(6000310) = {6000299,-2000187,6000305,6000303,-1000187,6000301};
-Complex Volume(6000311) = {6000310};
+Volume(6000311) = {6000310};
Surface Loop(6000312) = {1000160,-6000281,-6000307,-6000299,2000160,6000309};
-Complex Volume(6000313) = {6000312};
+Volume(6000313) = {6000312};
Surface Loop(6000344) = {6000337,-2000193,-6000333,6000289,-1000193,6000335};
-Complex Volume(6000345) = {6000344};
+Volume(6000345) = {6000344};
Surface Loop(6000346) = {2000191,6000337,6000291,-6000341,1000191,-6000339};
-Complex Volume(6000347) = {6000346};
+Volume(6000347) = {6000346};
Surface Loop(6000348) = {1000189,6000341,2000189,-6000343,6000301,6000309};
-Complex Volume(6000349) = {6000348};
+Volume(6000349) = {6000348};
Surface Loop(6000326) = {6000269,2000181,-6000321,6000323,6000325,1000181};
-Complex Volume(6000327) = {6000326};
+Volume(6000327) = {6000326};
Surface Loop(6000328) = {6000317,-2000183,-6000319,-6000321,-1000183,6000273};
-Complex Volume(6000329) = {6000328};
+Volume(6000329) = {6000328};
Surface Loop(6000330) = {6000303,6000315,6000317,2000185,-6000307,1000185};
-Complex Volume(6000331) = {6000330};
+Volume(6000331) = {6000330};
//Surface Loop(6000210) = {1000144,1000142,1000140,6000195,2000140,2000142,2000144,-6000199,-6000197,-6000201,-6000203,6000205,-6000207,6000209};
@@ -1350,50 +1350,50 @@ Recombine Surface{7000315,7000319,7000323,7000317,7000321,7000325,7000333,700033
Surface Loop(7000276) = {7000240,3000154,-7000271,-7000269,-7000267,2000154};
-Complex Volume(7000277) = {7000276};
+Volume(7000277) = {7000276};
Transfinite Volume{7000277} = {3000013,2000013,2000006,3000006,3000015,2000015,2000008,3000008};
Surface Loop(7000278) = {7000234,-3000156,-7000273,7000275,-2000156,-7000271};
-Complex Volume(7000279) = {7000278};
+Volume(7000279) = {7000278};
Surface Loop(7000215) = {7000212,-3000144,7000203,7000201,7000199,-2000144};
-Complex Volume(7000216) = {7000215};
+Volume(7000216) = {7000215};
Surface Loop(7000217) = {2000142,7000214,7000205,7000212,3000142,-7000197};
-Complex Volume(7000218) = {7000217};
+Volume(7000218) = {7000217};
Surface Loop(7000219) = {7000214,7000207,-3000140,-7000209,-7000195,-2000140};
-Complex Volume(7000220) = {7000219};
+Volume(7000220) = {7000219};
Surface Loop(7000254) = {3000152,7000234,7000236,2000152,-7000251,-7000207};
-Complex Volume(7000255) = {7000254};
+Volume(7000255) = {7000254};
Surface Loop(7000256) = {2000150,7000230,3000150,-7000205,7000236,-7000232};
-Complex Volume(7000257) = {7000256};
+Volume(7000257) = {7000256};
Surface Loop(7000258) = {2000148,7000226,3000148,7000203,-7000230,7000228};
-Complex Volume(7000259) = {7000258};
+Volume(7000259) = {7000258};
Surface Loop(7000262) = {7000226,-3000146,7000222,-7000201,-2000146,7000261};
-Complex Volume(7000263) = {7000262};
+Volume(7000263) = {7000262};
Surface Loop(7000264) = {7000209,7000251,3000138,-7000240,7000242,2000138};
-Complex Volume(7000265) = {7000264};
+Volume(7000265) = {7000264};
Surface Loop(7000292) = {3000158,-7000281,7000275,2000158,-7000232,7000283};
-Complex Volume(7000293) = {7000292};
+Volume(7000293) = {7000292};
Surface Loop(7000294) = {2000162,-7000285,-7000291,3000162,-7000283,7000228};
-Complex Volume(7000295) = {7000294};
+Volume(7000295) = {7000294};
Surface Loop(7000296) = {2000164,-7000287,3000164,7000289,7000285,-7000261};
-Complex Volume(7000297) = {7000296};
+Volume(7000297) = {7000296};
Surface Loop(7000310) = {7000299,-3000187,7000305,7000303,-2000187,7000301};
-Complex Volume(7000311) = {7000310};
+Volume(7000311) = {7000310};
Surface Loop(7000312) = {2000160,-7000281,-7000307,-7000299,3000160,7000309};
-Complex Volume(7000313) = {7000312};
+Volume(7000313) = {7000312};
Surface Loop(7000344) = {7000337,-3000193,-7000333,7000289,-2000193,7000335};
-Complex Volume(7000345) = {7000344};
+Volume(7000345) = {7000344};
Surface Loop(7000346) = {3000191,7000337,7000291,-7000341,2000191,-7000339};
-Complex Volume(7000347) = {7000346};
+Volume(7000347) = {7000346};
Surface Loop(7000348) = {2000189,7000341,3000189,-7000343,7000301,7000309};
-Complex Volume(7000349) = {7000348};
+Volume(7000349) = {7000348};
Surface Loop(7000326) = {7000269,3000181,-7000321,7000323,7000325,2000181};
-Complex Volume(7000327) = {7000326};
+Volume(7000327) = {7000326};
Surface Loop(7000328) = {7000317,-3000183,-7000319,-7000321,-2000183,7000273};
-Complex Volume(7000329) = {7000328};
+Volume(7000329) = {7000328};
Surface Loop(7000330) = {7000303,7000315,7000317,3000185,-7000307,2000185};
-Complex Volume(7000331) = {7000330};
+Volume(7000331) = {7000330};
//Surface Loop(7000210) = {2000144,2000142,2000140,7000195,3000140,3000142,3000144,-7000199,-7000197,-7000201,-7000203,7000205,-7000207,7000209};
@@ -1623,50 +1623,50 @@ Recombine Surface{8000315,8000319,8000323,8000317,8000321,8000325,8000333,800033
Surface Loop(8000276) = {8000240,4000154,-8000271,-8000269,-8000267,3000154};
-Complex Volume(8000277) = {8000276};
+Volume(8000277) = {8000276};
Transfinite Volume{8000277} = {4000013,3000013,3000006,4000006,4000015,3000015,3000008,4000008};
Surface Loop(8000278) = {8000234,-4000156,-8000273,8000275,-3000156,-8000271};
-Complex Volume(8000279) = {8000278};
+Volume(8000279) = {8000278};
Surface Loop(8000215) = {8000212,-4000144,8000203,8000201,8000199,-3000144};
-Complex Volume(8000216) = {8000215};
+Volume(8000216) = {8000215};
Surface Loop(8000217) = {3000142,8000214,8000205,8000212,4000142,-8000197};
-Complex Volume(8000218) = {8000217};
+Volume(8000218) = {8000217};
Surface Loop(8000219) = {8000214,8000207,-4000140,-8000209,-8000195,-3000140};
-Complex Volume(8000220) = {8000219};
+Volume(8000220) = {8000219};
Surface Loop(8000254) = {4000152,8000234,8000236,3000152,-8000251,-8000207};
-Complex Volume(8000255) = {8000254};
+Volume(8000255) = {8000254};
Surface Loop(8000256) = {3000150,8000230,4000150,-8000205,8000236,-8000232};
-Complex Volume(8000257) = {8000256};
+Volume(8000257) = {8000256};
Surface Loop(8000258) = {3000148,8000226,4000148,8000203,-8000230,8000228};
-Complex Volume(8000259) = {8000258};
+Volume(8000259) = {8000258};
Surface Loop(8000262) = {8000226,-4000146,8000222,-8000201,-3000146,8000261};
-Complex Volume(8000263) = {8000262};
+Volume(8000263) = {8000262};
Surface Loop(8000264) = {8000209,8000251,4000138,-8000240,8000242,3000138};
-Complex Volume(8000265) = {8000264};
+Volume(8000265) = {8000264};
Surface Loop(8000292) = {4000158,-8000281,8000275,3000158,-8000232,8000283};
-Complex Volume(8000293) = {8000292};
+Volume(8000293) = {8000292};
Surface Loop(8000294) = {3000162,-8000285,-8000291,4000162,-8000283,8000228};
-Complex Volume(8000295) = {8000294};
+Volume(8000295) = {8000294};
Surface Loop(8000296) = {3000164,-8000287,4000164,8000289,8000285,-8000261};
-Complex Volume(8000297) = {8000296};
+Volume(8000297) = {8000296};
Surface Loop(8000310) = {8000299,-4000187,8000305,8000303,-3000187,8000301};
-Complex Volume(8000311) = {8000310};
+Volume(8000311) = {8000310};
Surface Loop(8000312) = {3000160,-8000281,-8000307,-8000299,4000160,8000309};
-Complex Volume(8000313) = {8000312};
+Volume(8000313) = {8000312};
Surface Loop(8000344) = {8000337,-4000193,-8000333,8000289,-3000193,8000335};
-Complex Volume(8000345) = {8000344};
+Volume(8000345) = {8000344};
Surface Loop(8000346) = {4000191,8000337,8000291,-8000341,3000191,-8000339};
-Complex Volume(8000347) = {8000346};
+Volume(8000347) = {8000346};
Surface Loop(8000348) = {3000189,8000341,4000189,-8000343,8000301,8000309};
-Complex Volume(8000349) = {8000348};
+Volume(8000349) = {8000348};
Surface Loop(8000326) = {8000269,4000181,-8000321,8000323,8000325,3000181};
-Complex Volume(8000327) = {8000326};
+Volume(8000327) = {8000326};
Surface Loop(8000328) = {8000317,-4000183,-8000319,-8000321,-3000183,8000273};
-Complex Volume(8000329) = {8000328};
+Volume(8000329) = {8000328};
Surface Loop(8000330) = {8000303,8000315,8000317,4000185,-8000307,3000185};
-Complex Volume(8000331) = {8000330};
+Volume(8000331) = {8000330};
//Surface Loop(8000210) = {3000144,3000142,3000140,8000195,4000140,4000142,4000144,-8000199,-8000197,-8000201,-8000203,8000205,-8000207,8000209};
@@ -1898,50 +1898,50 @@ Recombine Surface{9000315,9000319,9000323,9000317,9000321,9000325,9000333,900033
Surface Loop(9000276) = {9000240,5000154,-9000271,-9000269,-9000267,4000154};
-Complex Volume(9000277) = {9000276};
+Volume(9000277) = {9000276};
Transfinite Volume{9000277} = {5000013,4000013,4000006,5000006,5000015,4000015,4000008,5000008};
Surface Loop(9000278) = {9000234,-5000156,-9000273,9000275,-4000156,-9000271};
-Complex Volume(9000279) = {9000278};
+Volume(9000279) = {9000278};
Surface Loop(9000215) = {9000212,-5000144,9000203,9000201,9000199,-4000144};
-Complex Volume(9000216) = {9000215};
+Volume(9000216) = {9000215};
Surface Loop(9000217) = {4000142,9000214,9000205,9000212,5000142,-9000197};
-Complex Volume(9000218) = {9000217};
+Volume(9000218) = {9000217};
Surface Loop(9000219) = {9000214,9000207,-5000140,-9000209,-9000195,-4000140};
-Complex Volume(9000220) = {9000219};
+Volume(9000220) = {9000219};
Surface Loop(9000254) = {5000152,9000234,9000236,4000152,-9000251,-9000207};
-Complex Volume(9000255) = {9000254};
+Volume(9000255) = {9000254};
Surface Loop(9000256) = {4000150,9000230,5000150,-9000205,9000236,-9000232};
-Complex Volume(9000257) = {9000256};
+Volume(9000257) = {9000256};
Surface Loop(9000258) = {4000148,9000226,5000148,9000203,-9000230,9000228};
-Complex Volume(9000259) = {9000258};
+Volume(9000259) = {9000258};
Surface Loop(9000262) = {9000226,-5000146,9000222,-9000201,-4000146,9000261};
-Complex Volume(9000263) = {9000262};
+Volume(9000263) = {9000262};
Surface Loop(9000264) = {9000209,9000251,5000138,-9000240,9000242,4000138};
-Complex Volume(9000265) = {9000264};
+Volume(9000265) = {9000264};
Surface Loop(9000292) = {5000158,-9000281,9000275,4000158,-9000232,9000283};
-Complex Volume(9000293) = {9000292};
+Volume(9000293) = {9000292};
Surface Loop(9000294) = {4000162,-9000285,-9000291,5000162,-9000283,9000228};
-Complex Volume(9000295) = {9000294};
+Volume(9000295) = {9000294};
Surface Loop(9000296) = {4000164,-9000287,5000164,9000289,9000285,-9000261};
-Complex Volume(9000297) = {9000296};
+Volume(9000297) = {9000296};
Surface Loop(9000310) = {9000299,-5000187,9000305,9000303,-4000187,9000301};
-Complex Volume(9000311) = {9000310};
+Volume(9000311) = {9000310};
Surface Loop(9000312) = {4000160,-9000281,-9000307,-9000299,5000160,9000309};
-Complex Volume(9000313) = {9000312};
+Volume(9000313) = {9000312};
Surface Loop(9000344) = {9000337,-5000193,-9000333,9000289,-4000193,9000335};
-Complex Volume(9000345) = {9000344};
+Volume(9000345) = {9000344};
Surface Loop(9000346) = {5000191,9000337,9000291,-9000341,4000191,-9000339};
-Complex Volume(9000347) = {9000346};
+Volume(9000347) = {9000346};
Surface Loop(9000348) = {4000189,9000341,5000189,-9000343,9000301,9000309};
-Complex Volume(9000349) = {9000348};
+Volume(9000349) = {9000348};
Surface Loop(9000326) = {9000269,5000181,-9000321,9000323,9000325,4000181};
-Complex Volume(9000327) = {9000326};
+Volume(9000327) = {9000326};
Surface Loop(9000328) = {9000317,-5000183,-9000319,-9000321,-4000183,9000273};
-Complex Volume(9000329) = {9000328};
+Volume(9000329) = {9000328};
Surface Loop(9000330) = {9000303,9000315,9000317,5000185,-9000307,4000185};
-Complex Volume(9000331) = {9000330};
+Volume(9000331) = {9000330};
//Surface Loop(9000210) = {4000144,4000142,4000140,9000195,5000140,5000142,5000144,-9000199,-9000197,-9000201,-9000203,9000205,-9000207,9000209};
diff --git a/benchmarks/3d/naca12.geo b/benchmarks/3d/naca12.geo
index c9f0c0b357d71d6e24233a1fef9986dd8f3f10b7..1b506c545d157051ec0363fea6f38569f2380709 100644
--- a/benchmarks/3d/naca12.geo
+++ b/benchmarks/3d/naca12.geo
@@ -476,6 +476,6 @@ Plane Surface(1105 ) = {1005};
Line Loop(1006)= {1012,1007,-1011,-1003};
Plane Surface(1106 ) = {1006};
Surface Loop(1107) = {1101,1100,1105,-1103,-1102,1104,-1106,-24,14,18,20,-22};
-Complex Volume(1108) = {1107};
+Volume(1108) = {1107};
Physical Volume(1110) = {1108};
diff --git a/benchmarks/3d/p4a.geo b/benchmarks/3d/p4a.geo
index 4a2367a39702954582960f4f8f596b15f045fe16..9d250fb017c29cc9c7a015d2c82ff616268c7fc9 100644
--- a/benchmarks/3d/p4a.geo
+++ b/benchmarks/3d/p4a.geo
@@ -124,15 +124,15 @@ Line Loop(75) = {-25,23,27};
Ruled Surface(76) = {75};
Surface Loop(77) = {48,-46,-38,-40,-44,42,-36};
-Complex Volume(78) = {77};
+Volume(78) = {77};
Surface Loop(79) = {64,-62,-50,40,44,-42,-74};
-Complex Volume(80) = {79};
+Volume(80) = {79};
Surface Loop(81) = {36,38,50,54,58,70};
-Complex Volume(82) = {81};
+Volume(82) = {81};
Surface Loop(83) = {70,-56,-52,-72,68};
-Complex Volume(84) = {83};
+Volume(84) = {83};
Surface Loop(85) = {52,66,-60,76,-74};
-Complex Volume(86) = {85};
+Volume(86) = {85};
diff --git a/benchmarks/3d/prism.geo b/benchmarks/3d/prism.geo
index d537e222cbbe26b62ec93d4e4b070023470fe985..c5c2fd892de0e72e4328022bf044c219bf4fa129 100644
--- a/benchmarks/3d/prism.geo
+++ b/benchmarks/3d/prism.geo
@@ -27,7 +27,7 @@ Line Loop(18) = {1,2,3};
Plane Surface(19) = {18};
Surface Loop(20) = {13,15,17,-11,-19};
-Complex Volume(21) = {20};
+Volume(21) = {20};
Transfinite Line {1,2,3,4,5,6,7,8,9} = 3;
diff --git a/benchmarks/3d/sph.geo b/benchmarks/3d/sph.geo
index 398fa067236b113000c250744808320a56d0ce1b..d4a6bb71a9acd0052f4c8d6c050d8d4dc16eeb86 100644
--- a/benchmarks/3d/sph.geo
+++ b/benchmarks/3d/sph.geo
@@ -36,7 +36,7 @@ Line Loop(25) = {-5,1,3};
Ruled Surface(26) = {25};
Surface Loop(27) = {24,-22,-18,20,-26};
-Complex Volume(28) = {27};
+Volume(28) = {27};
Transfinite Line {1,2,3,4,5,6} = 10 ;
Transfinite Line {-8,-10,-12} = 5 Using Power 1.6 ;
diff --git a/benchmarks/3d/sph2.geo b/benchmarks/3d/sph2.geo
index dec30487df72c1696f04631e67af811618a7ed36..74ff0f2d12d782c3b6992df1b7639033767d897f 100644
--- a/benchmarks/3d/sph2.geo
+++ b/benchmarks/3d/sph2.geo
@@ -36,7 +36,7 @@ Line Loop(25) = {-5,1,3};
Ruled Surface(26) = {25};
Surface Loop(27) = {24,-22,-18,20,-26};
-Complex Volume(28) = {27};
+Volume(28) = {27};
Transfinite Line {1,2,3,4,5,6} = nbdiv+1 ;
Transfinite Line {-8,-10,-12} = nbdiv+1 ;
diff --git a/benchmarks/3d/transfinite.geo b/benchmarks/3d/transfinite.geo
index 7d168cc0d22bf3f389e410cfe838a00b3ac1828f..1d50c602fae2f9a8028e6110ba1999e03bff9ad5 100644
--- a/benchmarks/3d/transfinite.geo
+++ b/benchmarks/3d/transfinite.geo
@@ -39,7 +39,7 @@ Line Loop(23) = {-9,10,11,3};
Ruled Surface(24) = {23};
Surface Loop(25) = {16,20,24,18,6,22};
-Complex Volume(26) = {25};
+Volume(26) = {25};
Transfinite Line {7,9,11,12} = 5;
Transfinite Line {3,10,14} = 10;
diff --git a/benchmarks/3d/trav33D.geo b/benchmarks/3d/trav33D.geo
index 5ae749dcddf965f358a6d05b31288b756e6227af..751babba22997eba5df2da17bdca221356ca8717 100644
--- a/benchmarks/3d/trav33D.geo
+++ b/benchmarks/3d/trav33D.geo
@@ -187,13 +187,13 @@ Plane Surface(158) = {157};
Surface Loop(147) = {116,-144,146,-136,138,96,-140,-142};
-Complex Volume(148) = {147};
+Volume(148) = {147};
Surface Loop(149) = {96,108,106,-98,110,-112};
-Complex Volume(150) = {149};
+Volume(150) = {149};
Surface Loop(151) = {108,104,-100,-116,102,-114};
-Complex Volume(152) = {151} ;
+Volume(152) = {151} ;
Surface Loop(159) = {112,-114,-140,156,158,120,-118,-61,-67,63,47,-43};
-Complex Volume(160) = {159};
+Volume(160) = {159};
Physical Volume(1000) = {160}; // Air
diff --git a/benchmarks/3d/vulp5.geo b/benchmarks/3d/vulp5.geo
index 98564699af185a8a800799b20637f4954df256bd..8320f19a1eee8fcf8466e5560cf5801f8b7f758a 100644
--- a/benchmarks/3d/vulp5.geo
+++ b/benchmarks/3d/vulp5.geo
@@ -1030,22 +1030,22 @@ Line Loop(4024) = {-72,-81,-66,58};Plane Surface(4124) = {4024};
/* volume bouchon */
Surface Loop(4125) = {3103,-3110,-3102,-3109,3111,3112};
-Complex Volume(4126) = {4125};
+Volume(4126) = {4125};
/* volume air */
Surface Loop(4127) = {4123,4116,-4101,4112,4107,4120};
Surface Loop(4128) = {2229,2232,2231,-2230,-3113,-3109,-3115,3101,3107,3112,-3110,-3116,-3105,3111,-3106,-3114,3104,3108,-127,126,-125,122,-128,-327,326,-325,322,-328,-527,526,-525,522,-528,-727,726,-725,722,-728,-927,926,-925,922,-928,-1127,1126,-1125,1122,-1128,-1327,1326,-1325,1322,-1328,-1527,1526,-1525,1522,-1528,-1727,1726,-1725,1722,-1728,-1927,1926,-1925,1922,-1928,-2127,2126,-2125,2122,-2128,-227,226,-225,222,-228,-427,426,-425,422,-428,-627,626,-625,622,-628,-827,826,-825,822,-828,-1027,1026,-1025,1022,-1028,-1227,1226,-1225,1222,-1228,-1427,1426,-1425,1422,-1428,-1627,1626,-1625,1622,-1628,-1827,1826,-1825,1822,-1828,-2027,2026,-2025,2022,-2028,-2227,2226,-2225,2222,-2228,129,132,131,-130,124,329,332,331,-330,324,529,532,531,-530,524,729,732,731,-730,724,929,932,931,-930,924,1129,1132,1131,-1130,1124,1329,1332,1331,-1330,1324,1529,1532,1531,-1530,1524,1729,1732,1731,-1730,1724,1929,1932,1931,-1930,1924,2129,2132,2131,-2130,2124,229,232,231,-230,224,429,432,431,-430,424,629,632,631,-630,624,829,832,831,-830,824,1029,1032,1031,-1030,1024,1229,1232,1231,-1230,1224,1429,1432,1431,-1430,1424,1629,1632,1631,-1630,1624,1829,1832,1831,-1830,1824,2029,2032,2031,-2030,2024,2224};
-Complex Volume(4129) = {4127,4128};
+Volume(4129) = {4127,4128};
/* volumes boite */
-Surface Loop(4130) = {4101,4102,-4103,-4104,-4106,-4105}; Complex Volume(4131) = {4130}; /* Zm */
-Surface Loop(4132) = {4113,4115,-4108,-4103,4112,-4114}; Complex Volume(4133) = {4132}; /* Xm */
-Surface Loop(4134) = {4110,4111,-4104,4108,4107,4109}; Complex Volume(4135) = {4134}; /* Ym */
-Surface Loop(4136) = {4118,4119,-4102,4113,-4116,-4117}; Complex Volume(4137) = {4136}; /* Yp */
-Surface Loop(4138) = {4105,-4124,4110,-4121,-4123,-4118}; Complex Volume(4139) = {4138}; /* Xp */
-Surface Loop(4140) = {4121,-4122,4109,-4114,4117,-4120}; Complex Volume(4141) = {4140}; /* Zp */
+Surface Loop(4130) = {4101,4102,-4103,-4104,-4106,-4105}; Volume(4131) = {4130}; /* Zm */
+Surface Loop(4132) = {4113,4115,-4108,-4103,4112,-4114}; Volume(4133) = {4132}; /* Xm */
+Surface Loop(4134) = {4110,4111,-4104,4108,4107,4109}; Volume(4135) = {4134}; /* Ym */
+Surface Loop(4136) = {4118,4119,-4102,4113,-4116,-4117}; Volume(4137) = {4136}; /* Yp */
+Surface Loop(4138) = {4105,-4124,4110,-4121,-4123,-4118}; Volume(4139) = {4138}; /* Xp */
+Surface Loop(4140) = {4121,-4122,4109,-4114,4117,-4120}; Volume(4141) = {4140}; /* Zp */
/* Surface et volume boite externe */
@@ -1068,12 +1068,12 @@ Line Loop(7051) = {7015,7005,-7018,74};Plane Surface(7052) = {7051};
Line Loop(7053) = {7005,-7008,7012,7001};Plane Surface(7054) = {7053};
Line Loop(7055) = {7007,-7002,7005,7006};Plane Surface(7056) = {7055};
-Surface Loop(7057) = {7036,7024,7032,7034,-4115,-7038}; Complex Volume(7058) = {7057}; /* XM */
-Surface Loop(7059) = {7046,7044,-7042,-4124,-7028,-7040}; Complex Volume(7060) = {7059}; /* XP */
-Surface Loop(7061) = {7054,-7052,-7032,-4111,-7026,7040}; Complex Volume(7062) = {7061}; /* YM */
-Surface Loop(7063) = {7036,-7022,-4119,7048,-7050,7044}; Complex Volume(7064) = {7063}; /* YP */
-Surface Loop(7065) = {4106,7022,7024,-7026,-7028,-7030}; Complex Volume(7066) = {7065}; /* ZM */
-Surface Loop(7067) = {4122,-7052,7034,-7048,7056,-7042}; Complex Volume(7068) = {7067}; /* ZP */
+Surface Loop(7057) = {7036,7024,7032,7034,-4115,-7038}; Volume(7058) = {7057}; /* XM */
+Surface Loop(7059) = {7046,7044,-7042,-4124,-7028,-7040}; Volume(7060) = {7059}; /* XP */
+Surface Loop(7061) = {7054,-7052,-7032,-4111,-7026,7040}; Volume(7062) = {7061}; /* YM */
+Surface Loop(7063) = {7036,-7022,-4119,7048,-7050,7044}; Volume(7064) = {7063}; /* YP */
+Surface Loop(7065) = {4106,7022,7024,-7026,-7028,-7030}; Volume(7066) = {7065}; /* ZM */
+Surface Loop(7067) = {4122,-7052,7034,-7048,7056,-7042}; Volume(7068) = {7067}; /* ZP */
/* physical entities */
diff --git a/benchmarks/extrude/Torus-ExtrMesh-2.geo b/benchmarks/extrude/Torus-ExtrMesh-2.geo
index 2454aa07972ff51449a1d53ebb8b9edf52b61709..7099dfbf42c9d511c3fc157f1a446cc7cba87d94 100644
--- a/benchmarks/extrude/Torus-ExtrMesh-2.geo
+++ b/benchmarks/extrude/Torus-ExtrMesh-2.geo
@@ -22,7 +22,7 @@ Extrude Surface {6, {0,0.0,2}} ;
Surface Loop(51) = {6,37,41,45,49,50};
-Complex Volume(52) = {51};
+Volume(52) = {51};
Extrude Surface {45, {0,2,0.0}}
diff --git a/demos/filter.geo b/demos/filter.geo
index 5d653a97f64c43f4f92c0ef17824f9a44861969f..b415b74affdba2d335dd468e701c16ce4b000517 100644
--- a/demos/filter.geo
+++ b/demos/filter.geo
@@ -411,19 +411,19 @@ Plane Surface(239) = {238,107,102};
Surface Loop(601) = {152,104,140,-101,146,144,142,-154,-148,150};
-Complex Volume(602) = {601};
+Volume(602) = {601};
Surface Loop(603) = {160,-158,-156,109,-132,-138,-136,-134,-112,-162};
-Complex Volume(604) = {603};
+Volume(604) = {603};
Surface Loop(605) = {213,217,-211,-209,207,-215,205,203};
-Complex Volume(606) = {605};
+Volume(606) = {605};
Surface Loop(607) = {186,190,-184,174,172,192,-178,-176};
-Complex Volume(608) = {607};
+Volume(608) = {607};
Surface Loop(6001) = {213,-239,-182,180,186,237,231,-229,227,-233,-188,
-201,-199,-219,132,138,136,134,112,156,-114,162,-160,158,-140,101,
-146,-144,-142,154,148,-105,-152,-150};
-Complex Volume(6002) = {6001};
+Volume(6002) = {6001};
Delete { Line{169} ; }
@@ -456,8 +456,6 @@ Ruled Surface(6026) = {6025};
Line Loop(6029) = {-56,-6016,6010,6012};
Ruled Surface(6030) = {6029};
Surface Loop(6031) = {184,6020,6030,6028,6018,-6024,-6022,-6026};
-//Complex Volume(6032) = {6031};
-
AIR = 1 ;
R1 = 2 ;