Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 319)
by schnetter＠cct.lsu.edu 11 May '12

11 May '12

User: eschnett Date: 2012/05/11 05:46 PM Modified: /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_Eigenproblem_Marquina.F90, GRHydro_FluxSplit.F90, GRHydro_PPM.F90 Log: Support real*16 (and real*4) in GRHydro Support using precisions other than real*8 in GRHydro by removing all explicit references to double precision functions and constants, and using type-generic functions and constants instead. In particular, use "one" and "half" as constants in some places, and use "abs", "max" etc. instead of "dabs", "dmax" etc. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +14 -12 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2012-05-11 22:17:18 UTC (rev 318) +++ trunk/src/GRHydro_Con2Prim.F90 2012-05-11 22:46:36 UTC (rev 319) @@ -1026,6 +1026,8 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS + CCTK_REAL, parameter :: half = 0.5d0 + integer :: i, j, k, itracer, nx, ny, nz CCTK_REAL :: uxxl, uxyl, uxzl, uyyl, uyzl, uzzl,& uxxr, uxyr, uxzr, uyyr, uyzr, uzzr, pmin, epsmin @@ -1135,9 +1137,9 @@ velyminus(i,j,k),velzminus(i,j,k),epsminus(i,j,k),& pressminus(i,j,k),w_lorentzminus(i,j,k),& uxxl,uxyl,uxzl,uyyl,uyzl,uzzl,avg_detl,& - x(i,j,k)-0.5d0*CCTK_DELTA_SPACE(1),& - y(i,j,k)-0.5d0*CCTK_DELTA_SPACE(2), & - z(i,j,k)-0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),& + x(i,j,k)-half*CCTK_DELTA_SPACE(1),& + y(i,j,k)-half*CCTK_DELTA_SPACE(2), & + z(i,j,k)-half*CCTK_DELTA_SPACE(3),r(i,j,k),& epsnegative,GRHydro_rho_min,pmin, epsmin, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) if (epsnegative) then !$OMP CRITICAL @@ -1149,9 +1151,9 @@ velyminus(i,j,k),velzminus(i,j,k),epsminus(i,j,k),& pressminus(i,j,k),w_lorentzminus(i,j,k),& uxxl,uxyl,uxzl,uyyl,uyzl,uzzl,avg_detl,& - x(i,j,k)-0.5d0*CCTK_DELTA_SPACE(1),& - y(i,j,k)-0.5d0*CCTK_DELTA_SPACE(2), & - z(i,j,k)-0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) + x(i,j,k)-half*CCTK_DELTA_SPACE(1),& + y(i,j,k)-half*CCTK_DELTA_SPACE(2), & + z(i,j,k)-half*CCTK_DELTA_SPACE(3),r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) end if if (epsminus(i,j,k) .lt. 0.0d0) then @@ -1182,9 +1184,9 @@ velyplus(i,j,k),velzplus(i,j,k),epsplus(i,j,k),& pressplus(i,j,k),w_lorentzplus(i,j,k),& uxxr,uxyr,uxzr,uyyr,uyzr,uzzr,avg_detr,& - x(i,j,k)+0.5d0*CCTK_DELTA_SPACE(1),& - y(i,j,k)+0.5d0*CCTK_DELTA_SPACE(2), & - z(i,j,k)+0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),& + x(i,j,k)+half*CCTK_DELTA_SPACE(1),& + y(i,j,k)+half*CCTK_DELTA_SPACE(2), & + z(i,j,k)+half*CCTK_DELTA_SPACE(3),r(i,j,k),& epsnegative,GRHydro_rho_min,pmin, epsmin, GRHydro_reflevel,GRHydro_C2P_failed(i,j,k)) if (epsnegative) then !$OMP CRITICAL @@ -1196,9 +1198,9 @@ velyplus(i,j,k),velzplus(i,j,k),epsplus(i,j,k),& pressplus(i,j,k),w_lorentzplus(i,j,k),& uxxr,uxyr,uxzr,uyyr,uyzr,uzzr,avg_detr,& - x(i,j,k)+0.5d0*CCTK_DELTA_SPACE(1),& - y(i,j,k)+0.5d0*CCTK_DELTA_SPACE(2), & - z(i,j,k)+0.5d0*CCTK_DELTA_SPACE(3),r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) + x(i,j,k)+half*CCTK_DELTA_SPACE(1),& + y(i,j,k)+half*CCTK_DELTA_SPACE(2), & + z(i,j,k)+half*CCTK_DELTA_SPACE(3),r(i,j,k),GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) end if if (epsplus(i,j,k) .lt. 0.0d0) then File [modified]: GRHydro_Eigenproblem_Marquina.F90 Delta lines: +9 -9 =================================================================== --- trunk/src/GRHydro_Eigenproblem_Marquina.F90 2012-05-11 22:17:18 UTC (rev 318) +++ trunk/src/GRHydro_Eigenproblem_Marquina.F90 2012-05-11 22:46:36 UTC (rev 319) @@ -200,11 +200,11 @@ !!$ FINAL - lam1 = dmax1(dabs(lam1l),dabs(lam1r)) + lam1 = max(abs(lam1l),abs(lam1r)) lam2 = lam1 lam3 = lam1 - lamp = dmax1(dabs(lampl),dabs(lampr)) - lamm = dmax1(dabs(lamml),dabs(lammr)) + lamp = max(abs(lampl),abs(lampr)) + lamm = max(abs(lamml),abs(lammr)) !!$ lam(1) = lamm !!$ lam(2) = lam1 @@ -918,11 +918,11 @@ !!$ FINAL - lam1 = dmax1(dabs(lam1l),dabs(lam1r)) + lam1 = max(abs(lam1l),abs(lam1r)) lam2 = lam1 lam3 = lam1 - lamp = dmax1(dabs(lampl),dabs(lampr)) - lamm = dmax1(dabs(lamml),dabs(lammr)) + lamp = max(abs(lampl),abs(lampr)) + lamm = max(abs(lamml),abs(lammr)) !!$ lam(1) = lamm !!$ lam(2) = lam1 @@ -1610,11 +1610,11 @@ !!$ FINAL - lam1 = dmax1(dabs(lam1l),dabs(lam1r)) + lam1 = max(abs(lam1l),abs(lam1r)) lam2 = lam1 lam3 = lam1 - lamp = dmax1(dabs(lampl),dabs(lampr)) - lamm = dmax1(dabs(lamml),dabs(lammr)) + lamp = max(abs(lampl),abs(lampr)) + lamm = max(abs(lamml),abs(lammr)) !!$ lam(1) = lamm !!$ lam(2) = lam1 File [modified]: GRHydro_FluxSplit.F90 Delta lines: +17 -15 =================================================================== --- trunk/src/GRHydro_FluxSplit.F90 2012-05-11 22:17:18 UTC (rev 318) +++ trunk/src/GRHydro_FluxSplit.F90 2012-05-11 22:46:36 UTC (rev 319) @@ -437,6 +437,8 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS + CCTK_REAL, parameter :: half = 0.5d0 + CCTK_INT :: i, nx, handle, ll CCTK_REAL, dimension(nx) :: gxx, gxy, gxz, gyy, gyz, gzz, & u, det, alp, beta, & @@ -493,21 +495,21 @@ !!$ Calculate the maximum eigenvalue and put it here call eigenproblem_leftright(handle, & - 0.5d0 * (rho (i) + rho (i+1)), & - 0.5d0 * (velx1 (i) + velx1 (i+1)), & - 0.5d0 * (vely1 (i) + vely1 (i+1)), & - 0.5d0 * (velz1 (i) + velz1 (i+1)), & - 0.5d0 * (eps (i) + eps (i+1)), & - 0.5d0 * (w_lorentz(i) + w_lorentz(i+1)), & - 0.5d0 * (gxx (i) + gxx (i+1)), & - 0.5d0 * (gxy (i) + gxy (i+1)), & - 0.5d0 * (gxz (i) + gxz (i+1)), & - 0.5d0 * (gyy (i) + gyy (i+1)), & - 0.5d0 * (gyz (i) + gyz (i+1)), & - 0.5d0 * (gzz (i) + gzz (i+1)), & - 0.5d0 * (u (i) + u (i+1)), & - 0.5d0 * (alp (i) + alp (i+1)), & - 0.5d0 * (beta (i) + beta (i+1)), & + half * (rho (i) + rho (i+1)), & + half * (velx1 (i) + velx1 (i+1)), & + half * (vely1 (i) + vely1 (i+1)), & + half * (velz1 (i) + velz1 (i+1)), & + half * (eps (i) + eps (i+1)), & + half * (w_lorentz(i) + w_lorentz(i+1)), & + half * (gxx (i) + gxx (i+1)), & + half * (gxy (i) + gxy (i+1)), & + half * (gxz (i) + gxz (i+1)), & + half * (gyy (i) + gyy (i+1)), & + half * (gyz (i) + gyz (i+1)), & + half * (gzz (i) + gzz (i+1)), & + half * (u (i) + u (i+1)), & + half * (alp (i) + alp (i+1)), & + half * (beta (i) + beta (i+1)), & lambda,& levec,& revec) File [modified]: GRHydro_PPM.F90 Delta lines: +26 -20 =================================================================== --- trunk/src/GRHydro_PPM.F90 2012-05-11 22:17:18 UTC (rev 318) +++ trunk/src/GRHydro_PPM.F90 2012-05-11 22:46:36 UTC (rev 319) @@ -66,6 +66,8 @@ DECLARE_CCTK_PARAMETERS + CCTK_REAL, parameter :: one = 1 + CCTK_INT :: handle,poly,nx CCTK_REAL :: dx CCTK_REAL, dimension(nx) :: rho,velx,vely,velz,eps @@ -112,10 +114,10 @@ !use_std_ppm = 1 #define STEEP(x,dx,dmx) \ - if ( (x(i+1) - x(i)) * (x(i) - x(i-1)) > 0.d0 ) then &&\ - dmx(i) = sign(1.d0, dx(i)) * \ - min(abs(dx(i)), 2.d0 * abs(x(i) - x(i-1)), \ - 2.d0 * abs(x(i+1) - x(i))) &&\ + if ( (x(i+1) - x(i)) * (x(i) - x(i-1)) > 0 ) then &&\ + dmx(i) = sign(one, dx(i)) * \ + min(abs(dx(i)), 2 * abs(x(i) - x(i-1)), \ + 2 * abs(x(i+1) - x(i))) &&\ else &&\ dmx(i) = 0.d0 &&\ end if @@ -205,7 +207,7 @@ D2a = 3.0d0 * (a(i) - 2.0d0*ah + a(i+1)) &&\ D2aL = (a(i-1) - 2.0d0*a(i) + a(i+1)) &&\ D2aR = (a(i) - 2.0d0*a(i+1) + a(i+2)) &&\ - D2aLim = sign(1.0d0, D2a)*min(C*abs(D2aL), C*abs(D2aR), abs(D2a))/3.0d0 &&\ + D2aLim = sign(one, D2a)*min(C*abs(D2aL), C*abs(D2aR), abs(D2a))/3.0d0 &&\ if (D2a*D2aR .ge. 0 .and. D2a*D2aL .ge. 0 .and. abs(D2aLim) .lt. abs(0.5d0*(a(i)+a(i+1)))) then &&\ alim = 0.5d0*(a(i)+a(i+1)) - D2aLim &&\ else &&\ @@ -478,7 +480,7 @@ end do else !!$ Really implement C&W, page 197; which requires stencil 4. do i = 4, nx - 3 - s=sign(1.d0, -dpress(i)) + s=sign(one, -dpress(i)) flatten = max(tilde_flatten(i), tilde_flatten(i+s)) if (abs(1.d0 - flatten) > 0.d0) then trivial_rp(i-1) = .false. @@ -543,8 +545,8 @@ D3aL = D2aC - D2aL &&\ D3aR = D2aRR - D2aR &&\ D3aLL = D2aL - D2aLL &&\ - if (sign(1.0d0, D2a) .eq. sign(1.0d0, D2aC) .and. sign(1.0d0, D2a) .eq. sign(1.0d0, D2aL) .and. sign(1.0d0, D2a) .eq. sign(1.0d0, D2aR)) then &&\ - D2aLim = sign(1.0d0, D2a) * min(C*abs(D2aL), C*abs(D2aR), C*abs(D2aC), abs(D2a)) &&\ + if (sign(one, D2a) .eq. sign(one, D2aC) .and. sign(one, D2a) .eq. sign(one, D2aL) .and. sign(one, D2a) .eq. sign(one, D2aR)) then &&\ + D2aLim = sign(one, D2a) * min(C*abs(D2aL), C*abs(D2aR), C*abs(D2aC), abs(D2a)) &&\ else &&\ D2aLim = 0 &&\ end if &&\ @@ -608,9 +610,9 @@ ! D2aC = a(i-1) - 2.0d0*a(i) + a(i+1) &&\ ! D2aL = a(i-2) - 2.0d0*a(i-1) + a(i) &&\ ! D2aR = a(i) - 2.0d0*a(i+1) + a(i+2) &&\ -! if (D2a .ne. 0 .and. sign(1.0d0, D2a) .eq. sign(1.0d0, D2aC) .and. sign(1.0d0, D2a) .eq. sign(1.0d0, D2aL) .and. sign(1.0d0, D2a) .eq. sign(1.0d0, D2aR)) then &&\ -! aplus(i) = a(i) + (aplus(i) -a(i)) * sign(1.0d0, D2a) * min(C*abs(D2aL), C*abs(D2aR), C*abs(D2aC), abs(D2a)) / D2a &&\ -! aminus(i) = a(i) + (aminus(i)-a(i)) * sign(1.0d0, D2a) * min(C*abs(D2aL), C*abs(D2aR), C*abs(D2aC), abs(D2a)) / D2a &&\ +! if (D2a .ne. 0 .and. sign(one, D2a) .eq. sign(one, D2aC) .and. sign(one, D2a) .eq. sign(one, D2aL) .and. sign(one, D2a) .eq. sign(one, D2aR)) then &&\ +! aplus(i) = a(i) + (aplus(i) -a(i)) * sign(one, D2a) * min(C*abs(D2aL), C*abs(D2aR), C*abs(D2aC), abs(D2a)) / D2a &&\ +! aminus(i) = a(i) + (aminus(i)-a(i)) * sign(one, D2a) * min(C*abs(D2aL), C*abs(D2aR), C*abs(D2aC), abs(D2a)) / D2a &&\ ! else &&\ ! aplus(i) = a(i) &&\ ! aminus(i) = a(i) &&\ @@ -637,8 +639,8 @@ D2aC = a(i-1) - 2.0d0*a(i) + a(i+1) &&\ D2aL = a(i-2) - 2.0d0*a(i-1) + a(i) &&\ D2aR = a(i) - 2.0d0*a(i+1) + a(i+2) &&\ - if (sign(1.0d0, D2a) .eq. sign(1.0d0, D2aC) .and. sign(1.0d0, D2a) .eq. sign(1.0d0, D2aL) .and. sign(1.0d0, D2a) .eq. sign(1.0d0, D2aR)) then &&\ - D2aLim = sign(1.0d0, D2a) * min(C*abs(D2aL), C*abs(D2aR), C*abs(D2aC), abs(D2a)) &&\ + if (sign(one, D2a) .eq. sign(one, D2aC) .and. sign(one, D2a) .eq. sign(one, D2aL) .and. sign(one, D2a) .eq. sign(one, D2aR)) then &&\ + D2aLim = sign(one, D2a) * min(C*abs(D2aL), C*abs(D2aR), C*abs(D2aC), abs(D2a)) &&\ else &&\ D2aLim = 0 &&\ end if &&\ @@ -898,6 +900,8 @@ DECLARE_CCTK_PARAMETERS + CCTK_REAL, parameter :: one = 1 + CCTK_INT :: nx CCTK_REAL :: dx CCTK_REAL, dimension(nx) :: rho,velx,vely,velz @@ -934,7 +938,7 @@ do i = 2, nx - 1 if( (tracer(i+1,itracer) - tracer(i,itracer)) * & (tracer(i,itracer) - tracer(i-1,itracer)) > 0.0d0 ) then - dmtracer(i,itracer) = sign(1.0d0,dtracer(i,itracer)) * & + dmtracer(i,itracer) = sign(one,dtracer(i,itracer)) * & min(abs(dtracer(i,itracer)), 2.0d0 * & abs(tracer(i,itracer) - tracer(i-1,itracer)), & 2.0d0 * abs(tracer(i+1,itracer) - tracer(i,itracer))) @@ -1111,6 +1115,8 @@ DECLARE_CCTK_PARAMETERS + CCTK_REAL, parameter :: one = 1 + CCTK_INT :: nx CCTK_REAL :: dx CCTK_REAL, dimension(nx) :: rho,velx,vely,velz @@ -1151,7 +1157,7 @@ do i = 2, nx - 1 if( (Y_e(i+1) - Y_e(i)) * & (Y_e(i) - Y_e(i-1)) > 0.0d0 ) then - dmY_e(i) = sign(1.0d0,dY_e(i)) * & + dmY_e(i) = sign(one,dY_e(i)) * & min(abs(dY_e(i)), 2.0d0 * & abs(Y_e(i) - Y_e(i-1)), & 2.0d0 * abs(Y_e(i+1) - Y_e(i))) @@ -1194,7 +1200,7 @@ D2aL = (a(i-1) - 2.0d0*a(i) + a(i+1)) &&\ D2aR = (a(i) - 2.0d0*a(i+1) + a(i+2)) &&\ if (D2a*D2aR .ge. 0 .and. D2a*D2aL .ge. 0 .and. abs(D2aLim) .lt. abs(0.5d0*(a(i)+a(i+1)))) then &&\ - alim = 0.5d0*(a(i)+a(i+1)) - sign(1.0d0, D2a)*min(C*abs(D2aL), C*abs(D2aR), abs(D2a))/3.0d0 &&\ + alim = 0.5d0*(a(i)+a(i+1)) - sign(one, D2a)*min(C*abs(D2aL), C*abs(D2aR), abs(D2a))/3.0d0 &&\ else &&\ alim = 0.5d0*(a(i)+a(i+1)) &&\ end if &&\ @@ -1292,8 +1298,8 @@ D3aL = D2aC - D2aL &&\ D3aR = D2aRR - D2aR &&\ D3aLL = D2aL - D2aLL &&\ - if (sign(1.0d0, D2a) .eq. sign(1.0d0, D2aC) .and. sign(1.0d0, D2a) .eq. sign(1.0d0, D2aL) .and. sign(1.0d0, D2a) .eq. sign(1.0d0, D2aR)) then &&\ - D2aLim = sign(1.0d0, D2a) * min(C*abs(D2aL), C*abs(D2aR), C*abs(D2aC), abs(D2a)) &&\ + if (sign(one, D2a) .eq. sign(one, D2aC) .and. sign(one, D2a) .eq. sign(one, D2aL) .and. sign(one, D2a) .eq. sign(one, D2aR)) then &&\ + D2aLim = sign(one, D2a) * min(C*abs(D2aL), C*abs(D2aR), C*abs(D2aC), abs(D2a)) &&\ else &&\ D2aLim = 0 &&\ end if &&\ @@ -1358,8 +1364,8 @@ D2aC = a(i-1) - 2.0d0*a(i) + a(i+1) &&\ D2aL = a(i-2) - 2.0d0*a(i-1) + a(i) &&\ D2aR = a(i) - 2.0d0*a(i+1) + a(i+2) &&\ - if (sign(1.0d0, D2a) .eq. sign(1.0d0, D2aC) .and. sign(1.0d0, D2a) .eq. sign(1.0d0, D2aL) .and. sign(1.0d0, D2a) .eq. sign(1.0d0, D2aR)) then &&\ - D2aLim = sign(1.0d0, D2a) * min(C*abs(D2aL), C*abs(D2aR), C*abs(D2aC), abs(D2a)) &&\ + if (sign(one, D2a) .eq. sign(one, D2aC) .and. sign(one, D2a) .eq. sign(one, D2aL) .and. sign(one, D2a) .eq. sign(one, D2aR)) then &&\ + D2aLim = sign(one, D2a) * min(C*abs(D2aL), C*abs(D2aR), C*abs(D2aC), abs(D2a)) &&\ else &&\ D2aLim = 0 &&\ end if &&\

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 318)
by roland.haas＠physics.gatech.edu 11 May '12

