From 6de8e6ee1f08aac6913e454b6a00f4f10fbabff0 Mon Sep 17 00:00:00 2001 From: David Ketcheson Date: Thu, 7 Nov 2019 10:24:44 +0300 Subject: [PATCH] Improvements to Solution initialization. See #635. --- src/pyclaw/solution.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/pyclaw/solution.py b/src/pyclaw/solution.py index 9a9c19e81..1bcc1cc85 100755 --- a/src/pyclaw/solution.py +++ b/src/pyclaw/solution.py @@ -56,7 +56,7 @@ class Solution(object): - (:class:`~pyclaw.geometry.Dimension`) - A domain and patch is created with the dimensions or list of dimensions provided. - 3. `args` is a variable number of arguments that describes the + 3. `args` is a variable number of keyword arguments that describes the location of a file to be read in to initialize the object :Examples: @@ -140,17 +140,14 @@ def get_clawpack_dot_xxx(modname): return modname.rpartition('.')[0] frame = arg[0] if not isinstance(frame,int): raise Exception('Invalid pyclaw.Solution object initialization') - if 'count_from_zero' in list(kargs.keys()) and\ - kargs['count_from_zero'] == True: - self._start_frame = 0 - else: - self._start_frame = frame - try: + if ('count_from_zero' in kargs): + if (kargs['count_from_zero'] == True): + self._start_frame = 0 + else: + self._start_frame = frame kargs.pop('count_from_zero') - except KeyError: - pass - self.read(frame,**kargs) + elif len(arg) == 2: #Set domain if isinstance(arg[1],Domain): @@ -163,7 +160,7 @@ def get_clawpack_dot_xxx(modname): return modname.rpartition('.')[0] elif isinstance(arg[1][0],Patch): self.domain = Domain(arg[1]) else: - raise Exception("Invalid argument list") + raise Exception("Invalid arguments for Solution initialization.") #Set state if isinstance(arg[0],State): @@ -176,11 +173,16 @@ def get_clawpack_dot_xxx(modname): return modname.rpartition('.')[0] elif isinstance(arg[0][0],int): self.states = State(self.domain,arg[0][0],arg[0][1]) else: - raise Exception("Invalid argument list") + raise Exception("Invalid arguments for Solution initialization.") elif isinstance(arg[0],int): self.states.append(State(self.domain,arg[0])) if self.states == [] or self.domain is None: - raise Exception("Invalid argument list") + raise Exception("Invalid arguments for Solution initialization.") + elif len(arg) == 0 and 'frame' in kargs: + frame = kargs.pop('frame') + self.read(frame,**kargs) + else: + raise Exception("Invalid arguments for Solution initialization.") def is_valid(self):