updates

calc_E.py

@@ -29,12 +29,18 @@ if argv[0]=='':
 else:
     date_0 = datetime(int(argv[2]),int(argv[3]),int(argv[4]),int(argv[5]))
     trapath = argv[1]
+    print(date_0)
 
 fname = "traj" + date_0.strftime('_%Y%m%d_%H') + ".npy"
 trajs = np.load(trapath + fname)
 
+for a in [0,1]:
+    if a == 0:
 
         t_sel = np.arange(0,int(trajs.shape[1]/2)+1)
+    else:
+        t_sel = np.arange(int(trajs.shape[1]/2),trajs.shape[1])
+
 
     z_coord_type = "p"
 

calc_E.sh

 #!/bin/bash
 
-#SBATCH --array=1-24                                                                                   
+#SBATCH --array=9-23                                                                                   
 
-year=2016
+year=2017
 TRAPATH=/net/scratch/schoelleh96/WP2/WP2.1/LAGRANTO/wp21/era5/traj
 CSPATH=/net/scratch/schoelleh96/WP2/WP2.1/LAGRANTO/csstandalone
 
@@ -16,4 +16,6 @@ M1=${filename:9:2}
 D1=${filename:11:2}
 H1=${filename:14:2}
 
+source /home/schoelleh96/Applications/envs/wp21env/bin/activate
+
 python ${CSPATH}/calc_E.py ${TRAPATH}/${year}/ ${Y1} ${M1} ${D1} ${H1}

main.py

@@ -32,12 +32,12 @@ n = 1
 
 force_calc = False
 
-date_0 = datetime(2017,1,25,0)
+date_0 = datetime(2016,5,2,0)
 fname = "../wp21/era5/traj/" + date_0.strftime('%Y/traj_%Y%m%d_%H') + ".npy"
 
 B = dd.get_block_dat(date_0)
 if date_0.strftime("%Y") == "2016":
-    coasts = dd.get_coasts(10, 90, -60, -240)
+    coasts = dd.get_coasts(10, 90, 0, -360)
 elif date_0.strftime("%Y") == "2017":
     coasts = dd.get_coasts(10, 90, 120, -60)
 
@@ -60,6 +60,7 @@ if direc=="whole":
 elif direc=="forward":
     t_sel = np.arange(int(trajs.shape[1]/2),trajs.shape[1])
     plot_0 = 0
+    B = list(B[12:,:,:], B[1], B[2])
 
 elif direc=="backward":
     t_sel = np.arange(0,int(trajs.shape[1]/2)+1)
@@ -488,16 +489,19 @@ if True:
 
     keys, inv = np.unique(kclust.labels_, return_inverse=True)
     vals = np.array([colors[key] for key in keys])
+    # to remove Null-Level-Set cluster (assuming its cluster 5):
+    # dat = dat[inv!=5, :]
+    # inv = inv[inv !=5]
     pp.plot_spaghetti(ax_spag, dat, alpha_spag, colors=colors, inv=inv)
 
-    v = pp.draw_vert_t(ax_spag, 0, lon.shape[1], t_slider2.val)
+    v = pp.draw_vert_t(ax_spag, t_sel[0]-72, t_sel[-1] -72, t_slider2.val -72)
     plt.show()
 
     def var_changed(val):
         dat = trajs[var_check.value_selected][::n, t_sel]
         ax_spag.clear()
         pp.plot_spaghetti(ax_spag, dat, alpha_spag, colors=colors, inv=inv)
-        pp.draw_vert_t(ax_spag, 0, lon.shape[1], t_slider2.val)
+        pp.draw_vert_t(ax_spag, t_sel[0]-72, t_sel[-1] -72, t_slider2.val -72)
         fig_spag.canvas.draw_idle()
 
     var_check.on_clicked(var_changed)