Changeset 1122 in lmdz_wrf for trunk

Timestamp:

Sep 30, 2016, 4:07:11 PM (9 years ago)

Author:

lfita

Message:

Fixing slices in `DataSetSection_multidims'

File:

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

trunk/tools/nc_var_tools.py ¶

@@ -5895 +5895 @@
                 dimsize = len(objdim)
             varslice.append(slice(0,len(objdim)))
+            dimslices[dims] = [0,len(objdim)]
         else:
             dimid = dimns.index(dims)
@@ -5913 +5914 @@
                     dimslices[dims] = [begvs[dimid],endvs[dimid]+1,intvs[dimid]]
                 else:
-                    print 'here!'
-                    dimsize = len(objdim)
+                    dimsize = len(objdim)-begvs[dimid]
                     dimslices[dims] = [begvs[dimid],len(objdim),1]
             else:
                 dimsize = 1
                 if begvs[dimid] == -1:
-                    dimslices[dims] = [len(objdim)-1,len(objdim),1]
+                    dimslices[dims] = [len(objdim)-1,len(objdim)-1,1]
                 else:
-                    dimslices[dims] = [begvs[dimid],begvs[dimid]+1,1]
+                    dimslices[dims] = [begvs[dimid],begvs[dimid],1]
 
         newdimsizes[dims] = dimsize
@@ -5953 +5953 @@
             vardims = varorigdims
         else:
+            varvals = None
             varslice = []
             for dimname in varorigdims:
                 if gen.searchInlist(dimns, dimname):
-                    varslice.append(slice(dimslices[dimname][0],                     \
-                      dimslices[dimname][1], dimslices[dimname][2]))
+                    if dimslices[dimname][0] != dimslices[dimname][1]:
+                        varslice.append(slice(dimslices[dimname][0],                 \
+                          dimslices[dimname][1], dimslices[dimname][2]))
+                    else:
+                        varslice.append(dimslices[dimname][0])
                     if newdimsizes[dimname] != 1: vardims.append(dimname)
                 else:
@@ -5963 +5967 @@
                     varslice.append(slice(0,Ldim))
                     vardims.append(dimname)
-
+                print fname + ';Lluis dimname:', dimname,'dimslices:',dimslices[dimname]
+
+            print fname + '; Lluis coinc:', coinc
+            print fname + ' Lluis; shapes varvals:', varvals, 'varobj:', varobj.shape,'varslice:',varslice 
             varvals = varobj[tuple(varslice)]
 
@@ -5978 +5985 @@
         newvar = ncoobj.createVariable(varns, vartype, tuple(vardims),               \
           fill_value=varfil)
-#        print 'newvar:',newvar.shape,'varvals:',varvals.shape
         newvar[:] = varvals