Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 452)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_Con2PrimM.F90 Log: GRHydro: disable in-AH polytrope call by default From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimM.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:23 UTC (rev 451) +++ trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:24 UTC (rev 452) @@ -270,7 +270,7 @@ if(evolve_temper.eq.0) then - if(sdet.ge.sqrtdet_thr) then + if(sqrtdet_thr.gt.0d0 .and. sdet.ge.sqrtdet_thr) then d2 = dens(i,j,k)**2 s2 = uxx*scon(i,j,k,1)**2 + uyy*scon(i,j,k,2)**2 & + uzz*scon(i,j,k,3)**2 & @@ -359,7 +359,7 @@ local_pgam=log(xpress(1)/local_K)/log(xrho(1)) sc = local_K*dens(i,j,k) - if(sdet.ge.sqrtdet_thr) then + if(sqrtdet_thr.gt.0d0 .and. sdet.ge.sqrtdet_thr) then GRHydro_C2P_failed(i,j,k) = 0 rho_tmp = rho(i,j,k) Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +2 -1 =================================================================== --- trunk/param.ccl 2013-01-14 14:23:23 UTC (rev 451) +++ trunk/param.ccl 2013-01-14 14:23:24 UTC (rev 452) @@ -354,7 +354,8 @@ REAL sqrtdet_thr "Threshold to apply cons rescalings deep inside the horizon" STEERABLE=ALWAYS { 1.0: :: "Larger values guarantees this sort of rescaling only deep inside the horizon" -} 30.0 + -1.0 :: "Do not apply limit" +} -1.0 REAL max_magnetic_to_gas_pressure_ratio "consider pressure to be magnetically dominated if magnetic pressure to gas pressure ratio is higher than this" STEERABLE=ALWAYS {

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 451)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_Con2PrimM.F90 Log: GRHydro: call polytrope EOS in a region dominated by mag. field. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimM.F90 Delta lines: +60 -12 =================================================================== --- trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:21 UTC (rev 450) +++ trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:23 UTC (rev 451) @@ -93,6 +93,8 @@ CCTK_REAL :: velx_tmp, vely_tmp, velz_tmp, w_lorentz_tmp CCTK_REAL :: Bvecx_tmp, Bvecy_tmp, Bvecz_tmp + CCTK_REAL :: bdotv, magpress + ! Assume 3-metric is positive definite. Check deep inside the horizon ! if this is actually satisfied and if it is not then cast the metric !as conformally flat only for con2prim inversion purposes. @@ -166,7 +168,7 @@ !$OMP sdet,d2,s2,oob,bscon,bxhat,byhat,bzhat, & !$OMP bhatscon,Wm,Wm0,Wm_resid,Wmold,s2m,s2m0,s2m_resid,s2mold,s2max, & !$OMP taum,niter,rho_tmp,press_tmp,eps_tmp,velx_tmp,vely_tmp,velz_tmp, & - !$OMP w_lorentz_tmp,Bvecx_tmp,Bvecy_tmp,Bvecz_tmp) + !$OMP w_lorentz_tmp,Bvecx_tmp,Bvecy_tmp,Bvecz_tmp,bdotv,magpress) do k = 1, nz do j = 1, ny do i = 1, nx @@ -345,6 +347,18 @@ epsnegative,GRHydro_C2P_failed(i,j,k)) if(GRHydro_C2P_failed(i,j,k).ne.0) then + + xrho=1.0d0; xtemp=0.0d0; xeps=1.0d0 + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + xrho,xeps,xtemp,xye,xpress,keyerr,anyerr) + local_K = xpress(1); + + xrho=10.0d0; xeps=1.0d0 + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + xrho,xeps,xtemp,xye,xpress,keyerr,anyerr) + local_pgam=log(xpress(1)/local_K)/log(xrho(1)) + sc = local_K*dens(i,j,k) + if(sdet.ge.sqrtdet_thr) then GRHydro_C2P_failed(i,j,k) = 0 @@ -358,18 +372,7 @@ Bvecx_tmp = Bprim(i,j,k,1) Bvecy_tmp = Bprim(i,j,k,2) Bvecz_tmp = Bprim(i,j,k,3) - - xrho=1.0d0; xtemp=0.0d0; xeps=1.0d0 - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& - xrho,xeps,xtemp,xye,xpress,keyerr,anyerr) - local_K = xpress(1); - xrho=10.0d0; xeps=1.0d0 - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& - xrho,xeps,xtemp,xye,xpress,keyerr,anyerr) - local_pgam=log(xpress(1)/local_K)/log(xrho(1)) - 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, & Bcons(i,j,k,1), Bcons(i,j,k,2), Bcons(i,j,k,3),rho_tmp,& @@ -391,6 +394,51 @@ cycle end if end if + + bdotv=g11(i,j,k)*Bprim(i,j,k,1)*vup(i,j,k,1)+ & + g22(i,j,k)*Bprim(i,j,k,2)*vup(i,j,k,2)+ & + g33(i,j,k)*Bprim(i,j,k,3)*vup(i,j,k,3)+ & + 2.0*(g12(i,j,k)*Bprim(i,j,k,1)*vup(i,j,k,2)+ & + g13(i,j,k)*Bprim(i,j,k,1)*vup(i,j,k,3)+ & + g23(i,j,k)*Bprim(i,j,k,2)*vup(i,j,k,3)) + + magpress = 0.5d0*(b2/w_lorentz(i,j,k)**2+bdotv**2) + + if(rho(i,j,k)*eps(i,j,k)*max_magnetic_to_gas_pressure_ratio.le.magpress) then + GRHydro_C2P_failed(i,j,k) = 0 + + rho_tmp = rho(i,j,k) + press_tmp = press(i,j,k) + eps_tmp = eps(i,j,k) + velx_tmp = vup(i,j,k,1) + vely_tmp = vup(i,j,k,2) + velz_tmp = vup(i,j,k,3) + w_lorentz_tmp = w_lorentz(i,j,k) + Bvecx_tmp = Bprim(i,j,k,1) + Bvecy_tmp = Bprim(i,j,k,2) + Bvecz_tmp = Bprim(i,j,k,3) + + 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, & + Bcons(i,j,k,1), Bcons(i,j,k,2), Bcons(i,j,k,3),rho_tmp,& + velx_tmp,vely_tmp,velz_tmp,eps_tmp,press_tmp,& + Bvecx_tmp,Bvecy_tmp,Bvecz_tmp,b2,w_lorentz_tmp,& + g11(i,j,k),g12(i,j,k),g13(i,j,k),g22(i,j,k),g23(i,j,k),g33(i,j,k), & + uxx,uxy,uxz,uyy,uyz,uzz,det, & + epsnegative,GRHydro_C2P_failed(i,j,k)) + + rho(i,j,k) = rho_tmp + press(i,j,k) = press_tmp + eps(i,j,k) = eps_tmp + vup(i,j,k,1) = velx_tmp + vup(i,j,k,2) = vely_tmp + vup(i,j,k,3) = velz_tmp + w_lorentz(i,j,k) = w_lorentz_tmp + Bprim(i,j,k,1) = Bvecx_tmp + Bprim(i,j,k,2) = Bvecy_tmp + Bprim(i,j,k,3) = Bvecz_tmp + cycle + end if end if else ! if(evolve_temper.eq.0) then Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +5 -0 =================================================================== --- trunk/param.ccl 2013-01-14 14:23:21 UTC (rev 450) +++ trunk/param.ccl 2013-01-14 14:23:23 UTC (rev 451) @@ -356,6 +356,11 @@ 1.0: :: "Larger values guarantees this sort of rescaling only deep inside the horizon" } 30.0 +REAL max_magnetic_to_gas_pressure_ratio "consider pressure to be magnetically dominated if magnetic pressure to gas pressure ratio is higher than this" STEERABLE=ALWAYS +{ + (0:* :: "any positive value, eg. 100." + -1.0 :: "disable" +} -1.0 boolean c2p_reset_pressure "If the pressure guess is unphysical should we recompute it?" {

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 450)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/src/ GRHydro_Con2PrimM.F90 Log: GRHydro: Call pointwise polytype upon con2primM failure. If it fails just use previous primitive values and get the cons from them. Basically freezing their values at previous time step. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimM.F90 Delta lines: +31 -19 =================================================================== --- trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:19 UTC (rev 449) +++ trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:21 UTC (rev 450) @@ -344,8 +344,8 @@ uxx,uxy,uxz,uyy,uyz,uzz,det, & epsnegative,GRHydro_C2P_failed(i,j,k)) - if(sdet.ge.sqrtdet_thr) then - if(GRHydro_C2P_failed(i,j,k).ne.0) then + if(GRHydro_C2P_failed(i,j,k).ne.0) then + if(sdet.ge.sqrtdet_thr) then GRHydro_C2P_failed(i,j,k) = 0 rho_tmp = rho(i,j,k) @@ -358,17 +358,38 @@ Bvecx_tmp = Bprim(i,j,k,1) Bvecy_tmp = Bprim(i,j,k,2) Bvecz_tmp = Bprim(i,j,k,3) + + xrho=1.0d0; xtemp=0.0d0; xeps=1.0d0 + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + xrho,xeps,xtemp,xye,xpress,keyerr,anyerr) + local_K = xpress(1); - call GRHydro_Con2PrimM_pt(GRHydro_polytrope_handle, keytemp, & - GRHydro_eos_rf_prec, local_gam(1), dens(i,j,k), & - scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), tau(i,j,k), & - Bcons(i,j,k,1),Bcons(i,j,k,2),Bcons(i,j,k,3),xye(1), & - xtemp(1),rho_tmp,velx_tmp,vely_tmp,velz_tmp,& - eps_tmp,press_tmp,Bvecx_tmp,Bvecy_tmp,Bvecz_tmp,b2,& - w_lorentz_tmp,g11(i,j,k),g12(i,j,k),g13(i,j,k),& - g22(i,j,k),g23(i,j,k),g33(i,j,k), & + xrho=10.0d0; xeps=1.0d0 + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + xrho,xeps,xtemp,xye,xpress,keyerr,anyerr) + local_pgam=log(xpress(1)/local_K)/log(xrho(1)) + 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, & + Bcons(i,j,k,1), Bcons(i,j,k,2), Bcons(i,j,k,3),rho_tmp,& + velx_tmp,vely_tmp,velz_tmp,eps_tmp,press_tmp,& + Bvecx_tmp,Bvecy_tmp,Bvecz_tmp,b2,w_lorentz_tmp,& + g11(i,j,k),g12(i,j,k),g13(i,j,k),g22(i,j,k),g23(i,j,k),g33(i,j,k), & uxx,uxy,uxz,uyy,uyz,uzz,det, & epsnegative,GRHydro_C2P_failed(i,j,k)) + + if(GRHydro_C2P_failed(i,j,k).ne.0) then + GRHydro_C2P_failed(i,j,k) = 0 + call prim2conM(GRHydro_eos_handle,g11(i,j,k),g12(i,j,k), & + g13(i,j,k),g22(i,j,k),g23(i,j,k),g33(i,j,k),det, & + dens(i,j,k),scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), & + tau(i,j,k),Bcons(i,j,k,1),Bcons(i,j,k,2),Bcons(i,j,k,3), & + rho(i,j,k),vup(i,j,k,1),vup(i,j,k,2),vup(i,j,k,3), & + eps(i,j,k),press(i,j,k), & + Bprim(i,j,k,1),Bprim(i,j,k,2),Bprim(i,j,k,3),w_lorentz(i,j,k)) + cycle + end if end if end if @@ -526,15 +547,6 @@ uxx,uxy,uxz,uyy,uyz,uzz,det, & epsnegative,GRHydro_C2P_failed(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, & -! Bcons(i,j,k,1), Bcons(i,j,k,2), Bcons(i,j,k,3), rho(i,j,k),& -! vup(i,j,k,1),vup(i,j,k,2),vup(i,j,k,3),eps(i,j,k),press(i,j,k),& -! Bprim(i,j,k,1), Bprim(i,j,k,2), Bprim(i,j,k,3),b2, w_lorentz(i,j,k),& -! g11(i,j,k),g12(i,j,k),g13(i,j,k),g22(i,j,k),g23(i,j,k),g33(i,j,k), & -! uxx,uxy,uxz,uyy,uyz,uzz,det, & - #endif end if ! if (epsnegative .ne. 0) then

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 449)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/src/ GRHydro_Con2PrimM.F90 Log: GRHydro: call pointwise con2primM with polytrope eos handle deep inside AH upon inversion failure of gamma law eos. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimM.F90 Delta lines: +28 -0 =================================================================== --- trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:16 UTC (rev 448) +++ trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:19 UTC (rev 449) @@ -344,6 +344,34 @@ uxx,uxy,uxz,uyy,uyz,uzz,det, & epsnegative,GRHydro_C2P_failed(i,j,k)) + if(sdet.ge.sqrtdet_thr) then + if(GRHydro_C2P_failed(i,j,k).ne.0) then + GRHydro_C2P_failed(i,j,k) = 0 + + rho_tmp = rho(i,j,k) + press_tmp = press(i,j,k) + eps_tmp = eps(i,j,k) + velx_tmp = vup(i,j,k,1) + vely_tmp = vup(i,j,k,2) + velz_tmp = vup(i,j,k,3) + w_lorentz_tmp = w_lorentz(i,j,k) + Bvecx_tmp = Bprim(i,j,k,1) + Bvecy_tmp = Bprim(i,j,k,2) + Bvecz_tmp = Bprim(i,j,k,3) + + call GRHydro_Con2PrimM_pt(GRHydro_polytrope_handle, keytemp, & + GRHydro_eos_rf_prec, local_gam(1), dens(i,j,k), & + scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), tau(i,j,k), & + Bcons(i,j,k,1),Bcons(i,j,k,2),Bcons(i,j,k,3),xye(1), & + xtemp(1),rho_tmp,velx_tmp,vely_tmp,velz_tmp,& + eps_tmp,press_tmp,Bvecx_tmp,Bvecy_tmp,Bvecz_tmp,b2,& + w_lorentz_tmp,g11(i,j,k),g12(i,j,k),g13(i,j,k),& + g22(i,j,k),g23(i,j,k),g33(i,j,k), & + uxx,uxy,uxz,uyy,uyz,uzz,det, & + epsnegative,GRHydro_C2P_failed(i,j,k)) + end if + end if + else ! if(evolve_temper.eq.0) then rho_tmp = rho(i,j,k)

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 448)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/src/ GRHydro_Con2PrimM_pt.c Log: GRHydro: Let the driver functions to take care of retval initialization From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimM_pt.c Delta lines: +2 -1 =================================================================== --- trunk/src/GRHydro_Con2PrimM_pt.c 2013-01-14 14:23:14 UTC (rev 447) +++ trunk/src/GRHydro_Con2PrimM_pt.c 2013-01-14 14:23:16 UTC (rev 448) @@ -229,7 +229,8 @@ gammaeos = *gamma_eos; /* Assume ok initially: */ - *retval = 0.; + // BCM: But let the driver function take care of its initialization + //*retval = 0.; *epsnegative = 0; #if(DEBUG_CON2PRIMM)

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 447)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/src/ GRHydro_UpdateMask.F90, GRHydro_UpdateMaskM.F90 Log: GRHydro: reset points inside the excision region to atmosphere in InitialAtmosphereReset(M) so that the ID thorns do not have to know about he excised region. From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_UpdateMask.F90 Delta lines: +3 -1 =================================================================== --- trunk/src/GRHydro_UpdateMask.F90 2013-01-14 14:23:12 UTC (rev 446) +++ trunk/src/GRHydro_UpdateMask.F90 2013-01-14 14:23:14 UTC (rev 447) @@ -452,7 +452,9 @@ do j = 1, cctk_lsh(2) do i = 1, cctk_lsh(1) - if (rho(i,j,k) .le. rho_min) then + if (rho(i,j,k) .le. rho_min .or. & + GRHydro_enable_internal_excision /= 0 .and. & + hydro_excision_mask(i,j,k) .ne. 0) then rho(i,j,k) = rho_min det = SPATIAL_DETERMINANT(g11(i,j,k), g12(i,j,k), g13(i,j,k), \ g22(i,j,k), g23(i,j,k), g33(i,j,k)) File [modified]: GRHydro_UpdateMaskM.F90 Delta lines: +3 -1 =================================================================== --- trunk/src/GRHydro_UpdateMaskM.F90 2013-01-14 14:23:12 UTC (rev 446) +++ trunk/src/GRHydro_UpdateMaskM.F90 2013-01-14 14:23:14 UTC (rev 447) @@ -323,7 +323,9 @@ do j = 1, cctk_lsh(2) do i = 1, cctk_lsh(1) - if (rho(i,j,k) .le. rho_min) then + if (rho(i,j,k) .le. rho_min .or. & + (GRHydro_enable_internal_excision .ne. 0 .and. & + hydro_excision_mask(i,j,k) .ne. 0) ) then rho(i,j,k) = rho_min vup(i,j,k,1) = 0.0d0 vup(i,j,k,2) = 0.0d0

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 446)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Removed: /trunk/src/ GRHydro_Con2PrimM_pt_EOSOmni.c.hopefullyfixed Log: GRHydro: remove old "hopefullyfixed" con2primM_pt version. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [removed]: GRHydro_Con2PrimM_pt_EOSOmni.c.hopefullyfixed Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 445)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 07:54 AM Modified: /trunk/ schedule.ccl Log: GRHydro: use timelevels parameter in STORAGE statement rather than if cascade to test for each value From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +32 -83 =================================================================== --- trunk/schedule.ccl 2013-01-14 13:54:06 UTC (rev 444) +++ trunk/schedule.ccl 2013-01-14 13:54:08 UTC (rev 445) @@ -49,57 +49,28 @@ ### use of MoL with Einstein ### ################################################# -if (timelevels == 3) +STORAGE:dens[timelevels] +STORAGE:tau[timelevels] +STORAGE:scon[timelevels] +if (number_of_particles) { - STORAGE:dens[3] - STORAGE:tau[3] - STORAGE:scon[3] - if (number_of_particles) - { - STORAGE:particles[3] - } - STORAGE: ADMBase::metric[3], ADMBase::curv[3] - STORAGE: ADMBase::lapse[3] - if(CCTK_Equals(Y_e_evolution_method,"GRHydro")) - { - STORAGE: Y_e_con[3] - STORAGE: Y_e_con_rhs, Y_e_con_flux, Y_e_plus, Y_e_minus - } - if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) - { - STORAGE: HydroBase::Bvec[3] - STORAGE: GRHydro::Bcons[3] - if (clean_divergence) - { - STORAGE:psidc[3] - } - } + STORAGE:particles[timelevels] } -else +STORAGE: ADMBase::metric[timelevels], ADMBase::curv[timelevels] +STORAGE: ADMBase::lapse[timelevels] +if(CCTK_Equals(Y_e_evolution_method,"GRHydro")) { - STORAGE:dens[2] - STORAGE:tau[2] - STORAGE:scon[2] - if (number_of_particles) + STORAGE: Y_e_con[timelevels] + STORAGE: Y_e_con_rhs, Y_e_con_flux, Y_e_plus, Y_e_minus +} +if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) +{ + STORAGE: HydroBase::Bvec[timelevels] + STORAGE: GRHydro::Bcons[timelevels] + if (clean_divergence) { - STORAGE:particles[2] + STORAGE:psidc[timelevels] } - STORAGE: ADMBase::metric[2], ADMBase::curv[2] - STORAGE: ADMBase::lapse[2] - if(CCTK_Equals(Y_e_evolution_method,"GRHydro")) - { - STORAGE: Y_e_con[2] - STORAGE: Y_e_con_rhs, Y_e_con_flux, Y_e_plus, Y_e_minus - } - if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) - { - STORAGE: HydroBase::Bvec[2] - STORAGE: GRHydro::Bcons[2] - if (clean_divergence) - { - STORAGE:psidc[2] - } - } } STORAGE:evolve_MHD STORAGE:evolve_Y_e @@ -123,9 +94,9 @@ } if (calculate_bcom) { - STORAGE:GRHydro::bcom[3] - STORAGE:GRHydro::bcom0[3] - STORAGE:GRHydro::bcom_sq[3] + STORAGE:GRHydro::bcom[timelevels] + STORAGE:GRHydro::bcom0[timelevels] + STORAGE:GRHydro::bcom_sq[timelevels] } } STORAGE:GRHydro_eos_scalars @@ -141,8 +112,8 @@ if (evolve_tracer) { - STORAGE:GRHydro_tracers[3] - STORAGE:GRHydro_cons_tracers[3] + STORAGE:GRHydro_tracers[timelevels] + STORAGE:GRHydro_cons_tracers[timelevels] STORAGE:GRHydro_tracer_rhs } @@ -183,36 +154,14 @@ ### use of MoL with Einstein ### ################################################# -if (timelevels == 3) -{ - STORAGE: ADMBase::metric[3], ADMBase::curv[3] - STORAGE: ADMBase::lapse[3] -} -else -{ - STORAGE: ADMBase::metric[2], ADMBase::curv[2] - STORAGE: ADMBase::lapse[2] -} +STORAGE: ADMBase::metric[timelevels], ADMBase::curv[timelevels] +STORAGE: ADMBase::lapse[timelevels] if (!CCTK_Equals(initial_shift,"none")) { - if (timelevels == 3) - { - STORAGE: ADMBase::shift[3] - } - else - { - STORAGE: ADMBase::shift[2] - } + STORAGE: ADMBase::shift[timelevels] if (CCTK_Equals(shift_evolution_method,"Comoving")) { - if (timelevels == 3) - { - STORAGE: GRHydro_coords[3] - } - else - { - STORAGE: GRHydro_coords[2] - } + STORAGE: GRHydro_coords[timelevels] STORAGE: GRHydro_coords_rhs schedule GRHydro_SetUpCoords IN HydroBase_Initial @@ -243,11 +192,11 @@ # _and_ we really want to safe this memory then it has to be turned off at # runtime via CCTK_GroupStorageDecrease if(CCTK_IsImplementationActive("Coordinates")) { - STORAGE: lvel[3] + STORAGE: lvel[timelevels] if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) { - STORAGE: lBvec[3] + STORAGE: lBvec[timelevels] } - STORAGE: local_metric[3] + STORAGE: local_metric[timelevels] STORAGE: local_extrinsic_curvature STORAGE: local_shift } @@ -830,7 +779,7 @@ { -##########################################3 +########################################## ### MHD not implemented yet for Flux split FD !!! ########################################## STORAGE:fs_alpha @@ -1034,8 +983,8 @@ if (evolve_tracer) { - STORAGE:GRHydro_tracers[3] - STORAGE:GRHydro_cons_tracers[3] + STORAGE:GRHydro_tracers[timelevels] + STORAGE:GRHydro_cons_tracers[timelevels] STORAGE:GRHydro_tracer_rhs }

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 444)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 07:54 AM Modified: /trunk/ interface.ccl Log: GRHydro: remove any traces of non-functional Fisheye support From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +0 -23 =================================================================== --- trunk/interface.ccl 2013-01-14 13:54:02 UTC (rev 443) +++ trunk/interface.ccl 2013-01-14 13:54:06 UTC (rev 444) @@ -9,7 +9,6 @@ implements: GRHydro inherits: ADMBase, Boundary, SpaceMask, ADMMacros, Tmunubase, HydroBase -USES INCLUDE: FishEye.h USES INCLUDE: SpaceMask.h USES INCLUDE HEADER: carpet.hh @@ -537,28 +536,6 @@ int whichpsidcspeed type = SCALAR tags='checkpoint="no"' "Which speed to set for psidc? Set in ParamCheck" -# real fluxweightvolume type = GF Timelevels = 1 -# { -# cell_volume -# cell_jdet -# } "Weighting factors for the interfaces for using FishEye" -# -# real cell_surface[3] type = GF Timelevels = 1 -# -# real GRHydro_fisheye_scalars type=GF timelevels=1 -# { -# frho -# fpress -# feps -# } "GRHydro scalars in physical coordinates" -# -# real GRHydro_fisheye_vectors type=GF timelevels=1 -# { -# fvelx -# fvely -# fvelz -# } "GRHydro vectors in physical coordinates" - real GRHydro_coords type=GF timelevels=3 { GRHydro_x

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 443)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 07:54 AM Modified: /trunk/ schedule.ccl Log: GRHydro: clean up schedule - no-op changes these mostly refer to groups that used to exist but no longer do From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +5 -5 =================================================================== --- trunk/schedule.ccl 2013-01-14 13:53:59 UTC (rev 442) +++ trunk/schedule.ccl 2013-01-14 13:54:02 UTC (rev 443) @@ -156,7 +156,7 @@ # leave this here for compatibility with older code, should not be used anymore # and go out at some point -schedule group GRHydro_Initial IN HydroBase_Initial BEFORE SetTmunu +schedule group GRHydro_Initial IN HydroBase_Initial { } "GRHydro initial data group" @@ -262,7 +262,7 @@ ### Register startup banner ### ############################### -schedule GRHydro_Startup AT WRAGH AFTER HydroBase_StartUp +schedule GRHydro_Startup AT WRAGH { LANG: Fortran } "Startup banner" @@ -503,7 +503,7 @@ LANG: Fortran } "Set up and check scalars for efficiency" -schedule GRHydro_Scalar_Setup IN CCTK_POSTINITIAL BEFORE HydroBase_RHS +schedule GRHydro_Scalar_Setup IN CCTK_POSTINITIAL { LANG: Fortran } "Set up and check scalars for efficiency" @@ -536,7 +536,7 @@ LANG: Fortran } "Initialize the atmosphere mask" -schedule GRHydro_SetupMask AT POSTREGRIDINITIAL BEFORE HydroBase_PostStep AFTER (MaskOne,MaskZero) +schedule GRHydro_SetupMask AT POSTREGRIDINITIAL BEFORE MoL_PostStep AFTER (MaskOne,MaskZero) { LANG: Fortran } "Initialize the atmosphere mask" @@ -934,7 +934,7 @@ ### Find the refinement level that is being computed ### ######################################################## -schedule GRHydro_RefinementLevel IN MoL_PostStep BEFORE (SetMetricTemps,HydroBase_PostStep) +schedule GRHydro_RefinementLevel IN MoL_PostStep BEFORE HydroBase_PostStep { LANG: Fortran } "Calculate current refinement level"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits