Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 166)
by rhaas＠tapir.caltech.edu 17 Sep '12

17 Sep '12

User: rhaas Date: 2012/09/17 11:27 AM Modified: /trunk/src/ GRHydro_Bondi_new.F90 Log: GRHydro_InitData: dump the bondi 1d solution to file. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Bondi_new.F90 Delta lines: +22 -15 =================================================================== --- trunk/src/GRHydro_Bondi_new.F90 2012-09-17 16:27:26 UTC (rev 165) +++ trunk/src/GRHydro_Bondi_new.F90 2012-09-17 16:27:27 UTC (rev 166) @@ -139,19 +139,26 @@ u_bondi(i) = utmp v_bondi(i) = vtmp enddo + + open (47,file="bondi.asc",form="formatted") + do i=1,N_points + write(47,'(i5,4f22.14)')i,r_bondi(i),rho_bondi(i),& + u_bondi(i),v_bondi(i) + end do + close(47) - write(debug_message,'(a,4f22.14)') "i=1:",r_bondi(1),rho_bondi(1),& - u_bondi(1),v_bondi(1) - call CCTK_INFO(debug_message) - write(debug_message,'(a,4f22.14)') "i=100:",r_bondi(100),rho_bondi(100),& - u_bondi(100),v_bondi(100) - call CCTK_INFO(debug_message) - write(debug_message,'(a,4f22.14)') "i=1000:",r_bondi(1000),rho_bondi(1000),& - u_bondi(1000),v_bondi(1000) - call CCTK_INFO(debug_message) - write(debug_message,'(a,4f22.14)') "i=1500:",r_bondi(1500),rho_bondi(1500),& - u_bondi(1500),v_bondi(1500) - call CCTK_INFO(debug_message) +!!$ write(debug_message,'(a,4f22.14)') "i=1:",r_bondi(1),rho_bondi(1),& +!!$ u_bondi(1),v_bondi(1) +!!$ call CCTK_INFO(debug_message) +!!$ write(debug_message,'(a,4f22.14)') "i=100:",r_bondi(100),rho_bondi(100),& +!!$ u_bondi(100),v_bondi(100) +!!$ call CCTK_INFO(debug_message) +!!$ write(debug_message,'(a,4f22.14)') "i=1000:",r_bondi(1000),rho_bondi(1000),& +!!$ u_bondi(1000),v_bondi(1000) +!!$ call CCTK_INFO(debug_message) +!!$ write(debug_message,'(a,4f22.14)') "i=1500:",r_bondi(1500),rho_bondi(1500),& +!!$ u_bondi(1500),v_bondi(1500) +!!$ call CCTK_INFO(debug_message) !!$ // find the derivative near r=M rnew = 2.25 * M @@ -223,9 +230,9 @@ eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) ! if(riso.gt.1.014d0.and.riso.lt.1.015) then - if(abs(z(i,j,k)).lt.tiny.and. & - x(i,j,k).gt.6.7d0.and.x(i,j,k).lt.6.9d0.and. & - y(i,j,k).gt.1.34d0.and.y(i,j,k).lt.1.38d0 ) then + if(z(i,j,k).ge.-2.0d-1.and.z(i,j,k).le.2.0d-1.and. & + x(i,j,k).ge.6.8d0.and.x(i,j,k).le.7.0d0.and. & + y(i,j,k).ge.1.2d0.and.y(i,j,k).le.1.4d0 ) then write(debug_message,'(a,15f22.14)') 'Point to check:', & x(i,j,k),y(i,j,k),z(i,j,k),riso,gxx(i,j,k),dens(i,j,k),& tau(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),rho(i,j,k),eps(i,j,k),&

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 165)
by rhaas＠tapir.caltech.edu 17 Sep '12

17 Sep '12

User: rhaas Date: 2012/09/17 11:27 AM Modified: /trunk/src/ GRHydro_Bondi_new.F90 Log: GRHydro_InitData: relax on the tiny value hard coded. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Bondi_new.F90 Delta lines: +3 -3 =================================================================== --- trunk/src/GRHydro_Bondi_new.F90 2012-09-17 16:27:24 UTC (rev 164) +++ trunk/src/GRHydro_Bondi_new.F90 2012-09-17 16:27:26 UTC (rev 165) @@ -52,7 +52,7 @@ CCTK_INT :: i, j, k, nx, ny, nz, imin, jb,N_points CCTK_REAL :: ONEmTINY, tiny - PARAMETER (N_points=2000,ONEmTINY=0.999999d0,tiny=1.0d-14) + PARAMETER (N_points=2000,ONEmTINY=0.999999d0,tiny=1.0d-12) CCTK_REAL :: M, Msq, Mdot, rs, gam, rmin_bondi, rmax_bondi, cs_sq,cs,vs_sq,vs,rhos,gtemp,hs, Kval, Qdot CCTK_REAL :: logrmin,dlogr,rhotmp,utmp,vtmp,rspher CCTK_REAL :: r_bondi(N_points), logr_bondi(N_points), rho_bondi(N_points), u_bondi(N_points), v_bondi(N_points) @@ -224,8 +224,8 @@ ! if(riso.gt.1.014d0.and.riso.lt.1.015) then if(abs(z(i,j,k)).lt.tiny.and. & - x(i,j,k).gt.6.7d0.and.x(i,j,k).lt.6.9.and. & - y(i,j,k).gt.1.34d0.and.y(i,j,k).lt.1.38 ) then + x(i,j,k).gt.6.7d0.and.x(i,j,k).lt.6.9d0.and. & + y(i,j,k).gt.1.34d0.and.y(i,j,k).lt.1.38d0 ) then write(debug_message,'(a,15f22.14)') 'Point to check:', & x(i,j,k),y(i,j,k),z(i,j,k),riso,gxx(i,j,k),dens(i,j,k),& tau(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),rho(i,j,k),eps(i,j,k),&

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 164)
by rhaas＠tapir.caltech.edu 17 Sep '12

17 Sep '12

User: rhaas Date: 2012/09/17 11:27 AM Modified: /trunk/src/ GRHydro_Bondi_new.F90 Log: GRHydro_InitData: Change debug messages; get rid of tabs; From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Bondi_new.F90 Delta lines: +40 -19 =================================================================== --- trunk/src/GRHydro_Bondi_new.F90 2012-09-17 16:27:22 UTC (rev 163) +++ trunk/src/GRHydro_Bondi_new.F90 2012-09-17 16:27:24 UTC (rev 164) @@ -51,8 +51,8 @@ DECLARE_CCTK_FUNCTIONS CCTK_INT :: i, j, k, nx, ny, nz, imin, jb,N_points - CCTK_REAL :: ONEmTINY - PARAMETER (N_points=2000,ONEmTINY=0.999999d0) + CCTK_REAL :: ONEmTINY, tiny + PARAMETER (N_points=2000,ONEmTINY=0.999999d0,tiny=1.0d-14) CCTK_REAL :: M, Msq, Mdot, rs, gam, rmin_bondi, rmax_bondi, cs_sq,cs,vs_sq,vs,rhos,gtemp,hs, Kval, Qdot CCTK_REAL :: logrmin,dlogr,rhotmp,utmp,vtmp,rspher CCTK_REAL :: r_bondi(N_points), logr_bondi(N_points), rho_bondi(N_points), u_bondi(N_points), v_bondi(N_points) @@ -60,6 +60,8 @@ CCTK_REAL :: uiso, uisocheck, vcheck, ucheck2, vcheck2, xhat,yhat, zhat, xp, yp, zp CCTK_REAL :: f,df,ddf,a,b,c,rsm,roverm + character(400) :: debug_message + !!$set_bondi_parameters M = bondi_central_mass(1) Msq = M*M @@ -67,7 +69,9 @@ rs = r_sonicpt_bondi gam = gl_gamma - write(*,*) 'Bondi_pars:',M,mdot_sonicpt_bondi,r_sonicpt_bondi,gl_gamma + write(debug_message,'(a,4f22.14)') "Bondi_pars: ",M,mdot_sonicpt_bondi, & + r_sonicpt_bondi,gl_gamma + call CCTK_INFO(debug_message) rmin_bondi = M * bondi_rmin(1) rmax_bondi = M * bondi_rmax(1) @@ -91,7 +95,9 @@ logrmin = log10(rmin_bondi) dlogr = (log10(rmax_bondi) - logrmin)/(1.*(N_points-1)) - write(*,*)'More pars:',cs,vs,rhos,hs,Kval,Qdot,logrmin,dlogr + write(debug_message,'(a,8f22.14)') "More pars: ",cs,vs,rhos,hs,Kval,Qdot,& + logrmin,dlogr + call CCTK_INFO(debug_message) rhotmp=1.0d30 imin=1 @@ -134,10 +140,18 @@ v_bondi(i) = vtmp enddo - write(*,*)"i=1:",r_bondi(1),rho_bondi(1),u_bondi(1),v_bondi(1) - write(*,*)"i=100:",r_bondi(100),rho_bondi(100),u_bondi(100),v_bondi(100) - write(*,*)"i=1000:",r_bondi(1000),rho_bondi(1000),u_bondi(1000),v_bondi(1000) - write(*,*)"i=1500:",r_bondi(1500),rho_bondi(1500),u_bondi(1500),v_bondi(1500) + write(debug_message,'(a,4f22.14)') "i=1:",r_bondi(1),rho_bondi(1),& + u_bondi(1),v_bondi(1) + call CCTK_INFO(debug_message) + write(debug_message,'(a,4f22.14)') "i=100:",r_bondi(100),rho_bondi(100),& + u_bondi(100),v_bondi(100) + call CCTK_INFO(debug_message) + write(debug_message,'(a,4f22.14)') "i=1000:",r_bondi(1000),rho_bondi(1000),& + u_bondi(1000),v_bondi(1000) + call CCTK_INFO(debug_message) + write(debug_message,'(a,4f22.14)') "i=1500:",r_bondi(1500),rho_bondi(1500),& + u_bondi(1500),v_bondi(1500) + call CCTK_INFO(debug_message) !!$ // find the derivative near r=M rnew = 2.25 * M @@ -152,7 +166,8 @@ call find_bondi_solution( rnew, rhocheck2, ucheck2, vcheck2, rs, rhos, M, Mdot, Kval, gam, Qdot ) drhodr = 100.0*(rhocheck2-rhocheck)/M - write(6,*)'Rhocheck:',rhocheck,rhocheck2,drhodr + write(debug_message,'(a,3f22.14)') 'Rhocheck:',rhocheck,rhocheck2,drhodr + call CCTK_INFO(debug_message) nx = cctk_lsh(1) ny = cctk_lsh(2) @@ -170,7 +185,7 @@ xhat = xp/riso yhat = yp/riso zhat = zp/riso - roverm = riso/M + roverm = riso/M if(roverm > ONEmTINY) then rsch = 0.25 * ( 2.*riso + M)**2 / riso @@ -201,16 +216,22 @@ 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)) call Prim2ConGen(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),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)) + 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),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)) - if(riso.gt.1.014d0.and.riso.lt.1.015)write(6,*)'Point to check:', & - x(i,j,k),y(i,j,k),z(i,j,k),riso,gxx(i,j,k),dens(i,j,k),tau(i,j,k),& - sx(i,j,k),sy(i,j,k),sz(i,j,k),rho(i,j,k),eps(i,j,k),& - velx(i,j,k),vely(i,j,k),velz(i,j,k) +! if(riso.gt.1.014d0.and.riso.lt.1.015) then + if(abs(z(i,j,k)).lt.tiny.and. & + x(i,j,k).gt.6.7d0.and.x(i,j,k).lt.6.9.and. & + y(i,j,k).gt.1.34d0.and.y(i,j,k).lt.1.38 ) then + write(debug_message,'(a,15f22.14)') 'Point to check:', & + x(i,j,k),y(i,j,k),z(i,j,k),riso,gxx(i,j,k),dens(i,j,k),& + tau(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),rho(i,j,k),eps(i,j,k),& + velx(i,j,k),vely(i,j,k),velz(i,j,k) + call CCTK_INFO(debug_message) + end if end do end do

1 0

[svn:einsteintoolkit] GRHydro_InitData/ (Rev. 163)
by rhaas＠tapir.caltech.edu 17 Sep '12

17 Sep '12

User: rhaas Date: 2012/09/17 11:27 AM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_Bondi_new.F90 Log: GRHydro_InitData: Move the metric fudge from Bondi routine to SmoothedPuncture thorn From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> Directory Changes: Directory: /svn:executable/ =========================== + * File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Bondi_new.F90 Delta lines: +11 -63 =================================================================== --- trunk/src/GRHydro_Bondi_new.F90 2012-09-17 16:27:20 UTC (rev 162) +++ trunk/src/GRHydro_Bondi_new.F90 2012-09-17 16:27:22 UTC (rev 163) @@ -67,7 +67,7 @@ rs = r_sonicpt_bondi gam = gl_gamma - !!write(*,*) 'Bondi_pars:',M,mdot_sonicpt_bondi,r_sonicpt_bondi,gl_gamma + write(*,*) 'Bondi_pars:',M,mdot_sonicpt_bondi,r_sonicpt_bondi,gl_gamma rmin_bondi = M * bondi_rmin(1) rmax_bondi = M * bondi_rmax(1) @@ -91,7 +91,7 @@ logrmin = log10(rmin_bondi) dlogr = (log10(rmax_bondi) - logrmin)/(1.*(N_points-1)) - !!write(*,*)'More pars:',cs,vs,rhos,hs,Kval,Qdot,logrmin,dlogr + write(*,*)'More pars:',cs,vs,rhos,hs,Kval,Qdot,logrmin,dlogr rhotmp=1.0d30 imin=1 @@ -134,10 +134,10 @@ v_bondi(i) = vtmp enddo - !!write(*,*)"i=1:",r_bondi(1),rho_bondi(1),u_bondi(1),v_bondi(1) - !!write(*,*)"i=100:",r_bondi(100),rho_bondi(100),u_bondi(100),v_bondi(100) - !!write(*,*)"i=1000:",r_bondi(1000),rho_bondi(1000),u_bondi(1000),v_bondi(1000) - !!write(*,*)"i=1500:",r_bondi(1500),rho_bondi(1500),u_bondi(1500),v_bondi(1500) + write(*,*)"i=1:",r_bondi(1),rho_bondi(1),u_bondi(1),v_bondi(1) + write(*,*)"i=100:",r_bondi(100),rho_bondi(100),u_bondi(100),v_bondi(100) + write(*,*)"i=1000:",r_bondi(1000),rho_bondi(1000),u_bondi(1000),v_bondi(1000) + write(*,*)"i=1500:",r_bondi(1500),rho_bondi(1500),u_bondi(1500),v_bondi(1500) !!$ // find the derivative near r=M rnew = 2.25 * M @@ -152,7 +152,7 @@ call find_bondi_solution( rnew, rhocheck2, ucheck2, vcheck2, rs, rhos, M, Mdot, Kval, gam, Qdot ) drhodr = 100.0*(rhocheck2-rhocheck)/M - !!write(6,*)'Rhocheck:',rhocheck,rhocheck2,drhodr + write(6,*)'Rhocheck:',rhocheck,rhocheck2,drhodr nx = cctk_lsh(1) ny = cctk_lsh(2) @@ -172,58 +172,6 @@ zhat = zp/riso roverm = riso/M - if(bondi_use_smooth_puncture_data.ne.0 .and. roverm.lt.(bondi_smooth_puncture_radius*ONEmTINY)) then - - rsm=bondi_smooth_puncture_radius - !!write(6,*)'smoothing at a radius',rsm - - if(bondi_smooth_gxx.ne.0) then - - f=(1.d0+0.5d0/rsm)**4 - df=-1.d0*(2.d0*rsm+1.d0)**3/4.d0/rsm**5 - ddf=(2.d0*rsm+1.d0)**2*(4.d0*rsm+5.d0)/4.d0/rsm**6 - - a=f-0.625d0*rsm*df+0.125d0*rsm**2*ddf - b=0.75d0/rsm*df-0.25d0*ddf - c=-0.125d0/rsm**3*df+0.125d0/rsm**2*ddf - - !!write(6,*)'smooth gxx:',rsm,f,df,ddf,a,b,c - - gxx(i,j,k) = a + b*roverm**2 + c*roverm**4 - gyy(i,j,k) = a + b*roverm**2 + c*roverm**4 - gzz(i,j,k) = a + b*roverm**2 + c*roverm**4 - - else - f=1.d0+0.5d0/rsm - df=-0.5d0/rsm**2 - ddf=1.d0/rsm**3 - - a=f-0.625d0*rsm*df+0.125d0*rsm**2*ddf - b=0.75d0/rsm*df-0.25d0*ddf - c=-0.125d0/rsm**3*df+0.125d0/rsm**2*ddf - - !!write(6,*)'smooth psi:',rsm,f,df,ddf,a,b,c - - psinew=a + b*roverm**2 + c*roverm**4 - gxx(i,j,k) = psinew**4 - gyy(i,j,k) = psinew**4 - gzz(i,j,k) = psinew**4 - endif - gxy(i,j,k) = 0.0 - gxz(i,j,k) = 0.0 - gyz(i,j,k) = 0.0 - - else if(riso < 1.0e-7) then - gxx(i,j,k) = 1.0e4 - gyy(i,j,k) = 1.0e4 - gzz(i,j,k) = 1.0e4 - gxy(i,j,k) = 0.0 - gxz(i,j,k) = 0.0 - gyz(i,j,k) = 0.0 - endif - - alp(i,j,k) = 1.0/sqrt(gxx(i,j,k)) - if(roverm > ONEmTINY) then rsch = 0.25 * ( 2.*riso + M)**2 / riso jb = floor( 0.5 + (log10(rsch) - logrmin) / dlogr ) @@ -259,10 +207,10 @@ 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)) - !! if(riso.gt.1.014d0.and.riso.lt.1.015)write(6,*)'Point to check:', & - !! x(i,j,k),y(i,j,k),z(i,j,k),riso,gxx(i,j,k),dens(i,j,k),tau(i,j,k),& - !! sx(i,j,k),sy(i,j,k),sz(i,j,k),rho(i,j,k),eps(i,j,k),& - !! velx(i,j,k),vely(i,j,k),velz(i,j,k) + if(riso.gt.1.014d0.and.riso.lt.1.015)write(6,*)'Point to check:', & + x(i,j,k),y(i,j,k),z(i,j,k),riso,gxx(i,j,k),dens(i,j,k),tau(i,j,k),& + sx(i,j,k),sy(i,j,k),sz(i,j,k),rho(i,j,k),eps(i,j,k),& + velx(i,j,k),vely(i,j,k),velz(i,j,k) end do end do Property changes on: trunk/src/GRHydro_Bondi_new.F90 ___________________________________________________________________ Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +0 -14 =================================================================== --- trunk/param.ccl 2012-09-17 16:27:20 UTC (rev 162) +++ trunk/param.ccl 2012-09-17 16:27:22 UTC (rev 163) @@ -99,20 +99,6 @@ 0.0:* :: "Anything positive" } 1.0 -BOOLEAN bondi_use_smooth_puncture_data "Smooth puncture solution inside R=M using 4th order matching polynomial" -{ -} "no" - - -BOOLEAN bondi_smooth_gxx "Smooth puncture data by matching to gxx not psi" -{ -} "yes" - -REAL bondi_smooth_puncture_radius "Radius inside which to mathc functions, in units of R/M" -{ - 0:0.5 :: "Less than/equal to 0.5" -} 0.5 - BOOLEAN change_shock_direction "Change the shock direction" { } "no" Property changes on: trunk/param.ccl ___________________________________________________________________

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 162)
by rhaas＠tapir.caltech.edu 17 Sep '12

17 Sep '12

User: rhaas Date: 2012/09/17 11:27 AM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_Bondi_new.F90 Log: GRHydro_InitData: Bondi routine: smooth puncture data. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Bondi_new.F90 Delta lines: +56 -16 =================================================================== --- trunk/src/GRHydro_Bondi_new.F90 2012-09-17 16:27:18 UTC (rev 161) +++ trunk/src/GRHydro_Bondi_new.F90 2012-09-17 16:27:20 UTC (rev 162) @@ -51,12 +51,14 @@ DECLARE_CCTK_FUNCTIONS CCTK_INT :: i, j, k, nx, ny, nz, imin, jb,N_points - PARAMETER (N_points=2000) + CCTK_REAL :: ONEmTINY + PARAMETER (N_points=2000,ONEmTINY=0.999999d0) CCTK_REAL :: M, Msq, Mdot, rs, gam, rmin_bondi, rmax_bondi, cs_sq,cs,vs_sq,vs,rhos,gtemp,hs, Kval, Qdot CCTK_REAL :: logrmin,dlogr,rhotmp,utmp,vtmp,rspher CCTK_REAL :: r_bondi(N_points), logr_bondi(N_points), rho_bondi(N_points), u_bondi(N_points), v_bondi(N_points) CCTK_REAL :: drhodr, det, rhocheck, rhocheck2, riso, rnew, rsch, ucheck, psinew CCTK_REAL :: uiso, uisocheck, vcheck, ucheck2, vcheck2, xhat,yhat, zhat, xp, yp, zp + CCTK_REAL :: f,df,ddf,a,b,c,rsm,roverm !!$set_bondi_parameters M = bondi_central_mass(1) @@ -65,7 +67,7 @@ rs = r_sonicpt_bondi gam = gl_gamma - write(*,*) 'Bondi_pars:',M,mdot_sonicpt_bondi,r_sonicpt_bondi,gl_gamma + !!write(*,*) 'Bondi_pars:',M,mdot_sonicpt_bondi,r_sonicpt_bondi,gl_gamma rmin_bondi = M * bondi_rmin(1) rmax_bondi = M * bondi_rmax(1) @@ -89,7 +91,7 @@ logrmin = log10(rmin_bondi) dlogr = (log10(rmax_bondi) - logrmin)/(1.*(N_points-1)) - write(*,*)'More pars:',cs,vs,rhos,hs,Kval,Qdot,logrmin,dlogr + !!write(*,*)'More pars:',cs,vs,rhos,hs,Kval,Qdot,logrmin,dlogr rhotmp=1.0d30 imin=1 @@ -132,10 +134,10 @@ v_bondi(i) = vtmp enddo - write(*,*)"i=1:",r_bondi(1),rho_bondi(1),u_bondi(1),v_bondi(1) - write(*,*)"i=100:",r_bondi(100),rho_bondi(100),u_bondi(100),v_bondi(100) - write(*,*)"i=1000:",r_bondi(1000),rho_bondi(1000),u_bondi(1000),v_bondi(1000) - write(*,*)"i=1500:",r_bondi(1500),rho_bondi(1500),u_bondi(1500),v_bondi(1500) + !!write(*,*)"i=1:",r_bondi(1),rho_bondi(1),u_bondi(1),v_bondi(1) + !!write(*,*)"i=100:",r_bondi(100),rho_bondi(100),u_bondi(100),v_bondi(100) + !!write(*,*)"i=1000:",r_bondi(1000),rho_bondi(1000),u_bondi(1000),v_bondi(1000) + !!write(*,*)"i=1500:",r_bondi(1500),rho_bondi(1500),u_bondi(1500),v_bondi(1500) !!$ // find the derivative near r=M rnew = 2.25 * M @@ -150,7 +152,7 @@ call find_bondi_solution( rnew, rhocheck2, ucheck2, vcheck2, rs, rhos, M, Mdot, Kval, gam, Qdot ) drhodr = 100.0*(rhocheck2-rhocheck)/M - write(6,*)'Rhocheck:',rhocheck,rhocheck2,drhodr + !!write(6,*)'Rhocheck:',rhocheck,rhocheck2,drhodr nx = cctk_lsh(1) ny = cctk_lsh(2) @@ -168,12 +170,45 @@ xhat = xp/riso yhat = yp/riso zhat = zp/riso + roverm = riso/M - if(use_smooth_puncture_data.ne.0 .and. riso.lt.M) then - psinew=2.875 - 5*(riso/M)**2 + 6*(riso/M)**4 - gxx(i,j,k) = psinew**4 - gyy(i,j,k) = psinew**4 - gzz(i,j,k) = psinew**4 + if(bondi_use_smooth_puncture_data.ne.0 .and. roverm.lt.(bondi_smooth_puncture_radius*ONEmTINY)) then + + rsm=bondi_smooth_puncture_radius + !!write(6,*)'smoothing at a radius',rsm + + if(bondi_smooth_gxx.ne.0) then + + f=(1.d0+0.5d0/rsm)**4 + df=-1.d0*(2.d0*rsm+1.d0)**3/4.d0/rsm**5 + ddf=(2.d0*rsm+1.d0)**2*(4.d0*rsm+5.d0)/4.d0/rsm**6 + + a=f-0.625d0*rsm*df+0.125d0*rsm**2*ddf + b=0.75d0/rsm*df-0.25d0*ddf + c=-0.125d0/rsm**3*df+0.125d0/rsm**2*ddf + + !!write(6,*)'smooth gxx:',rsm,f,df,ddf,a,b,c + + gxx(i,j,k) = a + b*roverm**2 + c*roverm**4 + gyy(i,j,k) = a + b*roverm**2 + c*roverm**4 + gzz(i,j,k) = a + b*roverm**2 + c*roverm**4 + + else + f=1.d0+0.5d0/rsm + df=-0.5d0/rsm**2 + ddf=1.d0/rsm**3 + + a=f-0.625d0*rsm*df+0.125d0*rsm**2*ddf + b=0.75d0/rsm*df-0.25d0*ddf + c=-0.125d0/rsm**3*df+0.125d0/rsm**2*ddf + + !!write(6,*)'smooth psi:',rsm,f,df,ddf,a,b,c + + psinew=a + b*roverm**2 + c*roverm**4 + gxx(i,j,k) = psinew**4 + gyy(i,j,k) = psinew**4 + gzz(i,j,k) = psinew**4 + endif gxy(i,j,k) = 0.0 gxz(i,j,k) = 0.0 gyz(i,j,k) = 0.0 @@ -187,9 +222,9 @@ gyz(i,j,k) = 0.0 endif - alp(i,j,k) = 1.0/gxx(i,j,k)**2 + alp(i,j,k) = 1.0/sqrt(gxx(i,j,k)) - if(riso > M) then + if(roverm > ONEmTINY) then rsch = 0.25 * ( 2.*riso + M)**2 / riso jb = floor( 0.5 + (log10(rsch) - logrmin) / dlogr ) @@ -200,7 +235,7 @@ rho(i,j,k) = rhotmp uiso = vtmp / (1.0 - M/2.0/riso) / (1.0+ M/2.0/riso) else - if(riso > 0.5*M) then + if(roverm > 0.5d0*ONEmTINY) then rho(i,j,k) = rhocheck+drhodr*riso*(riso-M)/M else rho(i,j,k) = (rhocheck-drhodr*M/4.0)*(1.-cos(2.*M_PI*riso/M))/2.0 @@ -224,6 +259,11 @@ 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)) + !! if(riso.gt.1.014d0.and.riso.lt.1.015)write(6,*)'Point to check:', & + !! x(i,j,k),y(i,j,k),z(i,j,k),riso,gxx(i,j,k),dens(i,j,k),tau(i,j,k),& + !! sx(i,j,k),sy(i,j,k),sz(i,j,k),rho(i,j,k),eps(i,j,k),& + !! velx(i,j,k),vely(i,j,k),velz(i,j,k) + end do end do end do Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +11 -1 =================================================================== --- trunk/param.ccl 2012-09-17 16:27:18 UTC (rev 161) +++ trunk/param.ccl 2012-09-17 16:27:20 UTC (rev 162) @@ -99,10 +99,20 @@ 0.0:* :: "Anything positive" } 1.0 -BOOLEAN use_smooth_puncture_data "Smooth puncture solution inside R=M using 4th order matching polynomial" +BOOLEAN bondi_use_smooth_puncture_data "Smooth puncture solution inside R=M using 4th order matching polynomial" { } "no" + +BOOLEAN bondi_smooth_gxx "Smooth puncture data by matching to gxx not psi" +{ +} "yes" + +REAL bondi_smooth_puncture_radius "Radius inside which to mathc functions, in units of R/M" +{ + 0:0.5 :: "Less than/equal to 0.5" +} 0.5 + BOOLEAN change_shock_direction "Change the shock direction" { } "no"

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/par/ (Rev. 161)
by rhaas＠tapir.caltech.edu 17 Sep '12

