Merge branch 'master' into reconnection

sources/integrals.F90

@@ -370,7 +370,7 @@ module integrals
     use coordinates    , only : ymin, ymax, xlen, zlen, yarea
     use equations      , only : idn, ipr, ivx, ivy, ivz, ibx, iby, ibz, ibp
     use equations      , only : ien, imx, imy, imz
-    use equations      , only : gamma, csnd
+    use equations      , only : magnetized, gamma, csnd
     use evolution      , only : step, time, dtn
     use mpitools       , only : master
 #ifdef MPI
@@ -440,7 +440,7 @@ module integrals
       mnarr(2) = 0.0d+00
       mxarr(2) = 0.0d+00
     end if
-    if (ibx < 1) then
+    if (.not. magnetized) then
       mnarr(4) = 0.0d+00
       mxarr(4) = 0.0d+00
       mnarr(5) = 0.0d+00
@@ -506,7 +506,7 @@ module integrals
 
 ! sum up magnetic energy
 !
-      if (ibx > 0) then
+      if (magnetized) then
 #if NDIMS == 3
         inarr(7) = inarr(7) + sum(pdata%u(ibx,nb:ne,nb:ne,nb:ne)**2            &
                                 + pdata%u(iby,nb:ne,nb:ne,nb:ne)**2            &
@@ -556,7 +556,7 @@ module integrals
 ! get average, minimum and maximum values of magnetic field amplitude, and
 ! divergence potential
 !
-      if (ibx > 0) then
+      if (magnetized) then
 #if NDIMS == 3
         mag(:,:,:) = sqrt(sum(pdata%q(ibx:ibz,nb:ne,nb:ne,nb:ne)**2, 1))
 #else /* NDIMS == 3 */
@@ -602,7 +602,7 @@ module integrals
 
 ! get average, minimum and maximum values of Alfvénic Mach number
 !
-      if (ibx > 0) then
+      if (magnetized) then
         tmp(:,:,:) = sqd(:,:,:) * vel(:,:,:) / max(eps, mag(:,:,:))
         avarr(7) = avarr(7) + sum(tmp(:,:,:)) * dvol
         mnarr(7) = min(mnarr(7), minval(tmp(:,:,:)))