Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] GRHydro/branches/divclean/src/ (Rev. 242)
by bcmsma＠astro.rit.edu 27 Apr '11

27 Apr '11

User: bmundim Date: 2011/04/27 08:28 PM Modified: /branches/divclean/src/ GRHydro_RegisterVars.cc Log: Bcons is defined in GRHydro instead of HydroBase. PS: Con2Prim2Con test just passed! File Changes: Directory: /branches/divclean/src/ ================================== File [modified]: GRHydro_RegisterVars.cc Delta lines: +1 -1 =================================================================== --- branches/divclean/src/GRHydro_RegisterVars.cc 2011-04-28 01:16:05 UTC (rev 241) +++ branches/divclean/src/GRHydro_RegisterVars.cc 2011-04-28 01:28:55 UTC (rev 242) @@ -64,7 +64,7 @@ if (CCTK_EQUALS(Bvec_evolution_method, "GRHydro")) { register_constrained("HydroBase::Bvec"); - register_evolved("HydroBase::Bcons", "GRHydro::Bconsrhs"); + register_evolved("GRHydro::Bcons", "GRHydro::Bconsrhs"); if(clean_divergence) { register_evolved("GRHydro::psidc" , "GRHydro::psidcrhs"); }

1 0

[svn:einsteintoolkit] GRHydro/branches/divclean/ (Rev. 241)
by bcmsma＠astro.rit.edu 27 Apr '11

27 Apr '11

User: bmundim Date: 2011/04/27 08:16 PM Modified: /branches/divclean/ interface.ccl Log: Interface fix. File Changes: Directory: /branches/divclean/ ============================== File [modified]: interface.ccl Delta lines: +22 -3 =================================================================== --- branches/divclean/interface.ccl 2011-04-28 00:51:34 UTC (rev 240) +++ branches/divclean/interface.ccl 2011-04-28 01:16:05 UTC (rev 241) @@ -73,17 +73,18 @@ void FUNCTION Con2PrimGenM(CCTK_INT INOUT handle, CCTK_REAL INOUT gamma_eos, CCTK_REAL INOUT dens, \ CCTK_REAL INOUT sx, CCTK_REAL INOUT sy, CCTK_REAL INOUT sz, \ - CCTK_REAL INOUT tau, CCTK_REAL INOUT rho, \ + CCTK_REAL INOUT tau, CCTK_REAL INOUT Bconsx, CCTK_REAL INOUT Bconsy, CCTK_REAL INOUT Bconsz, \ + CCTK_REAL INOUT rho, \ CCTK_REAL INOUT velx, CCTK_REAL INOUT vely, CCTK_REAL INOUT velz, \ CCTK_REAL INOUT epsilon, CCTK_REAL INOUT pressure, \ + CCTK_REAL INOUT Bvecx, CCTK_REAL INOUT Bvecy, CCTK_REAL INOUT Bvecz, \ + CCTK_REAL INOUT Bvecsq, \ CCTK_REAL INOUT w_lorentz, \ CCTK_REAL INOUT gxx, CCTK_REAL INOUT gxy, CCTK_REAL INOUT gxz, \ CCTK_REAL INOUT gyy, CCTK_REAL INOUT gyz, CCTK_REAL INOUT gzz, \ CCTK_REAL INOUT uxx, CCTK_REAL INOUT uxy, CCTK_REAL INOUT uxz, \ CCTK_REAL INOUT uyy, CCTK_REAL INOUT uyz, CCTK_REAL INOUT uzz, \ CCTK_REAL INOUT det, \ - CCTK_REAL INOUT Bvecx, CCTK_REAL INOUT Bvecy, CCTK_REAL INOUT Bvecz, \ - CCTK_REAL INOUT Bvecsq, \ CCTK_INT OUT epsnegative, \ CCTK_REAL OUT retval) @@ -101,6 +102,23 @@ CCTK_REAL IN r, CCTK_REAL IN rho_min, \ CCTK_INT IN GRHydro_reflevel, CCTK_REAL IN GRHydro_C2P_failed) +void FUNCTION Con2PrimPolyM(CCTK_INT INOUT handle, CCTK_REAL INOUT gamma_eos, CCTK_REAL INOUT dens, \ + CCTK_REAL INOUT sx, CCTK_REAL INOUT sy, CCTK_REAL INOUT sz, \ + CCTK_REAL INOUT sc, CCTK_REAL INOUT Bconsx, CCTK_REAL INOUT Bconsy, CCTK_REAL INOUT Bconsz, \ + CCTK_REAL INOUT rho, \ + CCTK_REAL INOUT velx, CCTK_REAL INOUT vely, CCTK_REAL INOUT velz, \ + CCTK_REAL INOUT epsilon, CCTK_REAL INOUT pressure, \ + CCTK_REAL INOUT Bvecx, CCTK_REAL INOUT Bvecy, CCTK_REAL INOUT Bvecz, \ + CCTK_REAL INOUT Bvecsq, \ + CCTK_REAL INOUT w_lorentz, \ + CCTK_REAL INOUT gxx, CCTK_REAL INOUT gxy, CCTK_REAL INOUT gxz, \ + CCTK_REAL INOUT gyy, CCTK_REAL INOUT gyz, CCTK_REAL INOUT gzz, \ + CCTK_REAL INOUT uxx, CCTK_REAL INOUT uxy, CCTK_REAL INOUT uxz, \ + CCTK_REAL INOUT uyy, CCTK_REAL INOUT uyz, CCTK_REAL INOUT uzz, \ + CCTK_REAL INOUT det, \ + CCTK_INT OUT epsnegative, \ + CCTK_REAL OUT retval) + #void FUNCTION Prim2Con CCTK_INT handle, CCTK_REAL gxx, CCTK_REAL gxy, CCTK_REAL gxz, CCTK_REAL gyy, CCTK_REAL gyz, CCTK_REAL gzz, CCTK_REAL det, CCTK_REAL dens, CCTK_REAL sx, CCTK_REAL sy, CCTK_REAL sz, CCTK_REAL tau, CCTK_REAL rho, CCTK_REAL velx, CCTK_REAL vely, CCTK_REAL velz, CCTK_REAL epsilon, CCTK_REAL press, CCTK_REAL w_lorentz void FUNCTION Prim2ConGen(CCTK_INT IN handle, \ @@ -161,6 +179,7 @@ PROVIDES FUNCTION Con2PrimPoly WITH Con2Prim_ptPolytype LANGUAGE Fortran PROVIDES FUNCTION Con2PrimGenM WITH GRHydro_Con2PrimM_pt LANGUAGE Fortran PROVIDES FUNCTION Con2PrimGen WITH Con2Prim_pt LANGUAGE Fortran +PROVIDES FUNCTION Con2PrimPolyM WITH GRHydro_Con2PrimM_Polytype_pt LANGUAGE Fortran PROVIDES FUNCTION Prim2ConGen WITH prim2con LANGUAGE Fortran PROVIDES FUNCTION Prim2ConPoly WITH prim2conpolytype LANGUAGE Fortran PROVIDES FUNCTION Prim2ConGenM WITH prim2conM LANGUAGE Fortran

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 127)
by bcmsma＠astro.rit.edu 27 Apr '11

27 Apr '11

User: bmundim Date: 2011/04/27 08:14 PM Modified: /trunk/src/ GRHydro_CylindricalExplosionM.F90, GRHydro_MonopoleM.F90, GRHydro_P2C2PM.F90, GRHydro_ShockTubeM.F90 Log: A few fixes on the interface calls and related bugs. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_CylindricalExplosionM.F90 Delta lines: +12 -6 =================================================================== --- trunk/src/GRHydro_CylindricalExplosionM.F90 2011-04-28 00:50:07 UTC (rev 126) +++ trunk/src/GRHydro_CylindricalExplosionM.F90 2011-04-28 01:14:57 UTC (rev 127) @@ -22,6 +22,9 @@ #define Bvecx(i,j,k) Bvec(i,j,k,1) #define Bvecy(i,j,k) Bvec(i,j,k,2) #define Bvecz(i,j,k) Bvec(i,j,k,3) +#define Bconsx(i,j,k) Bcons(i,j,k,1) +#define Bconsy(i,j,k) Bcons(i,j,k,2) +#define Bconsz(i,j,k) Bcons(i,j,k,3) /*@@ @@ -117,25 +120,28 @@ call Prim2ConPolyM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(i,j,k),& + tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),& velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) + eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) else call Prim2ConGenM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(i,j,k),& + tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),& velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) + eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) end if + + enddo enddo - enddo enddo densrhs = 0.d0 srhs = 0.d0 taurhs = 0.d0 - Bvecrhs = 0.d0 + Bconsrhs = 0.d0 return File [modified]: GRHydro_MonopoleM.F90 Delta lines: +22 -17 =================================================================== --- trunk/src/GRHydro_MonopoleM.F90 2011-04-28 00:50:07 UTC (rev 126) +++ trunk/src/GRHydro_MonopoleM.F90 2011-04-28 01:14:57 UTC (rev 127) @@ -22,6 +22,9 @@ #define Bvecx(i,j,k) Bvec(i,j,k,1) #define Bvecy(i,j,k) Bvec(i,j,k,2) #define Bvecz(i,j,k) Bvec(i,j,k,3) +#define Bconsx(i,j,k) Bcons(i,j,k,1) +#define Bconsy(i,j,k) Bcons(i,j,k,2) +#define Bconsz(i,j,k) Bcons(i,j,k,3) /*@@ @routine GRHydro_MonopoleM @@ -77,23 +80,25 @@ Bvecz(i,j,k)=0.0 det=SPATIAL_DETERMINANT(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k)) - - if (CCTK_EQUALS(GRHydro_eos_type,"Polytype")) then - call Prim2ConPolyM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& - gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& - det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(i,j,k),& - velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) - else - call Prim2ConGenM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& - gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& - det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(i,j,k),& - velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) - end if + if (CCTK_EQUALS(GRHydro_eos_type,"Polytype")) then + call Prim2ConPolyM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& + gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& + det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& + tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),& + velx(i,j,k),vely(i,j,k),velz(i,j,k),& + eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) + else + call Prim2ConGenM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& + gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& + det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& + tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),& + velx(i,j,k),vely(i,j,k),velz(i,j,k),& + eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) + end if + enddo enddo enddo @@ -101,7 +106,7 @@ densrhs = 0.d0 srhs = 0.d0 taurhs = 0.d0 - Bvecrhs = 0.d0 + Bconsrhs = 0.d0 return File [modified]: GRHydro_P2C2PM.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_P2C2PM.F90 2011-04-28 00:50:07 UTC (rev 126) +++ trunk/src/GRHydro_P2C2PM.F90 2011-04-28 01:14:57 UTC (rev 127) @@ -131,7 +131,7 @@ call Prim2ConGenM(GRHydro_eos_handle,& gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,det, & dens_send,sx_send,sy_send,sz_send,tau_send, & - bconsx_send,bcibsy_send,bconsz_send, & + bconsx_send,bconsy_send,bconsz_send, & rho_send(1),velx_send,vely_send,velz_send,eps_send(1),press_send(1), & bvcx_send,bvcy_send,bvcz_send,w_lorentz_send) File [modified]: GRHydro_ShockTubeM.F90 Delta lines: +10 -5 =================================================================== --- trunk/src/GRHydro_ShockTubeM.F90 2011-04-28 00:50:07 UTC (rev 126) +++ trunk/src/GRHydro_ShockTubeM.F90 2011-04-28 01:14:57 UTC (rev 127) @@ -22,6 +22,9 @@ #define Bvecx(i,j,k) Bvec(i,j,k,1) #define Bvecy(i,j,k) Bvec(i,j,k,2) #define Bvecz(i,j,k) Bvec(i,j,k,3) +#define Bconsx(i,j,k) Bcons(i,j,k,1) +#define Bconsy(i,j,k) Bcons(i,j,k,2) +#define Bconsz(i,j,k) Bcons(i,j,k,3) #define OOSQRT2 (0.7071067811865475244008442) #define OOSQRT3 (0.5773502691896257645091489) @@ -611,16 +614,18 @@ call Prim2ConPolyM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(i,j,k),& + tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),& velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) + eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) else call Prim2ConGenM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(i,j,k),& + tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),& velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) + eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) end if enddo enddo @@ -629,7 +634,7 @@ densrhs = 0.d0 srhs = 0.d0 taurhs = 0.d0 - Bvecrhs = 0.d0 + Bconsrhs = 0.d0 return

1 0

[svn:einsteintoolkit] GRHydro/branches/divclean/src/ (Rev. 240)
by tanja.bode＠physics.gatech.edu 27 Apr '11

27 Apr '11

User: tbode Date: 2011/04/27 07:51 PM Modified: /branches/divclean/src/ GRHydro_SourceM.F90 Log: Remove di_psidc. File Changes: Directory: /branches/divclean/src/ ================================== File [modified]: GRHydro_SourceM.F90 Delta lines: +1 -2 =================================================================== --- branches/divclean/src/GRHydro_SourceM.F90 2011-04-28 00:47:43 UTC (rev 239) +++ branches/divclean/src/GRHydro_SourceM.F90 2011-04-28 00:51:34 UTC (rev 240) @@ -82,7 +82,6 @@ CCTK_REAL :: halfshiftdgx, halfshiftdgy, halfshiftdgz CCTK_REAL :: halfTdgx, halfTdgy, halfTdgz CCTK_REAL :: invalp, invalp2 - !!CCTK_REAL :: dx_psidc, dy_psidc, dz_psidc CCTK_REAL :: bvcx_source, bvcy_source, bvcz_source CCTK_REAL :: dx_det_bydet, dy_det_bydet, dz_det_bydet CCTK_REAL :: gdg_x, gdg_y, gdg_z !! g^{ik} d_k g_{ij} @@ -165,7 +164,7 @@ !$OMP vlowx,vlowy,vlowz,Bvecxlow,Bvecylow,Bveczlow, & !$OMP bdotv,b2,dum,bxlow,bylow,bzlow,bt,bx,by,bz,rhohstarW2,pstar,& !$OMP t00,t0x,t0y,t0z,txx,txy,txz,tyy,tyz,tzz,& - !$OMP dx_alp,dy_alp,dz_alp,dx_psidc,dy_psidc,dz_psidc,& + !$OMP dx_alp,dy_alp,dz_alp,& !$OMP tau_source,sx_source,sy_source,sz_source,& !$OMP bvcx_source,bvcy_source,bvcz_source,& !$OMP uxx, uxy, uxz, uyy, uyz, uzz,&

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 126)
by bcmsma＠astro.rit.edu 27 Apr '11

27 Apr '11