17 Sep '12

User: rhaas Date: 2012/09/17 11:27 AM Modified: /trunk/par/ advectedloop3D_vz.par Log: GRHydro_InitData/par/advectedloop3D_vz.par: changes to run w/storage for Tmunu From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/par/ ====================== File [modified]: advectedloop3D_vz.par Delta lines: +5 -4 =================================================================== --- trunk/par/advectedloop3D_vz.par 2012-09-17 16:27:17 UTC (rev 160) +++ trunk/par/advectedloop3D_vz.par 2012-09-17 16:27:18 UTC (rev 161) @@ -200,11 +200,12 @@ # Numerics: #---------- -#TmunuBase::stress_energy_storage = "yes" +TmunuBase::stress_energy_storage = "yes" #TmunuBase::stress_energy_at_RHS = "no" -#TmunuBase::timelevels = 1 -#TmunuBase::prolongation_type = "none" -#TmunuBase::support_old_CalcTmunu_mechanism = "no" +TmunuBase::stress_energy_at_RHS = "yes" +TmunuBase::timelevels = 1 +TmunuBase::prolongation_type = "none" +TmunuBase::support_old_CalcTmunu_mechanism = "no" HydroBase::timelevels = 2 #HydroBase::timelevels = 3

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/par/ (Rev. 160)
by rhaas＠tapir.caltech.edu 17 Sep '12

17 Sep '12

User: rhaas Date: 2012/09/17 11:27 AM Modified: /trunk/par/ advectedloop3D.par Log: GRHydro and GRHydro_InitData: Tmunu requires storage since 454e99d6a717. Since commit 454e99d6a717433c523ec7074302fc1fc7c01dbe it is not possible to run SRMHD tests anymore without assigning storage to Tmunu. This commit change changes advectedloop3D.par to reflect that and suggests a possible solution in GRHydro/src/GRHydro_RegisterVars.cc. This solution doesn't work yet due to inadequate scheduling. A trac ticket will be filed soon to discuss this issue more broadly. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/par/ ====================== File [modified]: advectedloop3D.par Delta lines: +5 -4 =================================================================== --- trunk/par/advectedloop3D.par 2012-09-17 16:27:12 UTC (rev 159) +++ trunk/par/advectedloop3D.par 2012-09-17 16:27:17 UTC (rev 160) @@ -200,11 +200,12 @@ # Numerics: #---------- -#TmunuBase::stress_energy_storage = "yes" +TmunuBase::stress_energy_storage = "yes" #TmunuBase::stress_energy_at_RHS = "no" -#TmunuBase::timelevels = 1 -#TmunuBase::prolongation_type = "none" -#TmunuBase::support_old_CalcTmunu_mechanism = "no" +TmunuBase::stress_energy_at_RHS = "yes" +TmunuBase::timelevels = 1 +TmunuBase::prolongation_type = "none" +TmunuBase::support_old_CalcTmunu_mechanism = "no" HydroBase::timelevels = 2 #HydroBase::timelevels = 3

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/par/ (Rev. 159)
by rhaas＠tapir.caltech.edu 17 Sep '12

17 Sep '12

User: rhaas Date: 2012/09/17 11:27 AM Modified: /trunk/par/ advectedloop3D.par, advectedloop3D_vz.par Log: GRHydro_InitData: advectedloop3D par files: allow larger number of constr. vrbs. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/par/ ====================== File [modified]: advectedloop3D.par Delta lines: +1 -1 =================================================================== --- trunk/par/advectedloop3D.par 2012-09-17 16:27:09 UTC (rev 158) +++ trunk/par/advectedloop3D.par 2012-09-17 16:27:12 UTC (rev 159) @@ -228,7 +228,7 @@ GRHydro::GRHydro_eos_type = "General" GRHydro::GRHydro_eos_table = "Ideal_Fluid" -GRHydro::Grhydro_MaxNumConstrainedVars = 13 +GRHydro::Grhydro_MaxNumConstrainedVars = 23 GRHydro::GRHydro_MaxNumEvolvedVars = 10 GRHydro::clean_divergence = "yes" File [modified]: advectedloop3D_vz.par Delta lines: +1 -1 =================================================================== --- trunk/par/advectedloop3D_vz.par 2012-09-17 16:27:09 UTC (rev 158) +++ trunk/par/advectedloop3D_vz.par 2012-09-17 16:27:12 UTC (rev 159) @@ -228,7 +228,7 @@ GRHydro::GRHydro_eos_type = "General" GRHydro::GRHydro_eos_table = "Ideal_Fluid" -GRHydro::Grhydro_MaxNumConstrainedVars = 13 +GRHydro::Grhydro_MaxNumConstrainedVars = 23 GRHydro::GRHydro_MaxNumEvolvedVars = 10 GRHydro::clean_divergence = "yes"

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/par/ (Rev. 158)
by rhaas＠tapir.caltech.edu 17 Sep '12

17 Sep '12

