Changeset 1748 in lmdz_wrf

Timestamp:

Dec 17, 2017, 4:21:01 PM (8 years ago)

Author:

lfita

Message:

Final version of the script with fast Fortran

File:

• trunk/tools/ORforcing_reconstruct.py (modified) (2 diffs)

trunk/tools/ORforcing_reconstruct.py

@@ -228 +228 @@
             quit(-1)
 
-        slices = gen.provide_slices(vardims, shapevar, ['x','y'])
+        print '  reconstructing:', vn, '...'
         # Filling variable. It would be faster if we can avoid this loop... I'm feeling lazy!
         if not gen.searchInlist(vardims,'x') and not gen.searchInlist(vardims,'y'):
             newvar[:] = ovar[:] 
         else:
-            iix = vardims.index('x')
-            iiy = vardims.index('y')
-            iislc = 0
-            Nslices = len(slices)
-            for slc in slices:
-                gen.percendone(iislc,Nslices,0.25,vn + ' reconstructed:')
-                ival = slc[iix]
-                jval = slc[iiy]
-                # Avoiding not found grid points
-                if matind[jval,ival] != -1:
-                    oldvarslice = []
-                    for dn in indn:
-                        if dn == vecdimn: oldvarslice.append(matind[jval,ival])
-                        else: 
-                            iid = vardims.index(dn)
-                            oldvarslice.append(slc[iid])
-
-                    newvar[tuple(slc)] = ovar[tuple(oldvarslice)]
-                else:
-                    if type(newvar.dtype) == type(float(2.)) or                      \
-                      type(newvar.dtype) == type(np.float(2.)) or                    \
-                      type(newvar.dtype) == type(np.float32(2)) or                   \
-                      type(newvar.dtype) == type(np.float64(2)):
-                        newvar[tuple(slc)] = gen.fillValuerF
-                    else:
-                        newvar[tuple(slc)] = gen.fillValueI
+            ovart = ovar[:].transpose()
+            if newvar.dtype == type(float(2.)) or newvar.dtype == type(np.float(2.)) \
+              or newvar.dtype == type(np.float32(2)) or                              \
+              newvar.dtype == type(np.float64(2)):
+                newvals = Sci.module_scientific.fill3dr_2dvec(matind=matindt,        \
+                  inmat=ovart, id1=ovart.shape[0], id2=ovart.shape[1],               \
+                  od1=newvar.shape[2], od2=newvar.shape[1], od3=newvar.shape[0])
+            else:
+                newvals = Sci.module_scientific.fill3di_2dvec(matind=matindt,        \
+                  inmat=ovart, id1=ovart.shape[0], id2=ovart.shape[1],               \
+                  od1=newvar.shape[2], od2=newvar.shape[1], od3=newvar.shape[0])
+            newvar[:] = newvals.transpose()
 
         # Attributes
         for atn in ovar.ncattrs():
-            if atn != 'fill_Value' and atn != 'units':
+            if atn != '_FillValue' and atn != 'units':
                 atv = ovar.getncattr(atn)
                 ncvar.set_attribute(newvar, atn, atv)
@@ -273 +259 @@
     ncvar.set_attribute(onewnc, atn, atv)
 onewnc.sync()
-ncvar.add_global_PyNCplot(onewnc, pyscript, fname, '0.1')
+ncvar.add_global_PyNCplot(onewnc, main, fname, '0.1')
 
 onc.close()