User: cott Date: 2011/08/02 02:01 PM

Modified: /trunk/src/ GRHydro_PPM.F90, GRHydro_PPMM.F90

Log: * remove psi4 (optimize)

File Changes:

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

File [modified]: GRHydro_PPM.F90 Delta lines: +8 -8 =================================================================== --- trunk/src/GRHydro_PPM.F90 2011-08-02 18:52:56 UTC (rev 256) +++ trunk/src/GRHydro_PPM.F90 2011-08-02 19:01:56 UTC (rev 257) @@ -55,7 +55,7 @@ nx,dx,rho,velx,vely,velz,eps,press,rhominus,& velxminus,velyminus,velzminus,epsminus,rhoplus,velxplus,velyplus,& velzplus,epsplus,trivial_rp, hydro_excision_mask,& - gxx, gxy, gxz, gyy, gyz, gzz, psi4, beta, alp, w_lorentz, & + gxx, gxy, gxz, gyy, gyz, gzz, beta, alp, w_lorentz, & dir, ni, nj, nrx, nry, nrz, ev_l, ev_r, xw)

USE GRHydro_Scalars @@ -88,7 +88,7 @@ CCTK_INT, dimension(nx) :: hydro_excision_mask

CCTK_REAL, dimension(nx) :: gxx, gxy, gxz, gyy, gyz, gzz, & - psi4, beta, alp, w_lorentz + beta, alp, w_lorentz CCTK_INT :: dir, ni, nj, nrx, nry, nrz CCTK_REAL, dimension(nrx, nry, nrz) :: ev_l, ev_r, xw

@@ -212,12 +212,12 @@ l_ev_r=0.d0 xwind=0.d0 do i=3, nx - 3 - agxx = 0.5d0*( psi4(i)*gxx(i) + psi4(i+1)*gxx(i+1) ) - agxy = 0.5d0*( psi4(i)*gxy(i) + psi4(i+1)*gxy(i+1) ) - agxz = 0.5d0*( psi4(i)*gxz(i) + psi4(i+1)*gxz(i+1) ) - agyy = 0.5d0*( psi4(i)*gyy(i) + psi4(i+1)*gyy(i+1) ) - agyz = 0.5d0*( psi4(i)*gyz(i) + psi4(i+1)*gyz(i+1) ) - agzz = 0.5d0*( psi4(i)*gzz(i) + psi4(i+1)*gzz(i+1) ) + agxx = 0.5d0*( gxx(i) + gxx(i+1) ) + agxy = 0.5d0*( gxy(i) + gxy(i+1) ) + agxz = 0.5d0*( gxz(i) + gxz(i+1) ) + agyy = 0.5d0*( gyy(i) + gyy(i+1) ) + agyz = 0.5d0*( gyz(i) + gyz(i+1) ) + agzz = 0.5d0*( gzz(i) + gzz(i+1) ) det = SPATIAL_DETERMINANT(agxx, agxy, agxz, \ agyy, agyz, agzz) call UpperMetric (uxx, uxy, uxz, uyy, uyz, uzz, &

File [modified]: GRHydro_PPMM.F90 Delta lines: +8 -8 =================================================================== --- trunk/src/GRHydro_PPMM.F90 2011-08-02 18:52:56 UTC (rev 256) +++ trunk/src/GRHydro_PPMM.F90 2011-08-02 19:01:56 UTC (rev 257) @@ -39,7 +39,7 @@ rhominus,velxminus,velyminus,velzminus,Bvcxminus,Bvcyminus,Bvczminus,psidcminus,epsminus,& rhoplus,velxplus,velyplus,velzplus,Bvcxplus,Bvcyplus,Bvczplus,psidcplus,epsplus,dc_flag,& trivial_rp, hydro_excision_mask,& - gxx, gxy, gxz, gyy, gyz, gzz, psi4, beta, alp, w_lorentz, & + gxx, gxy, gxz, gyy, gyz, gzz, beta, alp, w_lorentz, & dir, ni, nj, nrx, nry, nrz, ev_l, ev_r, xw)

USE GRHydro_Scalars @@ -71,7 +71,7 @@ CCTK_INT, dimension(nx) :: hydro_excision_mask

CCTK_REAL, dimension(nx) :: gxx, gxy, gxz, gyy, gyz, gzz, & - psi4, beta, alp, w_lorentz + beta, alp, w_lorentz CCTK_INT :: dir, ni, nj, nrx, nry, nrz CCTK_REAL, dimension(nrx, nry, nrz) :: ev_l, ev_r, xw

@@ -222,12 +222,12 @@ l_ev_r=0.d0 xwind=0.d0 do i=3, nx - 3 - agxx = 0.5d0*( psi4(i)*gxx(i) + psi4(i+1)*gxx(i+1) ) - agxy = 0.5d0*( psi4(i)*gxy(i) + psi4(i+1)*gxy(i+1) ) - agxz = 0.5d0*( psi4(i)*gxz(i) + psi4(i+1)*gxz(i+1) ) - agyy = 0.5d0*( psi4(i)*gyy(i) + psi4(i+1)*gyy(i+1) ) - agyz = 0.5d0*( psi4(i)*gyz(i) + psi4(i+1)*gyz(i+1) ) - agzz = 0.5d0*( psi4(i)*gzz(i) + psi4(i+1)*gzz(i+1) ) + agxx = 0.5d0*( gxx(i) + gxx(i+1) ) + agxy = 0.5d0*( gxy(i) + gxy(i+1) ) + agxz = 0.5d0*( gxz(i) + gxz(i+1) ) + agyy = 0.5d0*( gyy(i) + gyy(i+1) ) + agyz = 0.5d0*( gyz(i) + gyz(i+1) ) + agzz = 0.5d0*( gzz(i) + gzz(i+1) ) det = SPATIAL_DETERMINANT(agxx, agxy, agxz, \ agyy, agyz, agzz) call UpperMetric (uxx, uxy, uxz, uyy, uyz, uzz, &