Changeset 7705

Timestamp:

Apr 30, 2010, 8:57:25 PM (13 years ago)

Author:

steve

Message:

Ran into a problem with metis with a conflict with the naming of a procedure
log2 with ubuntu 9.10. Changed it over to ilog2

Location:

anuga_core/source

Files:

• anuga_parallel/run_parallel_sw_merimbula.py (modified) (1 diff)
• pymetis/metis-4.0/Lib/kvmetis.c (modified) (1 diff)
• pymetis/metis-4.0/Lib/mkmetis.c (modified) (1 diff)
• pymetis/metis-4.0/Lib/proto.h (modified) (1 diff)
• pymetis/metis-4.0/Lib/rename.h (modified) (1 diff)
• pymetis/metis-4.0/Lib/util.c (modified) (1 diff)

anuga_core/source/anuga_parallel/run_parallel_sw_merimbula.py

@@ -46 +46 @@
 #--------------------------------------------------------------------------
 
-#mesh_filename = "merimbula_10785_1.tsh" ; x0 = 756000.0 ; x1 = 756500.0
+mesh_filename = "merimbula_10785_1.tsh" ; x0 = 756000.0 ; x1 = 756500.0
 #mesh_filename = "merimbula_43200.tsh"   ; x0 = 756000.0 ; x1 = 756500.0
-mesh_filename = "test-100.tsh" ; x0 = 0.25 ; x1 = 0.5
+#mesh_filename = "test-100.tsh" ; x0 = 0.25 ; x1 = 0.5
 yieldstep = 5
 finaltime = 200

anuga_core/source/pymetis/metis-4.0/Lib/kvmetis.c

@@ -67 +67 @@
   }
   ctrl.optype = OP_KVMETIS;
-  ctrl.CoarsenTo = amax((*nvtxs)/(40*log2(*nparts)), 20*(*nparts));
+  ctrl.CoarsenTo = amax((*nvtxs)/(40*ilog2(*nparts)), 20*(*nparts));
   ctrl.maxvwgt = 1.5*((graph.vwgt ? idxsum(*nvtxs, graph.vwgt) : (*nvtxs))/ctrl.CoarsenTo);
 

anuga_core/source/pymetis/metis-4.0/Lib/mkmetis.c

@@ -48 +48 @@
   }
   ctrl.optype = OP_KMETIS;
-  ctrl.CoarsenTo = amax((*nvtxs)/(20*log2(*nparts)), 30*(*nparts));
+  ctrl.CoarsenTo = amax((*nvtxs)/(20*ilog2(*nparts)), 30*(*nparts));
 
   ctrl.nmaxvwgt = 1.5/(1.0*ctrl.CoarsenTo);

anuga_core/source/pymetis/metis-4.0/Lib/proto.h

@@ -460 +460 @@
 int ispow2(int);
 void InitRandom(int);
-int log2(int);
+int ilog2(int);
 
 

anuga_core/source/pymetis/metis-4.0/Lib/rename.h

@@ -411 +411 @@
 #define ispow2                          __ispow2
 #define InitRandom                      __InitRandom
-#define log2                            __log2
-
-
-
-
-
+#define ilog2                           __ilog2
+
+
+
+
+

anuga_core/source/pymetis/metis-4.0/Lib/util.c

@@ -508 +508 @@
 
 /*************************************************************************
-* This function returns the log2(x)
-**************************************************************************/
-int log2(int a)
+* This function returns the ilog2(x)
+**************************************************************************/
+int ilog2(int a)
 {
   int i;