Changeset 17692 for issm/trunk-jpl/src/c/modules/MeshPartitionx/MeshPartitionx.h

Timestamp:

04/09/14 13:15:54 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: starting to change iomodel->domaintype to iomodel->meshelementtype when necessary (useful for Tetras)

File:

• issm/trunk-jpl/src/c/modules/MeshPartitionx/MeshPartitionx.h (modified) (4 diffs)

issm/trunk-jpl/src/c/modules/MeshPartitionx/MeshPartitionx.h

@@ -11 +11 @@
 template <class doubletype> 
 int MeshPartitionx(int** pepart, int** pnpart, int numberofelements,int numberofnodes,int* elements,
-                int numberofelements2d,int numberofnodes2d,doubletype* elements2d,int numlayers,int elements_width, int domaintype,int num_procs){
+                int numberofelements2d,int numberofnodes2d,doubletype* elements2d,int numlayers,int elements_width, int meshelementtype,int num_procs){
 
         int noerr=1;
@@ -31 +31 @@
         int  edgecut=1;
 
-        switch(domaintype){
-                case Mesh2DhorizontalEnum:
-                case Mesh2DverticalEnum:
-                case Mesh3DtetrasEnum:
+        switch(meshelementtype){
+                case TriaEnum:
+                case TetraEnum:
                         epart=xNew<int>(numberofelements);
                         npart=xNew<int>(numberofnodes);
@@ -59 +58 @@
                         else _error_("At least one processor is required");
                         break;
-                case Mesh3DEnum:
+                case PentaEnum:
                         /*We have a 3d mesh, made of a regularly extruded 2d mesh. We first partition the 2d mesh, then we extrude the partition: */
 
@@ -111 +110 @@
                         break;
                 default:
-                        _error_("mesh type "<<EnumToStringx(domaintype)<<" not supported yet");
+                        _error_("mesh type "<<EnumToStringx(meshelementtype)<<" not supported yet");
         }