11 May '12

User: rhaas Date: 2012/05/11 05:17 PM Modified: /trunk/src/ GRHydro_PPM.F90 Log: GRHydro: correct reconstruction of velocities in ePPM This is a bug fix to the ePPM scheme. The velocity components were reconstructed from the plus face values! This is clearly incorrect. Patch by Christian Reisswig. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_PPM.F90 Delta lines: +6 -6 =================================================================== --- trunk/src/GRHydro_PPM.F90 2012-05-05 02:43:22 UTC (rev 317) +++ trunk/src/GRHydro_PPM.F90 2012-05-11 22:17:18 UTC (rev 318) @@ -229,15 +229,15 @@ LIMIT(rho, rhoplus(i), enhanced_ppm_C2, rhoplus(i)) rhominus(i+1) = rhoplus(i) - APPROX_AT_CELL_INTERFACE(velxplus, velxplus(i)) + APPROX_AT_CELL_INTERFACE(velx, velxplus(i)) LIMIT(velx, velxplus(i), enhanced_ppm_C2, velxplus(i)) velxminus(i+1) = velxplus(i) - APPROX_AT_CELL_INTERFACE(velyplus, velyplus(i)) + APPROX_AT_CELL_INTERFACE(vely, velyplus(i)) LIMIT(vely, velyplus(i), enhanced_ppm_C2, velyplus(i)) velyminus(i+1) = velyplus(i) - APPROX_AT_CELL_INTERFACE(velzplus, velzplus(i)) + APPROX_AT_CELL_INTERFACE(velz, velzplus(i)) LIMIT(velz, velzplus(i), enhanced_ppm_C2, velzplus(i)) velzminus(i+1) = velzplus(i) end do @@ -258,15 +258,15 @@ LIMIT(rho, rhoplus(i), enhanced_ppm_C2, rhoplus(i)) rhominus(i+1) = rhoplus(i) - APPROX_AT_CELL_INTERFACE_STENCIL4(velxplus, velxplus(i)) + APPROX_AT_CELL_INTERFACE_STENCIL4(velx, velxplus(i)) LIMIT(velx, velxplus(i), enhanced_ppm_C2, velxplus(i)) velxminus(i+1) = velxplus(i) - APPROX_AT_CELL_INTERFACE_STENCIL4(velyplus, velyplus(i)) + APPROX_AT_CELL_INTERFACE_STENCIL4(vely, velyplus(i)) LIMIT(vely, velyplus(i), enhanced_ppm_C2, velyplus(i)) velyminus(i+1) = velyplus(i) - APPROX_AT_CELL_INTERFACE_STENCIL4(velzplus, velzplus(i)) + APPROX_AT_CELL_INTERFACE_STENCIL4(velz, velzplus(i)) LIMIT(velz, velzplus(i), enhanced_ppm_C2, velzplus(i)) velzminus(i+1) = velzplus(i) end do

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 11 May '12

11 May '12

changeset: 3545:4d8db4cc1087 user: Erik Schnetter <schnetter(a)gmail.com> date: Fri May 11 12:52:09 2012 -0400 summary: LoopControl: Explain why downcast is safe changeset: 3546:e8a6f2b71bff user: Erik Schnetter <schnetter(a)gmail.com> date: Fri May 11 12:52:59 2012 -0400 summary: CarpetLib: Correct determining buffer and overlap zones changeset: 3547:f03f699f1c8e user: Erik Schnetter <schnetter(a)gmail.com> date: Fri May 11 12:55:38 2012 -0400 summary: CarpetLib: Correct determining overlap zones changeset: 3548:f2632828e984 tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Fri May 11 13:43:32 2012 -0400 summary: Remove all #warning statements

1 0

[svn:einsteintoolkit] NoExcision/trunk/src/ (Rev. 34)
by schnetter＠cct.lsu.edu 11 May '12

11 May '12

User: eschnett Date: 2012/05/11 11:50 AM Modified: /trunk/src/ reduce.F90 Log: Remove #warning File Changes: Directory: /trunk/src/ ====================== File [modified]: reduce.F90 Delta lines: +2 -1 =================================================================== --- trunk/src/reduce.F90 2012-05-05 13:52:50 UTC (rev 33) +++ trunk/src/reduce.F90 2012-05-11 16:50:34 UTC (rev 34) @@ -52,7 +52,8 @@ dist2 = (x - cx)**2 + (y - cy)**2 + (z - cz)**2 -#warning "TODO: reduce not only the RHS, but also drive the variables towards Minkowski" + ! TODO: reduce not only the RHS, but also drive the variables + ! towards Minkowski where (dist2 <= 1) rhs = smooth (rhs, rhs * reduction_factor(n), dist2) end where

1 0

[svn:einsteintoolkit] HydroBase/trunk/doc/ (Rev. 52)
by bcmsma＠astro.rit.edu 10 May '12

10 May '12

User: bmundim Date: 2012/05/10 11:00 PM Modified: /trunk/doc/ documentation.tex Log: Mention the reference frame the fluid velocity is measured. File Changes: Directory: /trunk/doc/ ====================== File [modified]: documentation.tex Delta lines: +2 -1 =================================================================== --- trunk/doc/documentation.tex 2012-05-10 21:54:25 UTC (rev 51) +++ trunk/doc/documentation.tex 2012-05-11 04:00:52 UTC (rev 52) @@ -138,7 +138,8 @@ \item \verb|rho|: rest mass density $\varrho$ \item \verb|press|: pressure $p$ \item \verb|eps|: specific internal energy $\epsilon$ - \item \verb|vel[3]|: contravariant fluid three velocity $v^i$ defined as + \item \verb|vel[3]|: contravariant fluid three velocity $v^i$ with respect +to the Eulerian observer defined as \begin{equation} v^i = \frac{u^i}{\alpha u^0} + \frac{\beta^i}{\alpha} \end{equation}

1 0

[svn:einsteintoolkit] pyGWAnalysis/trunk/ (Rev. 14)
by reisswig＠tapir.caltech.edu 10 May '12

10 May '12

User: reisswig Date: 2012/05/10 07:23 PM Modified: /trunk/DataAnalysis/ DataAnalysis.py /trunk/DiscreteFunction/ DiscreteFunction.py, WaveFunction.py Log: 1) Make sure monotonic phase-alignment loop is executed at least once. 2) Better handling of loading data. It is now possible to have non-float columns. File Changes: Directory: /trunk/DataAnalysis/ =============================== File [modified]: DataAnalysis.py Delta lines: +3 -1 =================================================================== --- trunk/DataAnalysis/DataAnalysis.py 2012-03-28 01:05:46 UTC (rev 13) +++ trunk/DataAnalysis/DataAnalysis.py 2012-05-11 00:23:43 UTC (rev 14) @@ -723,12 +723,13 @@ minX = x_off trueMinX = x_off trueDeltaPhi = 0 + firstTime = True # If function is monotonic, we can use a faster algorithm if (monotonic==True): factor = 2.0*delta/accuracy*0.1 maxX = start_xoff+delta - while (factor >= 1.0): + while (factor >= 1.0 or firstTime == True): x_off = minX minErr = 10e10 while (x_off < maxX): @@ -757,6 +758,7 @@ break x_off += accuracy*factor factor *= 0.1 + FirstTime = False return trueMinX, trueDeltaPhi print "ERROR! ...using brute force method!" Directory: /trunk/DiscreteFunction/ =================================== File [modified]: DiscreteFunction.py Delta lines: +8 -5 =================================================================== --- trunk/DiscreteFunction/DiscreteFunction.py 2012-03-28 01:05:46 UTC (rev 13) +++ trunk/DiscreteFunction/DiscreteFunction.py 2012-05-11 00:23:43 UTC (rev 14) @@ -55,12 +55,13 @@ if line[0]=='#' or line[0]=='"' or len(line.strip())==0: continue data = [] - data = map(float, line.split()) - x_.append(data[col1-1]) + #data = map(float, line.split()) + data = line.split() + x_.append(float(data[col1-1])) if (len(data) == 2 or col3<=0): - f_.append(data[col2-1]) + f_.append(float(data[col2-1])) else: - f_.append(complex(data[col2-1], data[col3-1])) + f_.append(complex(float(data[col2-1]), float(data[col3-1]))) fp.close() self.x = array(x_) @@ -712,12 +713,13 @@ minErr = 10e10 minX = x_off trueMinX = x_off + firstTime = True # If function is monotonic, we can use a faster algorithm if (monotonic==True): factor = 2.0*delta/accuracy*0.1 maxX = start_xoff+delta - while (factor >= 1.0): + while (factor >= 1.0 or firstTime == True): x_off = minX minErr = 10e10 while (x_off < maxX): @@ -737,6 +739,7 @@ break x_off += accuracy*factor factor *= 0.1 + firstTime = False return trueMinX print "ERROR! ...using brute force method!" File [modified]: WaveFunction.py Delta lines: +5 -0 =================================================================== --- trunk/DiscreteFunction/WaveFunction.py 2012-03-28 01:05:46 UTC (rev 13) +++ trunk/DiscreteFunction/WaveFunction.py 2012-05-11 00:23:43 UTC (rev 14) @@ -112,3 +112,8 @@ return res + + + + +

1 0

[svn:einsteintoolkit] HydroBase/trunk/doc/ (Rev. 51)
by bcmsma＠astro.rit.edu 10 May '12

10 May '12

User: bmundim Date: 2012/05/10 04:54 PM Modified: /trunk/doc/ documentation.tex Log: Fix B field conversion factor to use cgs system to read it in Gauss. File Changes: Directory: /trunk/doc/ ====================== File [modified]: documentation.tex Delta lines: +2 -2 =================================================================== --- trunk/doc/documentation.tex 2012-05-08 17:30:37 UTC (rev 50) +++ trunk/doc/documentation.tex 2012-05-10 21:54:25 UTC (rev 51) @@ -222,10 +222,10 @@ \\{} [T] & = & 1\, M_{\mathrm{sun}} \equiv 4.92673\, \mathrm{\mu s} \\{} - [B] & = & 1\, \sqrt{\mu_0/4\pi} /M_{\mathrm{sun}} \equiv 2.355368\cdot + [B] & = & 1\, \sqrt{\mu_0/4\pi} /M_{\mathrm{sun}} \equiv 2.35537\cdot 10^{15}\, \mathrm{T}, \qquad (\mathrm{SI}) \\{} - [B] & = & 1\, M^{-1}_{\mathrm{sun}} \equiv 7.448329\cdot 10^{18}\, \mathrm{G}, + [B] & = & 1\, M^{-1}_{\mathrm{sun}} \equiv 2.35537\cdot 10^{19}\, \mathrm{G}, \qquad \qquad \qquad (\mathrm{Gaussian}) \end{eqnarray} where T (Tesla) is the magnetic field unit in SI,

1 0

[svn:einsteintoolkit] www/about/members/ (Rev. 803)
by knarf＠cct.lsu.edu 10 May '12

10 May '12

User: knarf Date: 2012/05/10 12:01 PM Modified: /about/members/ members.txt Log: new member File Changes: Directory: /about/members/ ========================== File [modified]: members.txt Delta lines: +3 -0 =================================================================== --- about/members/members.txt 2012-05-10 16:19:06 UTC (rev 802) +++ about/members/members.txt 2012-05-10 17:01:06 UTC (rev 803) @@ -84,6 +84,9 @@ David Rideout http://www.cct.lsu.edu/~eschnett/ Erik Schnetter +http://www.princeton.edu/ Princeton University + Jie Ren + http://ccrg.rit.edu/ Rochester Institute of Technology Manuela Campanelli Joshua Faber

1 0

[svn:einsteintoolkit] www/documentation/licenses/ (Rev. 802)
by knarf＠cct.lsu.edu 10 May '12

10 May '12

User: knarf Date: 2012/05/10 11:19 AM Modified: /documentation/licenses/ index.php Log: mention ET paper File Changes: Directory: /documentation/licenses/ =================================== File [modified]: index.php Delta lines: +13 -0 =================================================================== --- documentation/licenses/index.php 2012-05-08 16:33:31 UTC (rev 801) +++ documentation/licenses/index.php 2012-05-10 16:19:06 UTC (rev 802) @@ -13,6 +13,19 @@ and appropriate citation of their contributions is crucial for furthering academic careers.</p> +<p> +The main publication for the Einstein Toolkit is (key Loffler:2011ay in +the <a href="../../manifest/einsteintoolkit.bib">Einstein Toolkit bibtex file</a>: +<a name="Loffler:2011ay">Frank</a> LÃ¶ffler, Joshua Faber, + Eloisa Bentivegna, Tanja Bode, Peter Diener, Roland Haas, Ian Hinder, + Bruno C. Mundim, Christian D. Ott, Erik Schnetter, Gabrielle Allen, Manuela + Campanelli, and Pablo Laguna. +The Einstein Toolkit: A Community Computational Infrastructure + for Relativistic Astrophysics. +<cite>Classical and Quantum Gravity</cite>, 29(11):115001, 2012. +(<a href="http://dx.doi.org/10.1088/0264-9381/29/11/115001">doi:10.1088/0264-9381/29/11/115001</a>) +</p> + The current guidelines for citation of the Einstein Toolkit are:</p> <ol>

1 0

[svn:einsteintoolkit] manifest/trunk/ (Rev. 179)
by knarf＠cct.lsu.edu 10 May '12

10 May '12

User: knarf Date: 2012/05/10 10:52 AM Modified: /trunk/ einsteintoolkit.bib Log: update ET paper File Changes: Directory: /trunk/ ================== File [modified]: einsteintoolkit.bib Delta lines: +6 -1 =================================================================== --- trunk/einsteintoolkit.bib 2012-05-09 23:32:44 UTC (rev 178) +++ trunk/einsteintoolkit.bib 2012-05-10 15:52:47 UTC (rev 179) @@ -1942,7 +1942,12 @@ Erik and Allen, Gabrielle and Campanelli, Manuela and Laguna, Pablo", title = "{{T}he {E}instein {T}oolkit: {A} {C}ommunity {C}omputational {I}nfrastructure for {R}elativistic {A}strophysics}", - year = "2011", + journal = {Classical and Quantum Gravity}, + volume = {29}, + number = {11}, + pages = {115001}, + year = {2012}, + doi = "doi:10.1088/0264-9381/29/11/115001", eprint = "arXiv:1111.3344 [gr-qc]", }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits