Merge branch 'remco' into 'master'

Change all instances of .flat to .flatten(), which caused a problem in forward runs.

See merge request !22

da/analysis/cteco2/tools_regions.py

@@ -54,7 +54,7 @@ def state_to_grid(values, regionmap, reverse=False, avg=False, mapname=None):
         # dictionary for region <-> map conversions
         regs = {}
         for r in np.arange(1, nregions + 1):
-            sel = (regionmap.flat == r).nonzero()
+            sel = (regionmap.flatten() == r).nonzero()
             if len(sel[0]) > 0: 
                 regs[r] = sel
 
@@ -96,7 +96,7 @@ def globarea(im=360, jm=180, silent=True):
     dxy = dxx * (np.sin(lat + dyy) - np.sin(lat)) * radius ** 2
     area = np.resize(np.repeat(dxy, im, axis=0) , [jm, im])
     if not silent:
-        print('total area of field = ', np.sum(area.flat))
+        print('total area of field = ', np.sum(area.flatten()))
         print('total earth area    = ', 4 * np.pi * radius ** 2)
     return area
 

da/analysis/cteco2/tools_transcom.py

@@ -309,7 +309,7 @@ def cov2corr(A):
         regs = {}
         nregions = map.max()
         for r in arange(1, nregions + 1):
-            sel = (map.flat == r).nonzero()
+            sel = (map.flatten() == r).nonzero()
             if len(sel[0]) > 0:
                 regs[r] = sel
         regionselect = regs

da/archive/ffdas/statevector.py

@@ -90,7 +90,7 @@ class CO2StateVector(StateVector):
         nparams = self.gridmap.max()
         self.griddict = {}
         for r in range(1, int(nparams) + 1):
-            sel = (self.gridmap.flat == r).nonzero()
+            sel = (self.gridmap.flatten() == r).nonzero()
             if len(sel[0]) > 0: 
                 self.griddict[r] = sel
 

da/archive/methane/analysis/tools_regions.py

@@ -32,7 +32,7 @@ def state_to_grid(values, regionmap, reverse=False, avg=False, mapname=None):
         # dictionary for region <-> map conversions
         regs = {}
         for r in np.arange(1, nregions + 1):
-            sel = (regionmap.flat == r).nonzero()
+            sel = (regionmap.flatten() == r).nonzero()
             if len(sel[0]) > 0: 
                 regs[r] = sel
 

da/archive/methane/analysis/tools_regions.py.bak

@@ -32,7 +32,7 @@ def state_to_grid(values, regionmap, reverse=False, avg=False, mapname=None):
         # dictionary for region <-> map conversions
         regs = {}
         for r in np.arange(1, nregions + 1):
-            sel = (regionmap.flat == r).nonzero()
+            sel = (regionmap.flatten() == r).nonzero()
             if len(sel[0]) > 0: 
                 regs[r] = sel
 

da/archive/methane/statevector_2lambdas.py

@@ -87,7 +87,7 @@ class MethaneStateVector(StateVector):
         nparams = self.gridmap.max()
         self.griddict = {}
         for r in range(1, int(nparams) + 1):
-            sel = (self.gridmap.flat == r).nonzero()
+            sel = (self.gridmap.flatten() == r).nonzero()
             if len(sel[0]) > 0: 
                 self.griddict[r] = sel
 
@@ -98,7 +98,7 @@ class MethaneStateVector(StateVector):
         self.tcmatrix = np.zeros((self.nparams, int(self.tcmap.max())), 'float') 
 
         for r in range(1, self.nparams + 1):
-            sel = (self.gridmap.flat == r).nonzero()
+            sel = (self.gridmap.flatten() == r).nonzero()
             if len(sel[0]) < 1: 
                 continue
             else:

da/archive/sf6/statevector.py

@@ -103,7 +103,7 @@ class SF6StateVector(StateVector):
         nparams = self.gridmap.max()
         self.griddict = {}
         for r in range(1, int(nparams) + 1):
-            sel = (self.gridmap.flat == r).nonzero()
+            sel = (self.gridmap.flatten() == r).nonzero()
             if len(sel[0]) > 0: 
                 self.griddict[r] = sel
 

da/statevectors/statevector_baseclass.py

@@ -180,7 +180,7 @@ class StateVector(object):
         nparams = self.gridmap.max()
         self.griddict = {}
         for r in range(1, int(nparams) + 1):
-            sel = np.nonzero(self.gridmap.flat == r)
+            sel = np.nonzero(self.gridmap.flatten() == r)
             if len(sel[0]) > 0: 
                 self.griddict[r] = sel
 
@@ -191,7 +191,7 @@ class StateVector(object):
         self.tcmatrix = np.zeros((self.nparams, 23), 'float') 
 
         for r in range(1, self.nparams + 1):
-            sel = np.nonzero(self.gridmap.flat == r)
+            sel = np.nonzero(self.gridmap.flatten() == r)
             if len(sel[0]) < 1: 
                 continue
             else: