[Commits] [svn:einsteintoolkit] GRHydro/branches/hot_and_MHD_temp_dev/src/ (Rev. 177)
cott at tapir.caltech.edu
cott at tapir.caltech.edu
Tue Nov 16 16:44:45 CST 2010
User: cott
Date: 2010/11/16 04:44 PM
Modified:
/branches/hot_and_MHD_temp_dev/src/
GRHydro_CalcUpdate.F90, GRHydro_Con2Prim.F90, GRHydro_Eigenproblem.F90, GRHydro_HLLE.F90, GRHydro_HLLEPoly.F90, GRHydro_Prim2Con.F90, GRHydro_Reconstruct.F90
Log:
* bunch of whitespace
* bugfix: allow negative eps in reconstruction (needed for hot EOS;
will still be caught in atmo routines)
* allow eigenvalues_hot routine to know on what point it is
operating
File Changes:
Directory: /branches/hot_and_MHD_temp_dev/src/
==============================================
File [modified]: GRHydro_CalcUpdate.F90
Delta lines: +6 -3
===================================================================
--- branches/hot_and_MHD_temp_dev/src/GRHydro_CalcUpdate.F90 2010-11-16 15:19:43 UTC (rev 176)
+++ branches/hot_and_MHD_temp_dev/src/GRHydro_CalcUpdate.F90 2010-11-16 22:44:45 UTC (rev 177)
@@ -81,6 +81,7 @@
(alp_l * tauflux(i-xoffset,j-yoffset,k-zoffset) - &
alp_r * tauflux(i,j,k)) * idx
+
if (evolve_tracer .ne. 0) then
do itracer=1,number_of_tracers
cons_tracerrhs(i,j,k,itracer) = cons_tracerrhs(i,j,k,itracer) + &
@@ -93,11 +94,13 @@
Y_e_con_rhs(i,j,k) = Y_e_con_rhs(i,j,k) + &
(alp_l * Y_e_con_flux(i-xoffset,j-yoffset,k-zoffset) - &
alp_r * Y_e_con_flux(i,j,k)) * idx
-! if(j.eq.4.and.k.eq.4) then
-! write(6,*) Y_e(i,j,k),Y_e_plus(i,j,k), Y_e_minus(i,j,k)
-! endif
end if
+! densrhs(i,j,k) = 0.0d0
+! taurhs(i,j,k) = 0.0d0
+! srhs(i,j,k,:) = 0.0d0
+! y_e_con_rhs(i,j,k) = 0.0d0
+
if (wk_atmosphere .eq. 1) then
File [modified]: GRHydro_Con2Prim.F90
Delta lines: +2 -0
===================================================================
--- branches/hot_and_MHD_temp_dev/src/GRHydro_Con2Prim.F90 2010-11-16 15:19:43 UTC (rev 176)
+++ branches/hot_and_MHD_temp_dev/src/GRHydro_Con2Prim.F90 2010-11-16 22:44:45 UTC (rev 177)
@@ -668,6 +668,7 @@
f = pnew - xpress
enddo
+
!!$ Polish the root
@@ -698,6 +699,7 @@
call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n, &
rho,epsilon,temp,ye,xpress,keyerr,anyerr)
+
! error handling
if(anyerr.ne.0) then
call CCTK_WARN(1,"EOS error in c2p 3")
File [modified]: GRHydro_Eigenproblem.F90
Delta lines: +2 -2
===================================================================
--- branches/hot_and_MHD_temp_dev/src/GRHydro_Eigenproblem.F90 2010-11-16 15:19:43 UTC (rev 176)
+++ branches/hot_and_MHD_temp_dev/src/GRHydro_Eigenproblem.F90 2010-11-16 22:44:45 UTC (rev 177)
@@ -118,7 +118,7 @@
end subroutine eigenvalues
-subroutine eigenvalues_hot(handle,rho,velx,vely,velz,eps, &
+subroutine eigenvalues_hot(handle,ii,jj,kk,rho,velx,vely,velz,eps, &
temp,ye,w_lorentz,lam,gxx,gxy,gxz,gyy,gyz,gzz,u,alp,beta)
implicit none
@@ -133,7 +133,7 @@
CCTK_REAL cs2,one,two
CCTK_REAL vlowx,vlowy,vlowz,v2,w
CCTK_REAL lam1,lam2,lam3,lamm,lamp,lamm_nobeta,lamp_nobeta
- CCTK_INT handle
+ CCTK_INT handle,ii,jj,kk
CCTK_REAL dpdrho,dpdeps,press
! begin EOS Omni vars
File [modified]: GRHydro_HLLE.F90
Delta lines: +1 -0
===================================================================
--- branches/hot_and_MHD_temp_dev/src/GRHydro_HLLE.F90 2010-11-16 15:19:43 UTC (rev 176)
+++ branches/hot_and_MHD_temp_dev/src/GRHydro_HLLE.F90 2010-11-16 22:44:45 UTC (rev 177)
@@ -341,6 +341,7 @@
end do
end do
+
end subroutine GRHydro_HLLEGeneral
File [modified]: GRHydro_HLLEPoly.F90
Delta lines: +10 -6
===================================================================
--- branches/hot_and_MHD_temp_dev/src/GRHydro_HLLEPoly.F90 2010-11-16 15:19:43 UTC (rev 176)
+++ branches/hot_and_MHD_temp_dev/src/GRHydro_HLLEPoly.F90 2010-11-16 22:44:45 UTC (rev 177)
@@ -199,7 +199,7 @@
usendh,avg_alp,avg_beta)
else
xtemp = temperature(i,j,k)
- call eigenvalues_hot(GRHydro_eos_handle,&
+ call eigenvalues_hot(GRHydro_eos_handle,i,j,k,&
rhominus(i+xoffset,j+yoffset,k+zoffset),&
velxminus(i+xoffset,j+yoffset,k+zoffset),&
velyminus(i+xoffset,j+yoffset,k+zoffset),&
@@ -212,7 +212,8 @@
gyzh,gzzh,&
usendh,avg_alp,avg_beta)
xtemp = temperature(i,j,k)
- call eigenvalues_hot(GRHydro_eos_handle,rhoplus(i,j,k),&
+ call eigenvalues_hot(GRHydro_eos_handle,i,j,k,&
+ rhoplus(i,j,k),&
velxplus(i,j,k),velyplus(i,j,k),&
velzplus(i,j,k),epsplus(i,j,k), &
xtemp,y_e_plus(i,j,k),&
@@ -251,7 +252,7 @@
usendh,avg_alp,avg_beta)
else
xtemp = temperature(i,j,k)
- call eigenvalues_hot(GRHydro_eos_handle,&
+ call eigenvalues_hot(GRHydro_eos_handle,i,j,k,&
rhominus(i+xoffset,j+yoffset,k+zoffset),&
velyminus(i+xoffset,j+yoffset,k+zoffset),&
velzminus(i+xoffset,j+yoffset,k+zoffset),&
@@ -264,7 +265,8 @@
gxzh,gxxh,&
usendh,avg_alp,avg_beta)
xtemp = temperature(i,j,k)
- call eigenvalues_hot(GRHydro_eos_handle,rhoplus(i,j,k),&
+ call eigenvalues_hot(GRHydro_eos_handle,i,j,k,&
+ rhoplus(i,j,k),&
velyplus(i,j,k),velzplus(i,j,k),&
velxplus(i,j,k),epsplus(i,j,k),&
xtemp,y_e_plus(i,j,k),&
@@ -303,7 +305,7 @@
usendh,avg_alp,avg_beta)
else
xtemp = temperature(i,j,k)
- call eigenvalues_hot(GRHydro_eos_handle,&
+ call eigenvalues_hot(GRHydro_eos_handle,i,j,k,&
rhominus(i+xoffset,j+yoffset,k+zoffset),&
velzminus(i+xoffset,j+yoffset,k+zoffset),&
velxminus(i+xoffset,j+yoffset,k+zoffset),&
@@ -315,7 +317,8 @@
gxxh,gxyh,gyyh,&
usendh,avg_alp,avg_beta)
xtemp = temperature(i,j,k)
- call eigenvalues_hot(GRHydro_eos_handle,rhoplus(i,j,k),&
+ call eigenvalues_hot(GRHydro_eos_handle,i,j,k,&
+ rhoplus(i,j,k),&
velzplus(i,j,k),velxplus(i,j,k),&
velyplus(i,j,k),epsplus(i,j,k),&
xtemp,y_e_plus(i,j,k),&
@@ -384,6 +387,7 @@
end do
end do
end do
+
end subroutine GRHydro_HLLE
File [modified]: GRHydro_Prim2Con.F90
Delta lines: +2 -0
===================================================================
--- branches/hot_and_MHD_temp_dev/src/GRHydro_Prim2Con.F90 2010-11-16 15:19:43 UTC (rev 176)
+++ branches/hot_and_MHD_temp_dev/src/GRHydro_Prim2Con.F90 2010-11-16 22:44:45 UTC (rev 177)
@@ -136,6 +136,7 @@
velzplus(i,j,k),epsplus(i,j,k),pressplus(i,j,k),&
w_lorentzplus(i,j,k),xtemp, &
y_e_plus(i,j,k))
+
end do
end do
@@ -259,6 +260,7 @@
dsz = sqrt(det) * (drho*(1+deps)+dpress)*w*w * vlowz
dtau = sqrt(det) * ((drho*(1+deps)+dpress)*w*w - dpress) - ddens
+
end subroutine prim2con_hot
File [modified]: GRHydro_Reconstruct.F90
Delta lines: +2 -2
===================================================================
--- branches/hot_and_MHD_temp_dev/src/GRHydro_Reconstruct.F90 2010-11-16 15:19:43 UTC (rev 176)
+++ branches/hot_and_MHD_temp_dev/src/GRHydro_Reconstruct.F90 2010-11-16 22:44:45 UTC (rev 177)
@@ -158,6 +158,7 @@
if (CCTK_EQUALS(recon_vars,"primitive")) then
call tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, &
rho, rhoplus, rhominus, trivial_rp, hydro_excision_mask)
+
call tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, &
vel(:,:,:,1), velxplus, velxminus, trivial_rp, hydro_excision_mask)
call tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, &
@@ -548,8 +549,7 @@
deallocate(psi4, lbetax, lbetay, lbetaz)
!$OMP WORKSHARE
- where ( (rhoplus < GRHydro_rho_min).or.(rhominus < GRHydro_rho_min).or.&
- (epsplus < 0.d0).or.(epsminus < 0.d0) )
+ where ( (rhoplus < GRHydro_rho_min).or.(rhominus < GRHydro_rho_min) )
rhoplus = rho
rhominus = rho
velxplus = vel(:,:,:,1)
More information about the Commits
mailing list