clean

ElectromagneticScattering/scattering.pro

@@ -383,7 +383,7 @@ Resolution {
   If (flag_study==RES_TMAT)
       { Name res_VPWall_helmholtz_vector;
       System {
-        { Name A; NameOfFormulation VPWMN_helmholtz_vector; Type ComplexValue; }
+        { Name T; NameOfFormulation VPWMN_helmholtz_vector; Type ComplexValue; }
       }
       Operation {
         CreateDir[Str[myDir]];
@@ -395,15 +395,15 @@ Resolution {
           Evaluate[ $NE  = Floor[Sqrt[$PE]] ];
           Evaluate[ $ME  = $NE*($NE+1) - Floor[$PE] ];
           If (pe==1)
-            Generate[A];
-            Solve[A];
+            Generate[T];
+            Solve[T];
           EndIf
-          GenerateRHS[A];
-          SolveAgain[A];
+          GenerateRHS[T];
+          SolveAgain[T];
           PostOperation[VPWM_postop~{pe}];
           Evaluate[$isN=1];
-          GenerateRHS[A];
-          SolveAgain[A];
+          GenerateRHS[T];
+          SolveAgain[T];
           PostOperation[VPWN_postop~{pe}];
         EndFor
         Evaluate[Python[]{"scattering_post.py"}];
@@ -460,7 +460,7 @@ PostProcessing {
   EndIf
 
   If (flag_study==RES_PW)
-    { Name PW_postpro  ; NameOfFormulation PW_helmholtz_vector;NameOfSystem P;
+    { Name PW_postpro  ; NameOfFormulation PW_helmholtz_vector; NameOfSystem P;
       Quantity {
         { Name E_tot             ; Value { Local { [{u}+Einc[]]; In All_domains; Jacobian JVol; } } }
         { Name E_scat            ; Value { Local { [{u}]; In All_domains; Jacobian JVol; } } }
@@ -478,10 +478,10 @@ PostProcessing {
       }
     }
   EndIf
+
   If (flag_study==RES_TMAT)
     For pe In {1:p_max}
-      // { Name VPWM_postpro~{pe}; NameOfFormulation VPWM_helmholtz_vector~{pe};NameOfSystem M~{pe};
-      { Name VPWM_postpro~{pe}; NameOfFormulation VPWMN_helmholtz_vector; NameOfSystem A;
+      { Name VPWM_postpro~{pe}; NameOfFormulation VPWMN_helmholtz_vector; NameOfSystem T;
         Quantity {
           { Name E_scat            ; Value { Local { [{u}]; In All_domains; Jacobian JVol; } } }
           { Name E_scat_sph        ; Value { Local { [Vector[
@@ -493,13 +493,12 @@ PostProcessing {
           { Name H_scat            ; Value { Local { [siwt*I[]/(mur[]*mu0*omega0)*{Curl u}]; In All_domains; Jacobian JVol; } } }
           { Name Mnm_source~{pe}   ; Value {    Local { [   Mnm_source~{pe}[] ]; In All_domains; Jacobian JVol; } } }
           For po In {1:p_max}
-            { Name a~{pe}~{po}     ; Value { Integral { [           (Cart2Sph[XYZ[]]*{u})*(Cart2Sph[XYZ[]]*Conj[Mnm_out~{pe}[]])]; In SurfInt; Integration Int_1 ; Jacobian JSur; } } }
-            { Name norma~{pe}~{po} ; Value { Integral { [(Cart2Sph[XYZ[]]*Mnm_out~{pe}[])*(Cart2Sph[XYZ[]]*Conj[Mnm_out~{pe}[]])]; In SurfInt; Integration Int_1 ; Jacobian JSur; } } }
+            { Name a~{pe}~{po}     ; Value { Integral { [            {u}*Conj[Mnm_out~{pe}[]] ]; In SurfInt; Integration Int_1 ; Jacobian JSur; } } }
+            { Name norma~{pe}~{po} ; Value { Integral { [ Mnm_out~{pe}[]*Conj[Mnm_out~{pe}[]] ]; In SurfInt; Integration Int_1 ; Jacobian JSur; } } }
           EndFor
         }
       }
-      // { Name VPWN_postpro~{pe}; NameOfFormulation VPWN_helmholtz_vector~{pe};NameOfSystem N~{pe};
-      { Name VPWN_postpro~{pe}; NameOfFormulation VPWN_helmholtz_vector~{pe};NameOfSystem A;
+      { Name VPWN_postpro~{pe}; NameOfFormulation VPWMN_helmholtz_vector; NameOfSystem T;
         Quantity {
           { Name E_scat            ; Value { Local { [{u}]; In All_domains; Jacobian JVol; } } }
           { Name E_scat_sph        ; Value { Local { [Vector[
@@ -514,6 +513,7 @@ PostProcessing {
       }
     EndFor
   EndIf
+
   If (flag_study==RES_GREEN)
     For ncomp In {0:2}
       { Name GreenAll_postpro~{ncomp}; NameOfFormulation GreenAll_helmholtz_vector~{ncomp};NameOfSystem M~{ncomp};
@@ -565,6 +565,7 @@ PostOperation {
       }
     }
   EndIf
+
   If (flag_study==RES_PW)
     {Name PW_postop; NameOfPostProcessing PW_postpro ;
       Operation {
@@ -585,6 +586,7 @@ PostOperation {
       }
     }
   EndIf
+
   If (flag_study==RES_TMAT)
     For pe In {1:p_max}
       {Name VPWM_postop~{pe}; NameOfPostProcessing VPWM_postpro~{pe} ;
@@ -627,6 +629,7 @@ PostOperation {
       }
     EndFor
   EndIf
+  
   If (flag_study==RES_GREEN)
     For ncomp In {0:2}
       {Name GreenAll_postop~{ncomp}; NameOfPostProcessing GreenAll_postpro~{ncomp} ;