Skip to content
Snippets Groups Projects
Commit f94a96f0 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

API to create discrete entities and to set mesh vertices/elements

parent d7bbece0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Common/gmsh.cpp
+ 387
− 127
View file @ f94a96f0
...@@ -3,8 +3,10 @@ ...@@ -3,8 +3,10 @@
// See the LICENSE.txt file for license information. Please report all // See the LICENSE.txt file for license information. Please report all
// bugs and problems to the public mailing list <gmsh@onelab.info>. // bugs and problems to the public mailing list <gmsh@onelab.info>.
#include <sstream>
#include "gmsh.h" #include "gmsh.h"
#include "GmshConfig.h" #include "GmshConfig.h"
#include "GmshDefines.h"
#include "GmshGlobal.h" #include "GmshGlobal.h"
#include "GModel.h" #include "GModel.h"
#include "GModelIO_GEO.h" #include "GModelIO_GEO.h"
...@@ -13,6 +15,10 @@ ...@@ -13,6 +15,10 @@
#include "GEdge.h" #include "GEdge.h"
#include "GFace.h" #include "GFace.h"
#include "GRegion.h" #include "GRegion.h"
#include "discreteVertex.h"
#include "discreteEdge.h"
#include "discreteFace.h"
#include "discreteRegion.h"
#include "MPoint.h" #include "MPoint.h"
#include "MLine.h" #include "MLine.h"
#include "MTriangle.h" #include "MTriangle.h"
...@@ -28,6 +34,11 @@ ...@@ -28,6 +34,11 @@
#include "Field.h" #include "Field.h"
#endif #endif
// -1 : not initialized
// 0 : success
// 1 : generic error
// 2 : bad input arguments
#define GMSH_API std::vector<int> #define GMSH_API std::vector<int>
#define GMSH_OK std::vector<int>(1, 0) #define GMSH_OK std::vector<int>(1, 0)
#define GMSH_ERROR(n) std::vector<int>(1, n) #define GMSH_ERROR(n) std::vector<int>(1, n)
...@@ -57,7 +68,7 @@ GMSH_API gmshInitialize(int argc, char **argv) ...@@ -57,7 +68,7 @@ GMSH_API gmshInitialize(int argc, char **argv)
_initialized = 1; _initialized = 1;
return GMSH_OK; return GMSH_OK;
} }
return GMSH_ERROR(1); return GMSH_ERROR(-1);
} }
GMSH_API gmshFinalize() GMSH_API gmshFinalize()
...@@ -196,6 +207,14 @@ GMSH_API gmshModelDelete() ...@@ -196,6 +207,14 @@ GMSH_API gmshModelDelete()
return GMSH_ERROR(1); return GMSH_ERROR(1);
} }
GMSH_API gmshModelList(std::vector<std::string> &names)
{
if(!_isInitialized()) return GMSH_ERROR(-1);
for(unsigned int i = 0; i < GModel::list.size(); i++)
names.push_back(GModel::list[i]->getName());
return GMSH_ERROR(1);
}
GMSH_API gmshModelSetCurrent(const std::string &name) GMSH_API gmshModelSetCurrent(const std::string &name)
{ {
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
...@@ -305,14 +324,30 @@ GMSH_API gmshModelGetEntitiesInBoundingBox(const double x1, const double y1, ...@@ -305,14 +324,30 @@ GMSH_API gmshModelGetEntitiesInBoundingBox(const double x1, const double y1,
return GMSH_OK; return GMSH_OK;
} }
static std::string _entityName(int dim, int tag)
{
std::stringstream stream;
switch(dim){
case 0 : stream << "Point "; break;
case 1 : stream << "Line "; break;
case 2 : stream << "Surface "; break;
case 3 : stream << "Volume "; break;
}
stream << tag;
return stream.str();
}
GMSH_API gmshModelGetBoundingBox(const int dim, const int tag, double &x1, double &y1, GMSH_API gmshModelGetBoundingBox(const int dim, const int tag, double &x1, double &y1,
double &z1, double &x2, double &y2, double &z2) double &z1, double &x2, double &y2, double &z2)
{ {
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
GEntity *ge = GModel::current()->getEntityByTag(dim, tag); GEntity *ge = GModel::current()->getEntityByTag(dim, tag);
if(!ge) return GMSH_ERROR(1); if(!ge){
Msg::Error("%s does not exist", _entityName(dim, tag).c_str());
return GMSH_ERROR(2);
}
SBoundingBox3d box = ge->bounds(); SBoundingBox3d box = ge->bounds();
if(box.empty()) return GMSH_ERROR(2); if(box.empty()) return GMSH_ERROR(3);
x1 = box.min().x(); x1 = box.min().x();
y1 = box.min().y(); y1 = box.min().y();
z1 = box.min().z(); z1 = box.min().z();
...@@ -322,6 +357,44 @@ GMSH_API gmshModelGetBoundingBox(const int dim, const int tag, double &x1, doubl ...@@ -322,6 +357,44 @@ GMSH_API gmshModelGetBoundingBox(const int dim, const int tag, double &x1, doubl
return GMSH_OK; return GMSH_OK;
} }
GMSH_API gmshModelAddDiscreteEntity(const int dim, const int tag,
const std::vector<int> &boundary)
{
if(!_isInitialized()) return GMSH_ERROR(-1);
GEntity *e = GModel::current()->getEntityByTag(dim, tag);
if(e){
Msg::Error("%s already exists", _entityName(dim, tag).c_str());
return GMSH_ERROR(2);
}
// FIXME: check and set boundary entities to construct topology!
switch(dim){
case 0: {
GVertex *gv = new discreteVertex(GModel::current(), tag);
GModel::current()->add(gv);
e = gv;
break;
}
case 1: {
GEdge *ge = new discreteEdge(GModel::current(), tag, 0, 0);
GModel::current()->add(ge);
break;
}
case 2: {
GFace *gf = new discreteFace(GModel::current(), tag);
GModel::current()->add(gf);
break;
}
case 3: {
GRegion *gr = new discreteRegion(GModel::current(), tag);
GModel::current()->add(gr);
break;
}
default :
return GMSH_ERROR(2);
}
return GMSH_OK;
}
GMSH_API gmshModelRemove(const vector_pair &dimTags, const bool recursive) GMSH_API gmshModelRemove(const vector_pair &dimTags, const bool recursive)
{ {
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
...@@ -349,7 +422,10 @@ GMSH_API gmshModelGetMeshVertices(const int dim, const int tag, ...@@ -349,7 +422,10 @@ GMSH_API gmshModelGetMeshVertices(const int dim, const int tag,
vertexTags.clear(); vertexTags.clear();
coordinates.clear(); coordinates.clear();
GEntity *ge = GModel::current()->getEntityByTag(dim, tag); GEntity *ge = GModel::current()->getEntityByTag(dim, tag);
if(!ge) return GMSH_ERROR(1); if(!ge){
Msg::Error("%s does not exist", _entityName(dim, tag).c_str());
return GMSH_ERROR(2);
}
for(unsigned int i = 0; i < ge->mesh_vertices.size(); i++){ for(unsigned int i = 0; i < ge->mesh_vertices.size(); i++){
MVertex *v = ge->mesh_vertices[i]; MVertex *v = ge->mesh_vertices[i];
vertexTags.push_back(v->getNum()); vertexTags.push_back(v->getNum());
...@@ -392,7 +468,10 @@ GMSH_API gmshModelGetMeshElements(const int dim, const int tag, ...@@ -392,7 +468,10 @@ GMSH_API gmshModelGetMeshElements(const int dim, const int tag,
elementTags.clear(); elementTags.clear();
vertexTags.clear(); vertexTags.clear();
GEntity *ge = GModel::current()->getEntityByTag(dim, tag); GEntity *ge = GModel::current()->getEntityByTag(dim, tag);
if(!ge) return GMSH_ERROR(1); if(!ge){
Msg::Error("%s does not exist", _entityName(dim, tag).c_str());
return GMSH_ERROR(2);
}
switch(dim){ switch(dim){
case 0: { case 0: {
GVertex *v = static_cast<GVertex*>(ge); GVertex *v = static_cast<GVertex*>(ge);
...@@ -418,6 +497,155 @@ GMSH_API gmshModelGetMeshElements(const int dim, const int tag, ...@@ -418,6 +497,155 @@ GMSH_API gmshModelGetMeshElements(const int dim, const int tag,
return GMSH_OK; return GMSH_OK;
} }
GMSH_API gmshModelSetMeshVertices(const int dim, const int tag,
const std::vector<int> &vertexTags,
const std::vector<double> &coordinates,
const std::vector<double> &parametricCoordinates)
{
if(!_isInitialized()) return GMSH_ERROR(-1);
GEntity *e = GModel::current()->getEntityByTag(dim, tag);
if(!e){
Msg::Error("%s does not exist", _entityName(dim, tag).c_str());
return GMSH_ERROR(2);
}
if(coordinates.size() != 3 * vertexTags.size()){
Msg::Error("Wrong number of coordinates");
return GMSH_ERROR(2);
}
bool param = false;
if(parametricCoordinates.size()){
if(parametricCoordinates.size() != dim * vertexTags.size()){
Msg::Error("Wrong number of parametric coordinates");
return GMSH_ERROR(2);
}
param = true;
}
GModel::current()->destroyMeshCaches();
if(e->mesh_vertices.size())
Msg::Warning("%s already contains mesh vertices",
_entityName(dim, tag).c_str());
e->mesh_vertices.clear();
for(unsigned int i = 0; i < vertexTags.size(); i++){
int n = vertexTags[i];
double x = coordinates[3 * i];
double y = coordinates[3 * i + 1];
double z = coordinates[3 * i + 2];
MVertex *vv = 0;
if(param && dim == 1){
double u = parametricCoordinates[i];
vv = new MEdgeVertex(x, y, z, e, u, n);
}
else if(param && dim == 2){
double u = parametricCoordinates[i];
double v = parametricCoordinates[i + 1];
vv = new MFaceVertex(x, y, z, e, u, v, n);
}
else
vv = new MVertex(x, y, z, e, n);
e->mesh_vertices.push_back(vv);
}
return GMSH_OK;
}
template<class T>
static void _addElements(int dim, int tag, const std::vector<MElement*> &src,
std::vector<T*> &dst)
{
if(dst.size())
Msg::Warning("%s already contains some mesh elements",
_entityName(dim, tag).c_str());
dst.clear();
for(unsigned int i = 0; i < src.size(); i++)
dst.push_back(static_cast<T*>(src[i]));
}
GMSH_API gmshModelSetMeshElements(const int dim, const int tag,
const std::vector<int> &types,
const std::vector<std::vector<int> > &elementTags,
const std::vector<std::vector<int> > &vertexTags)
{
if(!_isInitialized()) return GMSH_ERROR(-1);
GEntity *e = GModel::current()->getEntityByTag(dim, tag);
if(!e){
Msg::Error("%s does not exist", _entityName(dim, tag).c_str());
return GMSH_ERROR(2);
}
if(types.size() != elementTags.size()){
Msg::Error("Wrong number of element tags");
return GMSH_ERROR(2);
}
if(types.size() != vertexTags.size()){
Msg::Error("Wrong number of vertex tags");
return GMSH_ERROR(2);
}
for(unsigned int i = 0; i < types.size(); i++){
int type = types[i];
int numEle = elementTags[i].size();
int numVertPerEle = MElement::getInfoMSH(type);
if(!numEle) continue;
if(numEle * numVertPerEle != vertexTags[i].size()){
Msg::Error("Wrong number of vertex tags for element type %d", type);
return GMSH_ERROR(2);
}
std::vector<MElement*> elements(numEle);
std::vector<MVertex*> vertices(numVertPerEle);
for(unsigned int j = 0; j < numEle; j++){
int etag = elementTags[i][j];
MElementFactory f;
for(unsigned int k = 0; k < numVertPerEle; k++){
int vtag = vertexTags[i][numVertPerEle * j + k];
// this will rebuild the vertex cache if necessary
vertices[k] = GModel::current()->getMeshVertexByTag(vtag);
if(!vertices[k]){
Msg::Error("Unknown mesh vertex %d", vtag);
return GMSH_ERROR(2);
}
}
elements[j] = f.create(type, vertices, etag);
}
bool ok = true;
switch(dim){
case 0:
if(elements[0]->getType() == TYPE_PNT)
_addElements(dim, tag, elements, static_cast<GVertex*>(e)->points);
else
ok = false;
break;
case 1:
if(elements[0]->getType() == TYPE_LIN)
_addElements(dim, tag, elements, static_cast<GEdge*>(e)->lines);
else
ok = false;
break;
case 2:
if(elements[0]->getType() == TYPE_TRI)
_addElements(dim, tag, elements, static_cast<GFace*>(e)->triangles);
else if(elements[0]->getType() == TYPE_QUA)
_addElements(dim, tag, elements, static_cast<GFace*>(e)->quadrangles);
else
ok = false;
break;
case 3:
if(elements[0]->getType() == TYPE_TET)
_addElements(dim, tag, elements, static_cast<GRegion*>(e)->tetrahedra);
else if(elements[0]->getType() == TYPE_HEX)
_addElements(dim, tag, elements, static_cast<GRegion*>(e)->hexahedra);
else if(elements[0]->getType() == TYPE_PRI)
_addElements(dim, tag, elements, static_cast<GRegion*>(e)->prisms);
else if(elements[0]->getType() == TYPE_PYR)
_addElements(dim, tag, elements, static_cast<GRegion*>(e)->pyramids);
else
ok = false;
break;
}
if(!ok){
Msg::Error("Wrong type of element for %s", _entityName(dim, tag).c_str());
return GMSH_ERROR(2);
}
}
return GMSH_OK;
}
GMSH_API gmshModelSetMeshSize(const vector_pair &dimTags, const double size) GMSH_API gmshModelSetMeshSize(const vector_pair &dimTags, const double size)
{ {
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
...@@ -436,19 +664,20 @@ GMSH_API gmshModelSetTransfiniteLine(const int tag, const int nPoints, ...@@ -436,19 +664,20 @@ GMSH_API gmshModelSetTransfiniteLine(const int tag, const int nPoints,
{ {
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
GEdge *ge = GModel::current()->getEdgeByTag(tag); GEdge *ge = GModel::current()->getEdgeByTag(tag);
if(ge){ if(!ge){
ge->meshAttributes.method = MESH_TRANSFINITE; Msg::Error("%s does not exist", _entityName(1, tag).c_str());
ge->meshAttributes.nbPointsTransfinite = nPoints; return GMSH_ERROR(2);
ge->meshAttributes.typeTransfinite =
(type == "Progression" || type == "Power") ? 1 :
(type == "Bump") ? 2 :
1;
ge->meshAttributes.coeffTransfinite = std::abs(coef);
// in .geo file we use a negative tag to do this trick; it's a bad idea
if(coef < 0) ge->meshAttributes.typeTransfinite *= -1;
return GMSH_OK;
} }
return GMSH_ERROR(1); ge->meshAttributes.method = MESH_TRANSFINITE;
ge->meshAttributes.nbPointsTransfinite = nPoints;
ge->meshAttributes.typeTransfinite =
(type == "Progression" || type == "Power") ? 1 :
(type == "Bump") ? 2 :
1;
ge->meshAttributes.coeffTransfinite = std::abs(coef);
// in .geo file we use a negative tag to do this trick; it's a bad idea
if(coef < 0) ge->meshAttributes.typeTransfinite *= -1;
return GMSH_OK;
} }
GMSH_API gmshModelSetTransfiniteSurface(const int tag, GMSH_API gmshModelSetTransfiniteSurface(const int tag,
...@@ -457,25 +686,26 @@ GMSH_API gmshModelSetTransfiniteSurface(const int tag, ...@@ -457,25 +686,26 @@ GMSH_API gmshModelSetTransfiniteSurface(const int tag,
{ {
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
GFace *gf = GModel::current()->getFaceByTag(tag); GFace *gf = GModel::current()->getFaceByTag(tag);
if(gf){ if(!gf){
gf->meshAttributes.method = MESH_TRANSFINITE; Msg::Error("%s does not exist", _entityName(2, tag).c_str());
gf->meshAttributes.transfiniteArrangement = return GMSH_ERROR(2);
(arrangement == "Right") ? 1 : }
(arrangement == "Left") ? -1 : gf->meshAttributes.method = MESH_TRANSFINITE;
(arrangement == "AlternateRight") ? 2 : gf->meshAttributes.transfiniteArrangement =
(arrangement == "AlternateLeft") ? -2 : (arrangement == "Right") ? 1 :
(arrangement == "Alternate") ? 2 : (arrangement == "Left") ? -1 :
-1; (arrangement == "AlternateRight") ? 2 :
if(cornerTags.empty() || cornerTags.size() == 3 || cornerTags.size() == 4){ (arrangement == "AlternateLeft") ? -2 :
for(unsigned int j = 0; j < cornerTags.size(); j++){ (arrangement == "Alternate") ? 2 :
GVertex *gv = GModel::current()->getVertexByTag(cornerTags[j]); -1;
if(gv) if(cornerTags.empty() || cornerTags.size() == 3 || cornerTags.size() == 4){
gf->meshAttributes.corners.push_back(gv); for(unsigned int j = 0; j < cornerTags.size(); j++){
} GVertex *gv = GModel::current()->getVertexByTag(cornerTags[j]);
if(gv)
gf->meshAttributes.corners.push_back(gv);
} }
return GMSH_OK;
} }
return GMSH_ERROR(1); return GMSH_OK;
} }
GMSH_API gmshModelSetTransfiniteVolume(const int tag, GMSH_API gmshModelSetTransfiniteVolume(const int tag,
...@@ -483,42 +713,45 @@ GMSH_API gmshModelSetTransfiniteVolume(const int tag, ...@@ -483,42 +713,45 @@ GMSH_API gmshModelSetTransfiniteVolume(const int tag,
{ {
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
GRegion *gr = GModel::current()->getRegionByTag(tag); GRegion *gr = GModel::current()->getRegionByTag(tag);
if(gr){ if(!gr){
gr->meshAttributes.method = MESH_TRANSFINITE; Msg::Error("%s does not exist", _entityName(3, tag).c_str());
if(cornerTags.empty() || cornerTags.size() == 6 || cornerTags.size() == 8){ return GMSH_ERROR(2);
for(unsigned int i = 0; i < cornerTags.size(); i++){ }
GVertex *gv = GModel::current()->getVertexByTag(cornerTags[i]); gr->meshAttributes.method = MESH_TRANSFINITE;
if(gv) if(cornerTags.empty() || cornerTags.size() == 6 || cornerTags.size() == 8){
gr->meshAttributes.corners.push_back(gv); for(unsigned int i = 0; i < cornerTags.size(); i++){
} GVertex *gv = GModel::current()->getVertexByTag(cornerTags[i]);
if(gv)
gr->meshAttributes.corners.push_back(gv);
} }
return GMSH_OK;
} }
return GMSH_ERROR(1); return GMSH_OK;
} }
GMSH_API gmshModelSetRecombine(const int dim, const int tag, const double angle) GMSH_API gmshModelSetRecombine(const int dim, const int tag, const double angle)
{ {
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
GFace *gf = GModel::current()->getFaceByTag(tag); GFace *gf = GModel::current()->getFaceByTag(tag);
if(gf){ if(!gf){
gf->meshAttributes.recombine = 1; Msg::Error("%s does not exist", _entityName(dim, tag).c_str());
gf->meshAttributes.recombineAngle = angle; return GMSH_ERROR(2);
return GMSH_OK;
} }
return GMSH_ERROR(1); gf->meshAttributes.recombine = 1;
gf->meshAttributes.recombineAngle = angle;
return GMSH_OK;
} }
GMSH_API gmshModelSetSmoothing(const int dim, const int tag, const int val) GMSH_API gmshModelSetSmoothing(const int dim, const int tag, const int val)
{ {
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
if(dim != 2) return GMSH_ERROR(1); if(dim != 2) return GMSH_ERROR(2);
GFace *gf = GModel::current()->getFaceByTag(tag); GFace *gf = GModel::current()->getFaceByTag(tag);
if(gf){ if(!gf){
gf->meshAttributes.transfiniteSmoothing = val; Msg::Error("%s does not exist", _entityName(dim, tag).c_str());
return GMSH_OK; return GMSH_ERROR(2);
} }
return GMSH_ERROR(1); gf->meshAttributes.transfiniteSmoothing = val;
return GMSH_OK;
} }
GMSH_API gmshModelSetReverseMesh(const int dim, const int tag, const bool val) GMSH_API gmshModelSetReverseMesh(const int dim, const int tag, const bool val)
...@@ -526,19 +759,21 @@ GMSH_API gmshModelSetReverseMesh(const int dim, const int tag, const bool val) ...@@ -526,19 +759,21 @@ GMSH_API gmshModelSetReverseMesh(const int dim, const int tag, const bool val)
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
if(dim == 1){ if(dim == 1){
GEdge *ge = GModel::current()->getEdgeByTag(tag); GEdge *ge = GModel::current()->getEdgeByTag(tag);
if(ge){ if(!ge){
ge->meshAttributes.reverseMesh = val; Msg::Error("%s does not exist", _entityName(dim, tag).c_str());
return GMSH_OK; return GMSH_ERROR(2);
} }
ge->meshAttributes.reverseMesh = val;
} }
else if(dim == 2){ else if(dim == 2){
GFace *gf = GModel::current()->getFaceByTag(tag); GFace *gf = GModel::current()->getFaceByTag(tag);
if(gf){ if(!gf){
gf->meshAttributes.reverseMesh = val; Msg::Error("%s does not exist", _entityName(dim, tag).c_str());
return GMSH_OK; return GMSH_ERROR(2);
} }
gf->meshAttributes.reverseMesh = val;
} }
return GMSH_ERROR(1); return GMSH_OK;
} }
GMSH_API gmshModelEmbed(const int dim, const std::vector<int> &tags, GMSH_API gmshModelEmbed(const int dim, const std::vector<int> &tags,
...@@ -547,40 +782,59 @@ GMSH_API gmshModelEmbed(const int dim, const std::vector<int> &tags, ...@@ -547,40 +782,59 @@ GMSH_API gmshModelEmbed(const int dim, const std::vector<int> &tags,
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
if(inDim == 2){ if(inDim == 2){
GFace *gf = GModel::current()->getFaceByTag(inTag); GFace *gf = GModel::current()->getFaceByTag(inTag);
if(gf){ if(!gf){
for(unsigned int i = 0; i < tags.size(); i++){ Msg::Error("%s does not exist", _entityName(2, inTag).c_str());
if(dim == 0){ return GMSH_ERROR(2);
GVertex *gv = GModel::current()->getVertexByTag(tags[i]); }
if(gv) for(unsigned int i = 0; i < tags.size(); i++){
gf->addEmbeddedVertex(gv); if(dim == 0){
GVertex *gv = GModel::current()->getVertexByTag(tags[i]);
if(!gv){
Msg::Error("%s does not exist", _entityName(0, tags[i]).c_str());
return GMSH_ERROR(2);
} }
else if(dim == 1){ gf->addEmbeddedVertex(gv);
GEdge *ge = GModel::current()->getEdgeByTag(tags[i]); }
if(ge) else if(dim == 1){
gf->addEmbeddedEdge(ge); GEdge *ge = GModel::current()->getEdgeByTag(tags[i]);
if(!ge){
Msg::Error("%s does not exist", _entityName(1, tags[i]).c_str());
return GMSH_ERROR(2);
} }
gf->addEmbeddedEdge(ge);
} }
} }
} }
else if(inDim == 3){ else if(inDim == 3){
GRegion *gr = GModel::current()->getRegionByTag(inTag); GRegion *gr = GModel::current()->getRegionByTag(inTag);
if(gr){ if(!gr){
for(unsigned int i = 0; i < tags.size(); i++){ Msg::Error("%s does not exist", _entityName(3, inTag).c_str());
if(dim == 0){ return GMSH_ERROR(2);
GVertex *gv = GModel::current()->getVertexByTag(tags[i]); }
if(gv) for(unsigned int i = 0; i < tags.size(); i++){
gr->addEmbeddedVertex(gv); if(dim == 0){
GVertex *gv = GModel::current()->getVertexByTag(tags[i]);
if(!gv){
Msg::Error("%s does not exist", _entityName(0, tags[i]).c_str());
return GMSH_ERROR(2);
} }
else if(dim == 1){ gr->addEmbeddedVertex(gv);
GEdge *ge = GModel::current()->getEdgeByTag(tags[i]); }
if(ge) else if(dim == 1){
gr->addEmbeddedEdge(ge); GEdge *ge = GModel::current()->getEdgeByTag(tags[i]);
if(!ge){
Msg::Error("%s does not exist", _entityName(1, tags[i]).c_str());
return GMSH_ERROR(2);
} }
else if(dim == 2){ gr->addEmbeddedEdge(ge);
GFace *gf = GModel::current()->getFaceByTag(tags[i]); }
if(gf) else if(dim == 2){
gr->addEmbeddedFace(gf); GFace *gf = GModel::current()->getFaceByTag(tags[i]);
if(!gf){
Msg::Error("%s does not exist", _entityName(2, tags[i]).c_str());
return GMSH_ERROR(2);
} }
gr->addEmbeddedFace(gf);
} }
} }
} }
...@@ -599,7 +853,7 @@ GMSH_API gmshModelGeoAddPoint(const int tag, const double x, const double y, ...@@ -599,7 +853,7 @@ GMSH_API gmshModelGeoAddPoint(const int tag, const double x, const double y,
double zz = CTX::instance()->geom.scalingFactor * z; double zz = CTX::instance()->geom.scalingFactor * z;
double lc = CTX::instance()->geom.scalingFactor * meshSize; double lc = CTX::instance()->geom.scalingFactor * meshSize;
if(GModel::current()->getGEOInternals()->addVertex(outTag, xx, yy, zz, lc)){ if(GModel::current()->getGEOInternals()->addVertex(outTag, xx, yy, zz, lc)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -610,7 +864,7 @@ GMSH_API gmshModelGeoAddLine(const int tag, const int startTag, const int endTag ...@@ -610,7 +864,7 @@ GMSH_API gmshModelGeoAddLine(const int tag, const int startTag, const int endTag
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
int outTag = tag; int outTag = tag;
if(GModel::current()->getGEOInternals()->addLine(outTag, startTag, endTag)){ if(GModel::current()->getGEOInternals()->addLine(outTag, startTag, endTag)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -624,7 +878,7 @@ GMSH_API gmshModelGeoAddCircleArc(const int tag, const int startTag, ...@@ -624,7 +878,7 @@ GMSH_API gmshModelGeoAddCircleArc(const int tag, const int startTag,
int outTag = tag; int outTag = tag;
if(GModel::current()->getGEOInternals()->addCircleArc if(GModel::current()->getGEOInternals()->addCircleArc
(outTag, startTag, centerTag, endTag, nx, ny, nz)){ (outTag, startTag, centerTag, endTag, nx, ny, nz)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -639,7 +893,7 @@ GMSH_API gmshModelGeoAddEllipseArc(const int tag, const int startTag, ...@@ -639,7 +893,7 @@ GMSH_API gmshModelGeoAddEllipseArc(const int tag, const int startTag,
int outTag = tag; int outTag = tag;
if(GModel::current()->getGEOInternals()->addEllipseArc if(GModel::current()->getGEOInternals()->addEllipseArc
(outTag, startTag, centerTag, majorTag, endTag, nx, ny, nz)){ (outTag, startTag, centerTag, majorTag, endTag, nx, ny, nz)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -650,7 +904,7 @@ GMSH_API gmshModelGeoAddSpline(const int tag, const std::vector<int> &vertexTags ...@@ -650,7 +904,7 @@ GMSH_API gmshModelGeoAddSpline(const int tag, const std::vector<int> &vertexTags
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
int outTag = tag; int outTag = tag;
if(GModel::current()->getGEOInternals()->addSpline(outTag, vertexTags)){ if(GModel::current()->getGEOInternals()->addSpline(outTag, vertexTags)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -661,7 +915,7 @@ GMSH_API gmshModelGeoAddBSpline(const int tag, const std::vector<int> &vertexTag ...@@ -661,7 +915,7 @@ GMSH_API gmshModelGeoAddBSpline(const int tag, const std::vector<int> &vertexTag
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
int outTag = tag; int outTag = tag;
if(GModel::current()->getGEOInternals()->addBSpline(outTag, vertexTags)){ if(GModel::current()->getGEOInternals()->addBSpline(outTag, vertexTags)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -672,7 +926,7 @@ GMSH_API gmshModelGeoAddBezier(const int tag, const std::vector<int> &vertexTags ...@@ -672,7 +926,7 @@ GMSH_API gmshModelGeoAddBezier(const int tag, const std::vector<int> &vertexTags
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
int outTag = tag; int outTag = tag;
if(GModel::current()->getGEOInternals()->addBezier(outTag, vertexTags)){ if(GModel::current()->getGEOInternals()->addBezier(outTag, vertexTags)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -683,7 +937,7 @@ GMSH_API gmshModelGeoAddLineLoop(const int tag, const std::vector<int> &edgeTags ...@@ -683,7 +937,7 @@ GMSH_API gmshModelGeoAddLineLoop(const int tag, const std::vector<int> &edgeTags
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
int outTag = tag; int outTag = tag;
if(GModel::current()->getGEOInternals()->addLineLoop(outTag, edgeTags)){ if(GModel::current()->getGEOInternals()->addLineLoop(outTag, edgeTags)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -694,7 +948,7 @@ GMSH_API gmshModelGeoAddPlaneSurface(const int tag, const std::vector<int> &wire ...@@ -694,7 +948,7 @@ GMSH_API gmshModelGeoAddPlaneSurface(const int tag, const std::vector<int> &wire
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
int outTag = tag; int outTag = tag;
if(GModel::current()->getGEOInternals()->addPlaneSurface(outTag, wireTags)){ if(GModel::current()->getGEOInternals()->addPlaneSurface(outTag, wireTags)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -707,7 +961,7 @@ GMSH_API gmshModelGeoAddSurfaceFilling(const int tag, const std::vector<int> &wi ...@@ -707,7 +961,7 @@ GMSH_API gmshModelGeoAddSurfaceFilling(const int tag, const std::vector<int> &wi
int outTag = tag; int outTag = tag;
if(GModel::current()->getGEOInternals()->addSurfaceFilling if(GModel::current()->getGEOInternals()->addSurfaceFilling
(outTag, wireTags, sphereCenterTag)){ (outTag, wireTags, sphereCenterTag)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -718,7 +972,7 @@ GMSH_API gmshModelGeoAddSurfaceLoop(const int tag, const std::vector<int> &faceT ...@@ -718,7 +972,7 @@ GMSH_API gmshModelGeoAddSurfaceLoop(const int tag, const std::vector<int> &faceT
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
int outTag = tag; int outTag = tag;
if(GModel::current()->getGEOInternals()->addSurfaceLoop(outTag, faceTags)){ if(GModel::current()->getGEOInternals()->addSurfaceLoop(outTag, faceTags)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -729,7 +983,7 @@ GMSH_API gmshModelGeoAddVolume(const int tag, const std::vector<int> &shellTags) ...@@ -729,7 +983,7 @@ GMSH_API gmshModelGeoAddVolume(const int tag, const std::vector<int> &shellTags)
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
int outTag = tag; int outTag = tag;
if(GModel::current()->getGEOInternals()->addVolume(outTag, shellTags)){ if(GModel::current()->getGEOInternals()->addVolume(outTag, shellTags)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -923,7 +1177,7 @@ GMSH_API gmshModelGeoSetRecombine(const int dim, const int tag, const double ang ...@@ -923,7 +1177,7 @@ GMSH_API gmshModelGeoSetRecombine(const int dim, const int tag, const double ang
GMSH_API gmshModelGeoSetSmoothing(const int dim, const int tag, const int val) GMSH_API gmshModelGeoSetSmoothing(const int dim, const int tag, const int val)
{ {
if(!_isInitialized()) return GMSH_ERROR(-1); if(!_isInitialized()) return GMSH_ERROR(-1);
if(dim != 2) return GMSH_ERROR(1); if(dim != 2) return GMSH_ERROR(2);
GModel::current()->getGEOInternals()->setSmoothing(tag, val); GModel::current()->getGEOInternals()->setSmoothing(tag, val);
return GMSH_OK; return GMSH_OK;
} }
...@@ -966,7 +1220,7 @@ GMSH_API gmshModelOccAddPoint(const int tag, const double x, const double y, ...@@ -966,7 +1220,7 @@ GMSH_API gmshModelOccAddPoint(const int tag, const double x, const double y,
_createOcc(); _createOcc();
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addVertex(outTag, x, y, z, meshSize)){ if(GModel::current()->getOCCInternals()->addVertex(outTag, x, y, z, meshSize)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -978,7 +1232,7 @@ GMSH_API gmshModelOccAddLine(const int tag, const int startTag, const int endTag ...@@ -978,7 +1232,7 @@ GMSH_API gmshModelOccAddLine(const int tag, const int startTag, const int endTag
_createOcc(); _createOcc();
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addLine(outTag, startTag, endTag)){ if(GModel::current()->getOCCInternals()->addLine(outTag, startTag, endTag)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -992,7 +1246,7 @@ GMSH_API gmshModelOccAddCircleArc(const int tag, const int startTag, ...@@ -992,7 +1246,7 @@ GMSH_API gmshModelOccAddCircleArc(const int tag, const int startTag,
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addCircleArc if(GModel::current()->getOCCInternals()->addCircleArc
(outTag, startTag, centerTag, endTag)){ (outTag, startTag, centerTag, endTag)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1007,7 +1261,7 @@ GMSH_API gmshModelOccAddCircle(const int tag, const double x, const double y, ...@@ -1007,7 +1261,7 @@ GMSH_API gmshModelOccAddCircle(const int tag, const double x, const double y,
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addCircle if(GModel::current()->getOCCInternals()->addCircle
(outTag, x, y, z, r, angle1, angle2)){ (outTag, x, y, z, r, angle1, angle2)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1021,7 +1275,7 @@ GMSH_API gmshModelOccAddEllipseArc(const int tag, const int startTag, ...@@ -1021,7 +1275,7 @@ GMSH_API gmshModelOccAddEllipseArc(const int tag, const int startTag,
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addEllipseArc if(GModel::current()->getOCCInternals()->addEllipseArc
(outTag, startTag, centerTag, endTag)){ (outTag, startTag, centerTag, endTag)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1036,7 +1290,7 @@ GMSH_API gmshModelOccAddEllipse(const int tag, const double x, const double y, ...@@ -1036,7 +1290,7 @@ GMSH_API gmshModelOccAddEllipse(const int tag, const double x, const double y,
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addEllipse if(GModel::current()->getOCCInternals()->addEllipse
(outTag, x, y, z, r1, r2, angle1, angle2)){ (outTag, x, y, z, r1, r2, angle1, angle2)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1048,7 +1302,7 @@ GMSH_API gmshModelOccAddSpline(const int tag, const std::vector<int> &vertexTags ...@@ -1048,7 +1302,7 @@ GMSH_API gmshModelOccAddSpline(const int tag, const std::vector<int> &vertexTags
_createOcc(); _createOcc();
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addSpline(outTag, vertexTags)){ if(GModel::current()->getOCCInternals()->addSpline(outTag, vertexTags)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1060,7 +1314,7 @@ GMSH_API gmshModelOccAddBezier(const int tag, const std::vector<int> &vertexTags ...@@ -1060,7 +1314,7 @@ GMSH_API gmshModelOccAddBezier(const int tag, const std::vector<int> &vertexTags
_createOcc(); _createOcc();
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addBezier(outTag, vertexTags)){ if(GModel::current()->getOCCInternals()->addBezier(outTag, vertexTags)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1072,7 +1326,7 @@ GMSH_API gmshModelOccAddBSpline(const int tag, const std::vector<int> &vertexTag ...@@ -1072,7 +1326,7 @@ GMSH_API gmshModelOccAddBSpline(const int tag, const std::vector<int> &vertexTag
_createOcc(); _createOcc();
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addBSpline(outTag, vertexTags)){ if(GModel::current()->getOCCInternals()->addBSpline(outTag, vertexTags)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1086,7 +1340,7 @@ GMSH_API gmshModelOccAddWire(const int tag, const std::vector<int> &edgeTags, ...@@ -1086,7 +1340,7 @@ GMSH_API gmshModelOccAddWire(const int tag, const std::vector<int> &edgeTags,
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addWire if(GModel::current()->getOCCInternals()->addWire
(outTag, edgeTags, checkClosed)){ (outTag, edgeTags, checkClosed)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1098,7 +1352,7 @@ GMSH_API gmshModelOccAddLineLoop(const int tag, const std::vector<int> &edgeTags ...@@ -1098,7 +1352,7 @@ GMSH_API gmshModelOccAddLineLoop(const int tag, const std::vector<int> &edgeTags
_createOcc(); _createOcc();
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addLineLoop(outTag, edgeTags)){ if(GModel::current()->getOCCInternals()->addLineLoop(outTag, edgeTags)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1113,7 +1367,7 @@ GMSH_API gmshModelOccAddRectangle(const int tag, const double x, const double y, ...@@ -1113,7 +1367,7 @@ GMSH_API gmshModelOccAddRectangle(const int tag, const double x, const double y,
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addRectangle if(GModel::current()->getOCCInternals()->addRectangle
(outTag, x, y, z, dx, dy, roundedRadius)){ (outTag, x, y, z, dx, dy, roundedRadius)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1127,7 +1381,7 @@ GMSH_API gmshModelOccAddDisk(const int tag, const double xc, const double yc, ...@@ -1127,7 +1381,7 @@ GMSH_API gmshModelOccAddDisk(const int tag, const double xc, const double yc,
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addDisk if(GModel::current()->getOCCInternals()->addDisk
(outTag, xc, yc, zc, rx, ry)){ (outTag, xc, yc, zc, rx, ry)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1139,7 +1393,7 @@ GMSH_API gmshModelOccAddPlaneSurface(const int tag, const std::vector<int> &wire ...@@ -1139,7 +1393,7 @@ GMSH_API gmshModelOccAddPlaneSurface(const int tag, const std::vector<int> &wire
_createOcc(); _createOcc();
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addPlaneSurface(outTag, wireTags)){ if(GModel::current()->getOCCInternals()->addPlaneSurface(outTag, wireTags)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1151,7 +1405,7 @@ GMSH_API gmshModelOccAddSurfaceFilling(const int tag, const int wireTag) ...@@ -1151,7 +1405,7 @@ GMSH_API gmshModelOccAddSurfaceFilling(const int tag, const int wireTag)
_createOcc(); _createOcc();
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addSurfaceFilling(outTag, wireTag)){ if(GModel::current()->getOCCInternals()->addSurfaceFilling(outTag, wireTag)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1163,7 +1417,7 @@ GMSH_API gmshModelOccAddSurfaceLoop(const int tag, const std::vector<int> &faceT ...@@ -1163,7 +1417,7 @@ GMSH_API gmshModelOccAddSurfaceLoop(const int tag, const std::vector<int> &faceT
_createOcc(); _createOcc();
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addSurfaceLoop(outTag, faceTags)){ if(GModel::current()->getOCCInternals()->addSurfaceLoop(outTag, faceTags)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1175,7 +1429,7 @@ GMSH_API gmshModelOccAddVolume(const int tag, const std::vector<int> &shellTags) ...@@ -1175,7 +1429,7 @@ GMSH_API gmshModelOccAddVolume(const int tag, const std::vector<int> &shellTags)
_createOcc(); _createOcc();
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addVolume(outTag, shellTags)){ if(GModel::current()->getOCCInternals()->addVolume(outTag, shellTags)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1191,7 +1445,7 @@ GMSH_API gmshModelOccAddSphere(const int tag, const double xc, const double yc, ...@@ -1191,7 +1445,7 @@ GMSH_API gmshModelOccAddSphere(const int tag, const double xc, const double yc,
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addSphere if(GModel::current()->getOCCInternals()->addSphere
(outTag, xc, yc, zc, radius, angle1, angle2, angle3)){ (outTag, xc, yc, zc, radius, angle1, angle2, angle3)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1206,7 +1460,7 @@ GMSH_API gmshModelOccAddBox(const int tag, const double x, const double y, ...@@ -1206,7 +1460,7 @@ GMSH_API gmshModelOccAddBox(const int tag, const double x, const double y,
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addBox if(GModel::current()->getOCCInternals()->addBox
(outTag, x, y, z, dx, dy, dz)){ (outTag, x, y, z, dx, dy, dz)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1221,7 +1475,7 @@ GMSH_API gmshModelOccAddCylinder(const int tag, const double x, const double y, ...@@ -1221,7 +1475,7 @@ GMSH_API gmshModelOccAddCylinder(const int tag, const double x, const double y,
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addCylinder if(GModel::current()->getOCCInternals()->addCylinder
(outTag, x, y, z, dx, dy, dz, r, angle)){ (outTag, x, y, z, dx, dy, dz, r, angle)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1237,7 +1491,7 @@ GMSH_API gmshModelOccAddCone(const int tag, const double x, const double y, ...@@ -1237,7 +1491,7 @@ GMSH_API gmshModelOccAddCone(const int tag, const double x, const double y,
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addCone if(GModel::current()->getOCCInternals()->addCone
(outTag, x, y, z, dx, dy, dz, r1, r2, angle)){ (outTag, x, y, z, dx, dy, dz, r1, r2, angle)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1252,7 +1506,7 @@ GMSH_API gmshModelOccAddWedge(const int tag, const double x, const double y, ...@@ -1252,7 +1506,7 @@ GMSH_API gmshModelOccAddWedge(const int tag, const double x, const double y,
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addWedge if(GModel::current()->getOCCInternals()->addWedge
(outTag, x, y, z, dx, dy, dz, ltx)){ (outTag, x, y, z, dx, dy, dz, ltx)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1267,7 +1521,7 @@ GMSH_API gmshModelOccAddTorus(const int tag, const double x, const double y, ...@@ -1267,7 +1521,7 @@ GMSH_API gmshModelOccAddTorus(const int tag, const double x, const double y,
int outTag = tag; int outTag = tag;
if(GModel::current()->getOCCInternals()->addTorus if(GModel::current()->getOCCInternals()->addTorus
(outTag, x, y, z, r1, r2, angle)){ (outTag, x, y, z, r1, r2, angle)){
std::vector<int> ret(1, 0); ret.push_back(outTag); std::vector<int> ret = GMSH_OK; ret.push_back(outTag);
return ret; return ret;
} }
return GMSH_ERROR(1); return GMSH_ERROR(1);
...@@ -1553,7 +1807,8 @@ GMSH_API gmshModelFieldCreate(const int tag, const std::string &type) ...@@ -1553,7 +1807,8 @@ GMSH_API gmshModelFieldCreate(const int tag, const std::string &type)
} }
return GMSH_OK; return GMSH_OK;
#else #else
return GMSH_ERROR(1); Msg::Error("Fields require the mesh module");
return GMSH_ERROR(-1);
#endif #endif
} }
...@@ -1564,7 +1819,8 @@ GMSH_API gmshModelFieldDelete(const int tag) ...@@ -1564,7 +1819,8 @@ GMSH_API gmshModelFieldDelete(const int tag)
GModel::current()->getFields()->deleteField(tag); GModel::current()->getFields()->deleteField(tag);
return GMSH_OK; return GMSH_OK;
#else #else
return GMSH_ERROR(1); Msg::Error("Fields require the mesh module");
return GMSH_ERROR(-1);
#endif #endif
} }
...@@ -1601,7 +1857,8 @@ GMSH_API gmshModelFieldSetNumber(const int tag, const std::string &option, ...@@ -1601,7 +1857,8 @@ GMSH_API gmshModelFieldSetNumber(const int tag, const std::string &option,
} }
return GMSH_OK; return GMSH_OK;
#else #else
return GMSH_ERROR(1); Msg::Error("Fields require the mesh module");
return GMSH_ERROR(-1);
#endif #endif
} }
...@@ -1620,7 +1877,8 @@ GMSH_API gmshModelFieldSetString(const int tag, const std::string &option, ...@@ -1620,7 +1877,8 @@ GMSH_API gmshModelFieldSetString(const int tag, const std::string &option,
} }
return GMSH_OK; return GMSH_OK;
#else #else
return GMSH_ERROR(1); Msg::Error("Fields require the mesh module");
return GMSH_ERROR(-1);
#endif #endif
} }
...@@ -1652,7 +1910,8 @@ GMSH_API gmshModelFieldSetNumbers(const int tag, const std::string &option, ...@@ -1652,7 +1910,8 @@ GMSH_API gmshModelFieldSetNumbers(const int tag, const std::string &option,
} }
return GMSH_OK; return GMSH_OK;
#else #else
return GMSH_ERROR(1); Msg::Error("Fields require the mesh module");
return GMSH_ERROR(-1);
#endif #endif
} }
...@@ -1663,7 +1922,8 @@ GMSH_API gmshModelFieldSetAsBackground(const int tag) ...@@ -1663,7 +1922,8 @@ GMSH_API gmshModelFieldSetAsBackground(const int tag)
GModel::current()->getFields()->setBackgroundFieldId(tag); GModel::current()->getFields()->setBackgroundFieldId(tag);
return GMSH_OK; return GMSH_OK;
#else #else
return GMSH_ERROR(1); Msg::Error("Fields require the mesh module");
return GMSH_ERROR(-1);
#endif #endif
} }
Common/gmsh.h
+ 13
− 0
View file @ f94a96f0
...@@ -50,6 +50,7 @@ GMSH_API gmshOptionGetString(const std::string &name, std::string &value); ...@@ -50,6 +50,7 @@ GMSH_API gmshOptionGetString(const std::string &name, std::string &value);
// gmshModel // gmshModel
GMSH_API gmshModelCreate(const std::string &name); GMSH_API gmshModelCreate(const std::string &name);
GMSH_API gmshModelDelete(); GMSH_API gmshModelDelete();
GMSH_API gmshModelList(std::vector<std::string> &names);
GMSH_API gmshModelSetCurrent(const std::string &name); GMSH_API gmshModelSetCurrent(const std::string &name);
GMSH_API gmshModelGetEntities(vector_pair &dimTags, const int dim=-1); GMSH_API gmshModelGetEntities(vector_pair &dimTags, const int dim=-1);
GMSH_API gmshModelGetPhysicalGroups(vector_pair &dimTags, const int dim=-1); GMSH_API gmshModelGetPhysicalGroups(vector_pair &dimTags, const int dim=-1);
...@@ -70,6 +71,9 @@ GMSH_API gmshModelGetEntitiesInBoundingBox(const double x1, const double y1, ...@@ -70,6 +71,9 @@ GMSH_API gmshModelGetEntitiesInBoundingBox(const double x1, const double y1,
vector_pair &tags, const int dim=-1); vector_pair &tags, const int dim=-1);
GMSH_API gmshModelGetBoundingBox(const int dim, const int tag, double &x1, double &y1, GMSH_API gmshModelGetBoundingBox(const int dim, const int tag, double &x1, double &y1,
double &z1, double &x2, double &y2, double &z2); double &z1, double &x2, double &y2, double &z2);
GMSH_API gmshModelAddDiscreteEntity(const int dim, const int tag,
const std::vector<int> &boundary
= std::vector<int>());
GMSH_API gmshModelRemove(const vector_pair &dimTags, const bool recursive = false); GMSH_API gmshModelRemove(const vector_pair &dimTags, const bool recursive = false);
GMSH_API gmshModelMesh(const int dim); GMSH_API gmshModelMesh(const int dim);
GMSH_API gmshModelGetMeshVertices(const int dim, const int tag, GMSH_API gmshModelGetMeshVertices(const int dim, const int tag,
...@@ -80,6 +84,15 @@ GMSH_API gmshModelGetMeshElements(const int dim, const int tag, ...@@ -80,6 +84,15 @@ GMSH_API gmshModelGetMeshElements(const int dim, const int tag,
std::vector<int> &types, std::vector<int> &types,
std::vector<std::vector<int> > &elementTags, std::vector<std::vector<int> > &elementTags,
std::vector<std::vector<int> > &vertexTags); std::vector<std::vector<int> > &vertexTags);
GMSH_API gmshModelSetMeshVertices(const int dim, const int tag,
const std::vector<int> &vertexTags,
const std::vector<double> &coordinates,
const std::vector<double> &parametricCoordinates =
std::vector<double>());
GMSH_API gmshModelSetMeshElements(const int dim, const int tag,
const std::vector<int> &types,
const std::vector<std::vector<int> > &elementTags,
const std::vector<std::vector<int> > &vertexTags);
GMSH_API gmshModelSetMeshSize(const vector_pair &dimTags, const double size); GMSH_API gmshModelSetMeshSize(const vector_pair &dimTags, const double size);
GMSH_API gmshModelSetTransfiniteLine(const int tag, const int nPoints, GMSH_API gmshModelSetTransfiniteLine(const int tag, const int nPoints,
const std::string &type = "Progression", const std::string &type = "Progression",
......
Geo/GModel.h
+ 1
− 1
View file @ f94a96f0
...@@ -66,7 +66,7 @@ class GModel { ...@@ -66,7 +66,7 @@ class GModel {
// the visibility flag // the visibility flag
char _visible; char _visible;
// vertex and element caches to speed-up direct access by tag (only // vertex and element caches to speed-up direct access by tag (mostly
// used for post-processing I/O) // used for post-processing I/O)
std::vector<MVertex*> _vertexVectorCache; std::vector<MVertex*> _vertexVectorCache;
std::map<int, MVertex*> _vertexMapCache; std::map<int, MVertex*> _vertexMapCache;
......
Numeric/ElementType.cpp
+ 4
− 3
View file @ f94a96f0
...@@ -325,7 +325,7 @@ int ElementType::DimensionFromTag(int tag) ...@@ -325,7 +325,7 @@ int ElementType::DimensionFromTag(int tag)
case(MSH_HEX_92): case(MSH_HEX_104): case(MSH_HEX_92): case(MSH_HEX_104):
case(MSH_TRIH_4): case(MSH_TRIH_4):
case(MSH_POLYH_): case(MSH_POLYH_):
return 3; return 3;
...@@ -400,7 +400,7 @@ int ElementType::SerendipityFromTag(int tag) ...@@ -400,7 +400,7 @@ int ElementType::SerendipityFromTag(int tag)
case MSH_PYR_285 : case MSH_PYR_385 : case MSH_PYR_285 : case MSH_PYR_385 :
case MSH_TRIH_4 : case MSH_TRIH_4 :
return 0; // Not Serendipity return 0; // Not Serendipity
...@@ -563,6 +563,7 @@ int ElementType::getTag(int parentTag, int order, bool serendip) ...@@ -563,6 +563,7 @@ int ElementType::getTag(int parentTag, int order, bool serendip)
} }
} }
int ElementType::getPrimaryTag(int tag) { int ElementType::getPrimaryTag(int tag)
{
return getTag(ParentTypeFromTag(tag), 1); return getTag(ParentTypeFromTag(tag), 1);
} }
Numeric/ElementType.h
+ 1
− 2
View file @ f94a96f0
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
namespace ElementType namespace ElementType
{ {
// Give parent type, order & dimension // Give parent type, order & dimension corresponding to any element type.
// corresponding to any element type.
int ParentTypeFromTag(int tag); int ParentTypeFromTag(int tag);
int OrderFromTag(int tag); int OrderFromTag(int tag);
int DimensionFromTag(int tag); int DimensionFromTag(int tag);
......
demos/api/discrete.cpp 0 → 100644
+ 33
− 0
View file @ f94a96f0
#include <gmsh.h>
int main(int argc, char **argv)
{
gmshInitialize(argc, argv);
gmshOptionSetNumber("General.Terminal", 1);
gmshModelCreate("test");
// add discrete surface with tag 1
gmshModelAddDiscreteEntity(2, 1);
// add 4 mesh vertices
gmshModelSetMeshVertices(2, 1,
{1, 2, 3, 4}, // vertex tags: 1, 2, 3, and 4
{0., 0., 0., // coordinates of vertex 1
1., 0., 0., // coordinates of vertex 2
1., 1., 0., // ...
0., 1., 0.});
// add 2 triangles
gmshModelSetMeshElements(2, 1,
{2}, // single type : 3-node triangle
{{1, 2}}, // triangle tags: 1 and 2
{{1, 2, 3, // triangle 1: vertices 1, 2, 3
1, 3, 4}}); // triangle 2: vertices 1, 3, 4
// export the mesh ; use explore.cpp to read and examine the mesh
gmshExport("test.msh");
gmshFinalize();
return 0;
}
demos/api/discrete.py 0 → 100644
+ 33
− 0
View file @ f94a96f0
#!/usr/bin/env python
from gmsh import *
import sys
gmshInitialize(sys.argv)
gmshOptionSetNumber("General.Terminal", 1)
gmshModelCreate("test");
# add discrete surface with tag 1
gmshModelAddDiscreteEntity(2, 1)
# add 4 mesh vertices
gmshModelSetMeshVertices(2, 1,
[1, 2, 3, 4], # vertex tags: 1, 2, 3, and 4
[0., 0., 0., # coordinates of vertex 1
1., 0., 0., # coordinates of vertex 2
1., 1., 0., # ...
0., 1., 0.])
# add 2 triangles
gmshModelSetMeshElements(2, 1,
[2], # single type : 3-node triangle
[[1, 2]], # triangle tags: 1 and 2
[[1, 2, 3, # triangle 1: vertices 1, 2, 3
1, 3, 4]]); # triangle 2: vertices 1, 3, 4
# export the mesh ; use explore.py to read and examine the mesh
gmshExport("test.msh")
gmshFinalize()
demos/api/explore.cpp
+ 1
− 2
View file @ f94a96f0
...@@ -4,14 +4,13 @@ ...@@ -4,14 +4,13 @@
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
if(argc < 2){ if(argc < 2){
std::cout << "Usage: " << argv[0] << " file.geo [options]" << std::endl; std::cout << "Usage: " << argv[0] << " file.msh [options]" << std::endl;
return 1; return 1;
} }
gmshInitialize(); gmshInitialize();
gmshOptionSetNumber("General.Terminal", 1); gmshOptionSetNumber("General.Terminal", 1);
gmshOpen(argv[1]); gmshOpen(argv[1]);
gmshModelMesh(3);
// get all elementary entities in the model // get all elementary entities in the model
std::vector<std::pair<int, int> > entities; std::vector<std::pair<int, int> > entities;
......
demos/api/explore.py
+ 1
− 2
View file @ f94a96f0
...@@ -4,13 +4,12 @@ from gmsh import * ...@@ -4,13 +4,12 @@ from gmsh import *
import sys import sys
if len(sys.argv) < 2: if len(sys.argv) < 2:
print "Usage: " + sys.argv[0] + " file.geo [options]" print "Usage: " + sys.argv[0] + " file.msh [options]"
exit(0) exit(0)
gmshInitialize() gmshInitialize()
gmshOptionSetNumber("General.Terminal", 1) gmshOptionSetNumber("General.Terminal", 1)
gmshOpen(sys.argv[1]) gmshOpen(sys.argv[1])
gmshModelMesh(3)
# get all elementary entities in the model # get all elementary entities in the model
entities = PairVector() entities = PairVector()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment