Changeset 10087

Timestamp:

10/03/11 16:44:37 (13 years ago)

Author:

Eric.Larour

Message:

Trying to get metis 5.0 to work

Location:

issm/trunk/src/c/toolkits/metis/patches

Files:

• METIS_PartMeshNodalPatch.cpp (modified) (4 diffs)
• metispatches.h (modified) (2 diffs)

issm/trunk/src/c/toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp ¶

@@ -23 +23 @@
 
 
+
         /*setup options: */
         METIS_SetDefaultOptions(options);
@@ -39 +40 @@
         options[METIS_OPTION_NCUTS]   = 1;
 
+
         /*create eptr: */
         eptr=(idx_t*)xmalloc((*pnumberofelements+1)*sizeof(idx_t));
@@ -47 +49 @@
         }
 
+
         /*create tpwgts: */
         tpwgts=(real_t*)xmalloc(*pnum_procs*sizeof(real_t));
@@ -53 +56 @@
         }
 
+
         METIS_PartMeshNodal(pnumberofelements,pnumberofnodes, eptr, index,
                         NULL, NULL, pnum_procs, tpwgts, options, &objval,
                         epart, npart);
+        
+
         #else
         _error_("METIS version not supported yet");

issm/trunk/src/c/toolkits/metis/patches/metispatches.h ¶

@@ -14 +14 @@
 void METIS_PartMeshNodalPatch(int *, int *, int *, int *, int *, int *, int *, int *, int *); //Common interface we are using in ISSM.
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 #if _METIS_VERSION_ == 4
@@ -23 +21 @@
 #if _METIS_VERSION_ == 5
 int METIS_PartMeshNodal(idx_t*, idx_t*, idx_t*, idx_t*, idx_t*, idx_t*, idx_t*, real_t*, idx_t*, idx_t*, idx_t*, idx_t*);
+int METIS_SetDefaultOptions(idx_t *options);
 #endif
 
-#ifdef __cplusplus
 }
-#endif
-
 
 #endif