From c6306b94a585d6cd7a5da89a398150d1f06ed09c Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Fri, 14 Feb 2020 14:58:15 +0000 Subject: [PATCH] Remove unused order property. --- gprMax/cmds_geometry/add_grass.py | 1 - gprMax/cmds_geometry/add_surface_roughness.py | 1 - gprMax/cmds_geometry/add_surface_water.py | 1 - gprMax/cmds_geometry/box.py | 1 - gprMax/cmds_geometry/cmds_geometry.py | 5 ----- gprMax/cmds_geometry/cylinder.py | 1 - gprMax/cmds_geometry/cylindrical_sector.py | 1 - gprMax/cmds_geometry/edge.py | 1 - gprMax/cmds_geometry/fractal_box.py | 1 - gprMax/cmds_geometry/fractal_box_builder.py | 1 - gprMax/cmds_geometry/geometry_objects_read.py | 1 - gprMax/cmds_geometry/plate.py | 1 - gprMax/cmds_geometry/sphere.py | 1 - gprMax/cmds_geometry/triangle.py | 1 - gprMax/cmds_multiple.py | 22 ++++--------------- 15 files changed, 4 insertions(+), 36 deletions(-) diff --git a/gprMax/cmds_geometry/add_grass.py b/gprMax/cmds_geometry/add_grass.py index af0969e7..d36bfd23 100644 --- a/gprMax/cmds_geometry/add_grass.py +++ b/gprMax/cmds_geometry/add_grass.py @@ -50,7 +50,6 @@ class AddGrass(UserObjectGeometry): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 12 self.hash = '#add_grass' def create(self, grid, uip): diff --git a/gprMax/cmds_geometry/add_surface_roughness.py b/gprMax/cmds_geometry/add_surface_roughness.py index 29593a63..6cd4dcbc 100644 --- a/gprMax/cmds_geometry/add_surface_roughness.py +++ b/gprMax/cmds_geometry/add_surface_roughness.py @@ -51,7 +51,6 @@ class AddSurfaceRoughness(UserObjectGeometry): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 10 self.hash = '#add_surface_roughness' def create(self, grid, uip): diff --git a/gprMax/cmds_geometry/add_surface_water.py b/gprMax/cmds_geometry/add_surface_water.py index 54bbf511..dca123c6 100644 --- a/gprMax/cmds_geometry/add_surface_water.py +++ b/gprMax/cmds_geometry/add_surface_water.py @@ -42,7 +42,6 @@ class AddSurfaceWater(UserObjectGeometry): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 11 self.hash = '#add_surface_water' def create(self, grid, uip): diff --git a/gprMax/cmds_geometry/box.py b/gprMax/cmds_geometry/box.py index ed99f3e1..25a3b261 100644 --- a/gprMax/cmds_geometry/box.py +++ b/gprMax/cmds_geometry/box.py @@ -46,7 +46,6 @@ class Box(UserObjectGeometry): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 5 self.hash = '#box' def create(self, grid, uip): diff --git a/gprMax/cmds_geometry/cmds_geometry.py b/gprMax/cmds_geometry/cmds_geometry.py index 409028d3..45a3ef1f 100644 --- a/gprMax/cmds_geometry/cmds_geometry.py +++ b/gprMax/cmds_geometry/cmds_geometry.py @@ -26,12 +26,7 @@ class UserObjectGeometry: def __init__(self, **kwargs): self.kwargs = kwargs - # define the order of priority for calling create() - self.order = None - # hash command self.hash = '#example' - - # auto translate self.autotranslate = True def __str__(self): diff --git a/gprMax/cmds_geometry/cylinder.py b/gprMax/cmds_geometry/cylinder.py index 587a96ec..8af19fc2 100644 --- a/gprMax/cmds_geometry/cylinder.py +++ b/gprMax/cmds_geometry/cylinder.py @@ -47,7 +47,6 @@ class Cylinder(UserObjectGeometry): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 6 self.hash = '#cylinder' def create(self, grid, uip): diff --git a/gprMax/cmds_geometry/cylindrical_sector.py b/gprMax/cmds_geometry/cylindrical_sector.py index 5b6af84e..6185c2a3 100644 --- a/gprMax/cmds_geometry/cylindrical_sector.py +++ b/gprMax/cmds_geometry/cylindrical_sector.py @@ -58,7 +58,6 @@ class CylindricalSector(UserObjectGeometry): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 7 self.hash = '#cylindrical_sector' def create(self, grid, uip): diff --git a/gprMax/cmds_geometry/edge.py b/gprMax/cmds_geometry/edge.py index c893915f..db2e61c8 100644 --- a/gprMax/cmds_geometry/edge.py +++ b/gprMax/cmds_geometry/edge.py @@ -41,7 +41,6 @@ class Edge(UserObjectGeometry): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 2 self.hash = '#edge' def create(self, grid, uip): diff --git a/gprMax/cmds_geometry/fractal_box.py b/gprMax/cmds_geometry/fractal_box.py index 2257df73..effcdf92 100644 --- a/gprMax/cmds_geometry/fractal_box.py +++ b/gprMax/cmds_geometry/fractal_box.py @@ -53,7 +53,6 @@ class FractalBox(UserObjectGeometry): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 9 self.hash = '#fractal_box' def create(self, grid, uip): diff --git a/gprMax/cmds_geometry/fractal_box_builder.py b/gprMax/cmds_geometry/fractal_box_builder.py index 3127de7b..9a329bd1 100644 --- a/gprMax/cmds_geometry/fractal_box_builder.py +++ b/gprMax/cmds_geometry/fractal_box_builder.py @@ -31,7 +31,6 @@ class FractalBoxBuilder(UserObjectGeometry): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 13 self.hash = '#fractal_box_modifications' def create(self, grid, uip): diff --git a/gprMax/cmds_geometry/geometry_objects_read.py b/gprMax/cmds_geometry/geometry_objects_read.py index 801e0e6a..36e027c7 100644 --- a/gprMax/cmds_geometry/geometry_objects_read.py +++ b/gprMax/cmds_geometry/geometry_objects_read.py @@ -35,7 +35,6 @@ class GeometryObjectsRead(UserObjectGeometry): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 1 self.hash = '#geometry_objects_read' def create(self, G, uip): diff --git a/gprMax/cmds_geometry/plate.py b/gprMax/cmds_geometry/plate.py index 83cd78d1..2b7d9a40 100644 --- a/gprMax/cmds_geometry/plate.py +++ b/gprMax/cmds_geometry/plate.py @@ -43,7 +43,6 @@ class Plate(UserObjectGeometry): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 3 self.hash = '#plate' def create(self, grid, uip): diff --git a/gprMax/cmds_geometry/sphere.py b/gprMax/cmds_geometry/sphere.py index 41a55d75..37d17a83 100644 --- a/gprMax/cmds_geometry/sphere.py +++ b/gprMax/cmds_geometry/sphere.py @@ -46,7 +46,6 @@ class Sphere(UserObjectGeometry): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 8 self.hash = '#sphere' def create(self, grid, uip): diff --git a/gprMax/cmds_geometry/triangle.py b/gprMax/cmds_geometry/triangle.py index 8ea3f50b..bf925771 100644 --- a/gprMax/cmds_geometry/triangle.py +++ b/gprMax/cmds_geometry/triangle.py @@ -50,7 +50,6 @@ class Triangle(UserObjectGeometry): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 4 self.hash = '#triangle' def create(self, grid, uip): diff --git a/gprMax/cmds_multiple.py b/gprMax/cmds_multiple.py index 74b3d7f4..a3a4e65a 100644 --- a/gprMax/cmds_multiple.py +++ b/gprMax/cmds_multiple.py @@ -84,7 +84,6 @@ class Waveform(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 1 self.hash = '#waveform' def create(self, grid, uip): @@ -133,7 +132,6 @@ class VoltageSource(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 2 self.hash = '#voltage_source' def create(self, grid, uip): @@ -219,7 +217,6 @@ class HertzianDipole(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 3 self.hash = '#hertzian_dipole' def create(self, grid, uip): @@ -315,7 +312,6 @@ class MagneticDipole(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 4 self.hash = '#magnetic_dipole' def create(self, grid, uip): @@ -401,7 +397,6 @@ class TransmissionLine(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 5 self.hash = '#transmission_line' def create(self, grid, uip): @@ -490,7 +485,6 @@ class Rx(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 6 self.hash = '#rx' self.constructor = RxUser @@ -545,7 +539,6 @@ class RxArray(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 7 self.hash = '#rx_array' def create(self, grid, uip): @@ -618,7 +611,6 @@ class Snapshot(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 8 self.hash = '#snapshot' def create(self, grid, uip): @@ -685,7 +677,6 @@ class Material(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 9 self.hash = '#material' def create(self, grid, uip): @@ -745,7 +736,6 @@ class AddDebyeDispersion(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 10 self.hash = '#add_dispersion_debye' def create(self, grid, uip): @@ -809,7 +799,6 @@ class AddLorentzDispersion(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 11 self.hash = '#add_dispersion_lorentz' def create(self, grid, uip): @@ -872,7 +861,6 @@ class AddDrudeDispersion(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 12 self.hash = '#add_dispersion_drude' def create(self, grid, uip): @@ -937,7 +925,6 @@ class SoilPeplinski(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 13 self.hash = '#soil_peplinski' def create(self, grid, uip): @@ -994,7 +981,6 @@ class GeometryView(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 14 self.hash = '#geometry_view' self.multi_grid = False @@ -1073,7 +1059,6 @@ class GeometryObjectsWrite(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 15 self.hash = '#geometry_objects_write' def create(self, grid, uip): @@ -1129,7 +1114,6 @@ class PMLCFS(UserObjectMulti): def __init__(self, **kwargs): super().__init__(**kwargs) - self.order = 16 self.hash = '#pml_cfs' PMLCFS.count += 1 if PMLCFS.count == 2: @@ -1193,7 +1177,8 @@ class PMLCFS(UserObjectMulti): class Subgrid(UserObjectMulti): - + """ + """ def __init__(self, **kwargs): super().__init__(**kwargs) self.children_multiple = [] @@ -1209,7 +1194,8 @@ class Subgrid(UserObjectMulti): class SubgridHSG(UserObjectMulti): - + """ + """ def __init__(self, **kwargs): super().__init__(**kwargs) log.debug('Is this required?')