User: bmundim Date: 2011/04/27 07:50 PM Modified: /trunk/ interface.ccl /trunk/src/ GRHydro_C2P2CM.F90, GRHydro_P2C2PM.F90, GRHydro_P2C2PM_polytype.F90 Log: Change of Con2Prim and Prim2Con interface. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_C2P2CM.F90 Delta lines: +14 -5 =================================================================== --- trunk/src/GRHydro_C2P2CM.F90 2011-04-27 22:37:50 UTC (rev 125) +++ trunk/src/GRHydro_C2P2CM.F90 2011-04-28 00:50:07 UTC (rev 126) @@ -41,6 +41,7 @@ CCTK_REAL :: uxx,uxy,uxz,uyy,uyz,uzz CCTK_REAL :: gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send CCTK_REAL :: dens_send,sx_send,sy_send,sz_send,tau_send + CCTK_REAL :: bconsx_send, bconsy_send, bconsz_send CCTK_REAL :: rho_send,velx_send,vely_send,velz_send,eps_send CCTK_REAL :: press_send,w_lorentz_send,x_send,y_send,z_send,r_send CCTK_REAL :: bvcx_send, bvcy_send, bvcz_send, b2_send @@ -93,6 +94,9 @@ bvcx_send = Bx_init bvcy_send = By_init bvcz_send = Bz_init + bconsx_send = Bx_init + bconsy_send = By_init + bconsz_send = Bz_init eps_send = 1.0d-6 press_send = 6.666666666666667d-7 @@ -124,6 +128,9 @@ write(*,*) ' sy : ',sy_send write(*,*) ' sz : ',sz_send write(*,*) ' tau : ',tau_send + write(*,*) ' Bconsx : ',bconsx_send + write(*,*) ' Bconsy : ',bconsy_send + write(*,*) ' Bconsz : ',bconsz_send write(*,*) ' eps : ',eps_send write(*,*) ' W : ',w_lorentz_send write(*,*) ' Bvecx : ',bvcx_send @@ -132,11 +139,10 @@ write(*,*) 'C2P2CM test: getting the associated primitive variables.' call Con2PrimGenM(GRHydro_eos_handle,local_gam(1),dens_send,sx_send,sy_send,sz_send, & - tau_send,rho_send,velx_send,vely_send,velz_send, & - eps_send,press_send,w_lorentz_send, & + tau_send,bconsx_send,bconsy_send,bconsz_send,rho_send,velx_send,vely_send,velz_send, & + eps_send,press_send,bvcx_send,bvcy_send,bvcz_send,b2_send,w_lorentz_send, & gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,& uxx,uxy,uxz,uyy,uyz,uzz,det,& - bvcx_send,bvcy_send,bvcz_send,b2_send,& epsnegative,C2P_failed) write(*,*) 'C2P2CM test: the primitive variables are' @@ -155,8 +161,8 @@ write(*,*) 'C2P2CM test: converting back to conserved variables.' call Prim2ConGenM(GRHydro_eos_handle,gxx_send, gxy_send, gxz_send, gyy_send, gyz_send, gzz_send, det, & - dens_send, sx_send, sy_send, sz_send, tau_send, bvcx_send, bvcy_send, bvcz_send, rho_send, & - velx_send, vely_send, velz_send, eps_send, press_send, w_lorentz_send) + dens_send, sx_send, sy_send, sz_send, tau_send, bconsx_send, bconsy_send, bconsz_send, rho_send, & + velx_send, vely_send, velz_send, eps_send, press_send, bvcx_send, bvcy_send, bvcz_send, w_lorentz_send) write(*,*) 'C2P2CM test: the conserved variables are' write(*,*) ' conservative variables: ' @@ -165,6 +171,9 @@ write(*,*) ' sy : ',sy_send write(*,*) ' sz : ',sz_send write(*,*) ' tau : ',tau_send + write(*,*) ' Bconsx : ',bconsx_send + write(*,*) ' Bconsy : ',bconsy_send + write(*,*) ' Bconsz : ',bconsz_send write(*,*) ' eps : ',eps_send write(*,*) ' W : ',w_lorentz_send write(*,*) ' Bvecx : ',bvcx_send File [modified]: GRHydro_P2C2PM.F90 Delta lines: +15 -5 =================================================================== --- trunk/src/GRHydro_P2C2PM.F90 2011-04-27 22:37:50 UTC (rev 125) +++ trunk/src/GRHydro_P2C2PM.F90 2011-04-28 00:50:07 UTC (rev 126) @@ -40,6 +40,7 @@ CCTK_REAL :: uxx,uxy,uxz,uyy,uyz,uzz CCTK_REAL :: gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send CCTK_REAL :: dens_send,sx_send,sy_send,sz_send,tau_send + CCTK_REAL :: bconsx_send,bconsy_send,bconsz_send CCTK_REAL :: rho_send(1),velx_send,vely_send,velz_send,eps_send(1) CCTK_REAL :: press_send(1),w_lorentz_send,x_send,y_send,z_send,r_send CCTK_REAL :: bvcx_send,bvcy_send,bvcz_send,b2_send @@ -86,6 +87,9 @@ bvcx_send = Bx_init bvcy_send = By_init bvcz_send = Bz_init + bconsx_send = Bx_init + bconsy_send = By_init + bconsz_send = Bz_init w_lorentz_send = 1.d0/sqrt(1.0d0-velx_send*velx_send-vely_send*vely_send-velz_send*velz_send) @@ -127,8 +131,9 @@ call Prim2ConGenM(GRHydro_eos_handle,& gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,det, & dens_send,sx_send,sy_send,sz_send,tau_send, & - bvcx_send,bvcy_send,bvcz_send,rho_send(1), & - velx_send,vely_send,velz_send,eps_send(1),press_send(1),w_lorentz_send) + bconsx_send,bcibsy_send,bconsz_send, & + rho_send(1),velx_send,vely_send,velz_send,eps_send(1),press_send(1), & + bvcx_send,bvcy_send,bvcz_send,w_lorentz_send) write(*,*) 'P2C2PM test: initial values.' write(*,*) ' conservative variables: ' @@ -137,6 +142,9 @@ write(*,*) ' sy : ',sy_send write(*,*) ' sz : ',sz_send write(*,*) ' tau : ',tau_send + write(*,*) ' Bconsx : ',bconsx_send + write(*,*) ' Bconsy : ',bconsy_send + write(*,*) ' Bconsz : ',bconsz_send write(*,*) ' eps : ',eps_send write(*,*) ' W : ',w_lorentz_send write(*,*) ' Bvecx : ',bvcx_send @@ -146,11 +154,13 @@ write(*,*) 'P2C2PM test: getting the associated primitive variables.' call Con2PrimGenM(GRHydro_eos_handle,local_gam(1),dens_send,sx_send,sy_send,sz_send, & - tau_send,rho_send(1),velx_send,vely_send,velz_send, & - eps_send(1),press_send(1),w_lorentz_send, & + tau_send,bconsx_send,bconsy_send,bconsz_send,& + rho_send(1),velx_send,vely_send,velz_send, & + eps_send(1),press_send(1), & + bvcx_send,bvcy_send,bvcz_send,b2_send,& + w_lorentz_send, & gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,& uxx,uxy,uxz,uyy,uyz,uzz,det,& - bvcx_send,bvcy_send,bvcz_send,b2_send,& epsnegative,C2P_failed) write(*,*) 'P2C2PM test: the primitive variables are' File [modified]: GRHydro_P2C2PM_polytype.F90 Delta lines: +11 -5 =================================================================== --- trunk/src/GRHydro_P2C2PM_polytype.F90 2011-04-27 22:37:50 UTC (rev 125) +++ trunk/src/GRHydro_P2C2PM_polytype.F90 2011-04-28 00:50:07 UTC (rev 126) @@ -39,6 +39,7 @@ CCTK_REAL uxx,uxy,uxz,uyy,uyz,uzz CCTK_REAL gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send CCTK_REAL dens_send,sx_send,sy_send,sz_send,tau_send + CCTK_REAL bconsx_send,bconsy_send,bconsz_send CCTK_REAL rho_send,velx_send,vely_send,velz_send,eps_send CCTK_REAL press_send,w_lorentz_send,x_send,y_send,z_send,r_send CCTK_REAL bvcx_send,bvcy_send,bvcz_send,b2_send @@ -93,6 +94,9 @@ bvcx_send = Bx_init bvcy_send = By_init bvcz_send = Bz_init + bconsx_send = Bx_init + bconsy_send = By_init + bconsz_send = Bz_init w_lorentz_send = 1.d0/sqrt(1.0d0-velx_send*velx_send-vely_send*vely_send-velz_send*velz_send) @@ -133,8 +137,8 @@ write(*,*) 'P2C2PM test: converting back to conserved variables.' call prim2conpolytypeM(GRHydro_polytrope_handle,gxx_send, gxy_send, gxz_send, gyy_send, gyz_send, gzz_send, det, & - dens_send, sx_send, sy_send, sz_send, tau_send, bvcx_send, bvcy_send, bvcz_send, rho_send, & - velx_send, vely_send, velz_send, eps_send, press_send, w_lorentz_send) + dens_send, sx_send, sy_send, sz_send, tau_send, bconsx_send, bconsy_send, bconsz_send, rho_send, & + velx_send, vely_send, velz_send, eps_send, press_send, bvcx_send, bvcy_send, bvcz_send, w_lorentz_send) write(*,*) 'P2C2PM test: initial values.' write(*,*) ' conservative variables: ' @@ -143,6 +147,9 @@ write(*,*) ' sy : ',sy_send write(*,*) ' sz : ',sz_send write(*,*) ' tau : ',tau_send + write(*,*) ' Bconsx : ',bconsx_send + write(*,*) ' Bconsy : ',bconsy_send + write(*,*) ' Bconsz : ',bconsz_send write(*,*) ' eps : ',eps_send write(*,*) ' W : ',w_lorentz_send write(*,*) ' Bvecx : ',bvcx_send @@ -154,11 +161,10 @@ write(*,*) 'P2C2PM test: getting the associated primitive variables.' call GRHydro_Con2PrimM_Polytype_pt(GRHydro_polytrope_handle,local_gam,dens_send,sx_send,sy_send,sz_send, & - sc_send,rho_send,velx_send,vely_send,velz_send, & - eps_send,press_send,w_lorentz_send, & + sc_send,bconsx_send,bconsy_send,bconsz_send,rho_send,velx_send,vely_send,velz_send, & + eps_send,press_send,bvcx_send,bvcy_send,bvcz_send,b2_send,w_lorentz_send, & gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,& uxx,uxy,uxz,uyy,uyz,uzz,det,& - bvcx_send,bvcy_send,bvcz_send,b2_send,& epsnegative,C2P_failed) write(*,*) 'P2C2PM test: the primitive variables are' Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +20 -1 =================================================================== --- trunk/interface.ccl 2011-04-27 22:37:50 UTC (rev 125) +++ trunk/interface.ccl 2011-04-28 00:50:07 UTC (rev 126) @@ -101,17 +101,35 @@ void FUNCTION Con2PrimGenM(CCTK_INT INOUT handle, CCTK_REAL INOUT gamma_eos, CCTK_REAL INOUT dens, \ CCTK_REAL INOUT sx, CCTK_REAL INOUT sy, CCTK_REAL INOUT sz, \ - CCTK_REAL INOUT tau, CCTK_REAL INOUT rho, \ + CCTK_REAL INOUT tau, CCTK_REAL INOUT Bconsx, CCTK_REAL INOUT Bconsy, CCTK_REAL INOUT Bconsz, \ + CCTK_REAL INOUT rho, \ CCTK_REAL INOUT velx, CCTK_REAL INOUT vely, CCTK_REAL INOUT velz, \ CCTK_REAL INOUT epsilon, CCTK_REAL INOUT pressure, \ + CCTK_REAL INOUT Bvecx, CCTK_REAL INOUT Bvecy, CCTK_REAL INOUT Bvecz, \ + CCTK_REAL INOUT Bvecsq, \ CCTK_REAL INOUT w_lorentz, \ CCTK_REAL INOUT gxx, CCTK_REAL INOUT gxy, CCTK_REAL INOUT gxz, \ CCTK_REAL INOUT gyy, CCTK_REAL INOUT gyz, CCTK_REAL INOUT gzz, \ CCTK_REAL INOUT uxx, CCTK_REAL INOUT uxy, CCTK_REAL INOUT uxz, \ CCTK_REAL INOUT uyy, CCTK_REAL INOUT uyz, CCTK_REAL INOUT uzz, \ CCTK_REAL INOUT det, \ + CCTK_INT OUT epsnegative, \ + CCTK_REAL OUT retval) + +void FUNCTION Con2PrimPolyM(CCTK_INT INOUT handle, CCTK_REAL INOUT gamma_eos, CCTK_REAL INOUT dens, \ + CCTK_REAL INOUT sx, CCTK_REAL INOUT sy, CCTK_REAL INOUT sz, \ + CCTK_REAL INOUT sc, CCTK_REAL INOUT Bconsx, CCTK_REAL INOUT Bconsy, CCTK_REAL INOUT Bconsz, \ + CCTK_REAL INOUT rho, \ + CCTK_REAL INOUT velx, CCTK_REAL INOUT vely, CCTK_REAL INOUT velz, \ + CCTK_REAL INOUT epsilon, CCTK_REAL INOUT pressure, \ CCTK_REAL INOUT Bvecx, CCTK_REAL INOUT Bvecy, CCTK_REAL INOUT Bvecz, \ CCTK_REAL INOUT Bvecsq, \ + CCTK_REAL INOUT w_lorentz, \ + CCTK_REAL INOUT gxx, CCTK_REAL INOUT gxy, CCTK_REAL INOUT gxz, \ + CCTK_REAL INOUT gyy, CCTK_REAL INOUT gyz, CCTK_REAL INOUT gzz, \ + CCTK_REAL INOUT uxx, CCTK_REAL INOUT uxy, CCTK_REAL INOUT uxz, \ + CCTK_REAL INOUT uyy, CCTK_REAL INOUT uyz, CCTK_REAL INOUT uzz, \ + CCTK_REAL INOUT det, \ CCTK_INT OUT epsnegative, \ CCTK_REAL OUT retval) @@ -123,6 +141,7 @@ USES FUNCTION Con2PrimPoly USES FUNCTION Con2PrimGen USES FUNCTION Con2PrimGenM +USES FUNCTION Con2PrimPolyM CCTK_INT FUNCTION EOS_Omni_GetHandle(CCTK_STRING IN name) USES FUNCTION EOS_Omni_GetHandle

