diff --git a/DiffractionGratings/grating2D.pro b/DiffractionGratings/grating2D.pro index 2a2d13317923cce950032b0851045dc6d5d1cf2c..3154601175fbbf8ca8f7bee61afb6976f29db3dd 100644 --- a/DiffractionGratings/grating2D.pro +++ b/DiffractionGratings/grating2D.pro @@ -10,7 +10,7 @@ Include "grating2D_data_LamellarGrating.geo"; Include "grating2D_materials.pro"; -myDir = "run_results/"; +myDir = "res2D/"; DefineConstant[ lambda0 = {lambda_min , Min lambda_min, Max lambda_max, Step (lambda_max-lambda_min)/(nb_lambdas-1), Name StrCat[pp2, "0wavelength [nm]"] , Loop 1, Highlight Str[colorpp2],Graph "200000200020", ServerAction "Reset GetDP/T0, GetDP/R0, GetDP/Lambda_step, GetDP/total absorption"} ]; diff --git a/DiffractionGratings/grating2D_postplot.py b/DiffractionGratings/grating2D_postplot.py index 3cf37400329fefc9de7316931baa371f0386be16..89ccab2c0e3851ef87521756648d282ab051844e 100644 --- a/DiffractionGratings/grating2D_postplot.py +++ b/DiffractionGratings/grating2D_postplot.py @@ -7,9 +7,9 @@ import scipy as sc import matplotlib import pylab as pl pi=np.pi -respath = 'run_results/' -nb_orders = int(int(subprocess.check_output("ls ./run_results/efficiency_r_* | grep -c efficiency_r_", shell=True))/2) -nb_rods = int(int(subprocess.check_output("ls ./run_results/absorption-Q_rod_* | grep -c absorption-Q_rod_", shell=True))-1) +respath = 'res2D/' +nb_orders = int(int(subprocess.check_output("ls ./res2D/efficiency_r_* | grep -c efficiency_r_", shell=True))/2) +nb_rods = int(int(subprocess.check_output("ls ./res2D/absorption-Q_rod_* | grep -c absorption-Q_rod_", shell=True))-1) zerotol = 0.001 if len(np.loadtxt(respath+'efficiency_r_0.txt').shape)==2: tab_lambdas = np.loadtxt(respath+'temp_lambda_step.txt')[:,8] diff --git a/DiffractionGratings/grating3D.pro b/DiffractionGratings/grating3D.pro index 7525723d236270598f875eff1c82dce7d0d2e754..187d8dca103c92401787c40d786473c1b6b7ecbf 100644 --- a/DiffractionGratings/grating3D.pro +++ b/DiffractionGratings/grating3D.pro @@ -7,7 +7,7 @@ Include StrCat["grating3D_data_",test_case,".geo"]; Include "grating3D_materials.pro" -myDir = "run_results3D/"; +myDir = "res3D/"; Group { // SubDomains diff --git a/DiffractionGratings/grating3D_postplot.py b/DiffractionGratings/grating3D_postplot.py index aae37de7a1921e336029307817a2dbc64065bc5b..2e3d289a991bbad4ab095a9b29fb0319dfcf5e29 100644 --- a/DiffractionGratings/grating3D_postplot.py +++ b/DiffractionGratings/grating3D_postplot.py @@ -1,5 +1,5 @@ import numpy as np -myDir = 'run_results3D/' +myDir = 'res3D/' Rnm = np.loadtxt(myDir+'eff_r.txt')[:,1] Tnm = np.loadtxt(myDir+'eff_t.txt')[:,1] Q = [np.loadtxt(myDir+'temp-Q_L_%g.txt'%k)[1] for k in range(2,7)] diff --git a/DiffractionGratings/grating3D_runall.sh b/DiffractionGratings/grating3D_runall.sh index 8b91278baa427e4ba05dc3a97a74ed63aa5d53fe..823b749e86a01a79b9f55ce4847d43ccfc002870 100644 --- a/DiffractionGratings/grating3D_runall.sh +++ b/DiffractionGratings/grating3D_runall.sh @@ -1 +1,5 @@ -for test \ No newline at end of file +for t in bisin checker halfellipsoid hole pyramid torus +do + gmsh grating3D.pro -setstring test_case $t + mv res3D res3D_$t +done \ No newline at end of file diff --git a/DiffractionGratings/gratings_clean_all.sh b/DiffractionGratings/gratings_clean_all.sh index 9d322ec29f6677c2a06e191a3e0adfd7855cf563..0163b40b30bd7e8ee155d5431f2f82d87484263f 100644 --- a/DiffractionGratings/gratings_clean_all.sh +++ b/DiffractionGratings/gratings_clean_all.sh @@ -1,5 +1,5 @@ -rm -rf ./run_results -rm -rf ./run_results3D +rm -rf ./res2D +rm -rf ./res3D rm *.msh rm *.pre rm *.db