[Commits] [svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 246)
bcmsma at astro.rit.edu
bcmsma at astro.rit.edu
Thu Apr 28 16:33:20 CDT 2011
User: bmundim
Date: 2011/04/28 04:33 PM
Modified:
/trunk/src/
GRHydro_CalcUpdate.F90, GRHydro_HLLEM.F90, GRHydro_Reconstruct.F90, GRHydro_SourceM.F90
Log:
JOsh's fixes.
File Changes:
Directory: /trunk/src/
======================
File [modified]: GRHydro_CalcUpdate.F90
Delta lines: +2 -8
===================================================================
--- trunk/src/GRHydro_CalcUpdate.F90 2011-04-28 19:15:41 UTC (rev 245)
+++ trunk/src/GRHydro_CalcUpdate.F90 2011-04-28 21:33:20 UTC (rev 246)
@@ -59,7 +59,7 @@
do k = GRHydro_stencil + 1, cctk_lsh(3) - GRHydro_stencil
do j = GRHydro_stencil + 1, cctk_lsh(2) - GRHydro_stencil
do i = GRHydro_stencil + 1, cctk_lsh(1) - GRHydro_stencil
-
+
alp_l = 0.5d0 * (alp(i,j,k) + &
alp(i-xoffset,j-yoffset,k-zoffset))
alp_r = 0.5d0 * (alp(i,j,k) + &
@@ -103,12 +103,6 @@
divB(i,j,k) = divB(i,j,k) + ( alp_l * Bvec_l - alp_r * Bvec_r ) * idx
endif
-!!$ if(i.eq.75.and.j.eq.5.and.k.eq.5)write(6,*)'update:', &
-!!$ Bconsrhs(i,j,k,1),Bconsxflux(i,j,k), &
-!!$ Bconsxflux(i-xoffset,j-yoffset,k-zoffset), &
-!!$ Bconsrhs(i,j,k,3),Bconszflux(i,j,k), &
-!!$ Bconszflux(i-xoffset,j-yoffset,k-zoffset)
-
endif
if (evolve_tracer .ne. 0) then
@@ -270,7 +264,7 @@
divB(i,j,k) = divB(i,j,k) + ( Bvec_l - Bvec_r ) * idx
endif
endif
-
+
enddo
enddo
enddo
File [modified]: GRHydro_HLLEM.F90
Delta lines: +2 -9
===================================================================
--- trunk/src/GRHydro_HLLEM.F90 2011-04-28 19:15:41 UTC (rev 245)
+++ trunk/src/GRHydro_HLLEM.F90 2011-04-28 21:33:20 UTC (rev 246)
@@ -111,8 +111,6 @@
cons_m(7) = Bconsyminus(i+xoffset,j+yoffset,k+zoffset)
cons_m(8) = Bconszminus(i+xoffset,j+yoffset,k+zoffset)
-!!$ if(i.eq.75.and.j.eq.5.and.k.eq.5)write(6,*)'HLLEM0:',cons_m(6),cons_p(6),cons_m(7),cons_p(7),cons_m(8),cons_p(8)
-
prim_p(1) = rhoplus(i,j,k)
prim_p(2) = velxplus(i,j,k)
prim_p(3) = velyplus(i,j,k)
@@ -353,6 +351,7 @@
fminus(7),fminus(8),fminus(6),&
vytm,vztm,vxtm,pressstarm,bylowm,bzlowm,bxlowm,ab0m,wm, &
avg_det,avg_alp,avg_beta)
+
if(clean_divergence.ne.0) then
fminus(6)=fminus(6) + avg_alp*sdet*uxyh*psidcm - cons_m(7)*avg_betax
fminus(7)=fminus(7) + avg_alp*sdet*uyyh*psidcm - cons_m(7)*avg_betay
@@ -386,6 +385,7 @@
fminus(8),fminus(6),fminus(7), &
vztm,vxtm,vytm,pressstarm,bzlowm,bxlowm,bylowm,ab0m,wm, &
avg_det,avg_alp,avg_beta)
+
if(clean_divergence.ne.0) then
fminus(6)=fminus(6) + avg_alp*sdet*uxzh*psidcm - cons_m(8)*avg_betax
fminus(7)=fminus(7) + avg_alp*sdet*uyzh*psidcm - cons_m(8)*avg_betay
@@ -414,8 +414,6 @@
charpm = charmax - charmin
-!!$ if(i.eq.75.and.j.eq.5.and.k.eq.5)write(6,*)'HLLEM:',fplus(6),fminus(6),fplus(8),fminus(8),charmax,charmin,cons_p(6),cons_m(6)
-
!!$ Calculate flux by standard formula
do m = 1,8
@@ -427,9 +425,6 @@
end do
-!!$ if(i.eq.75.and.j.eq.5.and.k.eq.5)write(6,*)'HLLEM2:',fplus(6),fminus(6),fplus(8),fminus(8),charmax,charmin,qdiff(6),qdiff(8),f1(6),f1(8)
-
-
if(clean_divergence.ne.0) then
psidcdiff = psidcm - psidcp
@@ -456,8 +451,6 @@
Bconsyflux(i, j, k) = f1(7)
Bconszflux(i, j, k) = f1(8)
-!!$ if(i.eq.75.and.j.eq.5.and.k.eq.5)write(6,*)'HLLEM2:',fplus(6),fminus(6),fplus(8),fminus(8),f1(6),f1(8)
-
if(clean_divergence.ne.0) then
psidcflux(i,j,k) = psidcf
endif
File [modified]: GRHydro_Reconstruct.F90
Delta lines: +0 -4
===================================================================
--- trunk/src/GRHydro_Reconstruct.F90 2011-04-28 19:15:41 UTC (rev 245)
+++ trunk/src/GRHydro_Reconstruct.F90 2011-04-28 21:33:20 UTC (rev 246)
@@ -220,8 +220,6 @@
Bvec(:,:,:,3), Bveczplus, Bveczminus, trivial_rp, hydro_excision_mask)
endif
-!!$ write(6,*)'recon0:',Bvecxplus(75,5,5),Bvecxminus(75,5,5)
-
else if (CCTK_EQUALS(recon_vars,"conservative")) then
call tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, &
dens, densplus, densminus, trivial_rp, hydro_excision_mask)
@@ -924,8 +922,6 @@
if(evolve_mhd.ne.0) then
call primitive2conservativeM(CCTK_PASS_FTOF)
-!!$ write(6,*)'recon1:',Bvecxplus(75,5,5),Bvecxminus(75,5,5),Bconsxplus(75,5,5),Bconsxminus(75,5,5)
-
else
call primitive2conservative(CCTK_PASS_FTOF)
endif
File [modified]: GRHydro_SourceM.F90
Delta lines: +0 -6
===================================================================
--- trunk/src/GRHydro_SourceM.F90 2011-04-28 19:15:41 UTC (rev 245)
+++ trunk/src/GRHydro_SourceM.F90 2011-04-28 21:33:20 UTC (rev 246)
@@ -443,9 +443,6 @@
srhs(i,j,k,3) = alp(i,j,k)*sqrtdet*sz_source
taurhs(i,j,k) = alp(i,j,k)*sqrtdet*tau_source
-!!$ if(i.eq.75.and.j.eq.5.and.k.eq.5)write(6,*)'source:',i,j,k, &
-!!$ Bconsrhs(i,j,k,1),Bconsrhs(i,j,k,3)
-
if(clean_divergence.ne.0) then
psidcrhs(i,j,k) = -1.d0 * ( ch_dc*ch_dc/cp_dc/cp_dc*alp(i,j,k) + &
dx_betax + dy_betay + dz_betaz ) * psidc(i,j,k) + &
@@ -504,9 +501,6 @@
psidc(i,j,k)*alp(i,j,k)*sqrtdet*( uxz*gdg_x + uyz*gdg_y + &
uzz*gdg_z )
-!!$ if(i.eq.5.and.j.eq.5.and.k.eq.5)write(6,*)'source:',i,j,k, &
-!!$ bvcx_source,bvcz_source
-
Bconsrhsx(i,j,k) = bvcx_source
Bconsrhsy(i,j,k) = bvcy_source
Bconsrhsz(i,j,k) = bvcz_source
More information about the Commits
mailing list