1 0

[svn:einsteintoolkit] GRHydro/branches/divclean/src/ (Rev. 239)
by tanja.bode＠physics.gatech.edu 27 Apr '11

27 Apr '11

User: tbode Date: 2011/04/27 07:47 PM Modified: /branches/divclean/src/ GRHydro_SourceM.F90 Log: Fix Bcons sources. File Changes: Directory: /branches/divclean/src/ ================================== File [modified]: GRHydro_SourceM.F90 Delta lines: +26 -6 =================================================================== --- branches/divclean/src/GRHydro_SourceM.F90 2011-04-28 00:37:56 UTC (rev 238) +++ branches/divclean/src/GRHydro_SourceM.F90 2011-04-28 00:47:43 UTC (rev 239) @@ -85,6 +85,7 @@ !!CCTK_REAL :: dx_psidc, dy_psidc, dz_psidc CCTK_REAL :: bvcx_source, bvcy_source, bvcz_source CCTK_REAL :: dx_det_bydet, dy_det_bydet, dz_det_bydet + CCTK_REAL :: gdg_x, gdg_y, gdg_z !! g^{ik} d_k g_{ij} CCTK_REAL :: Bvecxlow,Bvecylow,Bveczlow,bdotv,b2,dum,bxlow,bylow,bzlow CCTK_REAL :: bt,bx,by,bz,rhohstarW2,pstar @@ -463,23 +464,42 @@ dz_det_bydet = uxx*dz_gxx + uyy*dz_gyy + uzz*dz_gzz + & 2.d0*(uxy*dz_gxy+uxz*dz_gxz+uyz*dz_gyz) + !!$ g^{ik} d_k g_{li} + gdg_x = uxx*dx_gxx + uxy*dy_gxx + uxz*dz_gxx + & + uxy*dx_gxy + uyy*dy_gxy + uyz*dz_gxy + & + uxz*dx_gxz + uyz*dy_gxz + uzz*dz_gxz + + gdg_y = uxx*dx_gxy + uxy*dy_gxy + uxz*dz_gxy + & + uxy*dx_gyy + uyy*dy_gyy + uyz*dz_gyy + & + uxz*dx_gyz + uyz*dy_gyz + uzz*dz_gyz + + gdg_z = uxx*dx_gxz + uxy*dy_gxz + uxz*dz_gxz + & + uxy*dx_gyz + uyy*dy_gyz + uyz*dz_gyz + & + uxz*dx_gzz + uyz*dy_gzz + uzz*dz_gzz + bvcx_source = -1.d0 * ( Bconsx(i,j,k)*dx_betax + & Bconsy(i,j,k)*dy_betax + Bconsz(i,j,k)*dz_betax ) + & psidc(i,j,k)*sqrtdet*( uxx*dx_alp+uxy*dy_alp+uxz*dz_alp ) + & - psidc(i,j,k)*3.d0*half*alp(i,j,k)*sqrtdet*( uxx*dx_det_bydet + & - uxy*dy_det_bydet + uxz*dz_det_bydet ) + psidc(i,j,k)*alp(i,j,k)*sqrtdet*( uxx*dx_det_bydet + & + uxy*dy_det_bydet + uxz*dz_det_bydet ) - & + psidc(i,j,k)*alp(i,j,k)*sqrtdet*( uxx*gdg_x + uxy*gdg_y + & + uxz*gdg_z ) bvcy_source = -1.d0 * ( Bconsx(i,j,k)*dx_betay + & Bconsy(i,j,k)*dy_betay + Bconsz(i,j,k)*dz_betay ) + & psidc(i,j,k)*sqrtdet*( uxy*dx_alp+uyy*dy_alp+uyz*dz_alp ) + & - psidc(i,j,k)*3.d0*half*alp(i,j,k)*sqrtdet*( uxy*dx_det_bydet + & - uyy*dy_det_bydet + uyz*dz_det_bydet ) + psidc(i,j,k)*alp(i,j,k)*sqrtdet*( uxy*dx_det_bydet + & + uyy*dy_det_bydet + uyz*dz_det_bydet ) - & + psidc(i,j,k)*alp(i,j,k)*sqrtdet*( uxy*gdg_x + uyy*gdg_y + & + uyz*gdg_z ) bvcz_source = -1.d0 * ( Bconsx(i,j,k)*dx_betaz + & Bconsy(i,j,k)*dy_betaz + Bconsz(i,j,k)*dz_betaz ) + & psidc(i,j,k)*sqrtdet*( uxz*dx_alp+uyz*dy_alp+uzz*dz_alp ) + & - psidc(i,j,k)*3.d0*half*alp(i,j,k)*sqrtdet*( uxz*dx_det_bydet + & - uyz*dy_det_bydet + uzz*dz_det_bydet ) + psidc(i,j,k)*alp(i,j,k)*sqrtdet*( uxz*dx_det_bydet + & + uyz*dy_det_bydet + uzz*dz_det_bydet ) - & + psidc(i,j,k)*alp(i,j,k)*sqrtdet*( uxz*gdg_x + uyz*gdg_y + & + uzz*gdg_z ) Bconsrhsx(i,j,k) = bvcx_source Bconsrhsy(i,j,k) = bvcy_source

1 0

