Merge branch 'master' of https://gitlab.onelab.info/doc/models

ElectromagneticScattering/scattererTmatrix.geo

@@ -6,12 +6,13 @@
 Include "scattererTmatrix_data.geo";
 SetFactory("OpenCASCADE");
 
-In_n =  Sqrt[Fabs[epsr_In_re]];
+In_n  =  Sqrt[Fabs[epsr_In_re]];
+Out_n =  Sqrt[Fabs[epsr_Out_re]];
   
 paramaille_pml = paramaille/1.1;
 
-Out_lc        = lambda_bg/paramaille;
-PML_lc        = lambda_bg/paramaille_pml;
+Out_lc        = lambda0/(paramaille*Out_n);
+PML_lc        = lambda0/(paramaille_pml*Out_n);
 In_lc         = lambda0/(paramaille*In_n*refine_scat);
 CenterScat_lc = lambda0/(paramaille*In_n);
 If(flag_shape==ELL)

ElectromagneticScattering/scattererTmatrix.pro

@@ -54,11 +54,11 @@ Function{
 
   epsilonr[Scat_In]   = epsilonr_In[]  * TensorDiag[1.,1.,1.];
   epsilonr[Scat_Out]  = epsilonr_Out[] * TensorDiag[1.,1.,1.];
-  epsilonr[PMLs]      = pml_tens[];
+  epsilonr[PMLs]      = epsilonr_Out[] * pml_tens[];
                           
   epsilonr1[Scat_In]  = epsilonr_Out[] * TensorDiag[1.,1.,1.];
   epsilonr1[Scat_Out] = epsilonr_Out[] * TensorDiag[1.,1.,1.];                
-  epsilonr1[PMLs]     = pml_tens[];
+  epsilonr1[PMLs]     = epsilonr_Out[] * pml_tens[];
                           
   mur[Scat_In]        = TensorDiag[1.,1.,1.];
   mur[Scat_Out]       = TensorDiag[1.,1.,1.];
@@ -204,8 +204,8 @@ PostProcessing {
         { Name Mnm_source~{pe}  ; Value { Local { [   Mnm_source~{pe}[] ]; In All_domains; Jacobian JVol; } } }
 
         For po In {1:p_max}
-          { Name feM~{pe}~{po} ; Value { Integral { [ (1/r_pml_in)^2 *normalize_fenm_Z~{po}[]*  {u}*Conj[Znm~{po}[]]  ]; In SurfInt; Integration Int_1 ; Jacobian JSur; } } }
-          { Name fhM~{pe}~{po} ; Value { Integral { [ (1/r_pml_in)^2 *normalize_fhnm_X~{po}[]*  {u}*Conj[Xnm~{po}[]]  ]; In SurfInt; Integration Int_1 ; Jacobian JSur; } } }
+          { Name feM~{pe}~{po} ; Value { Integral { [ 1/(r_pml_in^2*epsilonr_Out[]) * normalize_fenm_Z~{po}[]*  {u}*Conj[Znm~{po}[]]  ]; In SurfInt; Integration Int_1 ; Jacobian JSur; } } }
+          { Name fhM~{pe}~{po} ; Value { Integral { [ 1/(r_pml_in^2*epsilonr_Out[]) * normalize_fhnm_X~{po}[]*  {u}*Conj[Xnm~{po}[]]  ]; In SurfInt; Integration Int_1 ; Jacobian JSur; } } }
         EndFor
       }
     }
@@ -215,8 +215,8 @@ PostProcessing {
         { Name H_scat            ; Value { Local { [siwt*I[]/(mur[]*mu0*omega0)*{Curl u}]; In All_domains; Jacobian JVol; } } }
         { Name Nnm_source~{pe}   ; Value {    Local { [   Nnm_source~{pe}[] ]; In All_domains; Jacobian JVol; } } }
         For po In {1:p_max}
-          { Name feN~{pe}~{po}  ; Value { Integral { [ (1/r_pml_in)^2 *normalize_fenm_Z~{po}[]*  {u}*Conj[Znm~{po}[]]  ]; In SurfInt; Integration Int_1 ; Jacobian JSur; } } }
-          { Name fhN~{pe}~{po}  ; Value { Integral { [ (1/r_pml_in)^2 *normalize_fhnm_X~{po}[]*  {u}*Conj[Xnm~{po}[]]  ]; In SurfInt; Integration Int_1 ; Jacobian JSur; } } }
+          { Name feN~{pe}~{po}  ; Value { Integral { [ 1/(r_pml_in^2*epsilonr_Out[]) *normalize_fenm_Z~{po}[]*  {u}*Conj[Znm~{po}[]]  ]; In SurfInt; Integration Int_1 ; Jacobian JSur; } } }
+          { Name fhN~{pe}~{po}  ; Value { Integral { [ 1/(r_pml_in^2*epsilonr_Out[]) *normalize_fhnm_X~{po}[]*  {u}*Conj[Xnm~{po}[]]  ]; In SurfInt; Integration Int_1 ; Jacobian JSur; } } }
         EndFor
       }
     }