User: rhaas Date: 2012/09/17 11:27 AM Added: /trunk/par/ advectedloop3D_vz.par Modified: /trunk/par/ advectedloop3D.par Log: GRHydro_InitData: Fix advectedloop3D boundary map. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/par/ ====================== File [modified]: advectedloop3D.par Delta lines: +315 -81 =================================================================== --- trunk/par/advectedloop3D.par 2012-09-13 19:37:28 UTC (rev 157) +++ trunk/par/advectedloop3D.par 2012-09-17 16:27:09 UTC (rev 158) @@ -1,49 +1,127 @@ -## -ActiveThorns = "time MoL cartgrid3d carpetioascii ioutil Fortran boundary hydrobase grhydro grhydro_initdata nanchecker eos_omni CoordBase LoopControl CarpetLib Carpet CarpetReduce spacemask ADMCoupling ADMMacros ADMBASE STATICCONFORMAL TMUNUBASE SymBase localreduce CarpetIOBasic initbase Periodic Slab" -ActiveThorns = "CarpetIOHDF5" +#============================================================================== +# Advected magnetic field loop (3d version): GRHydro_InitData +#============================================================================== +#------------------------------------------------------------------------------ +# Cactus parameters: +#------------------------------------------------------------------------------ +Cactus::cctk_run_title = "Advected magnetic field loop (3d version)" +Cactus::cctk_full_warnings = "yes" -time::dtfac = 0.25 +#Cactus::terminate = "never" +Cactus::terminate = "time" +Cactus::cctk_final_time = 10.0 +#Cactus::terminate = "iteration" +#Cactus::cctk_itlast = 0 +#Cactus::cctk_itlast = 256 +#Cactus::terminate="runtime" +#Cactus::max_runtime=28800 # 46 days +#Cactus::max_runtime=1410 # 23.5 hours +#Cactus::max_runtime=1380 # 23 hours +#Cactus::max_runtime=690 # 11.5 hours +#Cactus::max_runtime=450 # 7.5 hours +#Cactus::max_runtime=210 # 3.5 hours -methodoflines::ODE_Method = "rk2" -methodoflines::MoL_Intermediate_Steps=2 +#------------------------------------------------------------------------------ +# Activate all necessary thorns: +#------------------------------------------------------------------------------ -ADMBase::initial_shift = "zero" +ActiveThorns = "Boundary CartGrid3D CoordBase Fortran InitBase IOUtil LocalReduce SymBase Time" +ActiveThorns = "AEILocalInterp LocalInterp" +ActiveThorns = "MoL Periodic Slab SpaceMask" +ActiveThorns = "Carpet CarpetInterp CarpetIOASCII CarpetIOHDF5 CarpetIOScalar CarpetLib CarpetIOBasic CarpetReduce CarpetRegrid2 CarpetSlab LoopControl" +#ActiveThorns = "Formaline NaNChecker TerminationTrigger TimerReport" +ActiveThorns = "NaNChecker TerminationTrigger TimerReport" +ActiveThorns = "ADMbase ADMcoupling ADMmacros CoordGauge StaticConformal" +ActiveThorns = "Constants TmunuBase HydroBase " +ActiveThorns = "EOS_Omni" +ActiveThorns = "GRHydro GRHydro_InitData" +ActiveThorns = "HDF5" +ActiveThorns = "SystemStatistics" -HydroBase::initial_hydro="advectedloop" -GRHydro_InitData::advectedloop_type = "3D" -GRHydro_InitData::advectedloop_case = "V^z=0" -GRHydro_InitData::advectedloop_delA = "Exact" +#------------------------------------------------------------------------------ +# Diagnostic parameters: +#------------------------------------------------------------------------------ +#AHFinderDirect::verbose_level = "physics details" +Carpet::output_timers_every = 1024 +Carpet::output_timer_tree_every = 256 +Carpet::output_initialise_timer_tree = "yes" +Carpet::storage_verbose = "no" +#Carpet::timers_verbose = "no" +#Carpet::verbose = "yes" # only for Initial Data +Carpet::verbose = "no" +Carpet::veryverbose = "no" +Carpet::grid_structure_filename = "carpet-grid-structure.asc" +Carpet::grid_coordinates_filename = "carpet-grid-coordinates.asc" -HydroBase::timelevels=2 -HydroBase::evolution_method="grhydro" -HydroBase::Bvec_evolution_method="grhydro" +CarpetLib::output_bboxes = "no" +CarpetLib::print_memstats_every = 1024 +CarpetLib::memstat_file = "carpetlib-memory-statistics.asc" +#CarpetLib::print_timestats_every = 1024 +#CarpetLib::timestat_file = "carpetlib-timing-statistics.asc" -SpaceMask::use_mask="yes" -EOS_Omni::gl_gamma=1.666666667 -grhydro::recon_method="tvd" -grhydro::method_type="RSA FV" -grhydro::recon_vars="primitive" -grhydro::riemann_solver="HLLE" -grhydro::tvd_limiter="vanleerMC" -grhydro::bound="none" -grhydro::grhydro_eos_type = "General" -grhydro::grhydro_eos_table="Ideal_Fluid" -grhydro::Grhydro_MaxNumConstrainedVars=13 -grhydro::GRHydro_MaxNumEvolvedVars=10 +CarpetReduce::verbose = "no" +CarpetRegrid2::verbose = "yes" +#CarpetRegrid2::veryverbose = "yes" -grhydro::clean_divergence = "yes" -grhydro::kap_dc = 1.0 -grhydro::track_divB = "yes" +#NaNChecker::verbose = "all" +TimerReport::out_every = 1024 +TimerReport::out_filename = "TimerReport" +#TimerReport::output_all_timers = "yes" +#TimerReport::output_all_timers_together = "yes" +#TimerReport::output_all_timers_readable = "yes" +#TimerReport::before_checkpoint = "yes" +TimerReport::n_top_timers = 40 +#------------------------------------------------------------------------------ +# Utility parameters: +#------------------------------------------------------------------------------ + +#NaNChecker::check_every = 16 +NaNChecker::check_every = 1 +NaNChecker::check_vars = " + HydroBase::Bvec + HydroBase::rho + HydroBase::eps + HydroBase::press + HydroBase::vel + HydroBase::w_lorentz +" +NaNChecker::action_if_found = "terminate" +#NaNChecker::action_if_found = "abort" +#NaNChecker::action_if_found = "just warn" #"terminate", "just warn", "abort" +#NaNChecker::check_after=0 + +#TerminationTrigger::max_walltime = 0.0 # hours +TerminationTrigger::max_walltime = 24.0 # hours +TerminationTrigger::on_remaining_walltime = 10.0 # minutes +TerminationTrigger::termination_from_file = "yes" +TerminationTrigger::create_termination_file = "yes" +TerminationTrigger::termination_file = "../TERMINATE" + + +#------------------------------------------------------------------------------ +# Run parameters: +#------------------------------------------------------------------------------ + +#------ +# Grid: +#------ + +Time::dtfac = 0.25 +MoL::ODE_Method = "rk2" +MoL::MoL_Intermediate_Steps = 2 +#MoL::ODE_Method = "rk4" +#MoL::MoL_Intermediate_Steps = 4 +#MoL::MoL_Num_Scratch_Levels = 1 + CartGrid3D::type = "coordbase" CartGrid3D::domain = "full" CartGrid3D::avoid_origin = "no" CoordBase::domainsize = "minmax" -#CoordBase::spacing = "gridspacing" # "gridspacing" or "numcells" CoordBase::spacing = "numcells" # "gridspacing" or "numcells" CoordBase::xmin = -0.5 @@ -52,13 +130,14 @@ CoordBase::xmax = 0.5 CoordBase::ymax = 0.5 CoordBase::zmax = 0.5 -#CoordBase::dx = 0.0078125 # dx or ncells_x -#CoordBase::dy = 0.0078125 # dy or ncells_y -#CoordBase::dz = 0.0078125 # dz or ncells_z +#CoordBase::dx = 0.0078125 # dx or ncells_x +#CoordBase::dy = 0.0078125 # dy or ncells_y +#CoordBase::dz = 0.0078125 # dz or ncells_z CoordBase::ncells_x = 128 # dx or ncells_x CoordBase::ncells_y = 128 # dy or ncells_y CoordBase::ncells_z = 128 # dz or ncells_z + CoordBase::boundary_size_x_lower = 3 CoordBase::boundary_size_y_lower = 3 CoordBase::boundary_size_z_lower = 3 @@ -79,78 +158,233 @@ CoordBase::boundary_staggered_z_upper = "yes" Driver::ghost_size = 3 -GRHydro::GRHydro_stencil = 3 +GRHydro::GRHydro_stencil = 3 Periodic::periodic = "yes" Periodic::periodic_x = "yes" Periodic::periodic_y = "yes" Periodic::periodic_z = "yes" -#ReflectionSymmetry::reflection_x = "no" -#ReflectionSymmetry::reflection_y = "no" -#ReflectionSymmetry::reflection_z = "yes" -#ReflectionSymmetry::avoid_origin_x = "no" -#ReflectionSymmetry::avoid_origin_y = "no" -#ReflectionSymmetry::avoid_origin_z = "no" +# General Carpet parameters: +Carpet::domain_from_coordbase = "yes" +Carpet::enable_all_storage = "no" +Carpet::schedule_barriers = "no" -#Cactus::terminate = "time" -#Cactus::cctk_final_time = 100.0 -#Cactus::cctk_final_time = 1.0 -Cactus::terminate = "iteration" -cactus::cctk_itlast = 1 +CarpetLib::poison_new_memory = "yes" +CarpetLib::poison_value = 114 +CarpetLib::check_bboxes = "no" +CarpetLib::interleave_communications = "yes" +#CarpetLib::vary_tags = "yes" # git version only! +CarpetLib::combine_sends = "yes" +#CarpetLib::reduce_mpi_waitall = "yes" # git version only! -Carpet::domain_from_coordbase = "yes" +CarpetInterp::tree_search = "yes" +CarpetInterp::check_tree_search = "no" +#------ +# MODEL: +#------ + +HydroBase::initial_hydro = "advectedloop" + +GRHydro_InitData::advectedloop_type = "3D" +#GRHydro_InitData::advectedloop_case = "V^z/=0" +GRHydro_InitData::advectedloop_case = "V^z=0" +GRHydro_InitData::advectedloop_delA = "Exact" +#GRHydro_InitData::advectedloop_delA = "Numeric" + +EOS_Omni::gl_gamma = 1.666666666666667 +GRHydro::initial_Gamma = 1.666666666666667 + +#---------- +# Numerics: +#---------- + +#TmunuBase::stress_energy_storage = "yes" +#TmunuBase::stress_energy_at_RHS = "no" +#TmunuBase::timelevels = 1 +#TmunuBase::prolongation_type = "none" +#TmunuBase::support_old_CalcTmunu_mechanism = "no" + +HydroBase::timelevels = 2 +#HydroBase::timelevels = 3 + +SpaceMask::use_mask = "yes" + +#----------- +# Evolution: +#----------- + +HydroBase::evolution_method = "GRHydro" +HydroBase::Bvec_evolution_method = "GRHydro" + +GRHydro::method_type = "RSA FV" +GRHydro::recon_method = "tvd" +GRHydro::tvd_limiter = "vanleerMC2" +GRHydro::recon_vars = "primitive" +GRHydro::riemann_solver = "HLLE" +GRHydro::decouple_normal_Bfield = "yes" +GRHydro::bound = "none" +GRHydro::GRHydro_eos_type = "General" +GRHydro::GRHydro_eos_table = "Ideal_Fluid" + +GRHydro::Grhydro_MaxNumConstrainedVars = 13 +GRHydro::GRHydro_MaxNumEvolvedVars = 10 + +GRHydro::clean_divergence = "yes" +GRHydro::psidcspeed = "light speed" +GRHydro::kap_dc = 10.0 +GRHydro::track_divB = "yes" +GRHydro::calculate_bcom = "yes" + +#------------------------------------------------------------------------------ +# Output: +#------------------------------------------------------------------------------ + IO::out_dir = $parfile -CarpetIOBasic::outInfo_vars="hydrobase::rho Hydrobase::bvec GRHydro::bcons" -CarpetIOBasic::outInfo_every=1 -CarpetIOASCII::out1D_every = 80 -CarpetIOASCII::out1D_vars = "HydroBase::rho HydroBase::press HydroBase::eps HydroBase::vel grhydro::dens grhydro::tau grhydro::scon HydroBase::Bvec grhydro::Bcons" +IO::out_fileinfo = "none" +IOBasic::outInfo_every = 1 +IOBasic::outInfo_reductions = "maximum" +IOBasic::outInfo_vars = " + Carpet::physical_time_per_hour + GRHydro::bcom_sq + HydroBase::press + HydroBase::rho + SystemStatistics::maxrss_mb +" + +#IOScalar::outScalar_every = 1024 +IOScalar::outScalar_every = 128 #t=0.25 +IOScalar::one_file_per_group = "yes" +IOScalar::outScalar_reductions = "minimum maximum average norm1 norm2" +IOScalar::outScalar_vars = " + GRHydro::bcom + GRHydro::bcom0 + GRHydro::bcom_sq + GRHydro::Bcons + GRHydro::dens + GrHydro::divB + GRHydro::scon + GRHydro::tau + HydroBase::Bvec + HydroBase::eps + HydroBase::press + HydroBase::rho + HydroBase::vel + HydroBase::w_lorentz + SystemStatistics::process_memory_mb +" + +IOASCII::one_file_per_group = "yes" +IOASCII::output_symmetry_points = "no" +IOASCII::output_ghost_points = "no" #hg version only! +IOASCII::output_boundary_points = "no" #hg version only! +#IOASCII::out3D_ghosts = "no" #hg (DEPRECATED) +#IOASCII::out3D_outer_ghosts = "no" #hg (DEPRECATED) + +IOASCII::out0D_every = 128 +IOASCII::out0D_vars = " + Carpet::timing +" + +#Set these IOASCII options for initial data only: +IOASCII::out1D_every = 256 +#IOASCII::out1D_dt = 10 +IOASCII::out1D_d = "yes" +IOASCII::out1D_vars = " + GRHydro::bcom + GRHydro::bcom0 + GRHydro::bcom_sq + GRHydro::Bcons + GRHydro::dens + GrHydro::divB + GrHydro::psidc + GRHydro::scon + GRHydro::tau + HydroBase::Bvec + HydroBase::eps + HydroBase::press + HydroBase::rho + HydroBase::vel + HydroBase::w_lorentz +" + +#IOASCII::out2D_every = 256000000 +#IOASCII::out2D_vars = " +# GRHydro::bcom +# GRHydro::bcom0 +# GRHydro::bcom_sq +# GRHydro::Bcons +# GRHydro::dens +# GrHydro::divB +# GRHydro::scon +# GRHydro::tau +# HydroBase::Bvec +# HydroBase::eps +# HydroBase::press +# HydroBase::rho +# HydroBase::vel +# HydroBase::w_lorentz +#" + CarpetIOHDF5::one_file_per_group = "yes" CarpetIOHDF5::open_one_input_file_at_a_time = "yes" -CarpetIOHDF5::out2D_every = 20 +CarpetIOHDF5::output_symmetry_points = "yes" +CarpetIOHDF5::output_ghost_points = "yes" +CarpetIOHDF5::output_boundary_points = "yes" +CarpetIOHDF5::output_buffer_points = "yes" + +CarpetIOHDF5::out2D_every = 512 #t=1 CarpetIOHDF5::out2D_xy = "yes" CarpetIOHDF5::out2D_xz = "no" CarpetIOHDF5::out2D_yz = "no" CarpetIOHDF5::out2D_xyplane_z = 0.0 CarpetIOHDF5::out2D_vars = " -# CarpetReduce::weight -# GRHydro::GRHydro_tracers -# Grid::coordinates - GRHydro::Bcons - GrHydro::dens - GrHydro::divB - GRHydro::scon - GRHydro::tau - HydroBase::Bvec - HydroBase::eps - HydroBase::press - HydroBase::rho - HydroBase::vel - HydroBase::w_lorentz + GRHydro::bcom + GRHydro::bcom0 + GRHydro::bcom_sq + GRHydro::Bcons + GRHydro::dens + GRHydro::divB + GrHydro::psidc + GRHydro::scon + GRHydro::tau + Grid::coordinates + HydroBase::Bvec + HydroBase::eps + HydroBase::press + HydroBase::rho + HydroBase::vel + HydroBase::w_lorentz " -CarpetIOHDF5::out3D_every = 100 -CarpetIOHDF5::out3D_vars = " -# CarpetReduce::weight -# GRHydro::GRHydro_tracers -# Grid::coordinates - GRHydro::Bcons - GrHydro::dens - GrHydro::divB - GRHydro::scon - GRHydro::tau - HydroBase::Bvec - HydroBase::eps - HydroBase::press - HydroBase::rho - HydroBase::vel - HydroBase::w_lorentz +CarpetIOHDF5::out3D_every = 2560 #t=5 = (1 loop) +CarpetIOHDF5::out3D_vars = " + GRHydro::bcom + GRHydro::bcom0 + GRHydro::bcom_sq + GRHydro::Bcons + GRHydro::dens + GRHydro::divB + GrHydro::psidc + GRHydro::scon + GRHydro::tau + Grid::coordinates + HydroBase::Bvec + HydroBase::eps + HydroBase::press + HydroBase::rho + HydroBase::vel + HydroBase::w_lorentz " #------------------------------------------------------------------------------ +# Analysis: +#------------------------------------------------------------------------------ + +#------------------------------------------------------------------------------ # Checkpoint/Recovery: #------------------------------------------------------------------------------ IOHDF5::checkpoint = "yes" File [added]: advectedloop3D_vz.par Delta lines: +401 -0 =================================================================== --- trunk/par/advectedloop3D_vz.par (rev 0) +++ trunk/par/advectedloop3D_vz.par 2012-09-17 16:27:09 UTC (rev 158) @@ -0,0 +1,401 @@ +#============================================================================== +# Advected magnetic field loop (3d version): GRHydro_InitData +#============================================================================== + +#------------------------------------------------------------------------------ +# Cactus parameters: +#------------------------------------------------------------------------------ +Cactus::cctk_run_title = "Advected magnetic field loop (3d version)" +Cactus::cctk_full_warnings = "yes" + +#Cactus::terminate = "never" +Cactus::terminate = "time" +Cactus::cctk_final_time = 10.0 +#Cactus::terminate = "iteration" +#Cactus::cctk_itlast = 0 +#Cactus::cctk_itlast = 256 +#Cactus::terminate="runtime" +#Cactus::max_runtime=28800 # 46 days +#Cactus::max_runtime=1410 # 23.5 hours +#Cactus::max_runtime=1380 # 23 hours +#Cactus::max_runtime=690 # 11.5 hours +#Cactus::max_runtime=450 # 7.5 hours +#Cactus::max_runtime=210 # 3.5 hours + +#------------------------------------------------------------------------------ +# Activate all necessary thorns: +#------------------------------------------------------------------------------ + +ActiveThorns = "Boundary CartGrid3D CoordBase Fortran InitBase IOUtil LocalReduce SymBase Time" +ActiveThorns = "AEILocalInterp LocalInterp" +ActiveThorns = "MoL Periodic Slab SpaceMask" +ActiveThorns = "Carpet CarpetInterp CarpetIOASCII CarpetIOHDF5 CarpetIOScalar CarpetLib CarpetIOBasic CarpetReduce CarpetRegrid2 CarpetSlab LoopControl" +#ActiveThorns = "Formaline NaNChecker TerminationTrigger TimerReport" +ActiveThorns = "NaNChecker TerminationTrigger TimerReport" +ActiveThorns = "ADMbase ADMcoupling ADMmacros CoordGauge StaticConformal" +ActiveThorns = "Constants TmunuBase HydroBase " +ActiveThorns = "EOS_Omni" +ActiveThorns = "GRHydro GRHydro_InitData" +ActiveThorns = "HDF5" +ActiveThorns = "SystemStatistics" + +#------------------------------------------------------------------------------ +# Diagnostic parameters: +#------------------------------------------------------------------------------ +#AHFinderDirect::verbose_level = "physics details" + +Carpet::output_timers_every = 1024 +Carpet::output_timer_tree_every = 256 +Carpet::output_initialise_timer_tree = "yes" +Carpet::storage_verbose = "no" +#Carpet::timers_verbose = "no" +#Carpet::verbose = "yes" # only for Initial Data +Carpet::verbose = "no" +Carpet::veryverbose = "no" +Carpet::grid_structure_filename = "carpet-grid-structure.asc" +Carpet::grid_coordinates_filename = "carpet-grid-coordinates.asc" + +CarpetLib::output_bboxes = "no" +CarpetLib::print_memstats_every = 1024 +CarpetLib::memstat_file = "carpetlib-memory-statistics.asc" +#CarpetLib::print_timestats_every = 1024 +#CarpetLib::timestat_file = "carpetlib-timing-statistics.asc" + +CarpetReduce::verbose = "no" +CarpetRegrid2::verbose = "yes" +#CarpetRegrid2::veryverbose = "yes" + +#NaNChecker::verbose = "all" + +TimerReport::out_every = 1024 +TimerReport::out_filename = "TimerReport" +#TimerReport::output_all_timers = "yes" +#TimerReport::output_all_timers_together = "yes" +#TimerReport::output_all_timers_readable = "yes" +#TimerReport::before_checkpoint = "yes" +TimerReport::n_top_timers = 40 + +#------------------------------------------------------------------------------ +# Utility parameters: +#------------------------------------------------------------------------------ + +#NaNChecker::check_every = 16 +NaNChecker::check_every = 1 +NaNChecker::check_vars = " + HydroBase::Bvec + HydroBase::rho + HydroBase::eps + HydroBase::press + HydroBase::vel + HydroBase::w_lorentz +" +NaNChecker::action_if_found = "terminate" +#NaNChecker::action_if_found = "abort" +#NaNChecker::action_if_found = "just warn" #"terminate", "just warn", "abort" +#NaNChecker::check_after=0 + +#TerminationTrigger::max_walltime = 0.0 # hours +TerminationTrigger::max_walltime = 24.0 # hours +TerminationTrigger::on_remaining_walltime = 10.0 # minutes +TerminationTrigger::termination_from_file = "yes" +TerminationTrigger::create_termination_file = "yes" +TerminationTrigger::termination_file = "../TERMINATE" + + +#------------------------------------------------------------------------------ +# Run parameters: +#------------------------------------------------------------------------------ + +#------ +# Grid: +#------ + +Time::dtfac = 0.25 +MoL::ODE_Method = "rk2" +MoL::MoL_Intermediate_Steps = 2 +#MoL::ODE_Method = "rk4" +#MoL::MoL_Intermediate_Steps = 4 +#MoL::MoL_Num_Scratch_Levels = 1 + +CartGrid3D::type = "coordbase" +CartGrid3D::domain = "full" +CartGrid3D::avoid_origin = "no" + +CoordBase::domainsize = "minmax" +CoordBase::spacing = "numcells" # "gridspacing" or "numcells" + +CoordBase::xmin = -0.5 +CoordBase::ymin = -0.5 +CoordBase::zmin = -0.5 +CoordBase::xmax = 0.5 +CoordBase::ymax = 0.5 +CoordBase::zmax = 0.5 +#CoordBase::dx = 0.0078125 # dx or ncells_x +#CoordBase::dy = 0.0078125 # dy or ncells_y +#CoordBase::dz = 0.0078125 # dz or ncells_z +CoordBase::ncells_x = 128 # dx or ncells_x +CoordBase::ncells_y = 128 # dy or ncells_y +CoordBase::ncells_z = 128 # dz or ncells_z + + +CoordBase::boundary_size_x_lower = 3 +CoordBase::boundary_size_y_lower = 3 +CoordBase::boundary_size_z_lower = 3 +CoordBase::boundary_size_x_upper = 3 +CoordBase::boundary_size_y_upper = 3 +CoordBase::boundary_size_z_upper = 3 +CoordBase::boundary_shiftout_x_lower = 0 +CoordBase::boundary_shiftout_y_lower = 0 +CoordBase::boundary_shiftout_z_lower = 0 +CoordBase::boundary_shiftout_x_upper = 0 +CoordBase::boundary_shiftout_y_upper = 0 +CoordBase::boundary_shiftout_z_upper = 0 +CoordBase::boundary_staggered_x_lower = "yes" +CoordBase::boundary_staggered_y_lower = "yes" +CoordBase::boundary_staggered_z_lower = "yes" +CoordBase::boundary_staggered_x_upper = "yes" +CoordBase::boundary_staggered_y_upper = "yes" +CoordBase::boundary_staggered_z_upper = "yes" + +Driver::ghost_size = 3 +GRHydro::GRHydro_stencil = 3 + +Periodic::periodic = "yes" +Periodic::periodic_x = "yes" +Periodic::periodic_y = "yes" +Periodic::periodic_z = "yes" + +# General Carpet parameters: +Carpet::domain_from_coordbase = "yes" +Carpet::enable_all_storage = "no" +Carpet::schedule_barriers = "no" + +CarpetLib::poison_new_memory = "yes" +CarpetLib::poison_value = 114 +CarpetLib::check_bboxes = "no" +CarpetLib::interleave_communications = "yes" +#CarpetLib::vary_tags = "yes" # git version only! +CarpetLib::combine_sends = "yes" +#CarpetLib::reduce_mpi_waitall = "yes" # git version only! + +CarpetInterp::tree_search = "yes" +CarpetInterp::check_tree_search = "no" + +#------ +# MODEL: +#------ + +HydroBase::initial_hydro = "advectedloop" + +GRHydro_InitData::advectedloop_type = "3D" +GRHydro_InitData::advectedloop_case = "V^z/=0" +#GRHydro_InitData::advectedloop_case = "V^z=0" +GRHydro_InitData::advectedloop_delA = "Exact" +#GRHydro_InitData::advectedloop_delA = "Numeric" + +EOS_Omni::gl_gamma = 1.666666666666667 +GRHydro::initial_Gamma = 1.666666666666667 + +#---------- +# Numerics: +#---------- + +#TmunuBase::stress_energy_storage = "yes" +#TmunuBase::stress_energy_at_RHS = "no" +#TmunuBase::timelevels = 1 +#TmunuBase::prolongation_type = "none" +#TmunuBase::support_old_CalcTmunu_mechanism = "no" + +HydroBase::timelevels = 2 +#HydroBase::timelevels = 3 + +SpaceMask::use_mask = "yes" + +#----------- +# Evolution: +#----------- + +HydroBase::evolution_method = "GRHydro" +HydroBase::Bvec_evolution_method = "GRHydro" + +GRHydro::method_type = "RSA FV" +GRHydro::recon_method = "tvd" +GRHydro::tvd_limiter = "vanleerMC2" +GRHydro::recon_vars = "primitive" +GRHydro::riemann_solver = "HLLE" +GRHydro::decouple_normal_Bfield = "yes" +GRHydro::bound = "none" +GRHydro::GRHydro_eos_type = "General" +GRHydro::GRHydro_eos_table = "Ideal_Fluid" + +GRHydro::Grhydro_MaxNumConstrainedVars = 13 +GRHydro::GRHydro_MaxNumEvolvedVars = 10 + +GRHydro::clean_divergence = "yes" +GRHydro::psidcspeed = "light speed" +GRHydro::kap_dc = 10.0 +GRHydro::track_divB = "yes" +GRHydro::calculate_bcom = "yes" + +#------------------------------------------------------------------------------ +# Output: +#------------------------------------------------------------------------------ + +IO::out_dir = $parfile +IO::out_fileinfo = "none" + +IOBasic::outInfo_every = 1 +IOBasic::outInfo_reductions = "maximum" +IOBasic::outInfo_vars = " + Carpet::physical_time_per_hour + GRHydro::bcom_sq + HydroBase::press + HydroBase::rho + SystemStatistics::maxrss_mb +" + +#IOScalar::outScalar_every = 1024 +IOScalar::outScalar_every = 128 #t=0.25 +IOScalar::one_file_per_group = "yes" +IOScalar::outScalar_reductions = "minimum maximum average norm1 norm2" +IOScalar::outScalar_vars = " + GRHydro::bcom + GRHydro::bcom0 + GRHydro::bcom_sq + GRHydro::Bcons + GRHydro::dens + GrHydro::divB + GRHydro::scon + GRHydro::tau + HydroBase::Bvec + HydroBase::eps + HydroBase::press + HydroBase::rho + HydroBase::vel + HydroBase::w_lorentz + SystemStatistics::process_memory_mb +" + +IOASCII::one_file_per_group = "yes" +IOASCII::output_symmetry_points = "no" +IOASCII::output_ghost_points = "no" #hg version only! +IOASCII::output_boundary_points = "no" #hg version only! +#IOASCII::out3D_ghosts = "no" #hg (DEPRECATED) +#IOASCII::out3D_outer_ghosts = "no" #hg (DEPRECATED) + +IOASCII::out0D_every = 128 +IOASCII::out0D_vars = " + Carpet::timing +" + +#Set these IOASCII options for initial data only: +IOASCII::out1D_every = 256 +#IOASCII::out1D_dt = 10 +IOASCII::out1D_d = "yes" +IOASCII::out1D_vars = " + GRHydro::bcom + GRHydro::bcom0 + GRHydro::bcom_sq + GRHydro::Bcons + GRHydro::dens + GrHydro::divB + GrHydro::psidc + GRHydro::scon + GRHydro::tau + HydroBase::Bvec + HydroBase::eps + HydroBase::press + HydroBase::rho + HydroBase::vel + HydroBase::w_lorentz +" + +#IOASCII::out2D_every = 256000000 +#IOASCII::out2D_vars = " +# GRHydro::bcom +# GRHydro::bcom0 +# GRHydro::bcom_sq +# GRHydro::Bcons +# GRHydro::dens +# GrHydro::divB +# GRHydro::scon +# GRHydro::tau +# HydroBase::Bvec +# HydroBase::eps +# HydroBase::press +# HydroBase::rho +# HydroBase::vel +# HydroBase::w_lorentz +#" + +CarpetIOHDF5::one_file_per_group = "yes" +CarpetIOHDF5::open_one_input_file_at_a_time = "yes" + +CarpetIOHDF5::output_symmetry_points = "yes" +CarpetIOHDF5::output_ghost_points = "yes" +CarpetIOHDF5::output_boundary_points = "yes" +CarpetIOHDF5::output_buffer_points = "yes" + +CarpetIOHDF5::out2D_every = 512 #t=1 +CarpetIOHDF5::out2D_xy = "yes" +CarpetIOHDF5::out2D_xz = "no" +CarpetIOHDF5::out2D_yz = "no" +CarpetIOHDF5::out2D_xyplane_z = 0.0 +CarpetIOHDF5::out2D_vars = " + GRHydro::bcom + GRHydro::bcom0 + GRHydro::bcom_sq + GRHydro::Bcons + GRHydro::dens + GRHydro::divB + GrHydro::psidc + GRHydro::scon + GRHydro::tau + Grid::coordinates + HydroBase::Bvec + HydroBase::eps + HydroBase::press + HydroBase::rho + HydroBase::vel + HydroBase::w_lorentz +" + +CarpetIOHDF5::out3D_every = 2560 #t=5 = (1 loop) +CarpetIOHDF5::out3D_vars = " + GRHydro::bcom + GRHydro::bcom0 + GRHydro::bcom_sq + GRHydro::Bcons + GRHydro::dens + GRHydro::divB + GrHydro::psidc + GRHydro::scon + GRHydro::tau + Grid::coordinates + HydroBase::Bvec + HydroBase::eps + HydroBase::press + HydroBase::rho + HydroBase::vel + HydroBase::w_lorentz +" + +#------------------------------------------------------------------------------ +# Analysis: +#------------------------------------------------------------------------------ + +#------------------------------------------------------------------------------ +# Checkpoint/Recovery: +#------------------------------------------------------------------------------ +IOHDF5::checkpoint = "yes" +IO::checkpoint_dir = $parfile +#IO::checkpoint_ID = "yes" +#IO::checkpoint_every = 6144 +##IO::checkpoint_every_walltime_hours = 6.0 +#IO::checkpoint_keep=3 +IO::checkpoint_on_terminate = "yes" + +#IO::recover = "autoprobe" +#IO::recover_dir = $parfile + +

1 0

[Carpet]Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/> branch, master, updated. carpet-6-init-6-gbdafb41
by Carpet git repositories 16 Sep '12

16 Sep '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via bdafb413884068b7327c2f32f41edacf7a620931 (commit) via b1f19a754bd95eaa06cd253783ad8dca063e367a (commit) via 6452bcc36e08f09b9ea723ce19ee15873d16b2a1 (commit) from 18ca797780f241bcf6705122fa757a7d3ae1100e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bdafb413884068b7327c2f32f41edacf7a620931 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun Sep 16 21:31:10 2012 -0400 CarpetLib: Do not interpolate from buffer zones, if requested Introduce parameter CarpetLib::interpolate_from_buffer_zones that allows disabling interpolation from buffer zones. commit b1f19a754bd95eaa06cd253783ad8dca063e367a Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun Sep 16 21:13:15 2012 -0400 CarpetLib: Store level_boxes in dh structure commit 6452bcc36e08f09b9ea723ce19ee15873d16b2a1 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun Sep 16 21:12:37 2012 -0400 CarpetLib: Implement bboxset::contains(vect) ----------------------------------------------------------------------- Summary of changes: Carpet/CarpetLib/param.ccl | 6 ++++ Carpet/CarpetLib/src/bboxset.cc | 12 ++++++++- Carpet/CarpetLib/src/bboxset.hh | 4 +++ Carpet/CarpetLib/src/defs.cc | 5 +++ Carpet/CarpetLib/src/dh.cc | 54 ++++++++++++++++++++++++++++++++++++++- Carpet/CarpetLib/src/dh.hh | 19 +++++++++++++ Carpet/CarpetLib/src/gh.cc | 37 +++++++++++++++++++++----- 7 files changed, 128 insertions(+), 9 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits