Commits March 2013

commits@lists.einsteintoolkit.org

9 participants
84 discussions

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 499)
by rhaas＠tapir.caltech.edu 27 Mar '13

27 Mar '13

User: rhaas Date: 2013/03/27 08:47 PM Modified: /trunk/src/ GRHydro_Prim2ConM.F90 Log: GRHydro: move critical section in prim2conM into if statement otherwise the code will enter and leave the critical section during each loop iteration From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Prim2ConM.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_Prim2ConM.F90 2013-03-28 01:47:00 UTC (rev 498) +++ trunk/src/GRHydro_Prim2ConM.F90 2013-03-28 01:47:09 UTC (rev 499) @@ -159,12 +159,12 @@ xtemp(1) = 0.5d0*(temperature(i,j,k) + & temperature(i-xoffset,j-yoffset,k-zoffset)) - !$OMP CRITICAL if (y_e_minus(i,j,k) .le. 0.0d0 .or. y_e_plus(i,j,k) .le. 0.0d0) then + !$OMP CRITICAL write(NaN_WarnLine,'(a100,7g15.6)') '(y_e_minus,y_e_plus,x,y,z,rho)', y_e(i,j,k), y_e_minus(i,j,k), y_e_plus(i,j,k), x(i,j,k),y(i,j,k),z(i,j,k),rho(i,j,k) call CCTK_WARN(1, NaN_WarnLine) + !$OMP END CRITICAL endif - !$OMP END CRITICAL call prim2conM_hot(GRHydro_eos_handle, GRHydro_reflevel,& i,j,k,x(i,j,k),y(i,j,k),z(i,j,k), gxxl,gxyl,gxzl,gyyl,gyzl,gzzl, & avg_detl,densminus(i,j,k),sxminus(i,j,k),&

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 498)
by rhaas＠tapir.caltech.edu 27 Mar '13

27 Mar '13

User: rhaas Date: 2013/03/27 08:47 PM Modified: /trunk/src/ GRHydro_PPM.F90, GRHydro_PPMM.F90 Log: GRHydro: explicitly cast from CCTK_REAL to int to avoid warning From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_PPM.F90 Delta lines: +7 -7 =================================================================== --- trunk/src/GRHydro_PPM.F90 2013-03-28 01:46:46 UTC (rev 497) +++ trunk/src/GRHydro_PPM.F90 2013-03-28 01:47:00 UTC (rev 498) @@ -494,7 +494,7 @@ end do else !!$ Really implement C&W, page 197; which requires stencil 4. do i = 4, nx - 3 - s=sign(one, -dpress(i)) + s=int(sign(one, -dpress(i))) flatten = max(tilde_flatten(i), tilde_flatten(i+s)) if (abs(1.d0 - flatten) > 0.d0) then trivial_rp(i-1) = .false. @@ -829,7 +829,7 @@ end do else !!$ Really implement C&W, page 197; which requires stencil 4. do i = 4, nx - 3 - s=sign(one, -dpress(i)) + s=int(sign(one, -dpress(i))) flatten = max(tilde_flatten(i), tilde_flatten(i+s)) if (abs(1.d0 - flatten) > 0.d0) then trivial_rp(i-1) = .false. @@ -1196,7 +1196,7 @@ end do else !!$ Really implement C&W, page 197; which requires stencil 4. do i = 4, nx - 3 - s=sign(one, -dpress(i)) + s=int(sign(one, -dpress(i))) flatten = max(tilde_flatten(i), tilde_flatten(i+s)) tempplus(i) = flatten * tempplus(i) + (1.d0 - flatten) * temperature(i) tempminus(i) = flatten * tempminus(i) + (1.d0 - flatten) * temperature(i) @@ -1459,7 +1459,7 @@ end do else !!$ Really implement C&W, page 197; which requires stencil 4. do i = 4, nx - 3 - s=sign(one, -dpress(i)) + s=int(sign(one, -dpress(i))) flatten = max(tilde_flatten(i), tilde_flatten(i+s)) tempplus(i) = flatten * tempplus(i) + (1.d0 - flatten) * temperature(i) tempminus(i) = flatten * tempminus(i) + (1.d0 - flatten) * temperature(i) @@ -1679,7 +1679,7 @@ else !!$ Really implement C&W, page 197; which requires stencil 4. do itracer=1,number_of_tracers do i = 4, nx - 3 - s=sign(one, -dpress(i)) + s=int(sign(one, -dpress(i))) flatten = max(tilde_flatten(i), tilde_flatten(i+s)) tracerplus(i,itracer) = flatten * tracerplus(i,itracer) + & (1.d0 - flatten) * tracer(i,itracer) @@ -1910,7 +1910,7 @@ end do else !!$ Really implement C&W, page 197; which requires stencil 4. do i = 4, nx - 3 - s=sign(one, -dpress(i)) + s=int(sign(one, -dpress(i))) flatten = max(tilde_flatten(i), tilde_flatten(i+s)) Y_e_plus(i) = flatten * Y_e_plus(i) + & (1.d0 - flatten) * Y_e(i) @@ -2040,7 +2040,7 @@ end do else !!$ Really implement C&W, page 197; which requires stencil 4. do i = 4, nx - 3 - s=sign(one, -dpress(i)) + s=int(sign(one, -dpress(i))) flatten = max(tilde_flatten(i), tilde_flatten(i+s)) Y_e_plus(i) = flatten * Y_e_plus(i) + & (1.d0 - flatten) * Y_e(i) File [modified]: GRHydro_PPMM.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_PPMM.F90 2013-03-28 01:46:46 UTC (rev 497) +++ trunk/src/GRHydro_PPMM.F90 2013-03-28 01:47:00 UTC (rev 498) @@ -411,7 +411,7 @@ end do else !!$ Really implement C&W, page 197; which requires stencil 4. do i = 4, nx - 3 - s=sign(1.d0, -dpress(i)) + s=int(sign(1.d0, -dpress(i))) flatten = max(tilde_flatten(i), tilde_flatten(i+s)) if (abs(1.d0 - flatten) > 0.d0) then trivial_rp(i-1) = .false.

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 497)
by rhaas＠tapir.caltech.edu 27 Mar '13

27 Mar '13

User: rhaas Date: 2013/03/27 08:46 PM Modified: /trunk/src/ GRHydro_HLLE.F90, GRHydro_HLLEM.F90, GRHydro_HLLE_AM.F90 Log: GRHydro: change CCTK_WARN(0,...) to CCTK_ERROR this should tell the compiler that the function never returns and help optimizing the code by indicating eg slow branches of if statements From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_HLLE.F90 Delta lines: +10 -10 =================================================================== --- trunk/src/GRHydro_HLLE.F90 2013-03-28 01:46:42 UTC (rev 496) +++ trunk/src/GRHydro_HLLE.F90 2013-03-28 01:46:46 UTC (rev 497) @@ -216,7 +216,7 @@ call SpaceMask_GetStateBits(trivial, "Hydro_RiemannProblemZ", & &"trivial") else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if if(evolve_temper.eq.1.and.reconstruct_temper.eq.1) then @@ -272,7 +272,7 @@ avg_beta = 0.5d0 * (beta3(i+xoffset,j+yoffset,k+zoffset) + & beta3(i,j,k)) else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if avg_alp = 0.5 * (alp(i,j,k) + alp(i+xoffset,j+yoffset,k+zoffset)) @@ -311,7 +311,7 @@ velzplus(i,j,k),pressplus(i,j,k),& avg_det,avg_alp,avg_beta) else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if else !!! The end of this branch is right at the bottom of the routine @@ -327,7 +327,7 @@ else if (flux_direction == 3) then usendh = uzzh else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if !!$ Calculate the jumps in the conserved variables @@ -498,7 +498,7 @@ pressminus(i+xoffset,j+yoffset,k+zoffset),& avg_det,avg_alp,avg_beta) else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if !!$ Compute H viscosity if requested @@ -536,7 +536,7 @@ etaY(i,j-1,k, vup, eos_c),& etaY(i,j-1,k+1, vup, eos_c)) else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if ! modify eigenvalues of Roe's matrix by computed H viscosity @@ -678,7 +678,7 @@ call SpaceMask_GetStateBits(trivial, "Hydro_RiemannProblemZ", & &"trivial") else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil @@ -714,7 +714,7 @@ avg_beta = 0.5d0 * (beta3(i+xoffset,j+yoffset,k+zoffset) + & beta3(i,j,k)) else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if avg_alp = 0.5 * (alp(i,j,k) + alp(i+xoffset,j+yoffset,k+zoffset)) @@ -740,7 +740,7 @@ else if (flux_direction == 3) then usendh = uzzh else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if !!$ Calculate the jumps in the conserved variables @@ -813,7 +813,7 @@ fminus(:) = (velzminus(i+xoffset,j+yoffset,k+zoffset) - avg_beta / avg_alp) * & cons_tracerminus(i+xoffset,j+yoffset,k+zoffset,:) else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if !!$ Find minimum and maximum wavespeeds File [modified]: GRHydro_HLLEM.F90 Delta lines: +9 -9 =================================================================== --- trunk/src/GRHydro_HLLEM.F90 2013-03-28 01:46:42 UTC (rev 496) +++ trunk/src/GRHydro_HLLEM.F90 2013-03-28 01:46:46 UTC (rev 497) @@ -119,7 +119,7 @@ call SpaceMask_GetStateBits(trivial, "Hydro_RiemannProblemZ", & &"trivial") else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if ! constraint transport needs to be able to average fluxes in the directions @@ -229,7 +229,7 @@ else if (flux_direction == 3) then avg_beta=avg_betaz else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if avg_alp = 0.5 * (alp(i,j,k) + alp(i+xoffset,j+yoffset,k+zoffset)) @@ -337,7 +337,7 @@ endif else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if else !!! The end of this branch is right at the bottom of the routine @@ -349,7 +349,7 @@ else if (flux_direction == 3) then usendh = uzzh else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if !!$ Calculate the jumps in the conserved variables @@ -541,7 +541,7 @@ endif else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if @@ -779,7 +779,7 @@ call SpaceMask_GetStateBits(trivial, "Hydro_RiemannProblemZ", & &"trivial") else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil @@ -840,7 +840,7 @@ avg_beta = 0.5d0 * (beta3(i+xoffset,j+yoffset,k+zoffset) + & beta3(i,j,k)) else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if avg_alp = 0.5 * (alp(i,j,k) + alp(i+xoffset,j+yoffset,k+zoffset)) @@ -865,7 +865,7 @@ else if (flux_direction == 3) then usendh = uzzh else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if !!$ b^2 = (1-v^2)B^2+(B dot v)^2 @@ -929,7 +929,7 @@ fminus(:) = (velzminus(i+xoffset,j+yoffset,k+zoffset) - avg_beta / avg_alp) * & cons_tracerminus(i+xoffset,j+yoffset,k+zoffset,:) else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if !!$ Find minimum and maximum wavespeeds File [modified]: GRHydro_HLLE_AM.F90 Delta lines: +9 -9 =================================================================== --- trunk/src/GRHydro_HLLE_AM.F90 2013-03-28 01:46:42 UTC (rev 496) +++ trunk/src/GRHydro_HLLE_AM.F90 2013-03-28 01:46:46 UTC (rev 497) @@ -117,7 +117,7 @@ call SpaceMask_GetStateBits(trivial, "Hydro_RiemannProblemZ", & &"trivial") else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if ! constraint transport needs to be able to average fluxes in the directions @@ -217,7 +217,7 @@ else if (flux_direction == 3) then avg_beta=avg_betaz else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if avg_alp = 0.5 * (alp(i,j,k) + alp(i+xoffset,j+yoffset,k+zoffset)) @@ -316,7 +316,7 @@ endif else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if else !!! The end of this branch is right at the bottom of the routine @@ -328,7 +328,7 @@ else if (flux_direction == 3) then usendh = uzzh else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if !!$ Calculate the jumps in the conserved variables @@ -505,7 +505,7 @@ endif else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if @@ -736,7 +736,7 @@ call SpaceMask_GetStateBits(trivial, "Hydro_RiemannProblemZ", & &"trivial") else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil @@ -797,7 +797,7 @@ avg_beta = 0.5d0 * (beta3(i+xoffset,j+yoffset,k+zoffset) + & beta3(i,j,k)) else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if avg_alp = 0.5 * (alp(i,j,k) + alp(i+xoffset,j+yoffset,k+zoffset)) @@ -822,7 +822,7 @@ else if (flux_direction == 3) then usendh = uzzh else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if !!$ b^2 = (1-v^2)B^2+(B dot v)^2 @@ -886,7 +886,7 @@ fminus(:) = (velzminus(i+xoffset,j+yoffset,k+zoffset) - avg_beta / avg_alp) * & cons_tracerminus(i+xoffset,j+yoffset,k+zoffset,:) else - call CCTK_WARN(0, "Flux direction not x,y,z") + call CCTK_ERROR("Flux direction not x,y,z") end if !!$ Find minimum and maximum wavespeeds

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 496)
by rhaas＠tapir.caltech.edu 27 Mar '13

27 Mar '13

User: rhaas Date: 2013/03/27 08:46 PM Modified: /trunk/src/ GRHydro_EigenproblemM.F90, GRHydro_HLLEM.F90, GRHydro_HLLE_AM.F90, GRHydro_PPMM.F90 Log: GRHydro: pass pressure into eigenvalue routine for MHD bugfix for hot eos case, just more efficient for cold eos From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_EigenproblemM.F90 Delta lines: +16 -21 =================================================================== --- trunk/src/GRHydro_EigenproblemM.F90 2013-03-28 01:46:38 UTC (rev 495) +++ trunk/src/GRHydro_EigenproblemM.F90 2013-03-28 01:46:42 UTC (rev 496) @@ -41,22 +41,22 @@ CONTAINS -subroutine eigenvaluesM(handle,rho,velx,vely,velz,eps,w_lorentz,& +subroutine eigenvaluesM(handle,rho,velx,vely,velz,eps,press,w_lorentz,& Bvcx,Bvcy,Bvcz,lam,gxx,gxy,gxz,gyy,gyz,gzz,u,alp,beta) implicit none DECLARE_CCTK_PARAMETERS - CCTK_REAL rho,velx,vely,velz,eps,w_lorentz - CCTK_REAL Bvcx,Bvcy,Bvcz - CCTK_REAL lam(5) - CCTK_REAL gxx,gxy,gxz,gyy,gyz,gzz - CCTK_REAL alp,beta,u + CCTK_REAL, intent(in) :: rho,velx,vely,velz,eps,w_lorentz + CCTK_REAL, intent(in) :: Bvcx,Bvcy,Bvcz + CCTK_REAL, intent(out) :: lam(5) + CCTK_REAL, intent(in) :: gxx,gxy,gxz,gyy,gyz,gzz + CCTK_REAL, intent(in) :: alp,beta,u CCTK_REAL cs2,one,two,U2 CCTK_REAL vlowx,vlowy,vlowz,v2,w CCTK_REAL lam1,lam2,lam3,lamm,lamp,lamm_nobeta,lamp_nobeta - CCTK_INT handle + CCTK_INT, intent(in) :: handle CCTK_REAL dpdrho,dpdeps,press CCTK_REAL Bvcxlow,Bvcylow,Bvczlow,Bvc2,rhohstar,va2 @@ -75,11 +75,6 @@ !!$ Set required fluid quantities -! call EOS_Omni_cs2(handle,keytemp,GRHydro_eos_rf_prec,n,& -! rho,eps,xtemp,xye,cs2,keyerr,anyerr) - call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& - rho,eps,xtemp,xye,press,keyerr,anyerr) - call EOS_Omni_DPressByDEps(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,eps,xtemp,xye,dpdeps,keyerr,anyerr) @@ -138,24 +133,24 @@ end subroutine eigenvaluesM -subroutine eigenvaluesM_hot(handle,ii,jj,kk,rho,velx,vely,velz,eps,w_lorentz,& +subroutine eigenvaluesM_hot(handle,ii,jj,kk,rho,velx,vely,velz,eps,press,w_lorentz,& Bvcx,Bvcy,Bvcz,temp,ye,lam,gxx,gxy,gxz,gyy,gyz,gzz,u,alp,beta) implicit none DECLARE_CCTK_PARAMETERS - CCTK_REAL rho,velx,vely,velz,eps,w_lorentz - CCTK_REAL Bvcx,Bvcy,Bvcz - CCTK_REAL lam(5) - CCTK_REAL gxx,gxy,gxz,gyy,gyz,gzz - CCTK_REAL alp,beta,u - CCTK_REAL temp,ye + CCTK_REAL, intent(in) :: rho,velx,vely,velz,eps,w_lorentz + CCTK_REAL, intent(in) :: Bvcx,Bvcy,Bvcz + CCTK_REAL, intent(out) :: lam(5) + CCTK_REAL, intent(in) :: gxx,gxy,gxz,gyy,gyz,gzz + CCTK_REAL, intent(in) :: alp,beta,u + CCTK_REAL, intent(in) :: temp,ye + CCTK_REAL, intent(in) :: press CCTK_REAL cs2,one,two,U2 CCTK_REAL vlowx,vlowy,vlowz,v2,w CCTK_REAL lam1,lam2,lam3,lamm,lamp,lamm_nobeta,lamp_nobeta - CCTK_INT handle, ii,jj,kk - CCTK_REAL press + CCTK_INT, intent(in) :: handle, ii,jj,kk CCTK_REAL Bvcxlow,Bvcylow,Bvczlow,Bvc2,rhohstar,va2 CCTK_REAL Bdotv,b2 File [modified]: GRHydro_HLLEM.F90 Delta lines: +28 -28 =================================================================== --- trunk/src/GRHydro_HLLEM.F90 2013-03-28 01:46:38 UTC (rev 495) +++ trunk/src/GRHydro_HLLEM.F90 2013-03-28 01:46:42 UTC (rev 496) @@ -375,26 +375,26 @@ if (flux_direction == 1) then if(evolve_temper.ne.1) then call eigenvaluesM(GRHydro_eos_handle,& - prim_m(1),prim_m(2),prim_m(3),prim_m(4),prim_m(5),prim_m(7), & + prim_m(1),prim_m(2),prim_m(3),prim_m(4),prim_m(5),prim_m(6),prim_m(7), & prim_m(8),prim_m(9),prim_m(10),& lamminus,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,& - usendh,avg_alp,avg_beta) + usendh,avg_alp,avg_beta) call eigenvaluesM(GRHydro_eos_handle, & - prim_p(1),prim_p(2),prim_p(3),prim_p(4),prim_p(5),prim_p(7), & + prim_p(1),prim_p(2),prim_p(3),prim_p(4),prim_p(5),prim_p(6),prim_p(7), & prim_p(8),prim_p(9),prim_p(10),& lamplus,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,& usendh,avg_alp,avg_beta) else xtemp = temperature(i,j,k) call eigenvaluesM_hot(GRHydro_eos_handle,i,j,k,& - prim_m(1),prim_m(2),prim_m(3),prim_m(4),prim_m(5),prim_m(7), & + prim_m(1),prim_m(2),prim_m(3),prim_m(4),prim_m(5),prim_m(6),prim_m(7), & prim_m(8),prim_m(9),prim_m(10),& xtemp,y_e_minus(i+xoffset,j+yoffset,k+zoffset),& lamminus,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,& usendh,avg_alp,avg_beta) xtemp = temperature(i,j,k) call eigenvaluesM_hot(GRHydro_eos_handle,i,j,k,& - prim_p(1),prim_p(2),prim_p(3),prim_p(4),prim_p(5),prim_p(7), & + prim_p(1),prim_p(2),prim_p(3),prim_p(4),prim_p(5),prim_p(6),prim_p(7), & prim_p(8),prim_p(9),prim_p(10),& xtemp,y_e_plus(i,j,k),& lamplus,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,& @@ -431,26 +431,26 @@ else if (flux_direction == 2) then if(evolve_temper.ne.1) then call eigenvaluesM(GRHydro_eos_handle,& - prim_m(1),prim_m(3),prim_m(4),prim_m(2),prim_m(5),prim_m(7), & + prim_m(1),prim_m(3),prim_m(4),prim_m(2),prim_m(5),prim_m(6),prim_m(7), & prim_m(9),prim_m(10),prim_m(8),& lamminus,gyyh,gyzh,gxyh,gzzh,gxzh,gxxh,& - usendh,avg_alp,avg_beta) + usendh,avg_alp,avg_beta) call eigenvaluesM(GRHydro_eos_handle, & - prim_p(1),prim_p(3),prim_p(4),prim_p(2),prim_p(5),prim_p(7), & + prim_p(1),prim_p(3),prim_p(4),prim_p(2),prim_p(5),prim_p(6),prim_p(7), & prim_p(9),prim_p(10),prim_p(8),& lamplus,gyyh,gyzh,gxyh,gzzh,gxzh,gxxh,& usendh,avg_alp,avg_beta) else xtemp = temperature(i,j,k) call eigenvaluesM_hot(GRHydro_eos_handle,i,j,k,& - prim_m(1),prim_m(3),prim_m(4),prim_m(2),prim_m(5),prim_m(7), & + prim_m(1),prim_m(3),prim_m(4),prim_m(2),prim_m(5),prim_m(6),prim_m(7), & prim_m(9),prim_m(10),prim_m(8),& xtemp,y_e_minus(i+xoffset,j+yoffset,k+zoffset),& lamminus,gyyh,gyzh,gxyh,gzzh,gxzh,gxxh,& - usendh,avg_alp,avg_beta) - xtemp = temperature(i,j,k) + usendh,avg_alp,avg_beta) + xtemp = temperature(i,j,k) call eigenvaluesM_hot(GRHydro_eos_handle,i,j,k,& - prim_p(1),prim_p(3),prim_p(4),prim_p(2),prim_p(5),prim_p(7), & + prim_p(1),prim_p(3),prim_p(4),prim_p(2),prim_p(5),prim_p(6),prim_p(7), & prim_p(9),prim_p(10),prim_p(8),& xtemp,y_e_plus(i,j,k),& lamplus,gyyh,gyzh,gxyh,gzzh,gxzh,gxxh,& @@ -487,26 +487,26 @@ else if (flux_direction == 3) then if(evolve_temper.ne.1) then call eigenvaluesM(GRHydro_eos_handle,& - prim_m(1),prim_m(4),prim_m(2),prim_m(3),prim_m(5),prim_m(7), & + prim_m(1),prim_m(4),prim_m(2),prim_m(3),prim_m(5),prim_m(6),prim_m(7), & prim_m(10),prim_m(8),prim_m(9),& lamminus,gzzh,gxzh,gyzh,gxxh,gxyh,gyyh,& - usendh,avg_alp,avg_beta) + usendh,avg_alp,avg_beta) call eigenvaluesM(GRHydro_eos_handle, & - prim_p(1),prim_p(4),prim_p(2),prim_p(3),prim_p(5),prim_p(7), & + prim_p(1),prim_p(4),prim_p(2),prim_p(3),prim_p(5),prim_p(6),prim_p(7), & prim_p(10),prim_p(8),prim_p(9),& lamplus,gzzh,gxzh,gyzh,gxxh,gxyh,gyyh,& usendh,avg_alp,avg_beta) else xtemp = temperature(i,j,k) call eigenvaluesM_hot(GRHydro_eos_handle,i,j,k,& - prim_m(1),prim_m(4),prim_m(2),prim_m(3),prim_m(5),prim_m(7), & + prim_m(1),prim_m(4),prim_m(2),prim_m(3),prim_m(5),prim_m(6),prim_m(7), & prim_m(10),prim_m(8),prim_m(9),& xtemp,y_e_minus(i+xoffset,j+yoffset,k+zoffset),& lamminus,gzzh,gxzh,gyzh,gxxh,gxyh,gyyh,& - usendh,avg_alp,avg_beta) - xtemp = temperature(i,j,k) + usendh,avg_alp,avg_beta) + xtemp = temperature(i,j,k) call eigenvaluesM_hot(GRHydro_eos_handle,i,j,k,& - prim_p(1),prim_p(4),prim_p(2),prim_p(3),prim_p(5),prim_p(7), & + prim_p(1),prim_p(4),prim_p(2),prim_p(3),prim_p(5),prim_p(6),prim_p(7), & prim_p(10),prim_p(8),prim_p(9),& xtemp,y_e_plus(i,j,k),& lamplus,gzzh,gxzh,gyzh,gxxh,gxyh,gyyh,& @@ -885,12 +885,12 @@ if (flux_direction == 1) then call eigenvaluesM(GRHydro_eos_handle,& - prim_m(1),prim_m(2),prim_m(3),prim_m(4),prim_m(5),prim_m(7), & + prim_m(1),prim_m(2),prim_m(3),prim_m(4),prim_m(5),prim_m(6),prim_m(7), & mag_m(1),mag_m(2),mag_m(3),& lamminus,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,& - usendh,avg_alp,avg_beta) + usendh,avg_alp,avg_beta) call eigenvaluesM(GRHydro_eos_handle, & - prim_p(1),prim_p(2),prim_p(3),prim_p(4),prim_p(5),prim_p(7), & + prim_p(1),prim_p(2),prim_p(3),prim_p(4),prim_p(5),prim_p(6),prim_p(7), & mag_p(1),mag_p(2),mag_p(3),& lamplus,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,& usendh,avg_alp,avg_beta) @@ -900,12 +900,12 @@ cons_tracerminus(i+xoffset,j+yoffset,k+zoffset,:) else if (flux_direction == 2) then call eigenvaluesM(GRHydro_eos_handle,& - prim_m(1),prim_m(3),prim_m(4),prim_m(2),prim_m(5),prim_m(7), & + prim_m(1),prim_m(3),prim_m(4),prim_m(2),prim_m(5),prim_m(6),prim_m(7), & mag_m(2),mag_m(3),mag_m(1),& lamminus,gyyh,gyzh,gxyh,gzzh,gxzh,gxxh,& - usendh,avg_alp,avg_beta) + usendh,avg_alp,avg_beta) call eigenvaluesM(GRHydro_eos_handle, & - prim_p(1),prim_p(3),prim_p(4),prim_p(2),prim_p(5),prim_p(7), & + prim_p(1),prim_p(3),prim_p(4),prim_p(2),prim_p(5),prim_p(6),prim_p(7), & mag_p(2),mag_p(3),mag_p(1),& lamplus,gyyh,gyzh,gxyh,gzzh,gxzh,gxxh,& usendh,avg_alp,avg_beta) @@ -915,12 +915,12 @@ cons_tracerminus(i+xoffset,j+yoffset,k+zoffset,:) else if (flux_direction == 3) then call eigenvaluesM(GRHydro_eos_handle,& - prim_m(1),prim_m(4),prim_m(2),prim_m(3),prim_m(5),prim_m(7), & + prim_m(1),prim_m(4),prim_m(2),prim_m(3),prim_m(5),prim_m(6),prim_m(7), & mag_m(3),mag_m(1),mag_m(2),& lamminus,gzzh,gxzh,gyzh,gxxh,gxyh,gyyh,& - usendh,avg_alp,avg_beta) + usendh,avg_alp,avg_beta) call eigenvaluesM(GRHydro_eos_handle,& - prim_p(1),prim_p(4),prim_p(2),prim_p(3),prim_p(5),prim_p(7), & + prim_p(1),prim_p(4),prim_p(2),prim_p(3),prim_p(5),prim_p(6),prim_p(7), & mag_p(3),mag_p(1),mag_p(2),& lamplus,gzzh,gxzh,gyzh,gxxh,gxyh,gyyh,& usendh,avg_alp,avg_beta) File [modified]: GRHydro_HLLE_AM.F90 Delta lines: +28 -28 =================================================================== --- trunk/src/GRHydro_HLLE_AM.F90 2013-03-28 01:46:38 UTC (rev 495) +++ trunk/src/GRHydro_HLLE_AM.F90 2013-03-28 01:46:42 UTC (rev 496) @@ -351,26 +351,26 @@ if (flux_direction == 1) then if(evolve_temper.ne.1) then call eigenvaluesM(GRHydro_eos_handle,& - prim_m(1),prim_m(2),prim_m(3),prim_m(4),prim_m(5),prim_m(7), & + prim_m(1),prim_m(2),prim_m(3),prim_m(4),prim_m(5),prim_m(6),prim_m(7), & prim_m(8),prim_m(9),prim_m(10),& lamminus,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,& - usendh,avg_alp,avg_beta) + usendh,avg_alp,avg_beta) call eigenvaluesM(GRHydro_eos_handle, & - prim_p(1),prim_p(2),prim_p(3),prim_p(4),prim_p(5),prim_p(7), & + prim_p(1),prim_p(2),prim_p(3),prim_p(4),prim_p(5),prim_p(6),prim_p(7), & prim_p(8),prim_p(9),prim_p(10),& lamplus,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,& usendh,avg_alp,avg_beta) else xtemp = temperature(i,j,k) call eigenvaluesM_hot(GRHydro_eos_handle,i,j,k,& - prim_m(1),prim_m(2),prim_m(3),prim_m(4),prim_m(5),prim_m(7), & + prim_m(1),prim_m(2),prim_m(3),prim_m(4),prim_m(5),prim_m(6),prim_m(7), & prim_m(8),prim_m(9),prim_m(10),& xtemp,y_e_minus(i+xoffset,j+yoffset,k+zoffset),& lamminus,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,& usendh,avg_alp,avg_beta) xtemp = temperature(i,j,k) call eigenvaluesM_hot(GRHydro_eos_handle,i,j,k,& - prim_p(1),prim_p(2),prim_p(3),prim_p(4),prim_p(5),prim_p(7), & + prim_p(1),prim_p(2),prim_p(3),prim_p(4),prim_p(5),prim_p(6),prim_p(7), & prim_p(8),prim_p(9),prim_p(10),& xtemp,y_e_plus(i,j,k),& lamplus,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,& @@ -403,26 +403,26 @@ else if (flux_direction == 2) then if(evolve_temper.ne.1) then call eigenvaluesM(GRHydro_eos_handle,& - prim_m(1),prim_m(3),prim_m(4),prim_m(2),prim_m(5),prim_m(7), & + prim_m(1),prim_m(3),prim_m(4),prim_m(2),prim_m(5),prim_m(6),prim_m(7), & prim_m(9),prim_m(10),prim_m(8),& lamminus,gyyh,gyzh,gxyh,gzzh,gxzh,gxxh,& - usendh,avg_alp,avg_beta) + usendh,avg_alp,avg_beta) call eigenvaluesM(GRHydro_eos_handle, & - prim_p(1),prim_p(3),prim_p(4),prim_p(2),prim_p(5),prim_p(7), & + prim_p(1),prim_p(3),prim_p(4),prim_p(2),prim_p(5),prim_p(6),prim_p(7), & prim_p(9),prim_p(10),prim_p(8),& lamplus,gyyh,gyzh,gxyh,gzzh,gxzh,gxxh,& usendh,avg_alp,avg_beta) else xtemp = temperature(i,j,k) call eigenvaluesM_hot(GRHydro_eos_handle,i,j,k,& - prim_m(1),prim_m(3),prim_m(4),prim_m(2),prim_m(5),prim_m(7), & + prim_m(1),prim_m(3),prim_m(4),prim_m(2),prim_m(5),prim_m(6),prim_m(7), & prim_m(9),prim_m(10),prim_m(8),& xtemp,y_e_minus(i+xoffset,j+yoffset,k+zoffset),& lamminus,gyyh,gyzh,gxyh,gzzh,gxzh,gxxh,& - usendh,avg_alp,avg_beta) - xtemp = temperature(i,j,k) + usendh,avg_alp,avg_beta) + xtemp = temperature(i,j,k) call eigenvaluesM_hot(GRHydro_eos_handle,i,j,k,& - prim_p(1),prim_p(3),prim_p(4),prim_p(2),prim_p(5),prim_p(7), & + prim_p(1),prim_p(3),prim_p(4),prim_p(2),prim_p(5),prim_p(6),prim_p(7), & prim_p(9),prim_p(10),prim_p(8),& xtemp,y_e_plus(i,j,k),& lamplus,gyyh,gyzh,gxyh,gzzh,gxzh,gxxh,& @@ -455,26 +455,26 @@ else if (flux_direction == 3) then if(evolve_temper.ne.1) then call eigenvaluesM(GRHydro_eos_handle,& - prim_m(1),prim_m(4),prim_m(2),prim_m(3),prim_m(5),prim_m(7), & + prim_m(1),prim_m(4),prim_m(2),prim_m(3),prim_m(5),prim_m(6),prim_m(7), & prim_m(10),prim_m(8),prim_m(9),& lamminus,gzzh,gxzh,gyzh,gxxh,gxyh,gyyh,& - usendh,avg_alp,avg_beta) + usendh,avg_alp,avg_beta) call eigenvaluesM(GRHydro_eos_handle, & - prim_p(1),prim_p(4),prim_p(2),prim_p(3),prim_p(5),prim_p(7), & + prim_p(1),prim_p(4),prim_p(2),prim_p(3),prim_p(5),prim_p(6),prim_p(7), & prim_p(10),prim_p(8),prim_p(9),& lamplus,gzzh,gxzh,gyzh,gxxh,gxyh,gyyh,& usendh,avg_alp,avg_beta) else xtemp = temperature(i,j,k) call eigenvaluesM_hot(GRHydro_eos_handle,i,j,k,& - prim_m(1),prim_m(4),prim_m(2),prim_m(3),prim_m(5),prim_m(7), & + prim_m(1),prim_m(4),prim_m(2),prim_m(3),prim_m(5),prim_m(6),prim_m(7), & prim_m(10),prim_m(8),prim_m(9),& xtemp,y_e_minus(i+xoffset,j+yoffset,k+zoffset),& lamminus,gzzh,gxzh,gyzh,gxxh,gxyh,gyyh,& - usendh,avg_alp,avg_beta) - xtemp = temperature(i,j,k) + usendh,avg_alp,avg_beta) + xtemp = temperature(i,j,k) call eigenvaluesM_hot(GRHydro_eos_handle,i,j,k,& - prim_p(1),prim_p(4),prim_p(2),prim_p(3),prim_p(5),prim_p(7), & + prim_p(1),prim_p(4),prim_p(2),prim_p(3),prim_p(5),prim_p(6),prim_p(7), & prim_p(10),prim_p(8),prim_p(9),& xtemp,y_e_plus(i,j,k),& lamplus,gzzh,gxzh,gyzh,gxxh,gxyh,gyyh,& @@ -842,12 +842,12 @@ if (flux_direction == 1) then call eigenvaluesM(GRHydro_eos_handle,& - prim_m(1),prim_m(2),prim_m(3),prim_m(4),prim_m(5),prim_m(7), & + prim_m(1),prim_m(2),prim_m(3),prim_m(4),prim_m(5),prim_m(6),prim_m(7), & mag_m(1),mag_m(2),mag_m(3),& lamminus,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,& - usendh,avg_alp,avg_beta) + usendh,avg_alp,avg_beta) call eigenvaluesM(GRHydro_eos_handle, & - prim_p(1),prim_p(2),prim_p(3),prim_p(4),prim_p(5),prim_p(7), & + prim_p(1),prim_p(2),prim_p(3),prim_p(4),prim_p(5),prim_p(6),prim_p(7), & mag_p(1),mag_p(2),mag_p(3),& lamplus,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,& usendh,avg_alp,avg_beta) @@ -857,12 +857,12 @@ cons_tracerminus(i+xoffset,j+yoffset,k+zoffset,:) else if (flux_direction == 2) then call eigenvaluesM(GRHydro_eos_handle,& - prim_m(1),prim_m(3),prim_m(4),prim_m(2),prim_m(5),prim_m(7), & + prim_m(1),prim_m(3),prim_m(4),prim_m(2),prim_m(5),prim_m(6),prim_m(7), & mag_m(2),mag_m(3),mag_m(1),& lamminus,gyyh,gyzh,gxyh,gzzh,gxzh,gxxh,& - usendh,avg_alp,avg_beta) + usendh,avg_alp,avg_beta) call eigenvaluesM(GRHydro_eos_handle, & - prim_p(1),prim_p(3),prim_p(4),prim_p(2),prim_p(5),prim_p(7), & + prim_p(1),prim_p(3),prim_p(4),prim_p(2),prim_p(5),prim_p(6),prim_p(7), & mag_p(2),mag_p(3),mag_p(1),& lamplus,gyyh,gyzh,gxyh,gzzh,gxzh,gxxh,& usendh,avg_alp,avg_beta) @@ -872,12 +872,12 @@ cons_tracerminus(i+xoffset,j+yoffset,k+zoffset,:) else if (flux_direction == 3) then call eigenvaluesM(GRHydro_eos_handle,& - prim_m(1),prim_m(4),prim_m(2),prim_m(3),prim_m(5),prim_m(7), & + prim_m(1),prim_m(4),prim_m(2),prim_m(3),prim_m(5),prim_m(6),prim_m(7), & mag_m(3),mag_m(1),mag_m(2),& lamminus,gzzh,gxzh,gyzh,gxxh,gxyh,gyyh,& - usendh,avg_alp,avg_beta) + usendh,avg_alp,avg_beta) call eigenvaluesM(GRHydro_eos_handle,& - prim_p(1),prim_p(4),prim_p(2),prim_p(3),prim_p(5),prim_p(7), & + prim_p(1),prim_p(4),prim_p(2),prim_p(3),prim_p(5),prim_p(6),prim_p(7), & mag_p(3),mag_p(1),mag_p(2),& lamplus,gzzh,gxzh,gyzh,gxxh,gxyh,gyyh,& usendh,avg_alp,avg_beta) File [modified]: GRHydro_PPMM.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_PPMM.F90 2013-03-28 01:46:38 UTC (rev 495) +++ trunk/src/GRHydro_PPMM.F90 2013-03-28 01:46:42 UTC (rev 496) @@ -247,7 +247,7 @@ det, agxx, agxy, agxz, agyy, agyz, agzz) call eigenvaluesM(handle,& D_UPW(rho), D_UPW(velx), D_UPW(vely), D_UPW(velz), & - D_UPW(eps), D_UPW(w_lorentz),& + D_UPW(eps), D_UPW(press), D_UPW(w_lorentz),& D_UPW(Bvcx), D_UPW(Bvcy), D_UPW(Bvcz), lam, & agxx, agxy, agxz, agyy, agyz, agzz, & uxx, D_UPW(alp), D_UPW(beta))

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 495)
by rhaas＠tapir.caltech.edu 27 Mar '13

27 Mar '13

User: rhaas Date: 2013/03/27 08:46 PM Modified: /trunk/src/ GRHydro_Boundaries.F90, GRHydro_Con2Prim.F90, GRHydro_Differences.F90, GRHydro_ENOReconstruct.F90, GRHydro_Eigenproblem.F90, GRHydro_EigenproblemM.F90, GRHydro_Eigenproblem_Marquina.F90, GRHydro_EoSChangeGamma.F90, GRHydro_Flux.F90, GRHydro_FluxSplit.F90, GRHydro_HLLE.F90, GRHydro_HLLEM.F90, GRHydro_HLLE_AM.F90, GRHydro_MP5Reconstruct.F90, GRHydro_Marquina.F90, GRHydro_PPM.F90, GRHydro_PPMM.F90, GRHydro_PPMMReconstruct_drv.F90, GRHydro_PPMReconstruct_drv.F90, GRHydro_Particle.F90, GRHydro_Prim2Con.F90, GRHydro_Prim2ConAM.F90, GRHydro_Prim2ConM.F90, GRHydro_Reconstruct.F90, GRHydro_RiemannSolve.F90, GRHydro_RiemannSolveAM.F90, GRHydro_RiemannSolveM.F90, GRHydro_RoeSolver.F90, GRHydro_WENOReconstruct.F90 Log: GRHydro: remove unused variables From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +0 -3 =================================================================== --- trunk/src/GRHydro_Boundaries.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_Boundaries.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -376,7 +376,6 @@ integer, dimension(3) :: sw integer :: ierr = 0 - integer :: i,j,k CCTK_INT :: GRHydro_UseGeneralCoordinates, general_coordinates CCTK_INT, parameter :: faces=CCTK_ALL_FACES @@ -515,7 +514,6 @@ integer, dimension(3) :: sw integer :: ierr = 0 - integer :: i,j,k CCTK_INT :: GRHydro_UseGeneralCoordinates, general_coordinates CCTK_INT, parameter :: faces=CCTK_ALL_FACES @@ -651,7 +649,6 @@ integer, dimension(3) :: sw integer :: ierr = 0 - integer :: i,j,k CCTK_INT, parameter :: faces=CCTK_ALL_FACES CCTK_INT, parameter :: ione=1 File [modified]: GRHydro_Con2Prim.F90 Delta lines: +8 -9 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_Con2Prim.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -54,7 +54,6 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS - integer :: CCTK_MyProc integer :: i, j, k, itracer, nx, ny, nz CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, det, pmin, epsmin, dummy1, dummy2 logical :: epsnegative @@ -416,11 +415,11 @@ press, uxx, uxy, uxz, uyy, uyz, uzz, det, w_lorentz, x, & y, z, r, GRHydro_rho_min - CCTK_REAL s2, c0, c1, c2, c3, c4, f, df, ftol, v2, w, vlowx, vlowy, vlowz + CCTK_REAL s2, f, df, vlowx, vlowy, vlowz CCTK_INT count, i, handle, GRHydro_reflevel CCTK_REAL GRHydro_C2P_failed, dummy1, dummy2 - CCTK_REAL udens, usx, usy, usz, utau, pold, pnew, epsold, epsnew, w2, & - w2mhalf, temp1, drhobydpress, depsbydpress, dpressbydeps, dpressbydrho, pmin, epsmin + CCTK_REAL udens, usx, usy, usz, utau, pold, pnew, & + temp1, drhobydpress, depsbydpress, dpressbydeps, dpressbydrho, pmin, epsmin character(len=200) warnline logical epsnegative, mustbisect @@ -778,11 +777,11 @@ press, uxx, uxy, uxz, uyy, uyz, uzz, det, w_lorentz, x, & y, z, r, GRHydro_rho_min CCTK_REAL temp, ye - CCTK_REAL s2, c0, c1, c2, c3, c4, f, df, ftol, v2, w, vlowx, vlowy, vlowz + CCTK_REAL s2, f, df, vlowx, vlowy, vlowz CCTK_INT cctk_iteration, ii,jj,kk,count, i, handle, GRHydro_reflevel CCTK_REAL GRHydro_C2P_failed - CCTK_REAL udens, usx, usy, usz, utau, pold, pnew, epsold, epsnew, w2, & - w2mhalf, temp1, drhobydpress, depsbydpress, dpressbydeps, dpressbydrho, pmin, epsmin + CCTK_REAL udens, usx, usy, usz, utau, pold, pnew, & + temp1, drhobydpress, depsbydpress, dpressbydeps, dpressbydrho, pmin, epsmin CCTK_REAL epsminl,pminl,plow,tmp, dummy1, dummy2 CCTK_REAL local_perc_ptol @@ -1248,7 +1247,7 @@ w_lorentz = 1.d0 end if -51 press = pnew + press = pnew vlowx = usx / ( (rho + rho*epsilon + press) * w_lorentz**2) vlowy = usy / ( (rho + rho*epsilon + press) * w_lorentz**2) vlowz = usz / ( (rho + rho*epsilon + press) * w_lorentz**2) @@ -1666,7 +1665,7 @@ CCTK_REAL s2, f, df, vlowx, vlowy, vlowz CCTK_INT count, handle, GRHydro_reflevel - CCTK_REAL udens, usx, usy, usz, rhoold, rhonew, epsold, epsnew, & + CCTK_REAL udens, usx, usy, usz, rhoold, rhonew, & enthalpy, denthalpy, sqrtdet, invsqrtdet, invfac, GRHydro_C2P_failed, dummy1, dummy2 character(len=200) warnline File [modified]: GRHydro_Differences.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Differences.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_Differences.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -27,7 +27,7 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS - CCTK_INT :: i, j, k, nx, ny, nz, kk, ll + CCTK_INT :: i, j, k, nx, ny, nz CCTK_REAL :: idx, idy, idz CCTK_REAL :: dr_eps = 1.d-2 File [modified]: GRHydro_ENOReconstruct.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_ENOReconstruct.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_ENOReconstruct.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -40,7 +40,7 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS - CCTK_INT :: i, j, k, l, m, q, allocstat + CCTK_INT :: i, j, l, m, q, allocstat CCTK_REAL :: denominator, numerator, numerator_product if(.not.coeffs_allocated) then File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +1 -2 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_Eigenproblem.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -145,7 +145,6 @@ CCTK_REAL vlowx,vlowy,vlowz,v2,w CCTK_REAL lam1,lam2,lam3,lamm,lamp,lamm_nobeta,lamp_nobeta CCTK_INT handle,ii,jj,kk - CCTK_REAL dpdrho,dpdeps,press ! begin EOS Omni vars integer :: n,keytemp,anyerr,keyerr(1) @@ -598,7 +597,7 @@ CCTK_REAL lam1,lam2,lam3,lamm,lamp,lamm_nobeta,lamp_nobeta CCTK_REAL cs2,one,two CCTK_REAL vlowx,vlowy,vlowz,v2,w - CCTK_REAL press,dpdrho,dpdeps,enthalpy,kappa + CCTK_REAL press,dpdeps,enthalpy,kappa CCTK_REAL axp,axm,vxp,vxm,cxx,cxy,cxz,gam,xsi,dlt CCTK_INT handle File [modified]: GRHydro_EigenproblemM.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_EigenproblemM.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_EigenproblemM.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -155,7 +155,7 @@ CCTK_REAL vlowx,vlowy,vlowz,v2,w CCTK_REAL lam1,lam2,lam3,lamm,lamp,lamm_nobeta,lamp_nobeta CCTK_INT handle, ii,jj,kk - CCTK_REAL dpdrho,dpdeps,press + CCTK_REAL press CCTK_REAL Bvcxlow,Bvcylow,Bvczlow,Bvc2,rhohstar,va2 CCTK_REAL Bdotv,b2 File [modified]: GRHydro_Eigenproblem_Marquina.F90 Delta lines: +10 -14 =================================================================== --- trunk/src/GRHydro_Eigenproblem_Marquina.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_Eigenproblem_Marquina.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -49,8 +49,8 @@ DECLARE_CCTK_PARAMETERS - CCTK_REAL rhor,velxr,velyr,velzr,epsr,w_lorentzr - CCTK_REAL rhol,velxl,velyl,velzl,epsl,w_lorentzl + CCTK_REAL rhor,velxr,velyr,velzr,epsr + CCTK_REAL rhol,velxl,velyl,velzl,epsl CCTK_REAL densl,sxl,syl,szl,taul CCTK_REAL densr,sxr,syr,szr,taur @@ -63,8 +63,8 @@ !!$ LOCAL VARS - CCTK_REAL du(5),aa(5,5),qdiff1,qdiff2,qdiff3,qdiff4,qdiff5 - integer i,j,k,l + CCTK_REAL du(5),aa(5,5) + integer i,j,k CCTK_REAL paug(5,6),tmp1,tmp2,sump,summ,f_du(5) CCTK_REAL leivec1l(5),leivec2l(5),leivec3l(5),leivecpl(5),leivecml(5) CCTK_REAL leivec1r(5),leivec2r(5),leivec3r(5),leivecpr(5),leivecmr(5) @@ -78,8 +78,6 @@ CCTK_REAL vlowxr,vlowyr,vlowzr,v2r,wr CCTK_REAL vlowxl,vlowyl,vlowzl,v2l,wl - CCTK_REAL lamp_nobeta,lamm_nobeta - CCTK_REAL pressl,dpdrhol,dpdepsl,enthalpyl,kappal CCTK_REAL pressr,dpdrhor,dpdepsr,enthalpyr,kappar CCTK_REAL axpl,axml,vxpl,vxml,xsil,dltl @@ -774,8 +772,8 @@ DECLARE_CCTK_PARAMETERS - CCTK_REAL rhor,velxr,velyr,velzr,epsr,w_lorentzr - CCTK_REAL rhol,velxl,velyl,velzl,epsl,w_lorentzl + CCTK_REAL rhor,velxr,velyr,velzr,epsr + CCTK_REAL rhol,velxl,velyl,velzl,epsl CCTK_REAL densl,sxl,syl,szl,taul CCTK_REAL densr,sxr,syr,szr,taur CCTK_REAL templ,tempr,ye_l,ye_r @@ -789,8 +787,8 @@ !!$ LOCAL VARS - CCTK_REAL du(5),aa(5,5),qdiff1,qdiff2,qdiff3,qdiff4,qdiff5 - integer i,j,k,l + CCTK_REAL du(5),aa(5,5) + integer i,j,k CCTK_REAL paug(5,6),tmp1,tmp2,sump,summ,f_du(5) CCTK_REAL leivec1l(5),leivec2l(5),leivec3l(5),leivecpl(5),leivecml(5) CCTK_REAL leivec1r(5),leivec2r(5),leivec3r(5),leivecpr(5),leivecmr(5) @@ -804,10 +802,8 @@ CCTK_REAL vlowxr,vlowyr,vlowzr,v2r,wr CCTK_REAL vlowxl,vlowyl,vlowzl,v2l,wl - CCTK_REAL lamp_nobeta,lamm_nobeta - - CCTK_REAL pressl,dpdrhol,dpdepsl,enthalpyl,kappal - CCTK_REAL pressr,dpdrhor,dpdepsr,enthalpyr,kappar + CCTK_REAL pressl,dpdepsl,enthalpyl,kappal + CCTK_REAL pressr,dpdepsr,enthalpyr,kappar CCTK_REAL axpl,axml,vxpl,vxml,xsil,dltl CCTK_REAL axpr,axmr,vxpr,vxmr,xsir,dltr CCTK_REAL cxx,cxy,cxz,gam,vxa,vxb File [modified]: GRHydro_EoSChangeGamma.F90 Delta lines: +0 -4 =================================================================== --- trunk/src/GRHydro_EoSChangeGamma.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_EoSChangeGamma.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -291,10 +291,6 @@ CCTK_REAL :: local_Gamma, local_k, eos_k_initial - CCTK_REAL, dimension(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)) :: Q - - character(len=100) infoline - ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 File [modified]: GRHydro_Flux.F90 Delta lines: +0 -1 =================================================================== --- trunk/src/GRHydro_Flux.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_Flux.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -36,7 +36,6 @@ CCTK_REAL :: dens,sx,sy,sz,tau,velx,vely,velz,det CCTK_REAL :: densf,sxf,syf,szf,tauf CCTK_REAL :: alp,beta,press - integer :: i,j,k integer :: xoffset,yoffset,zoffset densf = dens * ( (velx*xoffset + vely*yoffset + & File [modified]: GRHydro_FluxSplit.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_FluxSplit.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_FluxSplit.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -40,7 +40,7 @@ DECLARE_CCTK_FUNCTIONS integer :: nx, ny, nz, i, j, k, ierr, max_handle - CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, det, psi4pt, beta + CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, det, beta CCTK_REAL, dimension(5) :: lambda CCTK_REAL :: alpha1_local, alpha2_local, alpha3_local, alpha4_local, & alpha5_local @@ -287,7 +287,7 @@ integer :: nx, ny, nz, i, j, k CCTK_REAL, dimension(:), allocatable :: upper, det, dummy - CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, psi4pt + CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz nx = cctk_lsh(1) ny = cctk_lsh(2) File [modified]: GRHydro_HLLE.F90 Delta lines: +4 -4 =================================================================== --- trunk/src/GRHydro_HLLE.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_HLLE.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -166,9 +166,9 @@ CCTK_REAL, dimension(5) :: qdiff CCTK_REAL :: charmin, charmax, charpm,avg_alp,avg_det, etabar CCTK_REAL :: gxxh, gxyh, gxzh, gyyh, gyzh, gzzh, uxxh, uxyh, & - uxzh, uyyh, uyzh, uzzh, avg_beta, usendh, alp_l, alp_r + uxzh, uyyh, uyzh, uzzh, avg_beta, usendh - CCTK_INT :: type_bits, trivial, not_trivial + CCTK_INT :: type_bits, trivial ! sign requires its arguments to be of identical KIND CCTK_REAL, parameter :: one = 1d0 @@ -634,9 +634,9 @@ CCTK_REAL, dimension(number_of_tracers) :: qdiff CCTK_REAL :: charmin, charmax, charpm,avg_alp,avg_det CCTK_REAL :: gxxh, gxyh, gxzh, gyyh, gyzh, gzzh, uxxh, uxyh, & - uxzh, uyyh, uyzh, uzzh, avg_beta, usendh, alp_l, alp_r + uxzh, uyyh, uyzh, uzzh, avg_beta, usendh - CCTK_INT :: type_bits, trivial, not_trivial + CCTK_INT :: type_bits, trivial ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates File [modified]: GRHydro_HLLEM.F90 Delta lines: +4 -6 =================================================================== --- trunk/src/GRHydro_HLLEM.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_HLLEM.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -53,8 +53,7 @@ CCTK_REAL, dimension(5) :: lamminus,lamplus CCTK_REAL :: charmin, charmax, charpm,chartop,avg_alp,avg_det, sdet CCTK_REAL :: gxxh, gxyh, gxzh, gyyh, gyzh, gzzh, uxxh, uxyh, & - uxzh, uyyh, uyzh, uzzh, avg_beta, usendh, alp_l, alp_r, & - cs2_p, cs2_m, dpdeps_p, dpdeps_m + uxzh, uyyh, uyzh, uzzh, avg_beta, usendh CCTK_REAL :: rhoenth_p, rhoenth_m, avg_betax, avg_betay, avg_betaz CCTK_REAL :: vxtp,vytp,vztp,vxtm,vytm,vztm,ab0p,ab0m,b2p,b2m,bdotvp,bdotvm CCTK_REAL :: wp,wm,v2p,v2m,bxlowp,bxlowm,bylowp,bylowm,bzlowp,bzlowm,vA2m,vA2p @@ -66,7 +65,7 @@ CCTK_REAL :: psidcp, psidcm, psidcf, psidcdiff, psidcfp, psidcfm CCTK_REAL :: charmax_dc, charmin_dc, charpm_dc - CCTK_INT :: type_bits, trivial, not_trivial + CCTK_INT :: type_bits, trivial CCTK_REAL :: xtemp ! save memory when MP is not used @@ -724,11 +723,10 @@ CCTK_REAL, dimension(3) :: mag_p, mag_m CCTK_REAL :: charmin, charmax, charpm,avg_alp,avg_det CCTK_REAL :: gxxh, gxyh, gxzh, gyyh, gyzh, gzzh, uxxh, uxyh, & - uxzh, uyyh, uyzh, uzzh, avg_beta, usendh, alp_l, alp_r, & - cs2_p, cs2_m, dpdeps_p, dpdeps_m + uxzh, uyyh, uyzh, uzzh, avg_beta, usendh CCTK_REAL :: b2p,b2m,vA2m,vA2p - CCTK_INT :: type_bits, trivial, not_trivial + CCTK_INT :: type_bits, trivial ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates File [modified]: GRHydro_HLLE_AM.F90 Delta lines: +4 -6 =================================================================== --- trunk/src/GRHydro_HLLE_AM.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_HLLE_AM.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -53,8 +53,7 @@ CCTK_REAL, dimension(5) :: lamminus,lamplus CCTK_REAL :: charmin, charmax, charpm,chartop,avg_alp,avg_det, sdet CCTK_REAL :: gxxh, gxyh, gxzh, gyyh, gyzh, gzzh, uxxh, uxyh, & - uxzh, uyyh, uyzh, uzzh, avg_beta, usendh, alp_l, alp_r, & - cs2_p, cs2_m, dpdeps_p, dpdeps_m + uxzh, uyyh, uyzh, uzzh, avg_beta, usendh CCTK_REAL :: rhoenth_p, rhoenth_m, avg_betax, avg_betay, avg_betaz CCTK_REAL :: vxtp,vytp,vztp,vxtm,vytm,vztm,ab0p,ab0m,b2p,b2m,bdotvp,bdotvm CCTK_REAL :: wp,wm,v2p,v2m,bxlowp,bxlowm,bylowp,bylowm,bzlowp,bzlowm,vA2m,vA2p @@ -64,7 +63,7 @@ CCTK_REAL :: psidcp, psidcm, psidcf, psidcdiff, psidcfp, psidcfm CCTK_REAL :: charmax_dc, charmin_dc, charpm_dc - CCTK_INT :: type_bits, trivial, not_trivial + CCTK_INT :: type_bits, trivial CCTK_REAL :: xtemp ! save memory when MP is not used @@ -681,11 +680,10 @@ CCTK_REAL, dimension(3) :: mag_p, mag_m CCTK_REAL :: charmin, charmax, charpm,avg_alp,avg_det CCTK_REAL :: gxxh, gxyh, gxzh, gyyh, gyzh, gzzh, uxxh, uxyh, & - uxzh, uyyh, uyzh, uzzh, avg_beta, usendh, alp_l, alp_r, & - cs2_p, cs2_m, dpdeps_p, dpdeps_m + uxzh, uyyh, uyzh, uzzh, avg_beta, usendh CCTK_REAL :: b2p,b2m,vA2m,vA2p - CCTK_INT :: type_bits, trivial, not_trivial + CCTK_INT :: type_bits, trivial ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates File [modified]: GRHydro_MP5Reconstruct.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_MP5Reconstruct.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_MP5Reconstruct.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -40,7 +40,7 @@ DECLARE_CCTK_PARAMETERS - CCTK_INT :: nx, i, j, k, r + CCTK_INT :: nx, i CCTK_REAL, dimension(nx) :: v, vplus, vminus CCTK_INT, dimension(nx) :: hydro_excision_mask @@ -95,7 +95,7 @@ #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)) -#define MP5(am2, am1, a, ap1, ap2, arecon) \ +#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 &&\ vmp = a + MINMOD( ap1-a, mp5_alpha*(a-am1) ) &&\ if ((vl-a)*(vl-vmp) .le. mp5_eps) then &&\ File [modified]: GRHydro_Marquina.F90 Delta lines: +1 -2 =================================================================== --- trunk/src/GRHydro_Marquina.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_Marquina.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -45,13 +45,12 @@ consp,consm_i,fplus,fminus,f_marquina,primp,primm_i CCTK_REAL :: avg_alp,avg_beta,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh, & avg_det,uxxh,uxyh,uxzh,uyyh,uyzh,uzzh,& - pressp,pressm_i, & tmp_w_lorentzp, tmp_w_lorentzm_i, w_lorentzp,w_lorentzm_i, usendh, psi4h integer :: m integer :: i,j,k integer :: keytemp - CCTK_INT :: type_bits, trivial, not_trivial + CCTK_INT :: type_bits, trivial if(evolve_temper.eq.1.and.reconstruct_temper.eq.1) then keytemp = 1 File [modified]: GRHydro_PPM.F90 Delta lines: +2 -18 =================================================================== --- trunk/src/GRHydro_PPM.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_PPM.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -73,13 +73,6 @@ CCTK_REAL, dimension(nx) :: rho,velx,vely,velz,eps CCTK_REAL, dimension(nx) :: rhominus,velxminus,velyminus,velzminus,epsminus CCTK_REAL, dimension(nx) :: rhoplus,velxplus,velyplus,velzplus,epsplus - CCTK_REAL, dimension(nx) :: rhominusl,velxminusl,velyminusl,velzminusl - CCTK_REAL, dimension(nx) :: epsminusl - CCTK_REAL, dimension(nx) :: rhoplusl,velxplusl,velyplusl,velzplusl,epsplusl - CCTK_REAL, dimension(nx) :: rhominusr,velxminusr,velyminusr,velzminusr - CCTK_REAL, dimension(nx) :: epsminusr - CCTK_REAL, dimension(nx) :: rhoplusr,velxplusr,velyplusr,velzplusr,epsplusr - CCTK_REAL, dimension(nx) :: atmosphere_mask CCTK_INT :: i,s CCTK_REAL, dimension(nx) :: drho,dvelx,dvely,dvelz,deps @@ -98,7 +91,6 @@ CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, det CCTK_REAL, dimension(5) :: lam - CCTK_REAL :: dupw, dloc, delta CCTK_REAL :: agxx, agxy, agxz, agyy, agyz, agzz CCTK_REAL, dimension(nx) :: xwind, l_ev_l, l_ev_r @@ -1046,17 +1038,12 @@ CCTK_REAL, dimension(nx) :: temperature, velx CCTK_REAL, dimension(nx) :: tempminus CCTK_REAL, dimension(nx) :: tempplus - CCTK_REAL, dimension(nx) :: tempminusl - CCTK_REAL, dimension(nx) :: tempplusl - CCTK_REAL, dimension(nx) :: tempminusr - CCTK_REAL, dimension(nx) :: tempplusr - CCTK_REAL, dimension(nx) :: atmosphere_mask CCTK_INT :: i,s CCTK_REAL, dimension(nx) :: dtemp CCTK_REAL, dimension(nx) :: dmtemp CCTK_REAL, dimension(nx) :: press,dpress,tilde_flatten - CCTK_REAL :: dpress2,dvel,w,flatten,eta,etatilde + CCTK_REAL :: dpress2,dvel,w,flatten CCTK_INT, dimension(nx) :: hydro_excision_mask @@ -1569,7 +1556,6 @@ CCTK_REAL, dimension(nx) :: press,dpress,tilde_flatten CCTK_REAL, dimension(nx,number_of_tracers) :: dmtracer, dtracer, tracerflat!, d2tracer CCTK_REAL :: dpress2,w,flatten,dvel - CCTK_REAL :: eta, etatilde !!$ Average slopes delta_m(a). See (1.7) of Colella and Woodward, p.178 !!$ This is the expression for an even grid. @@ -1777,14 +1763,12 @@ CCTK_REAL :: dx CCTK_REAL, dimension(nx) :: rho,velx,vely,velz CCTK_REAL, dimension(nx) :: Y_e,Y_e_minus,Y_e_plus - CCTK_REAL :: Y_eflatomega CCTK_INT :: i,s CCTK_REAL, dimension(nx) :: press,dpress,tilde_flatten - CCTK_REAL, dimension(nx) :: dmY_e, dY_e, Y_eflat!, d2tracer + CCTK_REAL, dimension(nx) :: dmY_e, dY_e CCTK_REAL :: dpress2,w,flatten,dvel - CCTK_REAL :: eta, etatilde CCTK_REAL :: D2a, D2aL, D2aR, D2aC, D2aLim, rhi, daplus, daminus, D3a, D3aLL, D3aL, D3aR, D2aLL, D2aRR, D3aMin, D3aMax File [modified]: GRHydro_PPMM.F90 Delta lines: +0 -1 =================================================================== --- trunk/src/GRHydro_PPMM.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_PPMM.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -73,7 +73,6 @@ CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, det CCTK_REAL, dimension(5) :: lam - CCTK_REAL :: dupw, dloc, delta CCTK_REAL :: agxx, agxy, agxz, agyy, agyz, agzz CCTK_REAL, dimension(nx) :: xwind, l_ev_l, l_ev_r File [modified]: GRHydro_PPMMReconstruct_drv.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_PPMMReconstruct_drv.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_PPMMReconstruct_drv.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -60,7 +60,7 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS - integer :: nx, ny, nz, i, j, k, itracer + integer :: nx, ny, nz, i, j, k logical, dimension(:,:,:), allocatable :: trivial_rp File [modified]: GRHydro_PPMReconstruct_drv.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_PPMReconstruct_drv.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_PPMReconstruct_drv.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -53,7 +53,7 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS - integer :: nx, ny, nz, i, j, k, itracer + integer :: nx, ny, nz, i, j, k logical, dimension(:,:,:), allocatable :: trivial_rp File [modified]: GRHydro_Particle.F90 Delta lines: +1 -2 =================================================================== --- trunk/src/GRHydro_Particle.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_Particle.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -36,14 +36,13 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_FUNCTIONS - CCTK_INT :: i, l + CCTK_INT :: i CCTK_INT :: interp_handle, table_handle, status, coord_system_handle character(len=200) :: particle_interp character(len=128) :: warn_message CCTK_INT :: particle_interp_len character(len=7) :: particle_order - character(len=15) :: vname CCTK_INT, dimension(1) :: lsh CCTK_POINTER, dimension(3) :: interp_coords File [modified]: GRHydro_Prim2Con.F90 Delta lines: +0 -1 =================================================================== --- trunk/src/GRHydro_Prim2Con.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_Prim2Con.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -441,7 +441,6 @@ CCTK_INT :: i, j, k CCTK_INT :: keytemp CCTK_REAL :: det - character(len=512) :: warnline ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates File [modified]: GRHydro_Prim2ConAM.F90 Delta lines: +1 -2 =================================================================== --- trunk/src/GRHydro_Prim2ConAM.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_Prim2ConAM.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -438,7 +438,6 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS - CCTK_REAL :: xtemp(1) CCTK_INT :: i, j, k CCTK_REAL :: det CCTK_REAL :: maxtau0 @@ -631,7 +630,7 @@ CCTK_REAL :: gxx, gxy, gxz, gyy, gyz, gzz, det CCTK_REAL :: ddens, dsx, dsy, dsz, dtau, & drho, dvelx, dvely, dvelz, deps, dpress, dBvcx, dBvcy, dBvcz, & - w_tmp, w, vlowx, vlowy, vlowz, sqrtdet + w_tmp, w, vlowx, vlowy, vlowz CCTK_INT :: handle CCTK_REAL :: Bdotv,ab0,b2,blowx,blowy,blowz character(len=256) NaN_WarnLine File [modified]: GRHydro_Prim2ConM.F90 Delta lines: +1 -2 =================================================================== --- trunk/src/GRHydro_Prim2ConM.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_Prim2ConM.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -455,7 +455,6 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS - CCTK_REAL :: xtemp(1) CCTK_INT :: i, j, k CCTK_REAL :: det CCTK_REAL :: maxtau0 @@ -654,7 +653,7 @@ CCTK_REAL :: gxx, gxy, gxz, gyy, gyz, gzz, det CCTK_REAL :: ddens, dsx, dsy, dsz, dtau, dBconsx, dBconsy, dBconsz, & drho, dvelx, dvely, dvelz, deps, dpress, dBvcx, dBvcy, dBvcz, & - w_tmp, w, vlowx, vlowy, vlowz, sqrtdet + w_tmp, w, vlowx, vlowy, vlowz CCTK_INT :: handle CCTK_REAL :: Bdotv,ab0,b2,blowx,blowy,blowz character(len=256) NaN_WarnLine File [modified]: GRHydro_Reconstruct.F90 Delta lines: +0 -1 =================================================================== --- trunk/src/GRHydro_Reconstruct.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_Reconstruct.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -49,7 +49,6 @@ CCTK_REAL :: local_min_tracer, dummy1, dummy2 CCTK_INT :: type_bits, not_trivial CCTK_REAL :: agxx, agxy, agxz, agyy, agyz, agzz, w - character*256 :: warnline ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates File [modified]: GRHydro_RiemannSolve.F90 Delta lines: +0 -4 =================================================================== --- trunk/src/GRHydro_RiemannSolve.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_RiemannSolve.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -36,8 +36,6 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS - CCTK_INT :: i,j,k - if (CCTK_EQUALS(riemann_solver,"HLLE")) then call GRHydro_HLLE(CCTK_PASS_FTOF) @@ -93,8 +91,6 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS - CCTK_INT :: i,j,k - if (CCTK_EQUALS(riemann_solver,"HLLE")) then call GRHydro_HLLE(CCTK_PASS_FTOF) File [modified]: GRHydro_RiemannSolveAM.F90 Delta lines: +0 -4 =================================================================== --- trunk/src/GRHydro_RiemannSolveAM.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_RiemannSolveAM.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -36,8 +36,6 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS - CCTK_INT :: i,j,k - if (CCTK_EQUALS(riemann_solver,"HLLE").or.CCTK_EQUALS(riemann_solver,"LLF")) then call GRHydro_HLLE_AM(CCTK_PASS_FTOF) @@ -100,8 +98,6 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS - CCTK_INT :: i,j,k - if (CCTK_EQUALS(riemann_solver,"HLLE")) then call GRHydro_HLLE_AM(CCTK_PASS_FTOF) File [modified]: GRHydro_RiemannSolveM.F90 Delta lines: +0 -4 =================================================================== --- trunk/src/GRHydro_RiemannSolveM.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_RiemannSolveM.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -36,8 +36,6 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS - CCTK_INT :: i,j,k - if (CCTK_EQUALS(riemann_solver,"HLLE").or.CCTK_EQUALS(riemann_solver,"LLF")) then call GRHydro_HLLEM(CCTK_PASS_FTOF) @@ -100,8 +98,6 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS - CCTK_INT :: i,j,k - if (CCTK_EQUALS(riemann_solver,"HLLE")) then call GRHydro_HLLEM(CCTK_PASS_FTOF) File [modified]: GRHydro_RoeSolver.F90 Delta lines: +4 -4 =================================================================== --- trunk/src/GRHydro_RoeSolver.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_RoeSolver.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -38,15 +38,15 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS CCTK_REAL, dimension(5) :: roeflux,roeave,qdiff,consp,consm_i,& - fplus,fminus,f_roe,primp,primm_i,consh + fplus,fminus,f_roe,primp,primm_i CCTK_REAL :: avg_alp,avg_beta,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh, & avg_det,uxxh,uxyh,uxzh,uyyh,uyzh,uzzh,& - rhoave, velxave, velyave, velzave, pressave, epsave, & - w_lorentzave, usendh, alp_l, alp_r, psi4h + rhoave, velxave, velyave, velzave, epsave, & + w_lorentzave, usendh integer :: m integer :: i,j,k - CCTK_INT :: type_bits, trivial, not_trivial + CCTK_INT :: type_bits, trivial if (flux_direction == 1) then call SpaceMask_GetTypeBits(type_bits, "Hydro_RiemannProblemX") File [modified]: GRHydro_WENOReconstruct.F90 Delta lines: +3 -4 =================================================================== --- trunk/src/GRHydro_WENOReconstruct.F90 2013-03-28 01:46:34 UTC (rev 494) +++ trunk/src/GRHydro_WENOReconstruct.F90 2013-03-28 01:46:38 UTC (rev 495) @@ -40,8 +40,7 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS - CCTK_INT :: i, j, k, l, m, q, allocstat - CCTK_REAL :: denominator, numerator, numerator_product + CCTK_INT :: allocstat if(.not.coeffs_allocated) then ! Right now we hardcode to 5th order @@ -156,7 +155,7 @@ DECLARE_CCTK_PARAMETERS - CCTK_INT :: order, nx, i, j, k, r + CCTK_INT :: order, nx, i, j CCTK_REAL, dimension(nx) :: v, vplus, vminus CCTK_INT, dimension(nx) :: hydro_excision_mask @@ -164,7 +163,7 @@ logical, dimension(nx) :: excise logical :: normal_weno - CCTK_REAL :: large = 1.d10, gamma1, gamma2, gamma3, beta1, beta2, beta3, vnorm, betanorm + CCTK_REAL :: beta1, beta2, beta3, vnorm, betanorm CCTK_REAL :: wplus1, wplus2, wplus3, wbarplus1, wbarplus2, wbarplus3 CCTK_REAL :: wminus1, wminus2, wminus3, wbarminus1, wbarminus2, wbarminus3

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 494)
by rhaas＠tapir.caltech.edu 27 Mar '13

27 Mar '13

User: rhaas Date: 2013/03/27 08:46 PM Modified: /trunk/src/ GRHydro_Eigenproblem.F90 Log: GRHydro: reduce size of critical section in eigenbalues routine From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2013-03-28 01:46:32 UTC (rev 493) +++ trunk/src/GRHydro_Eigenproblem.F90 2013-03-28 01:46:34 UTC (rev 494) @@ -86,16 +86,16 @@ (1.0d0 + eps + press/rho) if(cs2.lt.0.0d0) then - !$OMP CRITICAL if (abs(cs2) .gt. 1.0d-4) then + !$OMP CRITICAL write(warnline,'(a60,6g16.7)') 'abs(cs2), rho, dpdrho, press*dpdeps/rho**2, eps, press/rho: ', abs(cs2), rho, dpdrho, press * dpdeps / (rho**2), eps, press/rho call CCTK_WARN(1,warnline) call CCTK_WARN(1,"cs2 < 0! Check speed of sound calculation!") + !$OMP END CRITICAL cs2 = 0.0d0 else cs2 = 0.0d0 endif - !$OMP END CRITICAL endif

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 493)
by rhaas＠tapir.caltech.edu 27 Mar '13

27 Mar '13

User: rhaas Date: 2013/03/27 08:46 PM Modified: /trunk/src/ GRHydro_HLLE.F90 Log: GRHydro: convert more tabs to (8) spaces. No other changes. From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_HLLE.F90 Delta lines: +4 -4 =================================================================== --- trunk/src/GRHydro_HLLE.F90 2013-03-28 01:46:29 UTC (rev 492) +++ trunk/src/GRHydro_HLLE.F90 2013-03-28 01:46:32 UTC (rev 493) @@ -114,13 +114,13 @@ if (evolve_temper.ne.1) then call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& - rho(i,j,k),eps(i,j,k),xtemp,xye,xpress,keyerr,anyerr) + rho(i,j,k),eps(i,j,k),xtemp,xye,xpress,keyerr,anyerr) - call EOS_Omni_DPressByDEps(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& - rho(i,j,k),eps(i,j,k),xtemp,xye,dpdeps,keyerr,anyerr) + call EOS_Omni_DPressByDEps(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),eps(i,j,k),xtemp,xye,dpdeps,keyerr,anyerr) call EOS_Omni_DPressByDRho(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& - rho(i,j,k),eps(i,j,k),xtemp,xye,dpdrho,keyerr,anyerr) + rho(i,j,k),eps(i,j,k),xtemp,xye,dpdrho,keyerr,anyerr) cs2 = (dpdrho + xpress(1) * dpdeps / (rho(i,j,k)**2))/ & (1.0d0 + eps(i,j,k) + xpress(1)/rho(i,j,k))

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 492)
by rhaas＠tapir.caltech.edu 27 Mar '13

27 Mar '13

User: rhaas Date: 2013/03/27 08:46 PM Modified: /trunk/ param.ccl Log: GRHydro: Make recon_method steerable at recovery. From: Christian Reisswig <reisswig(a)scriwalker.(none)> File Changes: Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +1 -1 =================================================================== --- trunk/param.ccl 2013-03-28 01:46:26 UTC (rev 491) +++ trunk/param.ccl 2013-03-28 01:46:29 UTC (rev 492) @@ -134,7 +134,7 @@ 0:16 :: "A small range, depending on testing or not" } 16 -keyword recon_method "Which reconstruction method to use" +keyword recon_method "Which reconstruction method to use" STEERABLE=RECOVER { "tvd" :: "Slope limited TVD" "ppm" :: "PPM reconstruction"

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 491)
by rhaas＠tapir.caltech.edu 27 Mar '13

27 Mar '13

User: rhaas Date: 2013/03/27 08:46 PM Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ GRHydro_HLLE.F90 Log: GRHydro: implemented H viscosity for HLLE solver to eliminate the carbuncle instability. Tested with shocktube and TOV. Not yet tested for problem where carbuncles occur. From: Christian Reisswig <reisswig(a)scriwalker.(none)> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_HLLE.F90 Delta lines: +168 -3 =================================================================== --- trunk/src/GRHydro_HLLE.F90 2013-03-06 00:13:43 UTC (rev 490) +++ trunk/src/GRHydro_HLLE.F90 2013-03-28 01:46:26 UTC (rev 491) @@ -31,6 +31,118 @@ @@*/ +! eta across face in x-direction +#define etaX(i,j,k, v, c) \ + (0.5d0*(abs(v(i+1,j,k,0)-v(i,j,k,0)) + abs(c(i+1,j,k)-c(i,j,k)))) + +! eta across face in x-direction +#define etaY(i,j,k, v, c) \ + (0.5d0*(abs(v(i,j+1,k,1)-v(i,j,k,1)) + abs(c(i,j+1,k)-c(i,j,k)))) + +! eta across face in x-direction +#define etaZ(i,j,k, v, c) \ + (0.5d0*(abs(v(i,j,k+1,2)-v(i,j,k,2)) + abs(c(i,j,k+1)-c(i,j,k)))) + + + +subroutine H_viscosity(CCTK_ARGUMENTS) + implicit none + + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET lvel, vel + + DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS + + integer :: i, j, k, nx, ny, nz + CCTK_REAL dpdrho,dpdeps, cs2 + character*256 :: warnline + + ! save memory when MP is not used + CCTK_INT :: GRHydro_UseGeneralCoordinates + CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 + CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup + +! begin EOS Omni vars + integer :: n,keytemp,anyerr,keyerr(1) + real*8 :: xpress(1),xeps(1),xtemp(1),xye(1) + n = 1;keytemp = 0;anyerr = 0;keyerr(1) = 0 + xpress = 0.0d0;xeps = 0.0d0;xtemp = 0.0d0;xye = 0.0d0 +! end EOS Omni vars + + ! save memory when MP is not used + if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then + g11 => gaa + g12 => gab + g13 => gac + g22 => gbb + g23 => gbc + g33 => gcc + vup => lvel + else + g11 => gxx + g12 => gxy + g13 => gxz + g22 => gyy + g23 => gyz + g33 => gzz + vup => vel + end if + + nx = cctk_lsh(1) + ny = cctk_lsh(2) + nz = cctk_lsh(3) + + !$OMP PARALLEL DO PRIVATE(i,j,k,& + !$OMP anyerr, keyerr, keytemp,& + !$OMP warnline, xpress,xeps,xtemp,xye, dpdrho, dpdeps, cs2) + do k = 1, nz + do j = 1, ny + do i = 1, nx + + ! set to zero initially + eos_c(i,j,k) = 0.0d0 + + !do not compute if in atmosphere or in excised region + if ((atmosphere_mask(i,j,k) .ne. 0) .or. & + (hydro_excision_mask(i,j,k) .ne. 0)) cycle + +!!$ Set required fluid quantities + if (evolve_temper.ne.1) then + + call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),eps(i,j,k),xtemp,xye,xpress,keyerr,anyerr) + + call EOS_Omni_DPressByDEps(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),eps(i,j,k),xtemp,xye,dpdeps,keyerr,anyerr) + + call EOS_Omni_DPressByDRho(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),eps(i,j,k),xtemp,xye,dpdrho,keyerr,anyerr) + + cs2 = (dpdrho + xpress(1) * dpdeps / (rho(i,j,k)**2))/ & + (1.0d0 + eps(i,j,k) + xpress(1)/rho(i,j,k)) + + eos_c(i,j,k) = sqrt(cs2) + + else + + call EOS_Omni_cs2(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),eps(i,j,k),temperature(i,j,k),Y_e(i,j,k),cs2,keyerr,anyerr) + + eos_c(i,j,k) = sqrt(cs2) + + end if + + end do + end do + end do + +end subroutine H_viscosity + + subroutine GRHydro_HLLE(CCTK_ARGUMENTS) USE GRHydro_Eigenproblem @@ -42,6 +154,7 @@ TARGET gxx, gxy, gxz, gyy, gyz, gzz TARGET betaa, betab, betac TARGET betax, betay, betaz + TARGET lvel, vel DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -51,17 +164,21 @@ CCTK_REAL, dimension(5) :: consp,consm_i,fplus,fminus,lamplus CCTK_REAL, dimension(5) :: f1,lamminus CCTK_REAL, dimension(5) :: qdiff - CCTK_REAL :: charmin, charmax, charpm,avg_alp,avg_det + CCTK_REAL :: charmin, charmax, charpm,avg_alp,avg_det, etabar CCTK_REAL :: gxxh, gxyh, gxzh, gyyh, gyzh, gzzh, uxxh, uxyh, & uxzh, uyyh, uyzh, uzzh, avg_beta, usendh, alp_l, alp_r CCTK_INT :: type_bits, trivial, not_trivial + ! sign requires its arguments to be of identical KIND + CCTK_REAL, parameter :: one = 1d0 + ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:), POINTER :: beta1, beta2, beta3 - + CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup + if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then g11 => gaa g12 => gab @@ -72,6 +189,7 @@ beta1 => betaa beta2 => betab beta3 => betac + vup => lvel else g11 => gxx g12 => gxy @@ -82,6 +200,7 @@ beta1 => betax beta2 => betay beta3 => betaz + vup => vel end if if (flux_direction == 1) then @@ -111,7 +230,7 @@ !$OMP avg_det,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh, & !$OMP uxxh,uxyh,uxzh,uyyh,uyzh,uzzh, & !$OMP usendh, charmin, charmax, charpm, & - !$OMP m) + !$OMP m,etabar) do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil @@ -381,7 +500,53 @@ else call CCTK_WARN(0, "Flux direction not x,y,z") end if + +!!$ Compute H viscosity if requested + if (apply_H_viscosity .ne. 0) then + + if (flux_direction == 1) then + etabar = max(etaX(i,j,k, vup, eos_c),& + etaY(i,j,k, vup, eos_c),& + etaY(i+1,j,k, vup, eos_c),& + etaY(i,j-1,k, vup, eos_c),& + etaY(i+1,j-1,k, vup, eos_c),& + etaZ(i,j,k, vup, eos_c),& + etaZ(i+1,j,k, vup, eos_c),& + etaZ(i,j,k-1, vup, eos_c),& + etaZ(i+1,j,k-1, vup, eos_c)) + else if (flux_direction == 2) then + etabar = max(etaY(i,j,k, vup, eos_c),& + etaX(i,j,k, vup, eos_c),& + etaX(i,j+1,k, vup, eos_c),& + etaX(i-1,j,k, vup, eos_c),& + etaX(i-1,j+1,k, vup, eos_c),& + etaZ(i,j,k, vup, eos_c),& + etaZ(i,j+1,k, vup, eos_c),& + etaZ(i,j,k-1, vup, eos_c),& + etaZ(i,j+1,k-1, vup, eos_c)) + else if (flux_direction == 3) then + etabar = max(etaZ(i,j,k, vup, eos_c),& + etaX(i,j,k, vup, eos_c),& + etaX(i,j,k+1, vup, eos_c),& + etaX(i-1,j,k, vup, eos_c),& + etaX(i-1,j,k+1, vup, eos_c),& + etaY(i,j,k, vup, eos_c),& + etaY(i,j,k+1, vup, eos_c),& + etaY(i,j-1,k, vup, eos_c),& + etaY(i,j-1,k+1, vup, eos_c)) + else + call CCTK_WARN(0, "Flux direction not x,y,z") + end if + + ! modify eigenvalues of Roe's matrix by computed H viscosity + do m = 1,5 + lamplus(m) = sign(one, lamplus(m))*max(abs(lamplus(m)), etabar) + lamminus(m) = sign(one, lamminus(m))*max(abs(lamminus(m)), etabar) + end do + endif + + !!$ Find minimum and maximum wavespeeds charmin = min(0.d0, lamplus(1), lamplus(2), lamplus(3), & Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +6 -0 =================================================================== --- trunk/interface.ccl 2013-03-06 00:13:43 UTC (rev 490) +++ trunk/interface.ccl 2013-03-28 01:46:26 UTC (rev 491) @@ -747,3 +747,9 @@ eos_dpdeps_temp, eos_dpdrho_temp } "Temporaries for the conservative to primitive conversion" +CCTK_REAL H_viscosity_temps TYPE=GF tags='Prolongation="None" checkpoint="no"' +{ + eos_c +} "Temporaries for H viscosity" + + File [modified]: param.ccl Delta lines: +4 -0 =================================================================== --- trunk/param.ccl 2013-03-06 00:13:43 UTC (rev 490) +++ trunk/param.ccl 2013-03-28 01:46:26 UTC (rev 491) @@ -310,6 +310,10 @@ "normal" :: "Normal numerical viscosity" } "fast" +boolean apply_H_viscosity "H viscosity is useful to fix the carbuncle instability seen at strong shocks" +{ +} no + keyword bound "Which boundary condition to use - FIXME" { "flat" :: "Zero order extrapolation" File [modified]: schedule.ccl Delta lines: +17 -1 =================================================================== --- trunk/schedule.ccl 2013-03-06 00:13:43 UTC (rev 490) +++ trunk/schedule.ccl 2013-03-28 01:46:26 UTC (rev 491) @@ -264,6 +264,16 @@ STORAGE: conformal_state + +############################################### +### Storage for the H viscosity temporaries ### +############################################### + +if (apply_H_viscosity) +{ + STORAGE: H_viscosity_temps +} + ############################### ### Register startup banner ### ############################### @@ -1547,5 +1557,11 @@ } +if (apply_H_viscosity) { + SCHEDULE H_viscosity in GRHydroRHS BEFORE FluxTerms + { + LANG: FORTRAN + OPTION: LOCAL + } "Compute local temporaries for H viscosity" +} -

