Changeset 2696 in lmdz_wrf for trunk

Timestamp:

Aug 15, 2019, 3:03:07 PM (5 years ago)

Author:

lfita

Message:

Fixing plot

Location:

trunk/tools

Files:

• drawing.py (modified) (1 diff)
• drawing_tools.py (modified) (6 diffs)

trunk/tools/drawing.py

@@ -10580 +10580 @@
 
         for iff in range(Nfiles):
-            allhgtsea.append(allhgtseav[iff,:].compressed())
-            allxhgt.append(allxhgtv[iff])
-            allhgtxhgt.append(allhgtxhgtv[iff,:].compressed())
-            allpsea.append(allpseav[iff,:].compressed())
-            allpxhgt.append(allpxhgtv[iff,:].compressed())
-            alldhgtsea.append(alldhgtseav[iff,:].compressed())
-            alldhgtxhgt.append(alldhgtxhgtv[iff,:].compressed())
-            alldpsea.append(alldpseav[iff,:].compressed())
-            alldpxhgt.append(alldpxhgtv[iff,:].compressed())
-            alletaw.append(alletawv[iff,:].compressed())
-            alletau.append(alletauv[iff,:].compressed())
+            if type(allhgtseav[iff,:]) == type(gen.mamat):
+                allhgtsea.append(allhgtseav[iff,:].compressed())
+                allxhgt.append(allxhgtv[iff])
+                allhgtxhgt.append(allhgtxhgtv[iff,:].compressed())
+                allpsea.append(allpseav[iff,:].compressed())
+                allpxhgt.append(allpxhgtv[iff,:].compressed())
+                alldhgtsea.append(alldhgtseav[iff,:].compressed())
+                alldhgtxhgt.append(alldhgtxhgtv[iff,:].compressed())
+                alldpsea.append(alldpseav[iff,:].compressed())
+                alldpxhgt.append(alldpxhgtv[iff,:].compressed())
+                alletaw.append(alletawv[iff,:].compressed())
+                alletau.append(alletauv[iff,:].compressed())
+            else:
+                allhgtsea.append(allhgtseav[iff,:])
+                allxhgt.append(allxhgtv[iff])
+                allhgtxhgt.append(allhgtxhgtv[iff,:])
+                allpsea.append(allpseav[iff,:])
+                allpxhgt.append(allpxhgtv[iff,:])
+                alldhgtsea.append(alldhgtseav[iff,:])
+                alldhgtxhgt.append(alldhgtxhgtv[iff,:])
+                alldpsea.append(alldpseav[iff,:])
+                alldpxhgt.append(alldpxhgtv[iff,:])
+                alletaw.append(alletawv[iff,:])
+                alletau.append(alletauv[iff,:])
 
     # Legend

trunk/tools/drawing_tools.py

@@ -13479 +13479 @@
         hgtsxhgt = adpxhgt[ilab]
         dz = len(aetaw[ilab])
-        znw = aetaw[ilab][1:dz-1]
+        znw = np.array(list(aetaw[ilab][1:dz-1]) + [0,0])
 
         plt.plot(znw, hgtssea, linestyle='solid', marker=marks[ilab], linewidth=1.5, markersize=4, \
@@ -13510 +13510 @@
         dz = len(hgtssea)
 
-        plt.plot(hgtssea[1:dz], dhgtssea, linestyle='solid', marker=marks[ilab], linewidth=1.5,    \
+        plt.plot(hgtssea, dhgtssea, linestyle='solid', marker=marks[ilab], linewidth=1.5,    \
           markersize=4, label='$hgt_{sea}^{'+labels[ilab]+'}$', color=cols[ilab])
 #        if ilab == 0:
@@ -13549 +13549 @@
         if xx < nv: xx = xv
 
-        plt.plot(hgtssea[1:dz], dhgtssea, linestyle='solid', marker=marks[ilab], linewidth=1.5,    \
+        plt.plot(hgtssea, dhgtssea, linestyle='solid', marker=marks[ilab], linewidth=1.5,    \
           markersize=4, label='$p_{sea}^{'+labels[ilab]+'}$', color=cols[ilab])
 #        if ilab == 0:
@@ -13823 +13823 @@
         hgtsxhgt = adpxhgt[ilab]
         dz = len(aetaw[ilab])
-        znw = aetaw[ilab][1:dz-1]
+        znw = aetaw[ilab]
 
         plt.plot(znw, hgtssea, linestyle='solid', marker=marks[ilab], linewidth=1.5, \
@@ -13859 +13859 @@
         dz = len(hgtssea)
 
-        plt.plot(hgtssea[1:dz], dhgtssea, linestyle='solid', marker=marks[ilab],     \
+        plt.plot(hgtssea, dhgtssea, linestyle='solid', marker=marks[ilab],     \
           linewidth=1.5, markersize=4, label='$hgt_{sea}^{'+labels[ilab]+'}$',       \
           color=cols[ilab])
@@ -13904 +13904 @@
         if xx < nv: xx = xv
 
-        plt.plot(hgtssea[1:dz], dhgtssea, linestyle='solid', marker=marks[ilab],     \
+        plt.plot(hgtssea, dhgtssea, linestyle='solid', marker=marks[ilab],     \
           linewidth=1.5, markersize=4, label='$p_{sea}^{'+labels[ilab]+'}$',         \
           color=cols[ilab])