Changeset 21341 for issm/trunk/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp

Timestamp:

11/04/16 13:48:43 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21337

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (modified) (6 diffs)

issm/trunk/src/c

@@ -5 +5 @@
 *.obj
 *.exe
-issm
-kriging
 appscan.*
 ouncemake*
@@ -19 +17 @@
 *.dirstamp
 .libs
+issm
+kriging
+issm_slr

@@ -5 +5 @@
 *.obj
 *.exe
-issm
-kriging
 appscan.*
 ouncemake*
@@ -19 +17 @@
 *.dirstamp
 .libs
+issm
+kriging
+issm_slr

issm/trunk/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp

@@ -44 +44 @@
 
         /*Fetch parameters: */
-        iomodel->Constant(&numrifts,RiftsNumriftsEnum);
+        iomodel->FindConstant(&numrifts,"md.rifts.numrifts");
 
         /*First, check that partitioning has not yet been carryed out. Just check whether my_elements pointers is not already assigned a value: */
@@ -66 +66 @@
                 case PentaEnum:
                         elements_width=6;
-                        iomodel->FetchData(&elements2d,NULL,NULL,MeshElements2dEnum);
-                        iomodel->Constant(&numberofelements2d,MeshNumberofelements2dEnum);
-                        iomodel->Constant(&numberofvertices2d,MeshNumberofvertices2dEnum);
-                        iomodel->Constant(&numlayers,MeshNumberoflayersEnum);
+                        iomodel->FetchData(&elements2d,NULL,NULL,"md.mesh.elements2d");
+                        iomodel->FindConstant(&numberofelements2d,"md.mesh.numberofelements2d");
+                        iomodel->FindConstant(&numberofvertices2d,"md.mesh.numberofvertices2d");
+                        iomodel->FindConstant(&numlayers,"md.mesh.numberoflayers");
                         break;
                 default:
-                        _error_("mesh not supported yet");
+                        _error_("mesh elements "<< EnumToStringx(iomodel->meshelementtype) <<" not supported yet");
         }
 
@@ -82 +82 @@
         /*Deal with rifts, they have to be included into one partition only, not several: */
         if(numrifts){
-                iomodel->FetchData(&riftinfo,&numrifts,NULL,RiftsRiftstructEnum);
+                iomodel->FetchData(&riftinfo,&numrifts,NULL,"md.rifts.riftstruct");
                 for(i=0;i<numrifts;i++){
                         el1=reCast<int>(*(riftinfo+RIFTINFOSIZE*i+2))-1; //matlab indexing to c indexing
@@ -88 +88 @@
                         epart[el2]=epart[el1]; //ensures that this pair of elements will be in the same partition, as well as the corresponding vertices;
                 }
-                iomodel->DeleteData(riftinfo,RiftsRiftstructEnum);
+                iomodel->DeleteData(riftinfo,"md.rifts.riftstruct");
         }
 
@@ -114 +114 @@
          * penpair has 2 nodes that are poointing toward 2 vertices.
          * The 2 vertices must be in the same cpu as the penpair*/
-        iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,StressbalanceVertexPairingEnum);
+        iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,"md.stressbalance.vertex_pairing");
         for(i=0;i<numvertex_pairing;i++){
                 if(my_vertices[vertex_pairing[2*i+0]-1] && !my_vertices[vertex_pairing[2*i+1]-1]){
@@ -121 +121 @@
         }
         xDelete<int>(vertex_pairing);
-        iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,MasstransportVertexPairingEnum);
+        iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,"md.masstransport.vertex_pairing");
         for(i=0;i<numvertex_pairing;i++){
                 if(my_vertices[vertex_pairing[2*i+0]-1] && !my_vertices[vertex_pairing[2*i+1]-1]){

@@ -5 +5 @@
 *.obj
 *.exe
-issm
-kriging
 appscan.*
 ouncemake*
@@ -19 +17 @@
 *.dirstamp
 .libs
+issm
+kriging
+issm_slr