1 0

[svn:einsteintoolkit] manifest/trunk/ (Rev. 217)
by bcmsma＠astro.rit.edu 27 Mar '13

27 Mar '13

User: bmundim Date: 2013/03/27 06:42 PM Modified: /trunk/ einsteintoolkit.bib Log: new references File Changes: Directory: /trunk/ ================== File [modified]: einsteintoolkit.bib Delta lines: +22 -0 =================================================================== --- trunk/einsteintoolkit.bib 2013-03-27 17:28:28 UTC (rev 216) +++ trunk/einsteintoolkit.bib 2013-03-27 23:42:50 UTC (rev 217) @@ -1127,6 +1127,18 @@ SLACcitation = "%%CITATION = GR-QC/0512001;%%" } +@article{Dionysopoulou:2012zv, + author = "Dionysopoulou, Kyriaki and Alic, Daniela and Palenzuela, + Carlos and Rezzolla, Luciano and Giacomazzo, Bruno", + title = "{General-Relativistic Resistive Magnetohydrodynamics in + three dimensions: formulation and tests}", + year = "2012", + eprint = "1208.3487", + archivePrefix = "arXiv", + primaryClass = "gr-qc", + SLACcitation = "%%CITATION = ARXIV:1208.3487;%%", +} + @article{Dimmelmeier:2007ui, author = "Dimmelmeier, Harald and Ott, Christian D. and Janka, Hans-Thomas and Marek, Andreas and Mueller, Ewald", @@ -2509,6 +2521,16 @@ eprint = "arXiv:0810.1838 [astro-ph]", } +@article{Palenzuela:2012my, + author = "Palenzuela, Carlos", + title = "{Modeling magnetized neutron stars using resistive MHD}", + year = "2012", + eprint = "1212.0130", + archivePrefix = "arXiv", + primaryClass = "astro-ph.HE", + SLACcitation = "%%CITATION = ARXIV:1212.0130;%%", +} + @phdthesis{Penner:2011zz, author = {Penner, Andrew J.}, title = {Numerical Analysis of the Ultrarelativistic and Magnetized Bondi-Hoyle Problem},

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits March 2013