Changeset 3324

Timestamp:

03/24/10 09:17:49 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• io/WriteData.cpp (modified) (3 diffs)
• objects/BamgMesh.cpp (modified) (2 diffs)
• objects/BamgMesh.h (modified) (2 diffs)

issm/trunk/src/c/Makefile.am

@@ -402 +402 @@
 libpISSM_a_SOURCES = ./objects/objects.h\
                                         ./objects/Object.h\
+                                        ./objects/BamgGeom.h\
+                                        ./objects/BamgGeom.cpp\
+                                        ./objects/BamgMesh.h\
+                                        ./objects/BamgMesh.cpp\
+                                        ./objects/BamgOpts.h\
+                                        ./objects/BamgOpts.cpp\
                                         ./objects/Element.h\
                                         ./objects/Element.cpp\

issm/trunk/src/c/io/WriteData.cpp

@@ -189 +189 @@
         mxArray*    pfield=NULL;
         mxArray*    pfield2=NULL;
-        int         numfields=15;
+        int         numfields=16;
         const char* fnames[numfields];
         int         fsize[numfields][2];
@@ -203 +203 @@
         fnames[++i] = "Segments";                 fsize[i][0]=bm->SegmentsSize[0];                  fsize[i][1]=bm->SegmentsSize[1];                 fpointer[i]=&bm->Segments;
         fnames[++i] = "ElementEdges";             fsize[i][0]=bm->ElementEdgesSize[0];              fsize[i][1]=bm->ElementEdgesSize[1];             fpointer[i]=&bm->ElementEdges;
-        fnames[++i] = "CrackedEdges";             fsize[i][0]=bm->CrackedEdgesSize[0];              fsize[i][1]=bm->CrackedEdgesSize[1];             fpointer[i]=&bm->CrackedEdges;
         fnames[++i] = "Quadrilaterals";           fsize[i][0]=bm->QuadrilateralsSize[0];            fsize[i][1]=bm->QuadrilateralsSize[1];           fpointer[i]=&bm->Quadrilaterals;
         fnames[++i] = "VerticesOnGeometricVertex";fsize[i][0]=bm->VerticesOnGeometricVertexSize[0]; fsize[i][1]=bm->VerticesOnGeometricVertexSize[1];fpointer[i]=&bm->VerticesOnGeometricVertex;
@@ -213 +212 @@
         fnames[++i] = "NodalConnectivity";        fsize[i][0]=bm->NodalConnectivitySize[0];         fsize[i][1]=bm->NodalConnectivitySize[1];        fpointer[i]=&bm->NodalConnectivity;
         fnames[++i] = "NodalElementConnectivity"; fsize[i][0]=bm->NodalElementConnectivitySize[0];  fsize[i][1]=bm->NodalElementConnectivitySize[1]; fpointer[i]=&bm->NodalElementConnectivity;
+        fnames[++i] = "CrackedVertices";          fsize[i][0]=bm->CrackedVerticesSize[0];           fsize[i][1]=bm->CrackedVerticesSize[1];          fpointer[i]=&bm->CrackedVertices;
+        fnames[++i] = "CrackedEdges";             fsize[i][0]=bm->CrackedEdgesSize[0];              fsize[i][1]=bm->CrackedEdgesSize[1];             fpointer[i]=&bm->CrackedEdges;
         assert(i==numfields-1);
 

issm/trunk/src/c/objects/BamgMesh.cpp

@@ -9 +9 @@
         bamgmesh->ElementEdgesSize[0]=0,  bamgmesh->ElementEdgesSize[1]=0;   bamgmesh->ElementEdges=NULL;
         bamgmesh->SegmentsSize[0]=0,      bamgmesh->SegmentsSize[1]=0;       bamgmesh->Segments=NULL;
-        bamgmesh->CrackedEdgesSize[0]=0,  bamgmesh->CrackedEdgesSize[1]=0;   bamgmesh->CrackedEdges=NULL;
         bamgmesh->QuadrilateralsSize[0]=0,bamgmesh->QuadrilateralsSize[1]=0; bamgmesh->Quadrilaterals=NULL;
         bamgmesh->VerticesOnGeometricVertexSize[0]=0, bamgmesh->VerticesOnGeometricVertexSize[1]=0;bamgmesh->VerticesOnGeometricVertex=NULL;
@@ -20 +19 @@
         bamgmesh->NodalConnectivitySize[0]=0,        bamgmesh->NodalConnectivitySize[1]=0;        bamgmesh->NodalConnectivity=NULL;
         bamgmesh->NodalElementConnectivitySize[0]=0, bamgmesh->NodalElementConnectivitySize[1]=0; bamgmesh->NodalElementConnectivity=NULL;
+        bamgmesh->CrackedVerticesSize[0]=0, bamgmesh->CrackedVerticesSize[1]=0; bamgmesh->CrackedVertices=NULL;
+        bamgmesh->CrackedEdgesSize[0]=0, bamgmesh->CrackedEdgesSize[1]=0; bamgmesh->CrackedEdges=NULL;
 
 }

issm/trunk/src/c/objects/BamgMesh.h

@@ -21 +21 @@
         int     SegmentsSize[2];
         double* Segments;
-
-        int     CrackedEdgesSize[2];
-        double* CrackedEdges;
 
         int     QuadrilateralsSize[2];
@@ -53 +50 @@
         int     NodalElementConnectivitySize[2];
         double* NodalElementConnectivity;
+
+        int     CrackedVerticesSize[2];
+        double* CrackedVertices;
+
+        int     CrackedEdgesSize[2];
+        double* CrackedEdges;
 };