Changeset 2190 in lmdz_wrf

Timestamp:

Oct 17, 2018, 8:09:59 PM (7 years ago)

Author:

lfita

Message:

Improving `sellonlatbox', removing special case on stations list... will see !!

File:

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

trunk/tools/nc_var_tools.py ¶

@@ -6916 +6916 @@
 # Adding variable dimensions
         varslice = []
+        haslonlat = False
+        if gen.searchInlist(varinf.dimns, dlonn): haslonlat=True
+        if gen.searchInlist(varinf.dimns, dlatn): haslonlat=True
+
         for dimn in varinf.dimns:
             if not gen.searchInlist(newncobj.dimensions, dimn):
@@ -6922 +6926 @@
                 else:
                     newncobj.createDimension(dimn, len(objfile.dimensions[dimn]))
-# Very special case when we have for example a list of stations (which is the case!)
-            if dimn == dlonn and dimx != dimy: 
+            # Very special case when we have for example a list of stations (which is the case!)
+            #if dimn == dlonn and dimx != dimy: [removed]
+            if dimn == dlonn:
                 varslice.append(slice(ilon,elon+1))
-            elif dimn == dlatn and dimx != dimy: 
+            #elif dimn == dlatn and dimx != dimy: 
+            elif dimn == dlatn: 
                 varslice.append(slice(ilat,elat+1))
             else:
@@ -6936 +6942 @@
               fill_value = varinf.FillValue)
 
-        if dimx != dimy:
+        if not haslonlat: 
             newvar[:] = varobj[tuple(varslice)]
         else:
-# Very special case when we have for example a list of stations (which is the case!)
-            print '  ' + fname + ': woow we are in a stations-list like of file...'
-            inpos0 = 0
-            for i in range(newdimx):
-                inpos = gen.index_vec(malonlat[inpos0:dimx+1], False)
-                inpos = inpos + inpos0
-                inpos0 = inpos + 1
-                varslice = []
-                newvarslice = []
-                for dimn in varinf.dimns:
-                    if not gen.searchInlist(newncobj.dimensions, dimn):
-                        newncobj.createDimension(dimn, len(objfile.dimensions[dimn]))
-# Very special case when we have for example a list of stations (which is the case!)
-                    if dimn == dlonn: 
-                        varslice.append(inpos)
-                        newvarslice.append(i)
-                    else:
-                        varslice.append(slice(0,len(objfile.dimensions[dimn])))
-                        newvarslice.append(slice(0,len(objfile.dimensions[dimn])))
-                newvar[tuple(newvarslice)] = varobj[tuple(varslice)]
+#            if dimx != dimy:
+            if dlonn != dlatn:
+                newvar[:] = varobj[tuple(varslice)]
+            else:
+                # Very special case when we have for example a list of stations (which is the case!)
+                print '  ' + fname + ': woow we are in a stations-list like of file...'
+                inpos0 = 0
+                for i in range(newdimx):
+                    inpos = gen.index_vec(malonlat[inpos0:dimx+1], False)
+                    inpos = inpos + inpos0
+                    inpos0 = inpos + 1
+                    varslice = []
+                    newvarslice = []
+                    for dimn in varinf.dimns:
+                        if not gen.searchInlist(newncobj.dimensions, dimn):
+                            newncobj.createDimension(dimn, len(objfile.dimensions[dimn]))
+                    # Very special case when we have for example a list of stations (which is the case!)
+                        if dimn == dlonn: 
+                            varslice.append(inpos)
+                            newvarslice.append(i)
+                        else:
+                            varslice.append(slice(0,len(objfile.dimensions[dimn])))
+                            newvarslice.append(slice(0,len(objfile.dimensions[dimn])))
+                    newvar[tuple(newvarslice)] = varobj[tuple(varslice)]
 
         for atrn in varinf.attributes:
@@ -11565 +11575 @@
     if uvalsecs[1] == 'since': 
         tunits = True
-        if len(uvalsecs) == 4:
-            date=uvalsecs[2]
-            time=uvalsecs[3]
-        else:
-            if uvalsecs[2].find('_') == -1:
-                date=uvalsecs[2]
-                time='00:00:00'
-            else:
-                date=uvalsecs[2].split('_')[0]
-                time=uvalsecs[2].split('_')[1]
+        CFtimeu = gen.get_right_CFtimeunits(urefvals)
+        uvalsecs = CFtimeu.split(' ')
+        date=uvalsecs[2]
+        time=uvalsecs[3]
         refdate = gen.datetimeStr_datetime(date+'_'+time)
         print warnmsg