add logos to acknowledge funding

Author: danielru

img/BMBF_gefoerdert_2017_en.jpg

@@ -11,35 +11,29 @@
 import matplotlib.pyplot as plt
 from subprocess import call
 from pylab import rcParams
+from parameter import parameter
 
 from pseudo_spectral_radius import pseudo_spectral_radius
 
 
-Tend    = 1.0
-nslices = 10
-tol     = 0.0
-maxiter = 9
-nfine   = 10
-ncoarse = 10
+par = parameter(dedalus = True)
+Tend, nslices, maxiter, nfine, ncoarse, tol, epsilon, ndof_f = par.getpar()
 
-ndof_f   = 32
 # for 24 DoF, Parareal diverges, for 30 DoF, you get convergence. Of course, speedup would be impossible here.
 try:
-  figure      =  int(sys.argv[1]) # 9 generates figure_9, 10 generates figure_10
+  figure      =  int(sys.argv[1]) 
 except:
-  print("No or wrong command line argument provided, creating figure 9. Use 9 or 10 as command line argument.")
-  figure = 9
+  print("No or wrong command line argument provided, creating figure 11. Use 11 or 12 as command line argument.")
+  figure = 11
 
-if figure==9:
+if figure==11:
   ndof_c   = 24
-  filename = 'figure_9.pdf'
-elif figure==10:
+  filename = 'figure_11.pdf'
+elif figure==12:
   ndof_c   = 30
-  filename = 'figure_10.pdf'
+  filename = 'figure_12.pdf'
 else:
-  sys.exit("Figure needs to be 9 or 10")
-
-epsilon = 0.1
+  sys.exit("Figure needs to be 11 or 12")
 
 u0fine = solution_dedalus(np.zeros(ndof_f), ndof_f)
 u0coarse = solution_dedalus(np.zeros(ndof_c), ndof_c)

img/EuroHPC.jpg

@@ -13,23 +13,16 @@
 from solution_linear import solution_linear
 from get_matrix import get_upwind, get_centered
 from pseudo_spectral_radius import pseudo_spectral_radius
+from parameter import parameter
 
 from pylab import rcParams
 import matplotlib.pyplot as plt
 from subprocess import call
 
-Tend    = 1.0
-nslices = 10
-tol     = 0.0
-maxiter = 9
-nfine   = 10
-ncoarse = 1
-
-ndof_f   = 32
+par = parameter(dedalus = False)
+Tend, nslices, maxiter, nfine, ncoarse, tol, epsilon, ndof_f = par.getpar()
 ndof_c   = 24
 
-epsilon = 0.1
-
 xaxis_f = np.linspace(0.0, 2.0, ndof_f+1)[0:ndof_f]
 dx_f    = xaxis_f[1] - xaxis_f[0]
 
@@ -41,19 +34,19 @@
 try:
   figure      =  int(sys.argv[1]) # 1 generates figure_1, 2 generates figure_2
 except:
-  print("No or wrong command line argument provided, creating figure 1. Use 1 or 2 as command line argument.")
-  figure = 1
+  print("No or wrong command line argument provided, creating figure 13. Use 13 or 14 as command line argument.")
+  figure = 13
 
-if figure==1:
+if figure==13:
   A_f = get_upwind(ndof_f, dx_f)
   A_c = get_upwind(ndof_c, dx_c)
-  
-elif figure==2:
+  filename = 'figure_13.pdf'
+elif figure==14:
   A_f = get_centered(ndof_f, dx_f)
   A_c = get_centered(ndof_c, dx_c)
- 
+  filename = 'figure_14.pdf'
 else:
-  sys.exit("Figure should be set to 1 or 2")
+  sys.exit("Figure should be set to 13 or 14")
 
 D = A_f*A_f.H - A_f.H*A_f
 print("Normality number of the system matrix (this should be zero): %5.3f" % np.linalg.norm(D.todense()))
@@ -65,7 +58,7 @@
 
 u0coarse = solution_linear(np.zeros(ndof_c), A_c)
 
-if figure==1:
+if figure==13:
   para     = parareal(0.0, Tend, nslices, impeuler, impeuler, nfine, ncoarse, tol, maxiter, u0fine, u0coarse)
 else:
   para     = parareal(0.0, Tend, nslices, trapezoidal, trapezoidal, nfine, ncoarse, tol, maxiter, u0fine, u0coarse)
@@ -99,8 +92,8 @@
 ms = 4
 fig = plt.figure(1)
 plt.semilogy(range(1,maxiter+1), defect_l2[0,:], 'bo-', markersize=ms, label=r'$|| e^k ||$')
-plt.semilogy(range(1,5), [E_norm**(val-1)*1.1*defect_l2[0,0] for val in range(1,5)], 'b--', label=r'$|| E ||_2^k$')
-plt.semilogy(range(1,5), [psr**(val-1)*1.1*defect_l2[0,0] for val in range(1,5)], 'r-.', label=r'$\sigma_{\epsilon}(E)^k$')
+plt.semilogy(range(1,5), [E_norm**(val-1)*2.0*defect_l2[0,0] for val in range(1,5)], 'b-.', label=r'$|| E ||_2^k$', linewidth=2)
+plt.semilogy(range(1,5), [psr**(val-1)*2.0*defect_l2[0,0] for val in range(1,5)], 'r--', label=r'$\sigma_{\epsilon}(E)^k$', linewidth=2)
 plt.legend(loc='upper right', fontsize=fs, prop={'size':fs-2}, handlelength=3)
 plt.xlim([1, maxiter+1])
 plt.ylim([1e-5, 1e3])
@@ -110,12 +103,6 @@
 #plt.ylim([1e-15, 1e1])
 plt.xlim([1, maxiter+1])
 plt.xticks(range(2,maxiter,2))
-if figure==1:
-  filename = 'figure_1.pdf'
-elif figure==2:
-  filename = 'figure_2.pdf'
-else:
-  quit()
 plt.gcf().savefig(filename, bbox_inches='tight')
 call(["pdfcrop", filename, filename])
 plt.show()

img/LogoTime-X.png

@@ -11,36 +11,33 @@
 from solution_dedalus import solution_dedalus
 
 from pseudo_spectral_radius import pseudo_spectral_radius
+from parameter import parameter
 
 from pylab import rcParams
 import matplotlib.pyplot as plt
 from subprocess import call
 
-Tend    = 1.0
-nslices = 10
-tol     = 0.0
-maxiter = 9
-nfine   = 10
+par = parameter(dedalus = True)
+Tend, nslices, maxiter, nfine, ncoarse, tol, epsilon, ndof_f = par.getpar()
 ncoarse = 10
 
-ndof_f   = 32
 
 # for 24 DoF, Parareal diverges, for 30 DoF, you get convergence. Of course, speedup would be impossible here.
 try:
   figure      =  int(sys.argv[1]) # 3 generates figure_3, 4 generates figure_4
 except:
-  print("No or wrong command line argument provided, creating figure 3. Use 3 or 4 as command line argument.")
-  figure = 3
+  print("No or wrong command line argument provided, creating figure 15. Use 15 or 16 as command line argument.")
+  figure = 15
 
-if figure==3:
+if figure==15:
   ndof_c   = 24
-elif figure==4:
+  filename = 'figure_15.pdf'
+elif figure==16:
   ndof_c   = 30   
+  filename = 'figure_16.pdf'
 else:
-  sys.exit("Set figure to 1 or 2")
+  sys.exit("Set figure to 15 or 16")
 
-epsilon = 0.1
-
 u0fine   = solution_dedalus(np.zeros(ndof_f), ndof_f)
 u0coarse = solution_dedalus(np.zeros(ndof_c), ndof_c)
 para     = parareal(0.0, Tend, nslices, integrator_dedalus, integrator_dedalus, nfine, ncoarse, tol, maxiter, u0fine, u0coarse)
@@ -79,9 +76,9 @@
 ms = 4
 fig = plt.figure(1)
 plt.semilogy(range(1,maxiter+1), defect_l2[0,:], 'bo-', markersize=ms, label=r'$|| e^k ||$')
-plt.semilogy(range(1,5), [E_norm**(val-1)*1.1*defect_l2[0,0] for val in range(1,5)], 'b--', label=r'$|| E ||_2^k$')
-plt.semilogy(range(1,5), [psr**(val-1)*1.1*defect_l2[0,0] for val in range(1,5)], 'r-.', label=r'$\sigma_{\epsilon}(E)^k$')
-if figure==3:
+plt.semilogy(range(1,5), [E_norm**(val-1)*2.0*defect_l2[0,0] for val in range(1,5)], 'b-.', label=r'$|| E ||_2^k$', linewidth=2)
+plt.semilogy(range(1,5), [psr**(val-1)*2.0*defect_l2[0,0] for val in range(1,5)], 'r--', label=r'$\sigma_{\epsilon}(E)^k$', linewidth=2)
+if figure==15:
     plt.legend(loc='lower right', fontsize=fs, prop={'size':fs-2}, handlelength=3)
 else:
     plt.legend(loc='upper right', fontsize=fs, prop={'size':fs-2}, handlelength=3)
