Merge pull request #18 from Climdyn/bugfix/symbolic_IP_aspect_ratio_i…

…ssue

Bugfix for aspect ratio in symbolic IP issue

environment.yml

@@ -11,7 +11,7 @@ dependencies:
   - numba
   - numpy
   - scipy
-  - sympy=1.8
+  - sympy
   - sphinx
   - sphinx_rtd_theme
   - pytest

qgs/inner_products/symbolic.py

@@ -33,9 +33,12 @@
 from qgs.inner_products.definition import StandardSymbolicInnerProductDefinition
 from sympy import lambdify
 from scipy.integrate import dblquad
+from sympy import symbols
 
 # TODO: - Add warnings if trying to connect analytic and symbolic inner products together
 
+_n = symbols('n', real=True, nonnegative=True)
+
 
 class AtmosphericSymbolicInnerProducts(AtmosphericInnerProducts):
     """Class which contains all the atmospheric inner products coefficients needed for the tendencies
@@ -170,7 +173,7 @@ def __init__(self, params=None, stored=True, inner_product_definition=None, inte
         self.ground_basis = None
         self.connected_to_ground = False
 
-        self.subs = [('n', self.n)]
+        self.subs = [(_n, self.n)]
 
         if inner_product_definition is None:
             self.ip = StandardSymbolicInnerProductDefinition()
@@ -694,7 +697,7 @@ def __init__(self, params=None, stored=True, inner_product_definition=None, inte
         self.atmospheric_basis = None
         self.connected_to_atmosphere = False
 
-        self.subs = [('n', self.n)]
+        self.subs = [(_n, self.n)]
 
         if inner_product_definition is None:
             self.ip = StandardSymbolicInnerProductDefinition()
@@ -1083,7 +1086,7 @@ def __init__(self, params=None, stored=True, inner_product_definition=None, inte
         self.atmospheric_basis = None
         self.connected_to_atmosphere = False
 
-        self.subs = [('n', self.n)]
+        self.subs = [(_n, self.n)]
 
         if inner_product_definition is None:
             self.ip = StandardSymbolicInnerProductDefinition()