Changeset 23189 for issm/trunk/src/wrappers/javascript/io/WriteJavascriptData.cpp

Timestamp:

08/28/18 09:45:51 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 23187

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wrappers/javascript/io/WriteJavascriptData.cpp (modified) (5 diffs)

issm/trunk/src/wrappers/javascript/io/WriteJavascriptData.cpp

@@ -14 +14 @@
 /*Primitive data types*/
 /*FUNCTION WriteData(IssmPDouble** pmatrix, int* pnel, int* matrix, int M,int N){{{*/
-void WriteData(IssmPDouble** pmatrix,int* pnel, int* matrix, int M,int N){
+void WriteData(IssmPDouble** pmatrix, int* pnel, int* matrix, int M,int N){
 
         if(pmatrix && matrix){
@@ -27 +27 @@
 /*}}}*/
 /*FUNCTION WriteData(IssmPDouble** pmatrix, int* pM, int* pN, , int* matrix, int M,int N){{{*/
-void WriteData(IssmPDouble** pmatrix,int* pM, int* pN, int* matrix, int M, int N){
+void WriteData(IssmPDouble** pmatrix, int* pM, int* pN, int* matrix, int M, int N){
 
         if(pmatrix && matrix){
 
                 /*Copy matrix: */
-                IssmPDouble* dmatrix = xNew<IssmPDouble>(M*N); 
-                for (int i=0;i<M*N;i++)dmatrix[i]=(IssmPDouble)matrix[i];
+            IssmPDouble* dmatrix = xNew<IssmPDouble>(M*N); 
+                for (int i=0;i<M*N;i++) dmatrix[i]=(IssmPDouble)matrix[i];
                 *pmatrix=dmatrix;
                 *pM=M;
@@ -41 +41 @@
 /*}}}*/
 /*FUNCTION WriteData(IssmPDouble** pmatrix, int* pM, IssmPDouble* pN, , int* matrix, int M,int N){{{*/
-void WriteData(IssmPDouble** pmatrix,int* pM, int* pN, IssmPDouble* matrix, int M, int N){
+void WriteData(IssmPDouble** pmatrix, int* pM, int* pN, IssmPDouble* matrix, int M, int N){
 
         if(pmatrix && matrix){
@@ -47 +47 @@
                 /*Copy matrix: */
                 IssmPDouble* dmatrix = xNew<IssmPDouble>(M*N); 
-                for (int i=0;i<M*N;i++)dmatrix[i]=matrix[i];
+                for (int i=0;i<M*N;i++) dmatrix[i]=matrix[i];
                 *pmatrix=dmatrix;
-                if(pM)*pM=M;
-                if(pN)*pN=N;
+                *pM=M;
+                *pN=N;
         }
+}
+/*}}}*/
+/*FUNCTION WriteData(IssmPDouble** pmatrix, int** pSize, IssmPDouble* matrix, int* size){{{*/
+void WriteData(IssmPDouble** pmatrix, int** pSize, IssmPDouble* matrix, int* size){
+
+    int M = size[0];
+    int N = size[1];
+    int* imatrix = xNew<int>(2);
+    IssmPDouble* dmatrix = xNew<IssmPDouble>(M*N); 
+
+    /*Copy matrix: */
+    for (int i=0;i<2;i++) imatrix[i]=size[i];
+    for (int i=0;i<M*N;i++) dmatrix[i]=matrix[i];
+    *pmatrix=dmatrix;
+    *pSize=imatrix;
 }
 /*}}}*/
@@ -120 +135 @@
 }
 /*}}}*/
+
+/*ISSM objects*/
+/*FUNCTION WriteData(int** VerticesSize, double** Vertices, int** EdgesSize, double** Edges, int** CornersSize, double** Corners, int** RequiredVerticesSize, double** RequiredVertices, int** RequiredEdgesSize, double** RequiredEdges, int** CrackedEdgesSize, double** CrackedEdges, int** SubDomainsSize, double** SubDomains, BamgGeom* bamggeom){{{*/
+void WriteData(int** VerticesSize, double** Vertices, int** EdgesSize, double** Edges, int** CornersSize, double** Corners, int** RequiredVerticesSize, double** RequiredVertices, int** RequiredEdgesSize, double** RequiredEdges, int** CrackedEdgesSize, double** CrackedEdges, int** SubDomainsSize, double** SubDomains, BamgGeom* bamggeom){
+
+        /*Assign each field to output*/
+    WriteData(Vertices, VerticesSize, bamggeom->Vertices, bamggeom->VerticesSize);
+    WriteData(Edges, EdgesSize, bamggeom->Edges, bamggeom->EdgesSize);
+    WriteData(Corners, CornersSize, bamggeom->Corners, bamggeom->CornersSize);
+    WriteData(RequiredVertices, RequiredVerticesSize, bamggeom->RequiredVertices, bamggeom->RequiredVerticesSize);
+    WriteData(RequiredEdges, RequiredEdgesSize, bamggeom->RequiredEdges, bamggeom->RequiredEdgesSize);
+    WriteData(CrackedEdges, CrackedEdgesSize, bamggeom->CrackedEdges, bamggeom->CrackedEdgesSize);
+    WriteData(SubDomains, SubDomainsSize, bamggeom->SubDomains, bamggeom->SubDomainsSize);
+}
+/*}}}*/
+/*FUNCTION WriteData(int** VerticesSize, double** Vertices, int** EdgesSize, double** Edges, int** TrianglesSize, double** Triangles, int** IssmEdgesSize, double** IssmEdges, int** IssmSegmentsSize, double** IssmSegments, int** VerticesOnGeomVertexSize, double** VerticesOnGeomVertex, int** VerticesOnGeomEdgeSize, double** VerticesOnGeomEdge, int** EdgesOnGeomEdgeSize, double** EdgesOnGeomEdge, int** SubDomainsSize, double** SubDomains, int** SubDomainsFromGeomSize, double** SubDomainsFromGeom, int** ElementConnectivitySize, double** ElementConnectivity, int** NodalConnectivitySize, double** NodalConnectivity, int** NodalElementConnectivitySize, double** NodalElementConnectivity, int** CrackedVerticesSize, double** CrackedVertices, int** CrackedEdgesSize, double** CrackedEdges, int** PreviousNumberingSize, double** PreviousNumbering, BamgMesh* bamgmesh){{{*/
+void WriteData(int** VerticesSize, double** Vertices, int** EdgesSize, double** Edges, int** TrianglesSize, double** Triangles, int** IssmEdgesSize, double** IssmEdges, int** IssmSegmentsSize, double** IssmSegments, int** VerticesOnGeomVertexSize, double** VerticesOnGeomVertex, int** VerticesOnGeomEdgeSize, double** VerticesOnGeomEdge, int** EdgesOnGeomEdgeSize, double** EdgesOnGeomEdge, int** SubDomainsSize, double** SubDomains, int** SubDomainsFromGeomSize, double** SubDomainsFromGeom, int** ElementConnectivitySize, double** ElementConnectivity, int** NodalConnectivitySize, double** NodalConnectivity, int** NodalElementConnectivitySize, double** NodalElementConnectivity, int** CrackedVerticesSize, double** CrackedVertices, int** CrackedEdgesSize, double** CrackedEdges, int** PreviousNumberingSize, double** PreviousNumbering, BamgMesh* bamgmesh){
+
+        /*Assign each field to output*/
+    WriteData(Vertices, VerticesSize, bamgmesh->Vertices, bamgmesh->VerticesSize);
+    WriteData(Edges, EdgesSize, bamgmesh->Edges, bamgmesh->EdgesSize);
+    WriteData(Triangles, TrianglesSize, bamgmesh->Triangles, bamgmesh->TrianglesSize);
+    WriteData(IssmEdges, IssmEdgesSize, bamgmesh->IssmEdges, bamgmesh->IssmEdgesSize);
+    WriteData(IssmSegments, IssmSegmentsSize, bamgmesh->IssmSegments, bamgmesh->IssmSegmentsSize);
+    WriteData(VerticesOnGeomVertex, VerticesOnGeomVertexSize, bamgmesh->VerticesOnGeomVertex, bamgmesh->VerticesOnGeomVertexSize);
+    WriteData(VerticesOnGeomEdge, VerticesOnGeomEdgeSize, bamgmesh->VerticesOnGeomEdge, bamgmesh->VerticesOnGeomEdgeSize);
+    WriteData(EdgesOnGeomEdge, EdgesOnGeomEdgeSize, bamgmesh->EdgesOnGeomEdge, bamgmesh->EdgesOnGeomEdgeSize);
+    WriteData(SubDomains, SubDomainsSize, bamgmesh->SubDomains, bamgmesh->SubDomainsSize);
+    WriteData(SubDomainsFromGeom, SubDomainsFromGeomSize, bamgmesh->SubDomainsFromGeom, bamgmesh->SubDomainsFromGeomSize);
+    WriteData(ElementConnectivity, ElementConnectivitySize, bamgmesh->ElementConnectivity, bamgmesh->ElementConnectivitySize);
+    WriteData(NodalConnectivity, NodalConnectivitySize, bamgmesh->NodalConnectivity, bamgmesh->NodalConnectivitySize);
+    WriteData(NodalElementConnectivity, NodalElementConnectivitySize, bamgmesh->NodalElementConnectivity, bamgmesh->NodalElementConnectivitySize);
+    WriteData(CrackedVertices, CrackedVerticesSize, bamgmesh->CrackedVertices, bamgmesh->CrackedVerticesSize);
+    WriteData(CrackedEdges, CrackedEdgesSize, bamgmesh->CrackedEdges, bamgmesh->CrackedEdgesSize);
+    WriteData(PreviousNumbering, PreviousNumberingSize, bamgmesh->PreviousNumbering, bamgmesh->VerticesSize); //PreviousNumbering just resuses Vertices' Size
+}
+/*}}}*/