From e6debbf2f4c87e6a16154d6c7aa120851190b005 Mon Sep 17 00:00:00 2001 From: nmannall Date: Mon, 6 Jan 2025 16:05:27 +0000 Subject: [PATCH] Update SubGridHSG to new UserObject approach --- gprMax/subgrids/user_objects.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/gprMax/subgrids/user_objects.py b/gprMax/subgrids/user_objects.py index 8c155f03..992f3b7e 100644 --- a/gprMax/subgrids/user_objects.py +++ b/gprMax/subgrids/user_objects.py @@ -101,11 +101,12 @@ class SubGridBase(ModelUserObject): """Sets number of iterations that will take place in the subgrid.""" sg.iterations = model.iterations * sg.ratio - def setup(self, sg: SubGridBaseGrid, model: Model, uip: MainGridUserInput): + def setup(self, sg: SubGridBaseGrid, model: Model): """ "Common setup to both all subgrid types.""" p1 = self.kwargs["p1"] p2 = self.kwargs["p2"] + uip = self._create_uip(model.G) p1, p2 = uip.check_box_points(p1, p2, self.__str__()) self.set_discretisation(sg, model.G) @@ -179,6 +180,14 @@ class SubGridHSG(SubGridBase): stability. Defaults to True. """ + @property + def order(self): + return 18 + + @property + def hash(self): + return "#subgrid_hsg" + def __init__( self, p1=None, @@ -206,10 +215,8 @@ class SubGridHSG(SubGridBase): kwargs["filter"] = filter super().__init__(**kwargs) - self.order = 18 - self.hash = "#subgrid_hsg" - def build(self, model: Model, uip: MainGridUserInput) -> SubGridHSGUser: + def build(self, model: Model) -> SubGridHSGUser: sg = SubGridHSGUser(**self.kwargs) - self.setup(sg, model, uip) + self.setup(sg, model) return sg