Merge branch 'fix_Tmatrix_code_epsr_background' into 'master'

Fix tmatrix code epsr background

See merge request !10

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.];
@@ -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
       }
     }