diff --git a/Cohomology/indheat.pro b/Cohomology/indheat.pro
index 67aefe583d45b1bea37ffbe391ac13a2b2e84b3b..caf4a2a80b77c4026fff7b95ef9f05dcdd9dbddc 100644
--- a/Cohomology/indheat.pro
+++ b/Cohomology/indheat.pro
@@ -330,14 +330,16 @@ Formulation {
       Galerkin { DtDof [ rho[]*c[] * Dof{t} , {t} ];
 	In Omega_c2; Integration Int; Jacobian Vol;  }
 
-      Galerkin { [ -0.5/sigma[]*<h>[Re[{d h}]*Re[{d h}] + Im[{d h}]*Im[{d h}]], {t} ];
+      // <h>[ ... ] indicates that the argument should be evaluated in complex
+      // arithmetic (because h is computed in the frequency domain) - otherwise
+      // only the real part of {d h} would be considered, as the thermal
+      // resolution is not solved in the frequency domain.
+      //
+      // <h>[SquNorm[{d h}]] is identical to
+      //    <h>[Re[{d h}]*Re[{d h}] + Im[{d h}]*Im[{d h}]]
+      Galerkin { [ -0.5/sigma[] * <h>[SquNorm[{d h}]], {t} ];
       	In Omega_c2; Integration Int; Jacobian Vol;  }
 
-      // Identical to:
-      // Galerkin { [ -0.5/sigma[]*<h>[SquNorm[{d h}]], {t} ];
-      // In Omega_c2; Integration Int; Jacobian Vol;  }
-
-
       Galerkin { [ h[]*Dof{t} , {t} ] ;
 	In BdOmega_c2; Jacobian Sur ; Integration Int ; }
       Galerkin { [ -h[]*AmbT[] , {t} ] ;
@@ -404,7 +406,7 @@ PostProcessing {
 	    In Omega; Jacobian Vol; } } }
       { Name j; Value{ Local{ [ {d t} ] ;
 	    In Omega_c; Jacobian Vol; } } }
-      { Name q; Value{ Local{ [ 1./sigma[]*( Re[{d t}]*Re[{d t}] + Im[{d t}]*Im[{d t}]) ] ;
+      { Name q; Value{ Local{ [ 1./sigma[] * SquNorm[{d t}] ] ;
 	    In Omega_c; Jacobian Vol; } } }
       { Name b; Value{ Local{ [ mu[]*({t}) ] ;
             In Omega; Jacobian Vol; } } }
@@ -445,7 +447,7 @@ PostProcessing {
 	    In Omega; Jacobian Vol; } } }
       { Name j; Value{ Local{ [  -sigma[]*(Dt[ {a} ] + {e}) ]  ;
           In Omega_c; Jacobian Vol; } } }
-      { Name q; Value{ Local{ [  sigma[]*( Re[(Dt[ {a} ] + {e})]*Re[(Dt[ {a} ] + {e})] + Im[(Dt[ {a} ] + {e})]*Im[(Dt[ {a} ] + {e})]) ]  ;
+      { Name q; Value{ Local{ [  sigma[]* SquNorm[Dt[ {a} ] + {e}] ]  ;
           In Omega_c; Jacobian Vol; } } }
       { Name h; Value{ Local{ [ 1./mu[]*({d a}) ] ;
             In Omega; Jacobian Vol; } } }
@@ -475,7 +477,7 @@ PostProcessing {
 	    In Omega_c2; Jacobian Vol; } } }
       { Name q; Value{ Local{ [ -k[]*{d t} ] ;
 	    In Omega_c2; Jacobian Vol; } } }
-      { Name p; Value{ Local{ [ 1./sigma[]*( Re[{d h}]*Re[{d h}] + Im[{d h}]*Im[{d h}] ) ] ;
+      { Name p; Value{ Local{ [ 1./sigma[]* <h>[SquNorm[{d h}]] ] ;
             In Omega_c2; Jacobian Vol; } } }
     }
   }