From b830320972a02befa20855313ee1d20979bbce2b Mon Sep 17 00:00:00 2001
From: Guillaume Demesy <guillaume.demesy@fresnel.fr>
Date: Fri, 25 Nov 2022 14:21:17 +0100
Subject: [PATCH] simplify diff eff
---
DiffractionGratings/grating2D_conical.pro | 12 ++++++------
DiffractionGratings/grating3D.pro | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/DiffractionGratings/grating2D_conical.pro b/DiffractionGratings/grating2D_conical.pro
index a866832..0c9fada 100644
--- a/DiffractionGratings/grating2D_conical.pro
+++ b/DiffractionGratings/grating2D_conical.pro
@@ -453,13 +453,13 @@ PostProcessing {
For i In {0:2*nb_orders}
{ Name eff_t~{i} ; Value { Term{Type Global; [
- 1/(Ae^2*-beta1[]) * ( beta_subs~{i}[] * SquNorm[$int_x_t~{i}]+
- beta_subs~{i}[] * SquNorm[$int_y_t~{i}]+
- beta_subs~{i}[] * SquNorm[$int_z_t~{i}] ) ] ; In SurfCutSubs1 ; } } }
+ beta_subs~{i}[]/(Ae^2*-beta1[]) * ( SquNorm[$int_x_t~{i}]+
+ SquNorm[$int_y_t~{i}]+
+ SquNorm[$int_z_t~{i}] ) ] ; In SurfCutSubs1 ; } } }
{ Name eff_r~{i} ; Value { Term{Type Global; [
- 1/(Ae^2*-beta1[]) * ( beta_super~{i}[] * SquNorm[$int_x_r~{i}]+
- beta_super~{i}[] * SquNorm[$int_y_r~{i}]+
- beta_super~{i}[] * SquNorm[$int_z_r~{i}] ) ] ; In SurfCutSuper1 ; } } }
+ beta_super~{i}[]/(Ae^2*-beta1[]) * ( SquNorm[$int_x_r~{i}]+
+ SquNorm[$int_y_r~{i}]+
+ SquNorm[$int_z_r~{i}] ) ] ; In SurfCutSuper1 ; } } }
// // BUGGY
// { Name eff_t~{i} ; Value{ Term{Type Global; [
// 1/(Ae^2*beta_subs~{i}[]*-beta1[]) * ((beta_subs~{i}[]^2+gamma[]^2 )*SquNorm[$int_z_t~{i}]+
diff --git a/DiffractionGratings/grating3D.pro b/DiffractionGratings/grating3D.pro
index 544bc35..64f8f70 100644
--- a/DiffractionGratings/grating3D.pro
+++ b/DiffractionGratings/grating3D.pro
@@ -419,13 +419,13 @@ PostProcessing {
(gammar~{i}~{j}[]^2+ beta~{i}~{j}[]^2)*SquNorm[$int_y_r~{i}~{j}]+
2*alpha~{i}~{j}[]*beta~{i}~{j}[]*Re[$int_x_r~{i}~{j}*Conj[$int_y_r~{i}~{j}]]) ] ; In SurfIntTop ; } } }
{ Name eff_t2~{i}~{j} ; Value { Term{ Type Global; [
- 1/(gammat~{i}~{j}[]*-k1z[]*Cos[xsi]^2) * (gammat~{i}~{j}[]^2 * SquNorm[$int_x_t~{i}~{j}]+
- gammat~{i}~{j}[]^2 * SquNorm[$int_y_t~{i}~{j}]+
- gammat~{i}~{j}[]^2 * SquNorm[$int_z_t~{i}~{j}] ) ] ; In SurfIntBot ; } } }
+ gammat~{i}~{j}[]/(-k1z[]*Cos[xsi]^2) * ( SquNorm[$int_x_t~{i}~{j}]+
+ SquNorm[$int_y_t~{i}~{j}]+
+ SquNorm[$int_z_t~{i}~{j}] ) ] ; In SurfIntBot ; } } }
{ Name eff_r2~{i}~{j} ; Value { Term{ Type Global; [
- 1/(gammar~{i}~{j}[]*-k1z[]*Cos[xsi]^2) * (gammar~{i}~{j}[]^2 * SquNorm[$int_x_r~{i}~{j}]+
- gammar~{i}~{j}[]^2 * SquNorm[$int_y_r~{i}~{j}]+
- gammar~{i}~{j}[]^2 * SquNorm[$int_z_r~{i}~{j}] ) ] ; In SurfIntTop ; } } }
+ gammar~{i}~{j}[]/(-k1z[]*Cos[xsi]^2) * ( SquNorm[$int_x_r~{i}~{j}]+
+ SquNorm[$int_y_r~{i}~{j}]+
+ SquNorm[$int_z_r~{i}~{j}] ) ] ; In SurfIntTop ; } } }
{ Name numbering_ij~{i}~{j} ; Value { Term{ Type Global; [Vector[i-Nmax,j-Nmax,0]] ; In SurfIntBot ; } } }
EndFor
EndFor
--
GitLab