diff --git a/DiffractionGratings/grating3D.geo b/DiffractionGratings/grating3D.geo index c992df75a5778cbb35873d0422c62f5d2eec15e3..9912a627dbce91d6f3eb39ebf7e1531e3713fac6 100644 --- a/DiffractionGratings/grating3D.geo +++ b/DiffractionGratings/grating3D.geo @@ -291,9 +291,9 @@ For k In {0:8} EndFor -// If (tag_geom==3) // Split U weird otherwise -// Mesh.Algorithm = 6; -// EndIf +If (tag_geom==3) // Split U weird otherwise + Mesh.Algorithm = 6; +EndIf // Mesh.SurfaceEdges = 0; diff --git a/DiffractionGratings/grating3D_data.geo b/DiffractionGratings/grating3D_data.geo index c68d152ccb3f96b1a44ba49f79d034d2a644c338..d7588084f3c8d3af6453a6e3e27a15ca81d61406 100644 --- a/DiffractionGratings/grating3D_data.geo +++ b/DiffractionGratings/grating3D_data.geo @@ -1,6 +1,6 @@ DefineConstant[ - skewed_lattice = {"skewed_lattice", + test_case = {"skewed_lattice", Name "1Geometry", Choices {"half_ellipsoid", "hole", "pyramid", "U", "bi_sinusoidal", "retrieve_2D_lamellar", "nanowire_solarcell", "convergence", "skewed_lattice"}, GmshOption "Reset", Autocheck 0 diff --git a/DiffractionGratings/grating3D_parallel_Mmatrix.sh b/DiffractionGratings/grating3D_parallel_Mmatrix.sh index bf1cee524f19da2d5608996ab91339c5e513aa72..ffad7ef72f962aeb53d5c488e42dfcb385e35a27 100644 --- a/DiffractionGratings/grating3D_parallel_Mmatrix.sh +++ b/DiffractionGratings/grating3D_parallel_Mmatrix.sh @@ -2,18 +2,19 @@ export OPENBLAS_NUM_THREADS=1 export OMP_NUM_THREADS=1 export NPROC=96 - -export nb_lam=100 -export nb_phi=59 +export nb_lam=1 +export nb_phi=1 +# export nb_lam=100 +# export nb_phi=59 export lambda_min=350 export lambda_max=800 export FLAG_TOTAL=0 -export GRATING_CASE="U" +export GRATING_CASE="half_ellipsoid" export myDir="res_Matrix_nb_lam"$nb_lam"_nb_phi"$nb_phi"_total"$FLAG_TOTAL rm -r $myDir mkdir $myDir -gmsh grating3D.geo -3 -o grating3D.msh +gmsh grating3D.geo -setstring test_case $GRATING_CASE -3 -o grating3D.msh myfunc() { local mysubDir=$myDir/run_lam$1_phi$2_psi$3