moved options one level up; update import statement

this is to ensure that all enumerators are visible to src.pybella.utils.user_data

Author: ray-chew

src/pybella/data_assimilation/letkf.py

@@ -11,7 +11,7 @@
 
 import matplotlib.pyplot as plt
 
-from ..flow_solver.utils import options as opts
+from ..utils import options as opts
 from . import utils
 
 debug_cnt = 0

src/pybella/data_assimilation/utils.py

@@ -5,7 +5,9 @@
 
 import matplotlib.pyplot as plt
 
-from ..flow_solver.utils import options as opts, boundary as bdry
+from ..utils import options as opts
+
+from ..flow_solver.utils import boundary as bdry
 
 
 class ensemble(object):

src/pybella/flow_solver/discretisation/grid.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from ..utils import options as opts
+from ...utils import options as opts
 
 
 def grid_init(ud):

src/pybella/flow_solver/discretisation/time_update.py

@@ -3,9 +3,11 @@
 
 import numpy as np
 
+from ...utils import options as opts
+
 # dependencies of the flow solver subpackage
 from . import grid as dis_grid
-from ..utils import boundary as bdry, options as opts
+from ..utils import boundary as bdry
 from ..physics.gas_dynamics import (
     numerical_flux as gd_flux,
     eos as gd_eos,

src/pybella/flow_solver/physics/gas_dynamics/recovery.py

@@ -1,6 +1,8 @@
 import numpy as np
 
-from ...utils import options as opts, variable as var
+from ....utils import options as opts
+
+from ...utils import variable as var
 
 
 def do(Sol, flux, lmbda, ud, th, elem, split_step, tag):

src/pybella/flow_solver/physics/low_mach/laplacian.py

@@ -2,7 +2,7 @@
 import scipy as sp
 import numba as nb
 
-from ...utils import options as opts
+from ....utils import options as opts
 
 
 def stencil_9pt(elem, node, mpv, Sol, ud, diag_inv, dt, coriolis_params):

src/pybella/flow_solver/physics/low_mach/second_projection.py

@@ -4,7 +4,9 @@
 import numpy as np
 import scipy as sp
 
-from ...utils import options as opts, boundary as bdry
+from ....utils import options as opts
+
+from ...utils import boundary as bdry
 from . import laplacian as lm_lp
 
 

src/pybella/flow_solver/utils/boundary.py

@@ -3,7 +3,7 @@
 """
 import copy
 import numpy as np
-from . import options as opts
+from ...utils import options as opts
 from ...utils import io