Formatting cleanups.

这个提交包含在:
Craig Warren
2017-02-21 12:50:55 +00:00
父节点 6db9a7a6ba
当前提交 b632946d54

查看文件

@@ -16,15 +16,12 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with gprMax. If not, see <http://www.gnu.org/licenses/>. # along with gprMax. If not, see <http://www.gnu.org/licenses/>.
from collections import OrderedDict
from importlib import import_module from importlib import import_module
import numpy as np import numpy as np
from tqdm import tqdm from tqdm import tqdm
from gprMax.constants import e0, z0, floattype from gprMax.constants import e0, z0, floattype
import gprMax.pml_1order_update
import gprMax.pml_2order_update
class CFSParameter(object): class CFSParameter(object):
@@ -98,7 +95,7 @@ class CFS(object):
tmp = (np.linspace(0, (len(Evalues) - 1) + 0.5, num=2 * len(Evalues)) / (len(Evalues) - 1)) ** order tmp = (np.linspace(0, (len(Evalues) - 1) + 0.5, num=2 * len(Evalues)) / (len(Evalues) - 1)) ** order
Evalues = tmp[0:-1:2] Evalues = tmp[0:-1:2]
Hvalues = tmp[1::2] Hvalues = tmp[1::2]
return Evalues, Hvalues return Evalues, Hvalues
def calculate_values(self, thickness, parameter): def calculate_values(self, thickness, parameter):
@@ -141,9 +138,9 @@ class CFS(object):
class PML(object): class PML(object):
"""PML - the implementation comes from the derivation in: http://dx.doi.org/10.1109/TAP.2011.2180344""" """PML - the implementation comes from the derivation in: http://dx.doi.org/10.1109/TAP.2011.2180344"""
# IDs for default PML slabs at boundaries of domain # PML slabs IDs at boundaries of domain.
boundaryIDs = ['x0', 'y0', 'z0', 'xmax', 'ymax', 'zmax'] boundaryIDs = ['x0', 'y0', 'z0', 'xmax', 'ymax', 'zmax']
# Indicates direction of increasing absorption # Indicates direction of increasing absorption
# xminus, yminus, zminus - absorption increases in negative direction of x-axis, y-axis, or z-axis # xminus, yminus, zminus - absorption increases in negative direction of x-axis, y-axis, or z-axis
# xplus, yplus, zplus - absorption increases in positive direction of x-axis, y-axis, or z-axis # xplus, yplus, zplus - absorption increases in positive direction of x-axis, y-axis, or z-axis
@@ -170,8 +167,7 @@ class PML(object):
self.ny = yf - ys self.ny = yf - ys
self.nz = zf - zs self.nz = zf - zs
# Spatial discretisation and thickness # Spatial discretisation and thickness (one extra cell of thickness required for interpolation of electric and magnetic scaling values)
# (one extra cell of thickness required for interpolation of electric and magnetic scaling values)
if self.direction[0] == 'x': if self.direction[0] == 'x':
self.d = G.dx self.d = G.dx
self.thickness = self.nx + 1 self.thickness = self.nx + 1