Changeset 9554


Ignore:
Timestamp:
Jan 30, 2015, 9:59:22 AM (9 years ago)
Author:
steve
Message:

Fixed error in test_interpolate on win32

Location:
trunk/anuga_core/source/anuga/fit_interpolate
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/anuga_core/source/anuga/fit_interpolate/interpolate.py

    r9390 r9554  
    131131
    132132    if use_cache is True:
    133         if sys.platform != 'win32':
    134             I = cache(Interpolate, args, kwargs, verbose=verbose)
    135         else:
    136             # Messy wrapping of Interpolate to deal with win32 error
    137             def wrap_Interpolate(args,kwargs):
    138                 I = apply(Interpolate, args, kwargs)
    139                 return I
    140             I = cache(wrap_Interpolate, (args, kwargs), {}, verbose=verbose)
     133                I = cache(Interpolate, args, kwargs, verbose=verbose)
    141134    else:
    142135        I = apply(Interpolate, args, kwargs)   
  • trunk/anuga_core/source/anuga/fit_interpolate/test/test_interpolate.py

    r9551 r9554  
    99import os
    1010import unittest
    11 from math import sqrt
    1211import tempfile
    1312import csv
     13import time
    1414
    1515import numpy as num
    16 
     16from math import sqrt
    1717
    1818# ANUGA code imports
    1919import anuga
    20 from anuga.fit_interpolate.interpolate import *
     20from anuga.fit_interpolate.interpolate import Interpolate
     21from anuga.fit_interpolate.interpolate import Interpolation_function
     22from anuga.fit_interpolate.interpolate import interpolate
     23from anuga.fit_interpolate.interpolate import interpolate_sww2csv
     24
    2125from anuga.coordinate_transforms.geo_reference import Geo_reference
    2226from anuga.utilities.numerical_tools import mean, NAN
Note: See TracChangeset for help on using the changeset viewer.