Changeset 8303 for issm/trunk/src/c/modules/MeshPartitionx/MeshPartitionx.cpp

Timestamp:

05/16/11 15:42:41 (14 years ago)

Author:

seroussi

Message:

changed from grid to node in c

File:

• issm/trunk/src/c/modules/MeshPartitionx/MeshPartitionx.cpp (modified) (7 diffs)

issm/trunk/src/c/modules/MeshPartitionx/MeshPartitionx.cpp

@@ -1 +1 @@
 /*!\file:  MeshPartition.cpp
- * \brief partition elements and grids across a cluster of size numprocs. 
+ * \brief partition elements and nodes across a cluster of size numprocs. 
  */
 
@@ -9 +9 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-int MeshPartitionx(int** pepart, int** pnpart, int numberofelements,int numberofgrids,double* elements,
-                int numberofelements2d,int numberofgrids2d,double* elements2d,int numlayers,int elements_width, int dim,int num_procs){
+int MeshPartitionx(int** pepart, int** pnpart, int numberofelements,int numberofnodes,double* elements,
+                int numberofelements2d,int numberofnodes2d,double* elements2d,int numlayers,int elements_width, int dim,int num_procs){
 
         int noerr=1;
@@ -32 +32 @@
         if(dim==2){
                 epart=(int*)xmalloc(numberofelements*sizeof(int));
-                npart=(int*)xmalloc(numberofgrids*sizeof(int));
+                npart=(int*)xmalloc(numberofnodes*sizeof(int));
                 index=(int*)xmalloc(elements_width*numberofelements*sizeof(int));
                 for (i=0;i<numberofelements;i++){
@@ -42 +42 @@
                 /*Partition using Metis:*/
                 if (num_procs>1){
-                        METIS_PartMeshNodal(&numberofelements,&numberofgrids, index, &etype, &numflag, &num_procs, &edgecut, epart, npart);
+                        METIS_PartMeshNodal(&numberofelements,&numberofnodes, index, &etype, &numflag, &num_procs, &edgecut, epart, npart);
                 }
                 else if (num_procs==1){
                         /*METIS does not know how to deal with one cpu only!*/
                         for (i=0;i<numberofelements;i++) epart[i]=0;
-                        for (i=0;i<numberofgrids;i++)    npart[i]=0;
+                        for (i=0;i<numberofnodes;i++)    npart[i]=0;
                 }
                 else _error_("At least one processor is required");
@@ -56 +56 @@
                 /*First build concatenated 2d mesh  from 2d_coll and 2d_noncoll: */
                 epart2d=(int*)xmalloc(numberofelements2d*sizeof(int));
-                npart2d=(int*)xmalloc(numberofgrids2d*sizeof(int)); 
+                npart2d=(int*)xmalloc(numberofnodes2d*sizeof(int)); 
                 index2d=(int*)xmalloc(3*numberofelements2d*sizeof(int));
 
@@ -67 +67 @@
                 /*Partition using Metis:*/
                 if (num_procs>1){
-                        METIS_PartMeshNodal(&numberofelements2d,&numberofgrids2d, index2d, &etype2d, &numflag, &num_procs, &edgecut, epart2d, npart2d);
+                        METIS_PartMeshNodal(&numberofelements2d,&numberofnodes2d, index2d, &etype2d, &numflag, &num_procs, &edgecut, epart2d, npart2d);
                 }
                 else if (num_procs==1){
                         /*METIS does not know how to deal with one cpu only!*/
                         for (i=0;i<numberofelements2d;i++) epart2d[i]=0;
-                        for (i=0;i<numberofgrids2d;i++)    npart2d[i]=0;
+                        for (i=0;i<numberofnodes2d;i++)    npart2d[i]=0;
                 }
                 else _error_("At least one processor is required");
@@ -88 +88 @@
 
                 /*Extrude npart2d to npart, using numlayers: */
-                npart=(int*)xmalloc(numberofgrids*sizeof(int));
+                npart=(int*)xmalloc(numberofnodes*sizeof(int));
                 
                 count=0;
                 for(i=0;i<(numlayers);i++){
-                        for(j=0;j<numberofgrids2d;j++){
+                        for(j=0;j<numberofnodes2d;j++){
                                 npart[count]=npart2d[j];
                                 count++;