Changeset 2529 in lmdz_wrf

Timestamp:

May 11, 2019, 8:59:53 PM (6 years ago)

Author:

lfita

Message:

Adding new slicing/variables combination in 'compute_slices_stats_areaweighted' and 'usefile_compute_slices_stats_areaweighted'

File:

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

trunk/tools/nc_var_tools.py

@@ -30420 +30420 @@
 
            varvt = varv.transpose()
-           if Nvdims == 3 and len(sN.shape) == 4:
+           if Nvdims == 4 and len(sN.shape) == 3:
+               voutt=fsci.module_scientific.multi_spaceweightstats_in4drk3_4_slc3v3( \
+                 varin=varvt, ngridsin=sNt, gridsin=sint, percentages=spt,           \
+                 di1=d3, di2=d2, di3=d1, di4=d0, ds1=ssh[2], ds2=ssh[1], ds3=ssh[0], \
+                 maxngridsin=sin.shape[1])
+           elif Nvdims == 3 and len(sN.shape) == 4:
                voutt=fsci.module_scientific.multi_spaceweightstats_in3drk3_slc3v4(   \
                  varin=varvt, ngridsin=sNt, gridsin=sint, percentages=spt,           \
@@ -31171 +31176 @@
 
            varvt = varv.transpose()
-           if Nvdims == 3 and len(sN.shape) == 4:
+           if Nvdims == 4 and len(sN.shape) == 3:
+               voutt=fsci.module_scientific.multi_spaceweightstats_in4drk3_4_slc3v3( \
+                 varin=varvt, ngridsin=sNt, gridsin=sint, percentages=spt,           \
+                 di1=d3, di2=d2, di3=d1, di4=d0, ds1=ssh[2], ds2=ssh[1], ds3=ssh[0], \
+                 maxngridsin=sin.shape[1])
+           elif Nvdims == 3 and len(sN.shape) == 4:
                voutt=fsci.module_scientific.multi_spaceweightstats_in3drk3_slc3v4(   \
                  varin=varvt, ngridsin=sNt, gridsin=sint, percentages=spt,           \
                  di1=d2, di2=d1, di3=d0, ds1=ssh[3], ds2=ssh[2], ds3=ssh[1],         \
                  ds4=ssh[0], maxngridsin=sin.shape[1])
-           elif Nvdims == 4 and len(sN.shape) == 3:
-               voutt=fsci.module_scientific.multi_spaceweightstats_in4drk3_4_slc3v3( \
-                 varin=varvt, ngridsin=sNt, gridsin=sint, percentages=spt,           \
-                 di1=d3, di2=d2, di3=d1, di4=d0, ds1=ssh[2], ds2=ssh[1], ds3=ssh[0], \
-                 maxngridsin=sin.shape[1])
            elif Nvdims == 3 and len(sN.shape) == 3:
                voutt=fsci.module_scientific.multi_spaceweightstats_in3drk3_slc3v3(   \
@@ -31186 +31191 @@
                  di1=d2, di2=d1, di3=d0, ds1=ssh[2], ds2=ssh[1], ds3=ssh[0],         \
                  maxngridsin=sin.shape[1])
+           elif Nvdims == 3 and len(sN.shape) == 2:
+               voutt=fsci.module_scientific.multi_spaceweightstats_in3drk3_slc2v2(   \
+                 varin=varvt, ngridsin=sNt, gridsin=sint, percentages=spt,           \
+                 di1=d2, di2=d1, di3=d0, ds1=ssh[1], ds2=ssh[0],                     \
+                 maxngridsin=sin.shape[1])
            elif Nvdims == 2 and len(sN.shape) == 3:
                voutt=fsci.module_scientific.multi_spaceweightstats_in2drkno_slc3v3(  \
                  varin=varvt, ngridsin=sNt, gridsin=sint, percentages=spt,           \
                  di1=d1, di2=d0, ds1=ssh[2], ds2=ssh[1], ds3=ssh[0],                 \
+                 maxngridsin=sin.shape[1])
+           elif Nvdims == 2 and len(sN.shape) == 2:
+               voutt=fsci.module_scientific.multi_spaceweightstats_in2drkno_slc2v2(  \
+                 varin=varvt, ngridsin=sNt, gridsin=sint, percentages=spt,           \
+                 di1=d1, di2=d0, ds1=ssh[1], ds2=ssh[0],                             \
                  maxngridsin=sin.shape[1])
            elif Nvdims == 1 and len(sN.shape) == 3:
@@ -31200 +31215 @@
                  ' slice rank:', len(sN.shape), 'not ready!!'
                print '    available ones _______'
+               print ' var_rank: 4   slice_rank: 3'
                print ' var_rank: 3   slice_rank: 4'
-               print ' var_rank: 4   slice_rank: 3'
                print ' var_rank: 3   slice_rank: 3'
+               print ' var_rank: 3   slice_rank: 2'
                print ' var_rank: 2   slice_rank: 3'
+               print ' var_rank: 2   slice_rank: 2'
                print ' var_rank: 1   slice_rank: 3'
                quit(-1)