From cd823901d6eb576a911fba4e4b692dd93bef3095 Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Thu, 21 Jul 2016 16:01:53 +0100 Subject: [PATCH] Tidied imports. --- gprMax/fractals.py | 3 ++- gprMax/geometry_primitives.pyx | 3 ++- tools/plot_source_wave.py | 3 ++- user_libs/optimisation_taguchi/fitness_functions.py | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gprMax/fractals.py b/gprMax/fractals.py index 115255eb..271cd708 100644 --- a/gprMax/fractals.py +++ b/gprMax/fractals.py @@ -17,11 +17,12 @@ # along with gprMax. If not, see . import numpy as np -np.seterr(divide='raise') from gprMax.constants import floattype, complextype from gprMax.utilities import round_value +np.seterr(divide='raise') + class FractalSurface(object): """Fractal surfaces.""" diff --git a/gprMax/geometry_primitives.pyx b/gprMax/geometry_primitives.pyx index e4f3f74b..9ec190cc 100644 --- a/gprMax/geometry_primitives.pyx +++ b/gprMax/geometry_primitives.pyx @@ -18,11 +18,12 @@ import numpy as np cimport numpy as np -np.seterr(divide='raise') from gprMax.utilities import round_value from gprMax.yee_cell_setget_rigid cimport set_rigid_Ex, set_rigid_Ey, set_rigid_Ez, set_rigid_Hx, set_rigid_Hy, set_rigid_Hz, set_rigid_E, unset_rigid_E, set_rigid_H, unset_rigid_H +np.seterr(divide='raise') + cpdef bint are_clockwise(float v1x, float v1y, float v2x, float v2y): """Find if vector 2 is clockwise relative to vector 1. diff --git a/tools/plot_source_wave.py b/tools/plot_source_wave.py index aa935b60..301fb199 100644 --- a/tools/plot_source_wave.py +++ b/tools/plot_source_wave.py @@ -18,13 +18,14 @@ import os, argparse import numpy as np -np.seterr(divide='ignore') import matplotlib.pyplot as plt from gprMax.exceptions import CmdInputError from gprMax.utilities import round_value from gprMax.waveforms import Waveform +np.seterr(divide='ignore') + def check_timewindow(timewindow, dt): """Checks and sets time window and number of iterations. diff --git a/user_libs/optimisation_taguchi/fitness_functions.py b/user_libs/optimisation_taguchi/fitness_functions.py index df98d3d5..cecd6de5 100644 --- a/user_libs/optimisation_taguchi/fitness_functions.py +++ b/user_libs/optimisation_taguchi/fitness_functions.py @@ -8,10 +8,11 @@ import sys import h5py import numpy as np -np.seterr(divide='ignore') from scipy import signal import matplotlib.pyplot as plt +np.seterr(divide='ignore') + """This module contains fitness metric functions that can be used with the Taguchi optimisation method. All fitness functions must take two arguments and return a single fitness value.