[svn:einsteintoolkit] GRHydro/branches/divclean/src/ (Rev. 238)
by bcmsma＠astro.rit.edu 27 Apr '11

27 Apr '11

User: bmundim Date: 2011/04/27 07:37 PM Modified: /branches/divclean/src/ GRHydro_Con2PrimM.F90, GRHydro_Con2PrimM_polytype_pt.c, GRHydro_Con2PrimM_pt.c, GRHydro_InterfacesM.h Log: Change interface for Con2Prim routines to reflect the new Bcons field. File Changes: Directory: /branches/divclean/src/ ================================== File [modified]: GRHydro_Con2PrimM.F90 Delta lines: +40 -47 =================================================================== --- branches/divclean/src/GRHydro_Con2PrimM.F90 2011-04-27 23:05:18 UTC (rev 237) +++ branches/divclean/src/GRHydro_Con2PrimM.F90 2011-04-28 00:37:56 UTC (rev 238) @@ -129,10 +129,6 @@ if(evolve_Y_e.ne.0) then Y_e(i,j,k) = Y_e_con(i,j,k) / dens(i,j,k) endif - - Bvec(i,j,k,1) = Bcons(i,j,k,1)/sqrt(det) - Bvec(i,j,k,2) = Bcons(i,j,k,2)/sqrt(det) - Bvec(i,j,k,3) = Bcons(i,j,k,3)/sqrt(det) if ( dens(i,j,k) .le. sqrt(det)*GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then @@ -166,11 +162,11 @@ if(evolve_temper.eq.0) then call GRHydro_Con2PrimM_pt(GRHydro_eos_handle, local_gam, dens(i,j,k), & scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), tau(i,j,k), & - rho(i,j,k),& - vel(i,j,k,1),vel(i,j,k,2),vel(i,j,k,3),eps(i,j,k),press(i,j,k),w_lorentz(i,j,k),& + Bcons(i,j,k,1), Bcons(i,j,k,2), Bcons(i,j,k,3), rho(i,j,k),& + vel(i,j,k,1),vel(i,j,k,2),vel(i,j,k,3),eps(i,j,k),press(i,j,k),& + Bvec(i,j,k,1), Bvec(i,j,k,2), Bvec(i,j,k,3),b2, w_lorentz(i,j,k),& gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k), & uxx,uxy,uxz,uyy,uyz,uzz,det, & - Bvec(i,j,k,1), Bvec(i,j,k,2),Bvec(i,j,k,3),b2,& epsnegative,GRHydro_C2P_failed(i,j,k)) else stop "Please implement finite T con2prim routine in MHD part!" @@ -242,13 +238,13 @@ call GRHydro_Con2PrimM_Polytype_pt(GRHydro_eos_handle, local_pgam, dens(i,j,k), & scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), sc, & - rho(i,j,k),& - vel(i,j,k,1),vel(i,j,k,2),vel(i,j,k,3),eps(i,j,k),press(i,j,k),w_lorentz(i,j,k),& + Bcons(i,j,k,1), Bcons(i,j,k,2), Bcons(i,j,k,3), rho(i,j,k),& + vel(i,j,k,1),vel(i,j,k,2),vel(i,j,k,3),eps(i,j,k),press(i,j,k),& + Bvec(i,j,k,1), Bvec(i,j,k,2), Bvec(i,j,k,3),b2, w_lorentz(i,j,k),& gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k), & uxx,uxy,uxz,uyy,uyz,uzz,det, & - Bvec(i,j,k,1), Bvec(i,j,k,2),Bvec(i,j,k,3),b2,& epsnegative,GRHydro_C2P_failed(i,j,k)) - + #endif end if @@ -297,7 +293,7 @@ uxxr, uxyr, uxzr, uyyr, uyzr, uzzr, pmin, epsmin CCTK_REAL :: gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,& gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr - CCTK_REAL :: b2minus, b2plus, local_gam, local_pgam,local_K,sc + CCTK_REAL :: b2minus, b2plus, local_gam, local_pgam,local_K,scminus,scplus CCTK_INT :: epsnegative character(len=100) warnline @@ -390,11 +386,11 @@ call GRHydro_Con2PrimM_pt(GRHydro_eos_handle, local_gam,densminus(i,j,k), & sxminus(i,j,k),syminus(i,j,k),szminus(i,j,k), tauminus(i,j,k), & - rhominus(i,j,k),& - velxminus(i,j,k),velyminus(i,j,k),velzminus(i,j,k),epsminus(i,j,k),pressminus(i,j,k),w_lorentzminus(i,j,k),& + Bconsxminus(i,j,k), Bconsyminus(i,j,k), Bconszminus(i,j,k), rhominus(i,j,k),& + velxminus(i,j,k),velyminus(i,j,k),velzminus(i,j,k),epsminus(i,j,k),pressminus(i,j,k),& + Bvecxminus(i,j,k), Bvecyminus(i,j,k), Bveczminus(i,j,k),b2minus, w_lorentzminus(i,j,k),& gxxl,gxyl,gxzl,gyyl,gyzl,gzzl, & uxxl,uxyl,uxzl,uyyl,uyzl,uzzl,avg_detl, & - Bvecxminus(i,j,k), Bvecyminus(i,j,k),Bveczminus(i,j,k),b2minus,& epsnegative,GRHydro_C2P_failed(i,j,k)) if (epsnegative .ne. 0) then @@ -410,16 +406,17 @@ call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& xrho,1.0d0,xtemp,xye,xpress,keyerr,anyerr) local_pgam=log(xpress/local_K)/log(xrho) - sc = local_K*densminus(i,j,k) + scminus = local_K*densminus(i,j,k) call GRHydro_Con2PrimM_Polytype_pt(GRHydro_eos_handle, local_pgam, densminus(i,j,k), & - sxminus(i,j,k),syminus(i,j,k),szminus(i,j,k), sc, & - rhominus(i,j,k),& - velxminus(i,j,k),velyminus(i,j,k),velzminus(i,j,k),epsminus(i,j,k),pressminus(i,j,k),w_lorentzminus(i,j,k),& + sxminus(i,j,k),syminus(i,j,k),szminus(i,j,k), scminus, & + Bconsxminus(i,j,k), Bconsyminus(i,j,k), Bconszminus(i,j,k), rhominus(i,j,k),& + velxminus(i,j,k),velyminus(i,j,k),velzminus(i,j,k),epsminus(i,j,k),pressminus(i,j,k),& + Bvecxminus(i,j,k), Bvecyminus(i,j,k), Bveczminus(i,j,k),b2minus, w_lorentzminus(i,j,k),& gxxl,gxyl,gxzl,gyyl,gyzl,gzzl, & uxxl,uxyl,uxzl,uyyl,uyzl,uzzl,avg_detl, & - Bvecxminus(i,j,k), Bvecyminus(i,j,k),Bveczminus(i,j,k),b2minus,& epsnegative,GRHydro_C2P_failed(i,j,k)) + end if if (epsminus(i,j,k) .lt. 0.0d0) then @@ -446,13 +443,13 @@ epsnegative = 0 call GRHydro_Con2PrimM_pt(GRHydro_eos_handle, local_gam, densplus(i,j,k), & sxplus(i,j,k),syplus(i,j,k),szplus(i,j,k), tauplus(i,j,k),& - rhoplus(i,j,k),& - velxplus(i,j,k),velyplus(i,j,k),velzplus(i,j,k),epsplus(i,j,k),pressplus(i,j,k),w_lorentzplus(i,j,k),& + Bconsxplus(i,j,k), Bconsyplus(i,j,k), Bconszplus(i,j,k), rhoplus(i,j,k),& + velxplus(i,j,k),velyplus(i,j,k),velzplus(i,j,k),epsplus(i,j,k),pressplus(i,j,k),& + Bvecxplus(i,j,k), Bvecyplus(i,j,k), Bveczplus(i,j,k),b2plus, w_lorentzplus(i,j,k),& gxxr,gxyr,gxzr,gyyr,gyzr,gzzr, & uxxr,uxyr,uxzr,uyyr,uyzr,uzzr,avg_detr, & - Bvecxplus(i,j,k), Bvecyplus(i,j,k),Bveczplus(i,j,k),b2plus,& epsnegative,GRHydro_C2P_failed(i,j,k)) - + if (epsnegative .ne. 0) then !$OMP CRITICAL call CCTK_WARN(GRHydro_NaN_verbose+2, 'Specific internal energy just went below 0, trying polytype!!') @@ -466,15 +463,15 @@ call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& xrho,1.0d0,xtemp,xye,xpress,keyerr,anyerr) local_pgam=log(xpress/local_K)/log(xrho) - sc = local_K*densplus(i,j,k) + scplus = local_K*densplus(i,j,k) call GRHydro_Con2PrimM_Polytype_pt(GRHydro_eos_handle, local_pgam, densplus(i,j,k), & - sxplus(i,j,k),syplus(i,j,k),szplus(i,j,k), sc,& - rhoplus(i,j,k),& - velxplus(i,j,k),velyplus(i,j,k),velzplus(i,j,k),epsplus(i,j,k),pressplus(i,j,k),w_lorentzplus(i,j,k),& + sxplus(i,j,k),syplus(i,j,k),szplus(i,j,k), scplus,& + Bconsxplus(i,j,k), Bconsyplus(i,j,k), Bconszplus(i,j,k), rhoplus(i,j,k),& + velxplus(i,j,k),velyplus(i,j,k),velzplus(i,j,k),epsplus(i,j,k),pressplus(i,j,k),& + Bvecxplus(i,j,k), Bvecyplus(i,j,k), Bveczplus(i,j,k),b2plus, w_lorentzplus(i,j,k),& gxxr,gxyr,gxzr,gyyr,gyzr,gzzr, & uxxr,uxyr,uxzr,uyyr,uyzr,uzzr,avg_detr, & - Bvecxplus(i,j,k), Bvecyplus(i,j,k),Bveczplus(i,j,k),b2plus,& epsnegative,GRHydro_C2P_failed(i,j,k)) end if @@ -602,10 +599,6 @@ Y_e(i,j,k) = Y_e_con(i,j,k) / dens(i,j,k) endif - Bvec(i,j,k,1) = Bcons(i,j,k,1)/sqrt(det) - Bvec(i,j,k,2) = Bcons(i,j,k,2)/sqrt(det) - Bvec(i,j,k,3) = Bcons(i,j,k,3)/sqrt(det) - xrho=10.0d0 call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& 1.d0,1.0d0,xtemp,xye,xpress,keyerr,anyerr) @@ -617,14 +610,14 @@ sc = local_K*dens(i,j,k) call GRHydro_Con2PrimM_Polytype_pt(GRHydro_eos_handle, local_pgam, dens(i,j,k), & - scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), sc,& - rho(i,j,k),& - vel(i,j,k,1),vel(i,j,k,2),vel(i,j,k,3),eps(i,j,k),press(i,j,k),w_lorentz(i,j,k),& - gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k), & - uxx,uxy,uxz,uyy,uyz,uzz,det, & - Bvec(i,j,k,1), Bvec(i,j,k,2),Bvec(i,j,k,3),b2,& - epsnegative,GRHydro_C2P_failed(i,j,k)) - + scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), sc, & + Bcons(i,j,k,1), Bcons(i,j,k,2), Bcons(i,j,k,3), rho(i,j,k),& + vel(i,j,k,1),vel(i,j,k,2),vel(i,j,k,3),eps(i,j,k),press(i,j,k),& + Bvec(i,j,k,1), Bvec(i,j,k,2), Bvec(i,j,k,3),b2, w_lorentz(i,j,k),& + gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k), & + uxx,uxy,uxz,uyy,uyz,uzz,det, & + epsnegative,GRHydro_C2P_failed(i,j,k)) + end do end do end do @@ -730,20 +723,20 @@ call GRHydro_Con2PrimM_Polytype_pt(GRHydro_eos_handle, local_pgam,densminus(i,j,k), & sxminus(i,j,k),syminus(i,j,k),szminus(i,j,k), scminus,& - rhominus(i,j,k),& - velxminus(i,j,k),velyminus(i,j,k),velzminus(i,j,k),epsminus(i,j,k),pressminus(i,j,k),w_lorentzminus(i,j,k),& + Bconsxminus(i,j,k), Bconsyminus(i,j,k), Bconszminus(i,j,k), rhominus(i,j,k),& + velxminus(i,j,k),velyminus(i,j,k),velzminus(i,j,k),epsminus(i,j,k),pressminus(i,j,k),& + Bvecxminus(i,j,k), Bvecyminus(i,j,k), Bveczminus(i,j,k),b2minus, w_lorentzminus(i,j,k),& gxxl,gxyl,gxzl,gyyl,gyzl,gzzl, & uxxl,uxyl,uxzl,uyyl,uyzl,uzzl,avg_detl, & - Bvecxminus(i,j,k), Bvecyminus(i,j,k),Bveczminus(i,j,k),b2minus,& epsnegative,GRHydro_C2P_failed(i,j,k)) call GRHydro_Con2PrimM_Polytype_pt(GRHydro_eos_handle, local_pgam,densplus(i,j,k), & sxplus(i,j,k),syplus(i,j,k),szplus(i,j,k), scplus,& - rhoplus(i,j,k),& - velxplus(i,j,k),velyplus(i,j,k),velzplus(i,j,k),epsplus(i,j,k),pressplus(i,j,k),w_lorentzplus(i,j,k),& + Bconsxplus(i,j,k), Bconsyplus(i,j,k), Bconszplus(i,j,k), rhoplus(i,j,k),& + velxplus(i,j,k),velyplus(i,j,k),velzplus(i,j,k),epsplus(i,j,k),pressplus(i,j,k),& + Bvecxplus(i,j,k), Bvecyplus(i,j,k),Bveczplus(i,j,k),b2plus,w_lorentzplus(i,j,k),& gxxr,gxyr,gxzr,gyyr,gyzr,gzzr, & uxxr,uxyr,uxzr,uyyr,uyzr,uzzr,avg_detr, & - Bvecxplus(i,j,k), Bvecyplus(i,j,k),Bveczplus(i,j,k),b2plus,& epsnegative,GRHydro_C2P_failed(i,j,k)) end do end do File [modified]: GRHydro_Con2PrimM_polytype_pt.c Delta lines: +17 -8 =================================================================== --- branches/divclean/src/GRHydro_Con2PrimM_polytype_pt.c 2011-04-27 23:05:18 UTC (rev 237) +++ branches/divclean/src/GRHydro_Con2PrimM_polytype_pt.c 2011-04-28 00:37:56 UTC (rev 238) @@ -103,17 +103,18 @@ CCTK_REAL *dens_in, CCTK_REAL *sx_in, CCTK_REAL *sy_in, CCTK_REAL *sz_in, CCTK_REAL *sc_in, + CCTK_REAL *Bconsx_in, CCTK_REAL *Bconsy_in, CCTK_REAL *Bconsz_in, CCTK_REAL *rho, CCTK_REAL *velx, CCTK_REAL *vely, CCTK_REAL *velz, CCTK_REAL *epsilon, CCTK_REAL *pressure, + CCTK_REAL *Bx, CCTK_REAL *By, CCTK_REAL *Bz, + CCTK_REAL *bsq, CCTK_REAL *w_lorentz, CCTK_REAL *gxx, CCTK_REAL *gxy, CCTK_REAL *gxz, CCTK_REAL *gyy, CCTK_REAL *gyz, CCTK_REAL *gzz, CCTK_REAL *uxx, CCTK_REAL *uxy, CCTK_REAL *uxz, CCTK_REAL *uyy, CCTK_REAL *uyz, CCTK_REAL *uzz, CCTK_REAL *det, - CCTK_REAL *Bx, CCTK_REAL *By, CCTK_REAL *Bz, - CCTK_REAL *bsq, CCTK_INT *epsnegative, CCTK_REAL *retval); @@ -184,17 +185,18 @@ CCTK_REAL *dens_in, CCTK_REAL *sx_in, CCTK_REAL *sy_in, CCTK_REAL *sz_in, CCTK_REAL *sc_in, + CCTK_REAL *Bconsx_in, CCTK_REAL *Bconsy_in, CCTK_REAL *Bconsz_in, CCTK_REAL *rho, CCTK_REAL *velx, CCTK_REAL *vely, CCTK_REAL *velz, CCTK_REAL *epsilon, CCTK_REAL *pressure, + CCTK_REAL *Bx, CCTK_REAL *By, CCTK_REAL *Bz, + CCTK_REAL *bsq, CCTK_REAL *w_lorentz, CCTK_REAL *gxx, CCTK_REAL *gxy, CCTK_REAL *gxz, CCTK_REAL *gyy, CCTK_REAL *gyz, CCTK_REAL *gzz, CCTK_REAL *uxx, CCTK_REAL *uxy, CCTK_REAL *uxz, CCTK_REAL *uyy, CCTK_REAL *uyz, CCTK_REAL *uzz, CCTK_REAL *det, - CCTK_REAL *Bx, CCTK_REAL *By, CCTK_REAL *Bz, - CCTK_REAL *bsq, CCTK_INT *epsnegative, CCTK_REAL *retval) @@ -228,12 +230,19 @@ fprintf(stdout," *sy = %26.16e \n", *sy_in ); fprintf(stdout," *sz = %26.16e \n", *sz_in ); fprintf(stdout," *Sc = %26.16e \n", *sc_in ); + fprintf(stdout," *Bconsx = %26.16e \n", *Bconsx_in ); + fprintf(stdout," *Bconsy = %26.16e \n", *Bconsy_in ); + fprintf(stdout," *Bconsz = %26.16e \n", *Bconsz_in ); fprintf(stdout," *rho = %26.16e \n", *rho ); fprintf(stdout," *velx = %26.16e \n", *velx ); fprintf(stdout," *vely = %26.16e \n", *vely ); fprintf(stdout," *velz = %26.16e \n", *velz ); fprintf(stdout," *epsilon = %26.16e \n", *epsilon ); fprintf(stdout," *pressure = %26.16e \n", *pressure ); + fprintf(stdout," *Bx = %26.16e \n", *Bx ); + fprintf(stdout," *By = %26.16e \n", *By ); + fprintf(stdout," *Bz = %26.16e \n", *Bz ); + fprintf(stdout," *bsq = %26.16e \n", *bsq ); fprintf(stdout," *w_lorentz = %26.16e \n", *w_lorentz ); fprintf(stdout," *gxx = %26.16e \n", *gxx ); fprintf(stdout," *gxy = %26.16e \n", *gxy ); @@ -248,10 +257,6 @@ fprintf(stdout," *uyz = %26.16e \n", *uyz ); fprintf(stdout," *uzz = %26.16e \n", *uzz ); fprintf(stdout," *det = %26.16e \n", *det ); - fprintf(stdout," *Bx = %26.16e \n", *Bx ); - fprintf(stdout," *By = %26.16e \n", *By ); - fprintf(stdout," *Bz = %26.16e \n", *Bz ); - fprintf(stdout," *bsq = %26.16e \n", *bsq ); fprintf(stdout," *epsnegative = %10d \n", *epsnegative ); fprintf(stdout," *retval = %26.16e \n", *retval ); fflush(stdout); @@ -267,6 +272,10 @@ usy = (*uxy)*sx + (*uyy)*sy + (*uyz)*sz; usz = (*uxz)*sx + (*uyz)*sy + (*uzz)*sz; + *Bx = (*Bconsx_in) * inv_sqrt_detg; + *By = (*Bconsy_in) * inv_sqrt_detg; + *Bz = (*Bconsz_in) * inv_sqrt_detg; + // Calculate various scalars (Q.B, Q^2, etc) from the conserved variables: lg.Bsq = File [modified]: GRHydro_Con2PrimM_pt.c Delta lines: +17 -10 =================================================================== --- branches/divclean/src/GRHydro_Con2PrimM_pt.c 2011-04-27 23:05:18 UTC (rev 237) +++ branches/divclean/src/GRHydro_Con2PrimM_pt.c 2011-04-28 00:37:56 UTC (rev 238) @@ -108,18 +108,17 @@ CCTK_INT *handle, CCTK_REAL *gamma_eos, CCTK_REAL *dens_in, CCTK_REAL *sx_in, CCTK_REAL *sy_in, CCTK_REAL *sz_in, - CCTK_REAL *tau_in, + CCTK_REAL *tau_in, CCTK_REAL *Bconsx_in, CCTK_REAL *Bconsy_in, CCTK_REAL *Bconsz_in, CCTK_REAL *rho, CCTK_REAL *velx, CCTK_REAL *vely, CCTK_REAL *velz, CCTK_REAL *epsilon, CCTK_REAL *pressure, + CCTK_REAL *Bx, CCTK_REAL *By, CCTK_REAL *Bz, CCTK_REAL *bsq, CCTK_REAL *w_lorentz, CCTK_REAL *gxx, CCTK_REAL *gxy, CCTK_REAL *gxz, CCTK_REAL *gyy, CCTK_REAL *gyz, CCTK_REAL *gzz, CCTK_REAL *uxx, CCTK_REAL *uxy, CCTK_REAL *uxz, CCTK_REAL *uyy, CCTK_REAL *uyz, CCTK_REAL *uzz, CCTK_REAL *det, - CCTK_REAL *Bx, CCTK_REAL *By, CCTK_REAL *Bz, - CCTK_REAL *bsq, CCTK_INT *epsnegative, CCTK_REAL *retval); @@ -189,18 +188,19 @@ CCTK_INT *handle, CCTK_REAL *gamma_eos, CCTK_REAL *dens_in, CCTK_REAL *sx_in, CCTK_REAL *sy_in, CCTK_REAL *sz_in, - CCTK_REAL *tau_in, + CCTK_REAL *tau_in, + CCTK_REAL *Bconsx_in, CCTK_REAL *Bconsy_in, CCTK_REAL *Bconsz_in, CCTK_REAL *rho, CCTK_REAL *velx, CCTK_REAL *vely, CCTK_REAL *velz, CCTK_REAL *epsilon, CCTK_REAL *pressure, + CCTK_REAL *Bx, CCTK_REAL *By, CCTK_REAL *Bz, + CCTK_REAL *bsq, CCTK_REAL *w_lorentz, CCTK_REAL *gxx, CCTK_REAL *gxy, CCTK_REAL *gxz, CCTK_REAL *gyy, CCTK_REAL *gyz, CCTK_REAL *gzz, CCTK_REAL *uxx, CCTK_REAL *uxy, CCTK_REAL *uxz, CCTK_REAL *uyy, CCTK_REAL *uyz, CCTK_REAL *uzz, CCTK_REAL *det, - CCTK_REAL *Bx, CCTK_REAL *By, CCTK_REAL *Bz, - CCTK_REAL *bsq, CCTK_INT *epsnegative, CCTK_REAL *retval) @@ -231,12 +231,19 @@ fprintf(stdout," *sy = %26.16e \n", *sy_in ); fprintf(stdout," *sz = %26.16e \n", *sz_in ); fprintf(stdout," *tau = %26.16e \n", *tau_in ); + fprintf(stdout," *Bconsx = %26.16e \n", *Bconsx_in ); + fprintf(stdout," *Bconsy = %26.16e \n", *Bconsy_in ); + fprintf(stdout," *Bconsz = %26.16e \n", *Bconsz_in ); fprintf(stdout," *rho = %26.16e \n", *rho ); fprintf(stdout," *velx = %26.16e \n", *velx ); fprintf(stdout," *vely = %26.16e \n", *vely ); fprintf(stdout," *velz = %26.16e \n", *velz ); fprintf(stdout," *epsilon = %26.16e \n", *epsilon ); fprintf(stdout," *pressure = %26.16e \n", *pressure ); + fprintf(stdout," *Bx = %26.16e \n", *Bx ); + fprintf(stdout," *By = %26.16e \n", *By ); + fprintf(stdout," *Bz = %26.16e \n", *Bz ); + fprintf(stdout," *bsq = %26.16e \n", *bsq ); fprintf(stdout," *w_lorentz = %26.16e \n", *w_lorentz ); fprintf(stdout," *gxx = %26.16e \n", *gxx ); fprintf(stdout," *gxy = %26.16e \n", *gxy ); @@ -251,10 +258,6 @@ fprintf(stdout," *uyz = %26.16e \n", *uyz ); fprintf(stdout," *uzz = %26.16e \n", *uzz ); fprintf(stdout," *det = %26.16e \n", *det ); - fprintf(stdout," *Bx = %26.16e \n", *Bx ); - fprintf(stdout," *By = %26.16e \n", *By ); - fprintf(stdout," *Bz = %26.16e \n", *Bz ); - fprintf(stdout," *bsq = %26.16e \n", *bsq ); fprintf(stdout," *epsnegative = %10d \n", *epsnegative ); fprintf(stdout," *retval = %26.16e \n", *retval ); fflush(stdout); @@ -271,6 +274,10 @@ usy = (*uxy)*sx + (*uyy)*sy + (*uyz)*sz; usz = (*uxz)*sx + (*uyz)*sy + (*uzz)*sz; + *Bx = (*Bconsx_in) * inv_sqrt_detg; + *By = (*Bconsy_in) * inv_sqrt_detg; + *Bz = (*Bconsz_in) * inv_sqrt_detg; + // Calculate various scalars (Q.B, Q^2, etc) from the conserved variables: lg.Bsq = File [modified]: GRHydro_InterfacesM.h Delta lines: +12 -8 =================================================================== --- branches/divclean/src/GRHydro_InterfacesM.h 2011-04-27 23:05:18 UTC (rev 237) +++ branches/divclean/src/GRHydro_InterfacesM.h 2011-04-28 00:37:56 UTC (rev 238) @@ -7,17 +7,18 @@ local_gam, dens, & sx, sy, sz, & tau, & + Bconsx, Bconsy, Bconsz, & rho, & velx, vely, velz,& epsilon, pressure,& + Bx, By, Bz, & + bsq,& w_lorentz, & gxx, gxy, gxz, & gyy, gyz, gzz, & uxx, uxy, uxz,& uyy, uyz, uzz,& det,& - Bx, By, Bz, & - bsq,& epsnegative, & retval) @@ -27,17 +28,18 @@ CCTK_REAL dens CCTK_REAL sx, sy, sz CCTK_REAL tau + CCTK_REAL Bconsx, Bconsy, Bconsz CCTK_REAL rho CCTK_REAL velx, vely, velz CCTK_REAL epsilon, pressure + CCTK_REAL Bx, By, Bz + CCTK_REAL bsq CCTK_REAL w_lorentz CCTK_REAL gxx, gxy, gxz CCTK_REAL gyy, gyz, gzz CCTK_REAL uxx, uxy, uxz CCTK_REAL uyy, uyz, uzz CCTK_REAL det - CCTK_REAL Bx, By, Bz - CCTK_REAL bsq CCTK_INT epsnegative CCTK_REAL retval end subroutine GRHydro_Con2PrimM_pt @@ -46,17 +48,18 @@ dens, & sx, sy, sz, & sc, & + Bconsx, Bconsy, Bconsz, & rho, & velx, vely, velz,& epsilon, pressure,& + Bx, By, Bz, & + bsq,& w_lorentz, & gxx, gxy, gxz, & gyy, gyz, gzz, & uxx, uxy, uxz,& uyy, uyz, uzz,& det,& - Bx, By, Bz, & - bsq,& epsnegative, & retval) @@ -66,17 +69,18 @@ CCTK_REAL dens CCTK_REAL sx, sy, sz CCTK_REAL sc + CCTK_REAL Bconsx, Bconsy, Bconsz CCTK_REAL rho CCTK_REAL velx, vely, velz CCTK_REAL epsilon, pressure + CCTK_REAL Bx, By, Bz + CCTK_REAL bsq CCTK_REAL w_lorentz CCTK_REAL gxx, gxy, gxz CCTK_REAL gyy, gyz, gzz CCTK_REAL uxx, uxy, uxz CCTK_REAL uyy, uyz, uzz CCTK_REAL det - CCTK_REAL Bx, By, Bz - CCTK_REAL bsq CCTK_INT epsnegative CCTK_REAL retval end subroutine GRHydro_Con2PrimM_Polytype_pt

