mask_mean_dev: changes suggested by @certik

Author: jvdp1

src/tests/stats/test_mean.f90

@@ -44,9 +44,9 @@ program test_mean
 call assert( any(isnan(mean(d, 2, .false.))))
 
 ! check mask of the same shape as input
-call assert( abs(mean(d, d > 0._dp) - sum(d, d > 0._dp)/real(count(d > 0._dp), dp)) < dptol)
-call assert( sum(abs(mean(d, 1, d > 0._dp) - sum(d, 1, d > 0._dp)/real(count(d > 0._dp, 1), dp))) < dptol)
-call assert( sum(abs(mean(d, 2, d > 0._dp) - sum(d, 2, d > 0._dp)/real(count(d > 0._dp, 2), dp))) < dptol)
+call assert( abs(mean(d, d > 0) - sum(d, d > 0)/real(count(d > 0), dp)) < dptol)
+call assert( sum(abs(mean(d, 1, d > 0) - sum(d, 1, d > 0)/real(count(d > 0, 1), dp))) < dptol)
+call assert( sum(abs(mean(d, 2, d > 0) - sum(d, 2, d > 0)/real(count(d > 0, 2), dp))) < dptol)
 
 !int32
 call loadtxt("array3.dat", d)
@@ -67,8 +67,8 @@ program test_mean
 !dp rank 3
 allocate(d3(size(d,1),size(d,2),3))
 d3(:,:,1)=d;
-d3(:,:,2)=d*1.5_dp;
-d3(:,:,3)=d*4._dp;
+d3(:,:,2)=d*1.5;
+d3(:,:,3)=d*4;
 
 call assert( abs(mean(d3) - sum(d3)/real(size(d3), dp)) < dptol)
 call assert( sum( abs( mean(d3,1) - sum(d3,1)/real(size(d3,1), dp) )) < dptol)
@@ -78,11 +78,11 @@ program test_mean
 
 !dp rank 4
 allocate(d4(size(d,1),size(d,2),3,9))
-d4 = -1._dp
+d4 = -1
 d4(:,:,1,1)=d;
-d4(:,:,2,1)=d*1.5_dp;
-d4(:,:,3,1)=d*4._dp;
-d4(:,:,3,9)=d*4._dp;
+d4(:,:,2,1)=d*1.5;
+d4(:,:,3,1)=d*4;
+d4(:,:,3,9)=d*4;
 
 call assert( abs(mean(d4) - sum(d4)/real(size(d4), dp)) < dptol)
 call assert( sum( abs( mean(d4,1) - sum(d4,1)/real(size(d4,1), dp) )) < dptol)
@@ -100,10 +100,10 @@ program test_mean
 
 
 ! check mask of the same shape as input
-call assert( abs(mean(d4, d4 > 0._dp) - sum(d4, d4 > 0._dp)/real(count(d4 > 0._dp), dp)) < dptol)
-call assert( any(isnan(mean(d4, 1, d4 > 0._dp))) )
-call assert( any(isnan(mean(d4, 2, d4 > 0._dp))) )
-call assert( any(isnan(mean(d4, 3, d4 > 0._dp))) )
-call assert( sum(abs(mean(d4, 4, d4 > 0._dp) - sum(d4, 4, d4 > 0._dp)/real(count(d4 > 0._dp, 4), dp))) < dptol)
+call assert( abs(mean(d4, d4 > 0) - sum(d4, d4 > 0)/real(count(d4 > 0), dp)) < dptol)
+call assert( any(isnan(mean(d4, 1, d4 > 0))) )
+call assert( any(isnan(mean(d4, 2, d4 > 0))) )
+call assert( any(isnan(mean(d4, 3, d4 > 0))) )
+call assert( sum(abs(mean(d4, 4, d4 > 0) - sum(d4, 4, d4 > 0)/real(count(d4 > 0, 4), dp))) < dptol)
 
 end program