Changeset 2291 in lmdz_wrf for trunk

Timestamp:

Jan 25, 2019, 10:11:51 PM (7 years ago)

Author:

lfita

Message:

Getting there!

Location:

trunk/tools

Files:

• module_scientific.f90 (modified) (2 diffs)
• nc_var_tools.py (modified) (16 diffs)

trunk/tools/module_scientific.f90

@@ -6041 +6041 @@
     INTEGER, DIMENSION(dxB, dyB), INTENT(in)             :: NpointsB
     INTEGER, DIMENSION(dxA, dyA, dxyA, 2), INTENT(in)    :: pointsA
-    INTEGER, DIMENSION(dxA, dyA, dxyB, 2), INTENT(in)    :: pointsB
+    INTEGER, DIMENSION(dxB, dyB, dxyB, 2), INTENT(in)    :: pointsB
     INTEGER, DIMENSION(dxA, dyA, dxB, dyB), INTENT(out)  :: Npoints
     INTEGER, DIMENSION(dxA, dyA, dxB, dyB, dxyA, 2),                                                  &
@@ -6076 +6076 @@
         DO ixB=1, dxB
           DO iyB=1, dyB
-            NB = NpointsA(ixB,iyB)
+            NB = NpointsB(ixB,iyB)
             CALL coincident_list_2Dcoords(NA, pointsA(ixA,iyA,1:NA,:), NB, pointsB(ixB,iyB,1:NB,:),   &
               Npoints(ixA,iyA,ixB,iyB), points(ixA,iyA,ixB,iyB,:,:), inpointsA(ixA,iyA,:),            &

trunk/tools/nc_var_tools.py

@@ -27727 +27727 @@
         slices along sets of ranges for a series of variables weighting by the area
         covered by each grid (defined as polygon) within the slice
-      values=[slicevarsinf]@[dimvars]@[sliceremovedim]@[slicebndsdim]@[slicestatsdim]
+      values=[slicevarsinf]@[dimvars]@[sliceremovedim]@[slicebndsdim]@
+          [slicebndsvar]@[slicestatsdim]
         [slicevarsinf] ';' separated list of [varn1],[minvar1],[maxvar1],
           [slcevar1]; ...;[varnN],[minvarN],[maxvarN],[slcevarN]
@@ -27745 +27746 @@
           ('None' for any)
         [slicebndsdim]: ',' [dimn]|[dimbnd] list of dimensions and their associated 
-          bounds variables from the slicing variables ('None' for any)
+          bounds variables from the slicing variables 
+          ('None' for any)
+        [slicebndsvar]: ',' [varn]|[dimbnd] list of variables and their associated 
+          bounds variables (as ';' list when more than 1) from the slicing variables 
+          ('None' for any)
         [slicestatsdim]: ',' list of name of dimensions to do not use for computing 
           statistics of variables at each slice ('any' for not leaving any 
@@ -27760 +27765 @@
 
     expectargs = '[slicevarsinf]@[dimvars]@[sliceremovedim]@[slicebndsdim]@' +       \
-      '[slicestatsdim]'
+      '[slicebndsvar]@[slicestatsdim]'
     gen.check_arguments(fname, values, expectargs, '@')
 
@@ -27767 +27772 @@
     sliceremovedim = values.split('@')[2]
     slicebndsdim0 = values.split('@')[3]
-    slicestatsdim = values.split('@')[4].split(',')
+    slicebndsvar0 = values.split('@')[4]
+    slicestatsdim = values.split('@')[5].split(',')
 
     varvalues = varvalues0.split(';')
@@ -27788 +27794 @@
         sliceremovdim = None
 
+    # Variables with boundaries from slicing variables
+    if slicebndsvar0 != 'None':
+        slicebndsvar0 = gen.str_list(slicebndsvar0, ',')
+        slicebndsvar = {}
+        for slcn in slicebndsvar0:
+            vn = slcn.split('|')[0]
+            bndn = slcn.split('|')[1].split(';')
+            slicebndsvar[vn] = bndn
+    else:
+        sliceremovdim = None
+
     varvals = {}
     slcvarns = []
@@ -27956 +27973 @@
 
         varfinaldims = rmdims + []
-        dimbnds = []
-        for dn in rmdims:
-            if slicebndsdim.has_key(dn): dimbnds.append(dn)
-
-        if len(dimbnds) != 0:
+        varfinalshape = rmshape + []
+
+        if slicebndsvar.has_key(varn):
+            varbnds = slicebndsvar[varn]
+
             print '    ' + infmsg
             print '    ' +fname+ ": slicing variable '"+varn+ "' with bounded " +    \
-              " dimensions:", dimbnds, " !!"
+              " dimensions:", varbnds, " !!"
             print '      getting them to retrieve the slices'
 
@@ -27969 +27986 @@
             dimdbnds = {}
             dimsbnds = {}
-            for dn in dimbnds:
-                if not onc.variables.has_key(slicebndsdim[dn]):
+            for vn in varbnds:
+                dnn = gen.dictionary_key(slicebndsdim, vn)
+                if not onc.variables.has_key(vn):
                     print errormsg
                     print '  ' + fname + ": file '" + ncfile + "' does not have " +  \
-                      "bounds variable '" + slicebndsdim[dn]+ "' !!"
+                      "bounds variable '" + vn+ "' !!"
                     avar = list(onc.variables.keys())
                     avar.sort()
@@ -27979 +27997 @@
                     quit(-1)
 
-                ovarbnds = onc.variables[slicebndsdim[dn]]
+                ovarbnds = onc.variables[vn]
 
                 # Removing undesired dimensions from bounds slicing variable
@@ -27989 +28007 @@
                     rmshape = list(ovarbnds.shape)
 
-                dimvbnds[dn] = varv
-                dimdbnds[dn] = rmdims
-                dimsbnds[dn] = rmshape
-
-            dn = '_'.join(slicebndsdim)
+                dimvbnds[dnn] = varv
+                dimdbnds[dnn] = rmdims
+                dimsbnds[dnn] = rmshape
+
+            dn = '_'.join(varbnds)
             if not gen.searchInlist(slcvarns, dn) and not                            \
               gen.searchInlist(newslcvarns, dn) and not vardimbndslice.has_key(dn):
@@ -28210 +28228 @@
         else:
             dn = varn + ''
+            dv = np.zeros((1,Nslices), dtype=int)
             # Here is only done by 1D variables !!!
             print infmsg
@@ -28229 +28248 @@
 
             gridsin = np.zeros((2,Ngridsinmax,1,Nslices), dtype=int)
-            areas = np.zeros((Ngridsmax,1,Nslices), dtype=np.float)
+            areas = np.ones(tuple(varfinalshape), dtype=np.float)
             percens = np.zeros((Ngridsinmax,1,Nslices), dtype=np.float)
             for islc in range(Nslices):
@@ -28260 +28279 @@
                 ainds = np.array(indices)
                 if Ngridsin[0,islc] > 0:
-                    gridsin[0,0:Ngridsin[0,islc],0,islc] = ainds[0,0:Nt]
-                    gridsin[1,0:Ngridsin[0,islc],0,islc] = ainds[1,0:Nt]
-                    percens[0:Ngridsin[0,islc],0,islc] = 1.
-
-                onewnc.sync()
+                    
+                    gridsin[0,0:Nt,0,islc] = ainds[0,0:Nt]
+                    gridsin[1,0:Nt,0,islc] = ainds[1,0:Nt]
+                    percens[0:Nt,0,islc] = 1.
+
+                # Values for file
+                dxref = Nslices
+                dyref = 1
+                dxget = 1
+                dyget = 1
+
+                dref = ['fake', dn]
+                sref = [1, Nslices]
+                dget = ['fake']
+                sget = [1]
+                if not gen.searchInlist(onewnc.dimensions, 'fake'): 
+                    newdim = onewnc.createDimension('fake',1)
 
         if not gen.searchInlist(newslcvarns,dn):
@@ -28366 +28397 @@
     dxyB = osliceinB.shape[1]
 
-    Srgrid = list(osliceNA.dimensions) + list(osliceNB.dimensions)
+    Srgrid = list(osliceNB.dimensions) + list(osliceNA.dimensions)
     Sigrid = ['coord', dn+'gridin'] + Srgrid
     Spgrid = [dn+'gridin'] + Srgrid
@@ -28383 +28414 @@
     inpointsB = inpB.transpose()
 
+    maxNpointsAB = np.max(NpointsAB)
     print "  Joined slice '" + newslcvarns[0] + "' & '" + newslcvarns[1] + "':",     \
-      NpointsAB.shape
-    quit(-1)
-
-    maxNpointsAB = np.max(NpointsAB)
+      NpointsAB.shape, 'maxin:', maxNpointsAB
 
     if not gen.searchInlist(onewnc.dimensions, dn+'gridin'):
@@ -28410 +28439 @@
     anewvar.setncattr('coordinates',' '.join(Srgrid[::-1]))
 
+    print 'Lluis Spgrid:', Spgrid
     pnewvar = onewnc.createVariable(dn+'gridpercen','f',tuple(Spgrid),               \
       fill_value=gen.fillValueF)
@@ -28424 +28454 @@
                     print Nin, 'Lluis shapes sliceaA:', osliceaA.shape, 'sliceaB:', osliceaB.shape
                     for iv in range(Nin):
-                        pA = oslicepA[inpA[jA,iA,iv],jA,iA]
-                        pB = oslicepB[inpB[jB,iB,iv],jB,iB]
+                        pA = oslicepA[inpA[jA,iA,iv]-1,jA,iA]
+                        pB = oslicepB[inpB[jB,iB,iv]-1,jB,iB]
                         pnewvar[iv,jB,iB,jA,iA]= pA*pB
-                        ixA = sliceinA[0,inpA[jA,iA,iv],jA,iA]
-                        iyA = sliceinA[1,inpA[jA,iA,iv],jA,iA]
+                        ixA = sliceinA[1,inpointsA[jA,iA,iv]-1,jA,iA]
+                        iyA = sliceinA[0,inpointsA[jA,iA,iv]-1,jA,iA]
                         print '  A:', ixA, iyA
-                        aA = osliceaA[ixA,iyA]
-                        ixB = sliceinB[0,inpB[jB,iB,iv],jB,iB]
-                        iyB = sliceinB[1,inpB[jB,iB,iv],jB,iB]
+                        aA = osliceaA[iyA,ixA]
+                        ixB = sliceinB[1,inpointsB[jB,iB,iv]-1,jB,iB]
+                        iyB = sliceinB[0,inpointsB[jB,iB,iv]-1,jB,iB]
                         print '  B:', ixB, iyB
-                        aB = osliceaB[ixB,iyB]
+                        aB = osliceaB[iyB,ixB]
                         anewvar[jB,iB,jA,iA]= aA*aB