User: eschnett Date: 2013/10/28 11:36 AM

Modified: /trunk/src/ GRHydro_BvecfromAvec.F90, GRHydro_MP5Reconstruct.F90

Log: Make some macros safer

File Changes:

Directory: /trunk/src/ ======================

File [modified]: GRHydro_BvecfromAvec.F90 Delta lines: +6 -6 =================================================================== --- trunk/src/GRHydro_BvecfromAvec.F90 2013-10-28 16:35:34 UTC (rev 581) +++ trunk/src/GRHydro_BvecfromAvec.F90 2013-10-28 16:36:15 UTC (rev 582) @@ -26,12 +26,12 @@ #define DIFF_Z_2(q) (0.5d0 * (q(i,j,k+1) - q(i,j,k-1)) * idz)

! Fourth order f.d. for volume-centered quantity from volume-centered quantity -#define DIFF_X_4(q) ((-q(i+2,j,k) + 8.d0 * q(i+1,j,k) - 8.d0 * q(i-1,j,k) + \ - q(i-2,j,k)) / 12.d0 * idx) -#define DIFF_Y_4(q) ((-q(i,j+2,k) + 8.d0 * q(i,j+1,k) - 8.d0 * q(i,j-1,k) + \ - q(i,j-2,k)) / 12.d0 * idy) -#define DIFF_Z_4(q) ((-q(i,j,k+2) + 8.d0 * q(i,j,k+1) - 8.d0 * q(i,j,k-1) + \ - q(i,j,k-2)) / 12.d0 * idz) +#define DIFF_X_4(q) ((- q(i+2,j,k) + 8.d0 * q(i+1,j,k) \ + - 8.d0 * q(i-1,j,k) + q(i-2,j,k)) / 12.d0 * idx) +#define DIFF_Y_4(q) ((- q(i,j+2,k) + 8.d0 * q(i,j+1,k) \ + - 8.d0 * q(i,j-1,k) + q(i,j-2,k)) / 12.d0 * idy) +#define DIFF_Z_4(q) ((- q(i,j,k+2) + 8.d0 * q(i,j,k+1) \ + - 8.d0 * q(i,j,k-1) + q(i,j,k-2)) / 12.d0 * idz)

/*@@ @routine GRHydro_BvecfromAvec

File [modified]: GRHydro_MP5Reconstruct.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_MP5Reconstruct.F90 2013-10-28 16:35:34 UTC (rev 581) +++ trunk/src/GRHydro_MP5Reconstruct.F90 2013-10-28 16:36:15 UTC (rev 582) @@ -93,10 +93,10 @@ vnorm = sqrt(v(i-2)**2 + v(i-1)**2 + v(i)**2 + v(i+1)**2 + v(i+2)**2)

#define MINMOD(x,y) \ - 0.5d0*(sign(one,x) + sign(one,y)) * min(abs(x), abs(y)) + (0.5d0*(sign(one,x) + sign(one,y)) * min(abs(x), abs(y)))

#define MINMOD4(w,x,y,z) \ - 0.125d0*( sign(one,w)+sign(one,x) )*abs( (sign(one,w)+sign(one,y)) * (sign(one,w)+sign(one,z)) )*min(abs(w), abs(x), abs(y), abs(z)) + (0.125d0*( sign(one,w)+sign(one,x) )*abs( (sign(one,w)+sign(one,y)) * (sign(one,w)+sign(one,z)) )*min(abs(w), abs(x), abs(y), abs(z)))

#define MP5(am2, am1, a, ap1, ap2, arecon) \ vl = (2.0d0*am2 - 13.0d0*am1 + 47.0d0*a + 27.0d0*ap1 - 3.0d0*ap2)/60.0d0 &&\