From 708583d4fc6a388e4da1efa783486fda6369a506 Mon Sep 17 00:00:00 2001
From: Guillaume Demesy <guillaume.demesy@fresnel.fr>
Date: Thu, 21 Nov 2019 13:02:30 +0100
Subject: [PATCH] res instead of run_results
---
DiffractionGratings/grating2D.pro | 2 +-
DiffractionGratings/grating2D_postplot.py | 6 +++---
DiffractionGratings/grating3D.pro | 2 +-
DiffractionGratings/grating3D_postplot.py | 2 +-
DiffractionGratings/grating3D_runall.sh | 6 +++++-
DiffractionGratings/gratings_clean_all.sh | 4 ++--
6 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/DiffractionGratings/grating2D.pro b/DiffractionGratings/grating2D.pro
index 2a2d133..3154601 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 3cf3740..89ccab2 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 7525723..187d8dc 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 aae37de..2e3d289 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 8b91278..823b749 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 9d322ec..0163b40 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
--
GitLab