[gmsh] 03/04: Add missing patch.
Anton Gladky
gladk at moszumanska.debian.org
Tue Dec 27 21:43:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gmsh.
commit 1b31b71a38b49f50dbe23afda5e78fab51aac485
Author: Anton Gladky <gladk at debian.org>
Date: Tue Dec 27 21:25:52 2016 +0100
Add missing patch.
---
debian/patches/130_fix_CGNS_compilation.patch | 189 ++++++++++++++++++++++++++
1 file changed, 189 insertions(+)
diff --git a/debian/patches/130_fix_CGNS_compilation.patch b/debian/patches/130_fix_CGNS_compilation.patch
new file mode 100644
index 0000000..963765f
--- /dev/null
+++ b/debian/patches/130_fix_CGNS_compilation.patch
@@ -0,0 +1,189 @@
+Description: fix compilation against system cgns.
+ enums in system installed cgns are having a prefix CG_.
+ It should be added to all enums here.
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/845994
+Last-Update: 2016-12-27
+
+--- gmsh-2.15.0+dfsg1.orig/Geo/GModelIO_CGNS.cpp
++++ gmsh-2.15.0+dfsg1/Geo/GModelIO_CGNS.cpp
+@@ -155,24 +155,24 @@ class CGNSNameStr
+ // 1D second-order elements
+ // MSH_NUM_TYPE+1 is used to place non-cgns elements last.
+ static const int msh2cgns[MSH_NUM_TYPE][2] = {
+- {BAR_2, 16},
+- {TRI_3, 11},
+- {QUAD_4, 12},
+- {TETRA_4, 1},
+- {HEXA_8, 4},
+- {PENTA_6, 3},
+- {PYRA_5, 2},
+- {BAR_3, 17},
+- {TRI_6, 13},
+- {QUAD_9, 15},
+- {TETRA_10, 5},
+- {HEXA_27, 10},
+- {PENTA_18, 8},
+- {PYRA_14, 6},
++ {CG_BAR_2, 16},
++ {CG_TRI_3, 11},
++ {CG_QUAD_4, 12},
++ {CG_TETRA_4, 1},
++ {CG_HEXA_8, 4},
++ {CG_PENTA_6, 3},
++ {CG_PYRA_5, 2},
++ {CG_BAR_3, 17},
++ {CG_TRI_6, 13},
++ {CG_QUAD_9, 15},
++ {CG_TETRA_10, 5},
++ {CG_HEXA_27, 10},
++ {CG_PENTA_18, 8},
++ {CG_PYRA_14, 6},
+ {-1, MSH_NUM_TYPE+1}, // MSH_PNT (NODE in CGNS but not used herein)
+- {QUAD_8, 14},
+- {HEXA_20, 9},
+- {PENTA_15, 7},
++ {CG_QUAD_8, 14},
++ {CG_HEXA_20, 9},
++ {CG_PENTA_15, 7},
+ {-1, MSH_NUM_TYPE+1}, // MSH_PYR_13
+ {-1, MSH_NUM_TYPE+1}, // MSH_TRI_9
+ {-1, MSH_NUM_TYPE+1}, // MSH_TRI_10
+@@ -946,9 +946,9 @@ int GModel::readCGNS(const std::string &
+ for (int index_zone = 1; index_zone <= nZones; index_zone++) {
+ Msg::Debug("Reading zone to compute MG level %i.", index_zone);
+
+- ZoneType_t zoneType;
++ CG_ZoneType_t zoneType;
+ cg_zone_type(index_file, index_base, index_zone, &zoneType);
+- if ( zoneType == Unstructured ) {
++ if ( zoneType == CG_Unstructured ) {
+ Msg::Debug("Unstructured zone detected, skipping.");
+ continue;
+ }
+@@ -1037,9 +1037,9 @@ int GModel::readCGNS(const std::string &
+
+ int offset = vnum;
+
+- ZoneType_t zoneType;
++ CG_ZoneType_t zoneType;
+ cg_zone_type(index_file, index_base, index_zone, &zoneType);
+- if ( zoneType == Unstructured ) {
++ if ( zoneType == CG_Unstructured ) {
+ Msg::Debug("Unstructured zone detected, skipping.");
+ continue;
+ }
+@@ -1074,7 +1074,7 @@ int GModel::readCGNS(const std::string &
+ int nCoords;
+ cg_ncoords(index_file, index_base, index_zone, &nCoords);
+
+- DataType_t dataType;
++ CG_DataType_t dataType;
+ char coordName[35];
+ void* coord;
+ double nodes[nnodesZone][nCoords];
+@@ -1090,7 +1090,7 @@ int GModel::readCGNS(const std::string &
+ Msg::Debug("Reading coordinate %i : %s.", iCoord+1, coordName);
+
+ switch(dataType) {
+- case RealSingle:
++ case CG_RealSingle:
+ Msg::Debug(" [Type is float]");
+ coord = new float[nnodesZone];
+ if ( cg_coord_read(index_file, index_base, index_zone,
+@@ -1104,7 +1104,7 @@ int GModel::readCGNS(const std::string &
+ }
+ delete [] (float*)coord;
+ break;
+- case RealDouble:
++ case CG_RealDouble:
+ Msg::Debug(" [Type is double]");
+ coord = new double[nnodesZone];
+ if ( cg_coord_read(index_file, index_base, index_zone,
+@@ -2002,7 +2002,7 @@ int write_CGNS_zones(GModel &model, cons
+ cgZoneSize[2] = writeZone->numBoVert; // Number of boundary vertices
+ if(cg_zone_write(cgIndexFile, cgIndexBase,
+ writeTask->zoneName.c_str(), cgZoneSize,
+- Unstructured, &cgIndexZone))
++ CG_Unstructured, &cgIndexZone))
+ {
+ return cgnsErr();
+ }
+@@ -2029,7 +2029,7 @@ int write_CGNS_zones(GModel &model, cons
+ for (int i = 0; i != cgZoneSize[0]; ++i) {
+ dBuffer[i] = writeZone->zoneVertVec[i]->x()*scalingFactor;
+ }
+- if(cg_coord_write(cgIndexFile, cgIndexBase, cgIndexZone, RealDouble,
++ if(cg_coord_write(cgIndexFile, cgIndexBase, cgIndexZone, CG_RealDouble,
+ "CoordinateX", &dBuffer[0], &cgIndexCoord))
+ return cgnsErr();
+
+@@ -2037,7 +2037,7 @@ int write_CGNS_zones(GModel &model, cons
+ for(int i = 0; i != cgZoneSize[0]; ++i) {
+ dBuffer[i] = writeZone->zoneVertVec[i]->y()*scalingFactor;
+ }
+- if(cg_coord_write(cgIndexFile, cgIndexBase, cgIndexZone, RealDouble,
++ if(cg_coord_write(cgIndexFile, cgIndexBase, cgIndexZone, CG_RealDouble,
+ "CoordinateY", &dBuffer[0], &cgIndexCoord))
+ return cgnsErr();
+
+@@ -2046,7 +2046,7 @@ int write_CGNS_zones(GModel &model, cons
+ for(int i = 0; i != cgZoneSize[0]; ++i) {
+ dBuffer[i] = writeZone->zoneVertVec[i]->z()*scalingFactor;
+ }
+- if(cg_coord_write(cgIndexFile, cgIndexBase, cgIndexZone, RealDouble,
++ if(cg_coord_write(cgIndexFile, cgIndexBase, cgIndexZone, CG_RealDouble,
+ "CoordinateZ", &dBuffer[0], &cgIndexCoord))
+ return cgnsErr();
+ }
+@@ -2126,7 +2126,7 @@ int write_CGNS_zones(GModel &model, cons
+ int cgIndexSection;
+ if(cg_section_write
+ (cgIndexFile, cgIndexBase, cgIndexZone, elemName,
+- static_cast<ElementType_t>(typeCGNS), iElemSection + 1,
++ static_cast<CG_ElementType_t>(typeCGNS), iElemSection + 1,
+ writeZone->zoneElemConn[typeMSHm1].numElem + iElemSection,
+ writeZone->zoneElemConn[typeMSHm1].numBoElem + iElemSection,
+ (cgsize_t*)&writeZone->zoneElemConn[typeMSHm1].connectivity[0],
+@@ -2166,9 +2166,9 @@ int write_CGNS_zones(GModel &model, cons
+ // In the first zone
+ if(cg_conn_write
+ (cgIndexFile, cgIndexBase, zoneInfo[gCIt->first.zone1].cgIndex,
+- interfaceName.c_str(), Vertex, Abutting1to1, PointList, nVert,
++ interfaceName.c_str(), CG_Vertex, CG_Abutting1to1, CG_PointList, nVert,
+ &iBuffer1[0], zoneInfo[gCIt->first.zone2].name.c_str(),
+- Unstructured, PointListDonor, Integer, nVert, &iBuffer2[0],
++ CG_Unstructured, CG_PointListDonor, CG_Integer, nVert, &iBuffer2[0],
+ &cgIndexInterface))
+ {
+ return cgnsErr();
+@@ -2176,9 +2176,9 @@ int write_CGNS_zones(GModel &model, cons
+ // In the second zone
+ if(cg_conn_write
+ (cgIndexFile, cgIndexBase, zoneInfo[gCIt->first.zone2].cgIndex,
+- interfaceName.c_str(), Vertex, Abutting1to1, PointList, nVert,
++ interfaceName.c_str(), CG_Vertex, CG_Abutting1to1, CG_PointList, nVert,
+ &iBuffer2[0], zoneInfo[gCIt->first.zone1].name.c_str(),
+- Unstructured, PointListDonor, Integer, nVert, &iBuffer1[0],
++ CG_Unstructured, CG_PointListDonor, CG_Integer, nVert, &iBuffer1[0],
+ &cgIndexInterface))
+ {
+ return cgnsErr();
+@@ -2298,7 +2298,7 @@ int write_CGNS_zones(GModel &model, cons
+ }
+ if(cg_boco_write(cgIndexFile, cgIndexBase,
+ zoneInfo[zoneIndex].cgIndex, patchName.c_str(),
+- BCTypeNull, PointList, numBCVert, &iBuffer1[0],
++ CG_BCTypeNull, CG_PointList, numBCVert, &iBuffer1[0],
+ &cgIndexBoco))
+ {
+ return cgnsErr();
+@@ -2308,7 +2308,7 @@ int write_CGNS_zones(GModel &model, cons
+ int normalIndex;
+ if(cg_boco_normal_write(cgIndexFile, cgIndexBase,
+ zoneInfo[zoneIndex].cgIndex, cgIndexBoco,
+- &normalIndex, 1, RealDouble, &dBuffer[0]))
++ &normalIndex, 1, CG_RealDouble, &dBuffer[0]))
+ {
+ return cgnsErr();
+ }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gmsh.git
More information about the debian-science-commits
mailing list