Changeset 663 in lmdz_wrf for trunk

Timestamp:

Jan 11, 2016, 5:00:20 PM (9 years ago)

Author:

lfita

Message:

Adding slice for the weights variable

File:

• trunk/tools/nc_var_tools.py (modified) (6 diffs)

trunk/tools/nc_var_tools.py

@@ -17243 +17243 @@
                 for id1 in range(loopshape[0]):
                     slicevalues = SliceVar(iovar,dimsloop,[id1])
+                    slicewgt = SliceVar(iovarwgt,dimsloop,[id1])
                     newvals[id1] = np.mean(ivarv[tuple(slicevalues)] /               \
-                      ivarwgtv[tuple(slicevalues)])
+                      ivarwgtv[tuple(slicewgt)])
             elif len(loopshape) == 2:
                 newvals = np.ones((loopshape[0],loopshape[1]),dtype=np.float)*       \
@@ -17251 +17252 @@
                     for id2 in range(loopshape[1]):
                         slicevalues = SliceVar(iovar,dimsloop,[id1,id2])
+                        slicewgt = SliceVar(iovarwgt,dimsloop,[id1,id2])
                         newvals[id1,id2] = np.mean(ivarv[tuple(slicevalues)] /       \
-                          ivarwgtv[tuple(slicevalues)])
+                          ivarwgtv[tuple(slicewgt)])
             elif len(loopshape) == 3:
                 newvals = np.ones((loopshape[0],loopshape[1],loopshape[2]),          \
@@ -17260 +17262 @@
                         for id3 in range(loopshape[1]):
                             slicevalues = SliceVar(iovar,dimsloop,[id1,id2,id3])
+                            slicewgt = SliceVar(iovarwgt,dimsloop,[id1,id2,id3])
                             newvals[id1,id2,id3]= np.mean(ivarv[tuple(slicevalues)]/ \
-                              ivarwgtv[tuple(slicevalues)])
+                              ivarwgtv[tuple(slicewgt)])
         elif oper == 'nothing':
             longvarname = 'using variable ' + varname + ' as space weights'
@@ -17268 +17271 @@
                 for id1 in range(loopshape[0]):
                     slicevalues = SliceVar(iovar,dimsloop,[id1])
+                    slicewgt = SliceVar(iovarwgt,dimsloop,[id1])
                     newvals[id1] = np.mean(ivarv[tuple(slicevalues)]*                \
-                      ivarwgtv[tuple(slicevalues)])
+                      ivarwgtv[tuple(slicewgt)])
             elif len(loopshape) == 2:
                 newvals = np.ones((loopshape[0],loopshape[1]), dtype=np.float)*      \
@@ -17276 +17280 @@
                     for id2 in range(loopshape[1]):
                         slicevalues = SliceVar(iovar,dimsloop,[id1,id2])
+                        slicewgt = SliceVar(iovarwgt,dimsloop,[id1,id2])
                         newvals[id1,id2] = np.mean(ivarv[tuple(slicevalues)]*        \
-                          ivarwgtv[tuple(slicevalues)])
+                          ivarwgtv[tuple(slicewgt)])
             elif len(loopshape) == 3:
                 newvals = np.ones((loopshape[0],loopshape[1],loopshape[2]),          \
@@ -17285 +17290 @@
                         for id3 in range(loopshape[2]):
                             slicevalues = SliceVar(iovar,dimsloop,[id1,id2.id3])
+                            slicewgt = SliceVar(iovarwgt,dimsloop,[id1,id2,id3])
                             newvals[id1,id2,id3]=np.mean(ivarv[tuple(slicevalues)]*  \
-                              ivarwgtv[tuple(slicevalues)])
+                              ivarwgtv[tuple(slicewgt)])
     elif weightk == 'reglonlat':
         longvarname = 'using cos(latitude) variable ' + latname + ' as space weights'