Changeset 21624

Timestamp:

03/23/17 14:09:13 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: nor more quads

Location:

issm/trunk-jpl/src/wrappers

Files:

• matlab/io/WriteMatlabData.cpp (modified) (3 diffs)
• python/io/WritePythonData.cpp (modified) (1 diff)

issm/trunk-jpl/src/wrappers/matlab/io/WriteMatlabData.cpp

@@ -192 +192 @@
         int         i;
         mxArray    *dataref           = NULL;
-        const int   numfields         = 17;
+        const int   numfields         = 16;
         const char *fnames[numfields];
         mwSize      ndim              = 2;
@@ -202 +202 @@
         fnames[i++] = "Edges";
         fnames[i++] = "Triangles";
-        fnames[i++] = "Quadrilaterals";
         fnames[i++] = "IssmEdges";
         fnames[i++] = "IssmSegments";
@@ -226 +225 @@
         i++; SetStructureField(dataref,"Edges", bamgmesh->EdgesSize[0],bamgmesh->EdgesSize[1], bamgmesh->Edges);
         i++; SetStructureField(dataref,"Triangles", bamgmesh->TrianglesSize[0],bamgmesh->TrianglesSize[1], bamgmesh->Triangles);
-        i++; SetStructureField(dataref,"Quadrilaterals",bamgmesh->QuadrilateralsSize[0], bamgmesh->QuadrilateralsSize[1],bamgmesh->Quadrilaterals);
         i++; SetStructureField(dataref,"IssmEdges", bamgmesh->IssmEdgesSize[0],bamgmesh->IssmEdgesSize[1], bamgmesh->IssmEdges);
         i++; SetStructureField(dataref,"IssmSegments",bamgmesh->IssmSegmentsSize[0], bamgmesh->IssmSegmentsSize[1],bamgmesh->IssmSegments);

issm/trunk-jpl/src/wrappers/python/io/WritePythonData.cpp

@@ -151 +151 @@
         PyDict_SetItemString(dict,"Edges",PyArrayFromCopiedData(bamgmesh->EdgesSize,bamgmesh->Edges));
         PyDict_SetItemString(dict,"Triangles",PyArrayFromCopiedData(bamgmesh->TrianglesSize,bamgmesh->Triangles));
-        PyDict_SetItemString(dict,"Quadrilaterals",PyArrayFromCopiedData(bamgmesh->QuadrilateralsSize,bamgmesh->Quadrilaterals));
         PyDict_SetItemString(dict,"IssmEdges",PyArrayFromCopiedData(bamgmesh->IssmEdgesSize,bamgmesh->IssmEdges));
         PyDict_SetItemString(dict,"IssmSegments",PyArrayFromCopiedData(bamgmesh->IssmSegmentsSize,bamgmesh->IssmSegments));