Fix bug in diagnostics from AdvectionDiffusion

climlab · Jul 2, 2019 · 5c5a2ae · 5c5a2ae
1 parent 1de1ada
commit 5c5a2ae
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/climlab/__init__.py b/climlab/__init__.py
@@ -7,7 +7,7 @@
 has been documented for a comprehensive understanding and traceability.
 '''
 
-__version__ = '0.7.4'
+__version__ = '0.7.5.dev0'
 
 # this should ensure that we can still import constants.py as climlab.constants
 from .utils import constants, thermo, legendre

diff --git a/climlab/dynamics/advection_diffusion.py b/climlab/dynamics/advection_diffusion.py
@@ -177,9 +177,9 @@ def prescribed_flux(self, fluxvalue):
             W=self._weight_center, Wb=self._weight_bounds)
 
     def _compute_advdiff_matrix(self):
-        Karray = np.ones_like(self._Xbounds) * self._K
+        Karray = np.ones_like(self._Xbounds) * self.K
         try:
-            Uarray = np.ones_like(self._Xbounds) * self._U
+            Uarray = np.ones_like(self._Xbounds) * self.U
         except Exception:
             Uarray = 0.*Karray
         self._advdiffTriDiag = adv_diff_numerics.advdiff_tridiag(X=self._Xcenter,
@@ -197,11 +197,10 @@ def _implicit_solver(self):
         return newstate
 
     def _update_diagnostics(self, newstate):
-        Karray = self._Xbounds * self.K
-        Uarray = self._Xbounds * self.U
+        Karray = np.ones_like(self._Xbounds) * self.K
+        Uarray = np.ones_like(self._Xbounds) * self.U
         for varname, value in newstate.items():
             field = np.moveaxis(value, self.diffusion_axis_index,-1)
-            #field = value.squeeze()
             diff_flux = adv_diff_numerics.diffusive_flux(self._Xcenter,
                                         self._Xbounds, Karray, field)
             adv_flux = adv_diff_numerics.advective_flux(self._Xcenter,

diff --git a/climlab/dynamics/meridional_advection_diffusion.py b/climlab/dynamics/meridional_advection_diffusion.py
@@ -56,7 +56,7 @@ def __init__(self,
         self._Xbounds[...,:] = phi_stag*const.a
         self._weight_bounds[...,:] = np.cos(phi_stag)
         self._weight_center[...,:] = np.cos(phi)
-        #  Now properly compute the weighted diffusion matrix
+        #  Now properly compute the weighted advection-diffusion matrix
         self.prescribed_flux = prescribed_flux
         self.K = K
         self.U = U

diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "0.7.4" %}
+{% set version = "0.7.5.dev0" %}
 
 package:
   name: climlab

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 import os, sys
 import textwrap
 
-VERSION = '0.7.4'
+VERSION = '0.7.5.dev0'
 
 # BEFORE importing setuptools, remove MANIFEST. Otherwise it may not be
 # properly updated when the contents of directories change (true for distutils,