Changeset 7705


Ignore:
Timestamp:
Apr 30, 2010, 8:57:25 PM (14 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:
6 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga_parallel/run_parallel_sw_merimbula.py

    r7702 r7705  
    4646#--------------------------------------------------------------------------
    4747
    48 #mesh_filename = "merimbula_10785_1.tsh" ; x0 = 756000.0 ; x1 = 756500.0
     48mesh_filename = "merimbula_10785_1.tsh" ; x0 = 756000.0 ; x1 = 756500.0
    4949#mesh_filename = "merimbula_43200.tsh"   ; x0 = 756000.0 ; x1 = 756500.0
    50 mesh_filename = "test-100.tsh" ; x0 = 0.25 ; x1 = 0.5
     50#mesh_filename = "test-100.tsh" ; x0 = 0.25 ; x1 = 0.5
    5151yieldstep = 5
    5252finaltime = 200
  • anuga_core/source/pymetis/metis-4.0/Lib/kvmetis.c

    r2051 r7705  
    6767  }
    6868  ctrl.optype = OP_KVMETIS;
    69   ctrl.CoarsenTo = amax((*nvtxs)/(40*log2(*nparts)), 20*(*nparts));
     69  ctrl.CoarsenTo = amax((*nvtxs)/(40*ilog2(*nparts)), 20*(*nparts));
    7070  ctrl.maxvwgt = 1.5*((graph.vwgt ? idxsum(*nvtxs, graph.vwgt) : (*nvtxs))/ctrl.CoarsenTo);
    7171
  • anuga_core/source/pymetis/metis-4.0/Lib/mkmetis.c

    r2051 r7705  
    4848  }
    4949  ctrl.optype = OP_KMETIS;
    50   ctrl.CoarsenTo = amax((*nvtxs)/(20*log2(*nparts)), 30*(*nparts));
     50  ctrl.CoarsenTo = amax((*nvtxs)/(20*ilog2(*nparts)), 30*(*nparts));
    5151
    5252  ctrl.nmaxvwgt = 1.5/(1.0*ctrl.CoarsenTo);
  • anuga_core/source/pymetis/metis-4.0/Lib/proto.h

    r2051 r7705  
    460460int ispow2(int);
    461461void InitRandom(int);
    462 int log2(int);
     462int ilog2(int);
    463463
    464464
  • anuga_core/source/pymetis/metis-4.0/Lib/rename.h

    r2051 r7705  
    411411#define ispow2                          __ispow2
    412412#define InitRandom                      __InitRandom
    413 #define log2                            __log2
    414 
    415 
    416 
    417 
    418 
     413#define ilog2                           __ilog2
     414
     415
     416
     417
     418
  • anuga_core/source/pymetis/metis-4.0/Lib/util.c

    r2051 r7705  
    508508
    509509/*************************************************************************
    510 * This function returns the log2(x)
    511 **************************************************************************/
    512 int log2(int a)
     510* This function returns the ilog2(x)
     511**************************************************************************/
     512int ilog2(int a)
    513513{
    514514  int i;
Note: See TracChangeset for help on using the changeset viewer.