@@ -94,12 +91,6 @@
 #plt.ylim([1e-15, 1e1])
 plt.xlim([1, maxiter+1])
 plt.xticks(range(2,maxiter,2))
-if figure==3:
-    filename = 'figure_3.pdf'
-elif figure==4:
-    filename = 'figure_4.pdf'
-else:
-    quit()
 plt.gcf().savefig(filename, bbox_inches='tight')
 call(["pdfcrop", filename, filename])
 plt.show()

scripts/pseudo-spectrum/figure_9_10.py renamed to scripts/pseudo-spectrum/figure_11-12.py

@@ -12,6 +12,7 @@
 import scipy.sparse as sparse
 from scipy.linalg import svdvals
 import math
+from parameter import parameter
 
 import matplotlib.pyplot as plt
 from subprocess import call
@@ -20,14 +21,9 @@
 from pseudo_spectral_radius import pseudo_spectral_radius
 
 
-Tend    = 1.0
-nslices = 10
-tol     = 0.0
-maxiter = 9
-nfine   = 10
-ncoarse = 1
+par = parameter(dedalus = False)
+Tend, nslices, maxiter, nfine, ncoarse, tol, epsilon, ndof_f = par.getpar()
 
-ndof_f   = 32
 ndof_c   = 24
 
 epsilon = 0.1
@@ -43,28 +39,28 @@
 try:
   figure      =  int(sys.argv[1]) # 7 generates figure_7, 8 generates figure_8
 except:
-  print("No or wrong command line argument provided, creating figure 7. Use 7 or 8 as command line argument.")
-  figure = 7
+  print("No or wrong command line argument provided, creating figure 9. Use 9 or 10 as command line argument.")
+  figure = 9
 
-if figure==7:
+if figure==9:
   A_f = get_upwind(ndof_f, dx_f)
   A_c = get_upwind(ndof_c, dx_c)
-  
-elif figure==8:
+  filename = 'figure_9.pdf'
+elif figure==10:
   A_f = get_centered(ndof_f, dx_f)
   A_c = get_centered(ndof_c, dx_c)
- 
+  filename = 'figure_10.pdf'
 else:
-  quit()
+  sys.exit("Wrong value for figure")
 
 D = A_f*A_f.H - A_f.H*A_f
 print("Normality number of the system matrix (this should be zero): %5.3f" % np.linalg.norm(D.todense()))
 u0fine   = solution_linear(np.zeros(ndof_f), A_f)
 u0coarse = solution_linear(np.zeros(ndof_c), A_c)
 
-if figure==7:
+if figure==9:
   para     = parareal(0.0, Tend, nslices, impeuler, impeuler, nfine, ncoarse, tol, maxiter, u0fine, u0coarse)
-elif figure==8:
+elif figure==10:
   para     = parareal(0.0, Tend, nslices, trapezoidal, trapezoidal, nfine, ncoarse, tol, maxiter, u0fine, u0coarse)
 Pmat, Bmat = para.get_parareal_matrix()
 
@@ -91,7 +87,7 @@
     sigmin[j,i] = np.min(sv)
     circs[j,i]  = np.sqrt(lambda_real[i]**2 + lambda_imag[j]**2)
     if np.min(sv) > abs(z):
-      print("You were wrong!!!")
+      print("This should not happen")
       print("sv-min: %5.3e" % np.min(sv))
       print("abs(z): %5.3e" % abs(z))
 
@@ -106,12 +102,6 @@
 plt.ylabel(r'Imaginary part', fontsize=fs)
 plt.title(r'$1/|| (z - E)^{-1} \||_2$')
 ax.plot(0.0, 0.0, 'k+', markersize=fs)
-if figure==7:
-  filename = 'figure_7.pdf'
-elif figure==8:
-  filename = 'figure_8.pdf'
-else:
-  quit()
 plt.gcf().savefig(filename, bbox_inches='tight')
 call(["pdfcrop", filename, filename])
 plt.show()