1 0

[svn:einsteintoolkit] GRHydro/branches/divclean/src/ (Rev. 237)
by tanja.bode＠physics.gatech.edu 27 Apr '11

27 Apr '11

User: tbode Date: 2011/04/27 06:05 PM Modified: /branches/divclean/src/ GRHydro_SourceM.F90 Log: Fix variable names. File Changes: Directory: /branches/divclean/src/ ================================== File [modified]: GRHydro_SourceM.F90 Delta lines: +7 -7 =================================================================== --- branches/divclean/src/GRHydro_SourceM.F90 2011-04-27 22:58:37 UTC (rev 236) +++ branches/divclean/src/GRHydro_SourceM.F90 2011-04-27 23:05:18 UTC (rev 237) @@ -444,7 +444,7 @@ taurhs(i,j,k) = alp(i,j,k)*sqrtdet*tau_source 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_shiftx + dy_shifty + dz_shiftz ) * psidc(i,j,k) + & + dx_betax + dy_betay + dz_betaz ) * psidc(i,j,k) + & Bconsx(i,j,k) * ( dx_alp - half*alp(i,j,k) * & ( uxx*dx_gxx + uyy*dx_gyy + uzz*dx_gzz + 2.d0*uxy*dx_gxy + & 2.d0*uxz*dx_gxz + 2.d0*uyz*dx_gyz ) )/ sqrtdet + & @@ -463,20 +463,20 @@ dz_det_bydet = uxx*dz_gxx + uyy*dz_gyy + uzz*dz_gzz + & 2.d0*(uxy*dz_gxy+uxz*dz_gxz+uyz*dz_gyz) - bvcx_source = -1.d0 * ( Bconsx(i,j,k)*dx_shiftx + & - Bconsy(i,j,k)*dy_shiftx + Bconsz(i,j,k)*dz_shiftx ) + & + bvcx_source = -1.d0 * ( Bconsx(i,j,k)*dx_betax + & + Bconsy(i,j,k)*dy_betax + Bconsz(i,j,k)*dz_betax ) + & psidc(i,j,k)*sqrtdet*( uxx*dx_alp+uxy*dy_alp+uxz*dz_alp ) + & psidc(i,j,k)*3.d0*half*alp(i,j,k)*sqrtdet*( uxx*dx_det_bydet + & uxy*dy_det_bydet + uxz*dz_det_bydet ) - bvcy_source = -1.d0 * ( Bconsx(i,j,k)*dx_shifty + & - Bconsy(i,j,k)*dy_shifty + Bconsz(i,j,k)*dz_shifty ) + & + bvcy_source = -1.d0 * ( Bconsx(i,j,k)*dx_betay + & + Bconsy(i,j,k)*dy_betay + Bconsz(i,j,k)*dz_betay ) + & psidc(i,j,k)*sqrtdet*( uxy*dx_alp+uyy*dy_alp+uyz*dz_alp ) + & psidc(i,j,k)*3.d0*half*alp(i,j,k)*sqrtdet*( uxy*dx_det_bydet + & uyy*dy_det_bydet + uyz*dz_det_bydet ) - bvcz_source = -1.d0 * ( Bconsx(i,j,k)*dx_shiftz + & - Bconsy(i,j,k)*dy_shiftz + Bconsz(i,j,k)*dz_shiftz ) + & + bvcz_source = -1.d0 * ( Bconsx(i,j,k)*dx_betaz + & + Bconsy(i,j,k)*dy_betaz + Bconsz(i,j,k)*dz_betaz ) + & psidc(i,j,k)*sqrtdet*( uxz*dx_alp+uyz*dy_alp+uzz*dz_alp ) + & psidc(i,j,k)*3.d0*half*alp(i,j,k)*sqrtdet*( uxz*dx_det_bydet + & uyz*dy_det_bydet + uzz*dz_det_bydet )

1 0

[svn:einsteintoolkit] GRHydro/branches/divclean/src/ (Rev. 236)
by tanja.bode＠physics.gatech.edu 27 Apr '11

27 Apr '11

User: tbode Date: 2011/04/27 05:58 PM Modified: /branches/divclean/src/ GRHydro_RegisterVars.cc Log: Remove Bvecrhs. File Changes: Directory: /branches/divclean/src/ ================================== File [modified]: GRHydro_RegisterVars.cc Delta lines: +1 -1 =================================================================== --- branches/divclean/src/GRHydro_RegisterVars.cc 2011-04-27 22:56:11 UTC (rev 235) +++ branches/divclean/src/GRHydro_RegisterVars.cc 2011-04-27 22:58:37 UTC (rev 236) @@ -63,7 +63,7 @@ register_evolved("GRHydro::scon", "GRHydro::srhs"); if (CCTK_EQUALS(Bvec_evolution_method, "GRHydro")) { - register_constrained("HydroBase::Bvec", "GRHydro::Bvecrhs"); + register_constrained("HydroBase::Bvec"); register_evolved("HydroBase::Bcons", "GRHydro::Bconsrhs"); if(clean_divergence) { register_evolved("GRHydro::psidc" , "GRHydro::psidcrhs");

1 0

[svn:einsteintoolkit] GRHydro/branches/divclean/src/ (Rev. 235)
by tanja.bode＠physics.gatech.edu 27 Apr '11

27 Apr '11

User: tbode Date: 2011/04/27 05:56 PM Modified: /branches/divclean/src/ GRHydro_ReconstructPoly.F90 Log: Move erroneous end do statements. File Changes: Directory: /branches/divclean/src/ ================================== File [modified]: GRHydro_ReconstructPoly.F90 Delta lines: +1 -1 =================================================================== --- branches/divclean/src/GRHydro_ReconstructPoly.F90 2011-04-27 22:37:19 UTC (rev 234) +++ branches/divclean/src/GRHydro_ReconstructPoly.F90 2011-04-27 22:56:11 UTC (rev 235) @@ -693,6 +693,7 @@ end if end do end do + end do !$OMP END PARALLEL DO else if (flux_direction == 2) then !$OMP PARALLEL DO PRIVATE(i, j) @@ -764,7 +765,6 @@ end do end do end do - end do !$OMP END PARALLEL DO else if (flux_direction == 3) then !$OMP PARALLEL DO PRIVATE(i, j)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits