From 011eebbb9591a3b1b80ee02ad260a3d3a41684bf Mon Sep 17 00:00:00 2001
From: Guillaume Demesy <guillaume.demesy@fresnel.fr>
Date: Mon, 3 Oct 2022 10:24:10 +0200
Subject: [PATCH] clearer test case names
---
DiffractionGratings/README.txt | 2 +-
DiffractionGratings/grating3D_data.geo | 4 ++--
...D_data_bisin.geo => grating3D_data_bi_sinusoidal.geo} | 0
...ng3D_data_conv.geo => grating3D_data_convergence.geo} | 0
...lfellipsoid.geo => grating3D_data_half_ellipsoid.geo} | 0
...larcell.geo => grating3D_data_nanowire_solarcell.geo} | 0
...ellar.geo => grating3D_data_retrieve_2D_lamellar.geo} | 0
...D_data_skew.geo => grating3D_data_skewed_lattice.geo} | 0
DiffractionGratings/grating3D_parallel_Mmatrix.sh | 2 +-
DiffractionGratings/grating3D_runall.sh | 9 ++++-----
10 files changed, 8 insertions(+), 9 deletions(-)
rename DiffractionGratings/{grating3D_data_bisin.geo => grating3D_data_bi_sinusoidal.geo} (100%)
rename DiffractionGratings/{grating3D_data_conv.geo => grating3D_data_convergence.geo} (100%)
rename DiffractionGratings/{grating3D_data_halfellipsoid.geo => grating3D_data_half_ellipsoid.geo} (100%)
rename DiffractionGratings/{grating3D_data_solarcell.geo => grating3D_data_nanowire_solarcell.geo} (100%)
rename DiffractionGratings/{grating3D_data_2Dlamellar.geo => grating3D_data_retrieve_2D_lamellar.geo} (100%)
rename DiffractionGratings/{grating3D_data_skew.geo => grating3D_data_skewed_lattice.geo} (100%)
diff --git a/DiffractionGratings/README.txt b/DiffractionGratings/README.txt
index fa0bf74..51f6270 100644
--- a/DiffractionGratings/README.txt
+++ b/DiffractionGratings/README.txt
@@ -12,7 +12,7 @@ To run the test cases, type in terminal :
gmsh grating3D.pro -setstring test_case pyramid
gmsh grating3D.pro -setstring test_case hole
gmsh grating3D.pro -setstring test_case torus
-gmsh grating3D.pro -setstring test_case halfellipsoid
+gmsh grating3D.pro -setstring test_case half_ellipsoid
gmsh grating3D.pro -setstring test_case checker
gmsh grating3D.pro -setstring test_case bisin
diff --git a/DiffractionGratings/grating3D_data.geo b/DiffractionGratings/grating3D_data.geo
index d085052..4862669 100644
--- a/DiffractionGratings/grating3D_data.geo
+++ b/DiffractionGratings/grating3D_data.geo
@@ -1,8 +1,8 @@
DefineConstant[
- test_case = {"halfellipsoid",
+ test_case = {"half_ellipsoid",
Name "1Geometry",
- Choices {"hole", "pyramid", "torus", "2Dlamellar", "solarcell", "conv", "skew"},
+ Choices {"half_ellipsoid", "hole", "pyramid", "torus", "bi_sinusoidal", "retrieve_2D_lamellar", "nanowire_solarcell", "convergence", "skewed_lattice"},
GmshOption "Reset", Autocheck 0
}
];
diff --git a/DiffractionGratings/grating3D_data_bisin.geo b/DiffractionGratings/grating3D_data_bi_sinusoidal.geo
similarity index 100%
rename from DiffractionGratings/grating3D_data_bisin.geo
rename to DiffractionGratings/grating3D_data_bi_sinusoidal.geo
diff --git a/DiffractionGratings/grating3D_data_conv.geo b/DiffractionGratings/grating3D_data_convergence.geo
similarity index 100%
rename from DiffractionGratings/grating3D_data_conv.geo
rename to DiffractionGratings/grating3D_data_convergence.geo
diff --git a/DiffractionGratings/grating3D_data_halfellipsoid.geo b/DiffractionGratings/grating3D_data_half_ellipsoid.geo
similarity index 100%
rename from DiffractionGratings/grating3D_data_halfellipsoid.geo
rename to DiffractionGratings/grating3D_data_half_ellipsoid.geo
diff --git a/DiffractionGratings/grating3D_data_solarcell.geo b/DiffractionGratings/grating3D_data_nanowire_solarcell.geo
similarity index 100%
rename from DiffractionGratings/grating3D_data_solarcell.geo
rename to DiffractionGratings/grating3D_data_nanowire_solarcell.geo
diff --git a/DiffractionGratings/grating3D_data_2Dlamellar.geo b/DiffractionGratings/grating3D_data_retrieve_2D_lamellar.geo
similarity index 100%
rename from DiffractionGratings/grating3D_data_2Dlamellar.geo
rename to DiffractionGratings/grating3D_data_retrieve_2D_lamellar.geo
diff --git a/DiffractionGratings/grating3D_data_skew.geo b/DiffractionGratings/grating3D_data_skewed_lattice.geo
similarity index 100%
rename from DiffractionGratings/grating3D_data_skew.geo
rename to DiffractionGratings/grating3D_data_skewed_lattice.geo
diff --git a/DiffractionGratings/grating3D_parallel_Mmatrix.sh b/DiffractionGratings/grating3D_parallel_Mmatrix.sh
index 9d91ff0..af003d4 100644
--- a/DiffractionGratings/grating3D_parallel_Mmatrix.sh
+++ b/DiffractionGratings/grating3D_parallel_Mmatrix.sh
@@ -6,7 +6,7 @@ export NPROC=96
export lambda_min=400
export lambda_max=800
export FLAG_TOTAL=0
-export GRATING_CASE="halfellipsoid"
+export GRATING_CASE="half_ellipsoid"
export myDir="res_Matrix_nb_lam"$nb_lam"_nb_phi"$nb_phi"_total"$FLAG_TOTAL
export myFile="run_phideg_values_"$nb_phi".out"
diff --git a/DiffractionGratings/grating3D_runall.sh b/DiffractionGratings/grating3D_runall.sh
index 03c3d6f..9a90a02 100644
--- a/DiffractionGratings/grating3D_runall.sh
+++ b/DiffractionGratings/grating3D_runall.sh
@@ -1,8 +1,7 @@
rm -r res3D*
-# for t in bisin checker halfellipsoid hole pyramid torus 2Dlamellar solarcell conv skew
-# for t in halfellipsoid torus
-for t in halfellipsoid
+# for t in bi_sinusoidal checker half_ellipsoid hole pyramid torus retrieve_2D_lamellar nanowire_solarcell convergence skewed_lattice
+for t in half_ellipsoid
do
for f in 0 1
do
@@ -11,8 +10,8 @@ do
done
done
-# for t in bisin checker halfellipsoid hole pyramid torus 2Dlamellar solarcell conv skew
-for t in halfellipsoid
+# for t in bi_sinusoidal checker half_ellipsoid hole pyramid torus retrieve_2D_lamellar nanowire_solarcell convergence skewed_lattice
+for t in half_ellipsoid
do
for f in 0 1
do
--
GitLab