Commits June 2013

commits@lists.einsteintoolkit.org

6 participants
28 discussions

[svn:einsteintoolkit] NullNews/trunk/ (Rev. 16)
by reisswig＠tapir.caltech.edu 16 Jun '13

16 Jun '13

User: reisswig Date: 2013/06/16 04:10 AM Modified: /trunk/ param.ccl /trunk/src/ NullNews_Bondi.F90, NullNews_GetNews.F90 Log: Allow linearized inertial frame interpolation via a Cactus parameter. Fixed a bug in linearized strain computation. File Changes: Directory: /trunk/src/ ====================== File [modified]: NullNews_Bondi.F90 Delta lines: +1 -2 =================================================================== --- trunk/src/NullNews_Bondi.F90 2013-06-05 07:58:20 UTC (rev 15) +++ trunk/src/NullNews_Bondi.F90 2013-06-16 09:10:32 UTC (rev 16) @@ -67,7 +67,6 @@ CCTK_INT, dimension(5) :: out_array_type_codes CCTK_INT, dimension(10), save :: gf_indices - logical, parameter :: linearized = .false. CCTK_COMPLEX, dimension(:), allocatable, save ::& Iarr1_this, Iarr1_other,& @@ -198,7 +197,7 @@ ! write(message, *) "maxval Uyo = ", maxval(abs(Uyo)) ! CALL CCTK_INFO(trim(message)) - if (.NOT. linearized) then + if (linearized_inertial_frame .eq. 0) then Uyh = 0 do ip = 1, 2 File [modified]: NullNews_GetNews.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/NullNews_GetNews.F90 2013-06-05 07:58:20 UTC (rev 15) +++ trunk/src/NullNews_GetNews.F90 2013-06-16 09:10:32 UTC (rev 16) @@ -206,7 +206,7 @@ u0 = uBondi call NullInterp_d2 (etheth_u0(:,:,1), dcmplx(u0(:,:,1)), 0, 1, 1) call NullInterp_d2 (etheth_u0(:,:,2), dcmplx(u0(:,:,2)), 0, 1, 1) - call NullInterp_cinterp(cctkGH, tmp_cgfn, tmp_cgfs, etheth_u0(:,:,1), etheth_u0(:,:,2), 1) + call NullInterp_cinterp(cctkGH, tmp_cgfn, tmp_cgfs, etheth_u0(:,:,1), etheth_u0(:,:,2), 2) call NullNews_ResetInactive(null_lsh, etheth_u0) linStrain(:,:,1) = J_l(:,:,1) + tmp_cgfn linStrain(:,:,2) = J_l(:,:,2) + tmp_cgfs Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +4 -0 =================================================================== --- trunk/param.ccl 2013-06-05 07:58:20 UTC (rev 15) +++ trunk/param.ccl 2013-06-16 09:10:32 UTC (rev 16) @@ -109,4 +109,8 @@ { } no +BOOLEAN linearized_inertial_frame "Interpolation to inertial angular coordinates is linearized" +{ +} no +

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/ (Rev. 84)
by cott＠tapir.caltech.edu 13 Jun '13

13 Jun '13

User: cott Date: 2013/06/13 06:10 PM Modified: /trunk/ interface.ccl /trunk/src/ EOS_Omni_MultiVarCalls.F90, EOS_Omni_SingleVarCalls.F90 Log: * remove OMP pragmas from most routines, because they slow down pointwise calls * make a copy of the press routine, call it OMP, add interface entry; use this routine for GF-wide calls. * uglyness ensues File Changes: Directory: /trunk/src/ ====================== File [modified]: EOS_Omni_MultiVarCalls.F90 Delta lines: +0 -30 =================================================================== --- trunk/src/EOS_Omni_MultiVarCalls.F90 2013-06-08 00:23:17 UTC (rev 83) +++ trunk/src/EOS_Omni_MultiVarCalls.F90 2013-06-13 23:10:44 UTC (rev 84) @@ -47,8 +47,6 @@ anyerr = 0 keyerr(:) = 0 - !$OMP PARALLEL DO PRIVATE(xrho,xtemp,xye,xenr,xent,xcs2,& - !$OMP xdedt,xdpderho,xdpdrhoe,xmunu) do i=1,npoints xrho = rho(i) * inv_rho_gf @@ -61,9 +59,7 @@ keytemp,keyerr(i),rf_precision) if(keyerr(i).ne.0) then - !$OMP CRITICAL anyerr = 1 - !$OMP END CRITICAL endif if(keytemp.eq.1) then @@ -84,7 +80,6 @@ munu(i) = xmunu enddo - !$OMP END PARALLEL DO end subroutine EOS_Omni_EOS_short @@ -123,45 +118,35 @@ case (1) ! polytropic EOS if(keytemp.eq.1) then - !$OMP PARALLEL DO do i=1,npoints eps(i) = poly_k * & rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo - !$OMP END PARALLEL DO endif - !$OMP PARALLEL DO do i=1,npoints dpdrhoe(i) = poly_k * & poly_gamma * & rho(i) ** (poly_gamma - 1.d0) dpderho(i) = 0.0d0 enddo - !$OMP END PARALLEL DO case (2) ! gamma-law EOS if(keytemp.eq.1) then - !$OMP PARALLEL DO do i=1,npoints eps(i) = gl_k * & rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo - !$OMP END PARALLEL DO endif - !$OMP PARALLEL DO do i=1,npoints dpdrhoe(i) = (gl_gamma-1.0d0) * & eps(i) dpderho(i) = (gl_gamma - 1.0d0) * & rho(i) enddo - !$OMP END PARALLEL DO case (3) ! hybrid EOS - !$OMP PARALLEL DO PRIVATE(hybrid_local_gamma,hybrid_local_k,& - !$OMP hybrid_dp_poly,hybrid_dp_th1,hybrid_dp_th2) do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 @@ -187,9 +172,7 @@ dpdrhoe(i) = hybrid_dp_poly + hybrid_dp_th1 + hybrid_dp_th2 dpderho(i) = (hybrid_gamma_th - 1.0d0) * rho(i) enddo - !$OMP END PARALLEL DO case (4) - !$OMP PARALLEL DO PRIVATE(xrho,xtemp,xye,xenr,xdpderho,xdpdrhoe) do i=1,npoints xrho = rho(i) * inv_rho_gf xtemp = temp(i) @@ -200,9 +183,7 @@ keytemp,keyerr(i),rf_precision) if(keyerr(i).ne.0) then - !$OMP CRITICAL anyerr = 1 - !$OMP END CRITICAL endif if(keytemp.eq.1) then @@ -257,45 +238,34 @@ case (1) ! polytropic EOS if(keytemp.eq.1) then - !$OMP PARALLEL DO do i=1,npoints eps(i) = poly_k * & rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo - !$OMP END PARALLEL DO endif - !$OMP PARALLEL DO do i=1,npoints depsdpress(i) = 1.0d0/(poly_gamma - 1.0d0)/rho(i) depsdrho(i) = depsdpress(i) * poly_k * & poly_gamma * & rho(i) ** (poly_gamma - 1.d0) enddo - !$OMP END PARALLEL DO case (2) ! gamma-law EOS if(keytemp.eq.1) then - !$OMP PARALLEL DO do i=1,npoints eps(i) = gl_k * & rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo - !$OMP END PARALLEL DO endif - !$OMP PARALLEL DO do i=1,npoints depsdpress(i) = 1.0/( (gl_gamma - 1.0d0) * & rho(i)) depsdrho(i) = -eps(i)/rho(i) enddo - !$OMP END PARALLEL DO case (3) ! hybrid EOS - !$OMP PARALLEL DO PRIVATE(hybrid_local_gamma,hybrid_local_k,& - !$OMP hybrid_dp_poly,hybrid_dp_th1,& - !$OMP hybrid_dp_th2,xdpdrhoe,xdpderho) do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 File [modified]: EOS_Omni_SingleVarCalls.F90 Delta lines: +162 -66 =================================================================== --- trunk/src/EOS_Omni_SingleVarCalls.F90 2013-06-08 00:23:17 UTC (rev 83) +++ trunk/src/EOS_Omni_SingleVarCalls.F90 2013-06-13 23:10:44 UTC (rev 84) @@ -47,6 +47,156 @@ case (1) ! polytropic EOS if(keytemp.eq.1) then + do i=1,npoints + eps(i) = poly_k * & + rho(i)**(poly_gamma) / & + (poly_gamma - 1.0d0) / rho(i) + enddo + endif + do i=1,npoints + press(i) = poly_k * & + rho(i)**poly_gamma + enddo + case (2) + ! gamma-law EOS + if(keytemp.eq.1) then + do i=1,npoints + eps(i) = gl_k * & + rho(i)**(gl_gamma) / & + (gl_gamma - 1.0d0) / rho(i) + enddo + endif + do i=1,npoints + press(i) = (gl_gamma - 1.0d0) * rho(i) * eps(i) + enddo + + case (3) + ! hybrid EOS + do i=1,npoints + if(rho(i).gt.hybrid_rho_nuc) then + hybrid_local_gamma = hybrid_gamma2 + hybrid_local_k = hybrid_k2 + else + hybrid_local_gamma = hybrid_gamma1 + hybrid_local_k = hybrid_k1 + endif + hybrid_p_poly = hybrid_local_k * & + rho(i)**hybrid_local_gamma + hybrid_p_th = - hybrid_local_k * (hybrid_gamma_th - 1.d0) / & + (hybrid_local_gamma - 1.0d0) * rho(i)**hybrid_local_gamma + & + (hybrid_gamma_th - 1.0d0) * rho(i) * eps(i) - & + (hybrid_gamma_th - 1.d0) * (hybrid_local_gamma - hybrid_gamma1) / & + (hybrid_gamma1 - 1.d0) / (hybrid_gamma2 - 1.d0) * & + hybrid_k1 * & + hybrid_rho_nuc**(hybrid_gamma1 - 1.d0) * rho(i) + hybrid_p_th = max(zero, hybrid_p_th) + press(i) = hybrid_p_poly + hybrid_p_th + enddo + + case (4) + ! nuc eos + do i=1,npoints + xrho = rho(i) * inv_rho_gf + xtemp = temp(i) + xye = ye(i) + xenr = eps(i) * inv_eps_gf + call nuc_eos_press_eps(xrho,xtemp,xye,xenr,xprs,& + keytemp,keyerr(i),rf_precision) + + if(keyerr(i).ne.0) then + anyerr = 1 + endif + + if(keytemp.eq.1) then + eps(i) = xenr * eps_gf + else + temp(i) = xtemp + endif + + press(i) = xprs * press_gf + enddo + + case (5) + ! cold tabular EOS with gamma law + do i=1,npoints + if(rho(i).lt.coldeos_rhomin) then + press(i) = coldeos_low_kappa * rho(i)**coldeos_low_gamma + eps(i) = press(i) / (coldeos_low_gamma - 1.0) / rho(i) + cycle + else if(rho(i).gt.coldeos_rhomax) then + keyerr(i) = 103 + anyerr = 1 + else + xrho = log10(rho(i)) + ir = 2 + INT( (xrho - coldeos_logrho(1) - 1.0d-10) * coldeos_dlrhoi ) + endif + ir = max(2, min(ir,coldeos_nrho)) + + gamma = (coldeos_gamma(ir) - coldeos_gamma(ir-1)) / & + (coldeos_logrho(ir) - coldeos_logrho(ir-1)) * & + (xrho - coldeos_logrho(ir-1)) + coldeos_gamma(ir-1) + + eps_cold = (coldeos_eps(ir) - coldeos_eps(ir-1)) / & + (coldeos_logrho(ir) - coldeos_logrho(ir-1)) * & + (xrho - coldeos_logrho(ir-1)) + coldeos_eps(ir-1) + + if(keytemp.eq.0) then + eps_th = max(0.0d0,eps(i) - eps_cold) + else if (keytemp.eq.1) then + eps_th = 0.0d0 + eps(i) = eps_cold + endif + + press_cold = coldeos_kappa * rho(i)**gamma + press_th = coldeos_thfac*(coldeos_gammath - 1.0d0)*rho(i)*eps_th + press(i) = press_cold + press_th + enddo + + case DEFAULT + write(warnstring,*) "eoskey ",eoskey," not implemented!" + call CCTK_WARN(0,warnstring) + end select + +end subroutine EOS_Omni_EOS_Press + +subroutine EOS_Omni_EOS_PressOMP(eoskey,keytemp,rf_precision,npoints,& + rho,eps,temp,ye,press,keyerr,anyerr) + + use EOS_Omni_Module + implicit none + DECLARE_CCTK_PARAMETERS + + CCTK_INT, intent(in) :: eoskey,keytemp,npoints + CCTK_INT, intent(out) :: keyerr(npoints) + CCTK_INT, intent(out) :: anyerr + CCTK_REAL, intent(in) :: rf_precision + CCTK_REAL, intent(in) :: rho(npoints),ye(npoints) + CCTK_REAL, intent(inout) :: eps(npoints), temp(npoints) + CCTK_REAL, intent(out) :: press(npoints) + + ! local vars + integer :: i + character(256) :: warnstring + real*8 :: hybrid_local_gamma, hybrid_local_k, & + hybrid_p_poly, hybrid_p_th + real*8,parameter :: zero = 0.0d0 + ! temporary vars for nuc_eos + real*8 :: xrho,xye,xtemp,xenr,xent + real*8 :: xprs,xmunu,xcs2 + real*8 :: xdedt,xdpderho,xdpdrhoe + ! temporary vars for coldeos + gamma law + integer :: ir + real*8 :: press_cold, press_th + real*8 :: eps_cold, eps_th + real*8 :: gamma + + anyerr = 0 + keyerr(:) = 0 + + select case (eoskey) + case (1) + ! polytropic EOS + if(keytemp.eq.1) then !$OMP PARALLEL DO do i=1,npoints eps(i) = poly_k * & @@ -177,10 +327,9 @@ call CCTK_WARN(0,warnstring) end select -end subroutine EOS_Omni_EOS_Press +end subroutine EOS_Omni_EOS_PressOMP - subroutine EOS_Omni_EOS_DPressByDRho(eoskey,keytemp,rf_precision,npoints,& rho,eps,temp,ye,dpdrhoe,keyerr,anyerr) @@ -219,43 +368,32 @@ case (1) ! polytropic EOS if(keytemp.eq.1) then - !$OMP PARALLEL DO do i=1,npoints eps(i) = poly_k * & rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo - !$OMP END PARALLEL DO endif - !$OMP PARALLEL DO do i=1,npoints dpdrhoe(i) = poly_k * & poly_gamma * & rho(i) ** (poly_gamma - 1.d0) enddo - !$OMP END PARALLEL DO case (2) ! gamma-law EOS if(keytemp.eq.1) then - !$OMP PARALLEL DO do i=1,npoints eps(i) = gl_k * & rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo - !$OMP END PARALLEL DO endif - !$OMP PARALLEL DO do i=1,npoints dpdrhoe(i) = (gl_gamma-1.0d0) * & eps(i) enddo - !$OMP END PARALLEL DO case (3) ! hybrid EOS - !$OMP PARALLEL DO PRIVATE(hybrid_local_gamma,hybrid_local_k,& - !$OMP hybrid_dp_poly, hybrid_dp_th1, & - !$OMP hybrid_dp_th2) do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 @@ -281,10 +419,8 @@ dpdrhoe(i) = hybrid_dp_poly + max(0.0d0,hybrid_dp_th1 + hybrid_dp_th2) enddo - !$OMP END PARALLEL DO + case (4) - !$OMP PARALLEL DO PRIVATE(xrho,xtemp,xye,xenr,xprs,xent,xcs2,xdedt,& - !$OMP xdpderho,xdpdrhoe,xmunu,h) do i=1,npoints xrho = rho(i) * inv_rho_gf xtemp = temp(i) @@ -295,9 +431,7 @@ keytemp,keyerr(i),rf_precision) if(keyerr(i).ne.0) then - !$OMP CRITICAL anyerr = 1 - !$OMP END CRITICAL endif if(keytemp.eq.1) then @@ -308,13 +442,11 @@ dpdrhoe(i) = xdpdrhoe * press_gf * inv_rho_gf enddo - !$OMP END PARALLEL DO + case (5) ! with the cold eos we have to assume P = P(rho), so ! by definition dPdrho is at constant internal energy ! and entropy (the latter, because T=0) - !$OMP PARALLEL DO PRIVATE(xrho,ir,gamma,eps_cold,eps_th, & - !$OMP cs2,press_cold,press_th) do i=1,npoints if(rho(i).lt.coldeos_rhomin) then dpdrhoe(i) = coldeos_low_kappa * coldeos_low_gamma * & @@ -322,9 +454,7 @@ cycle else if(rho(i).gt.coldeos_rhomax) then keyerr(i) = 103 - !$OMP CRITICAL anyerr = 1 - !$OMP END CRITICAL else xrho = log10(rho(i)) ir = 2 + INT( (xrho - coldeos_logrho(1) - 1.0d-10) * coldeos_dlrhoi ) @@ -401,49 +531,38 @@ case (1) ! polytropic EOS if(keytemp.eq.1) then - !$OMP PARALLEL DO do i=1,npoints eps(i) = poly_k * & rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo - !$OMP END PARALLEL DO endif - !$OMP PARALLEL DO do i=1,npoints dpdepsrho(i) = 0.0d0 enddo - !$OMP END PARALLEL DO case (2) ! gamma-law EOS if(keytemp.eq.1) then - !$OMP PARALLEL DO do i=1,npoints eps(i) = gl_k * & rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo - !$OMP END PARALLEL DO endif - !$OMP PARALLEL DO do i=1,npoints dpdepsrho(i) = (gl_gamma - 1.0d0) * & rho(i) enddo - !$OMP END PARALLEL DO case (3) ! hybrid EOS - !$OMP PARALLEL DO do i=1,npoints dpdepsrho(i) = (hybrid_gamma_th - 1.0d0) * rho(i) enddo - !$OMP END PARALLEL DO + case (4) ! nuc_eos - !$OMP PARALLEL DO PRIVATE(xrho,xtemp,xye,xenr,xprs,& - !$OMP xent,xcs2,xdedt,xdpderho,xdpdrhoe,& - !$OMP xmunu) do i=1,npoints + xrho = rho(i) * inv_rho_gf xtemp = temp(i) xye = ye(i) @@ -453,9 +572,7 @@ keytemp,keyerr(i),rf_precision) if(keyerr(i).ne.0) then - !$OMP CRITICAL anyerr = 1 - !$OMP END CRITICAL endif if(keytemp.eq.1) then @@ -467,20 +584,17 @@ dpdepsrho(i) = xdpderho * press_gf * inv_eps_gf enddo - !$OMP END PARALLEL DO + case (5) ! with the cold eos we have to assume P = P(rho), so ! only the gamma law has non-zero dPdeps - !$OMP PARALLEL DO PRIVATE(xrho,ir,eps_cold,eps_th) do i=1,npoints if(rho(i).lt.coldeos_rhomin) then dpdepsrho(i) = 0.0d0 cycle else if(rho(i).gt.coldeos_rhomax) then keyerr(i) = 103 - !$OMP CRITICAL anyerr = 1 - !$OMP END CRITICAL else xrho = log10(rho(i)) ir = 2 + INT( (xrho - coldeos_logrho(1) - 1.0d-10) * coldeos_dlrhoi ) @@ -547,34 +661,27 @@ case (1) ! polytropic EOS if(keytemp.eq.1) then - !$OMP PARALLEL DO do i=1,npoints eps(i) = poly_k * & rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo - !$OMP END PARALLEL DO endif - !$OMP PARALLEL DO do i=1,npoints xpress = poly_k * & rho(i)**(poly_gamma) cs2(i) = poly_gamma * xpress / rho(i) / & (1 + eps(i) + xpress/rho(i)) enddo - !$OMP END PARALLEL DO case (2) ! gamma-law EOS if(keytemp.eq.1) then - !$OMP PARALLEL DO do i=1,npoints eps(i) = gl_k * & rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo - !$OMP END PARALLEL DO endif - !$OMP PARALLEL DO PRIVATE(xpress,xdpdrhoe,xdpderho) do i=1,npoints xpress = (gl_gamma-1.0d0)*rho(i)*eps(i) xdpdrhoe = (gl_gamma-1.0d0)*eps(i) @@ -582,12 +689,8 @@ cs2(i) = (xdpdrhoe + xpress * xdpderho / (rho(i)**2)) / & (1.0d0 + eps(i) + xpress/rho(i)) enddo - !$OMP END PARALLEL DO case(3) ! hybrid EOS - !$OMP PARALLEL DO PRIVATE(hybrid_local_gamma,hybrid_local_k,& - !$OMP hybrid_p_poly,hybrid_p_th,& - !$OMP xpress) do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 @@ -611,12 +714,11 @@ cs2(i) = (hybrid_local_gamma * hybrid_p_poly + hybrid_gamma_th * hybrid_p_th) / & rho(i) / (1.0d0 + eps(i) + xpress/rho(i)) enddo - !$OMP END PARALLEL DO case(4) ! nuc_eos - !$OMP PARALLEL DO PRIVATE(xrho,xtemp,xye,xenr,xprs,xent,xcs2,& - !$OMP xdedt,xdpderho,xdpdrhoe,xmunu) + do i=1,npoints + xrho = rho(i) * inv_rho_gf xtemp = temp(i) xye = ye(i) @@ -626,9 +728,7 @@ keytemp,keyerr(i),rf_precision) if(keyerr(i).ne.0) then - !$OMP CRITICAL anyerr = 1 - !$OMP END CRITICAL endif if(keytemp.eq.1) then @@ -639,15 +739,12 @@ cs2(i) = xcs2 * cliteinv2 / & (1.0d0 + eps(i) + xprs * press_gf / rho(i)) + enddo - !$OMP END PARALLEL DO case (5) ! with the cold eos we have to assume P = P(rho), so ! by definition dPdrho is at constant internal energy ! and entropy (the latter, because T=0) - !$OMP PARALLEL DO PRIVATE(xprs,xrho,ir,gamma,cs2_cold,& - !$OMP eps_cold,eps_th,press_cold,press_th,& - !$OMP xdpdrhoe,xdpderho,cs2_th,h,h_cold) do i=1,npoints if(rho(i).lt.coldeos_rhomin) then xprs = coldeos_low_kappa * rho(i)**coldeos_low_gamma @@ -658,10 +755,8 @@ cycle else if(rho(i).gt.coldeos_rhomax) then keyerr(i) = 103 - !$OMP CRITICAL anyerr = 1 - !$OMP END CRITICAL - else + else xrho = log10(rho(i)) ir = 2 + INT( (xrho - coldeos_logrho(1) - 1.0d-10) * coldeos_dlrhoi ) endif @@ -686,6 +781,7 @@ eps_th = 0.0d0 eps(i) = eps_cold endif + press_cold = coldeos_kappa * rho(i)**gamma press_th = coldeos_thfac*(coldeos_gammath - 1.0d0)*rho(i)*eps_th @@ -698,7 +794,7 @@ cs2(i) = (cs2_cold * h_cold + cs2_th) / h enddo - !$OMP END PARALLEL DO + case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" call CCTK_WARN(0,warnstring) Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +14 -0 =================================================================== --- trunk/interface.ccl 2013-06-08 00:23:17 UTC (rev 83) +++ trunk/interface.ccl 2013-06-13 23:10:44 UTC (rev 84) @@ -22,7 +22,21 @@ PROVIDES FUNCTION EOS_Omni_press WITH EOS_Omni_EOS_Press LANGUAGE Fortran +void FUNCTION EOS_Omni_pressOMP(CCTK_INT IN eoskey, \ + CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ + CCTK_INT IN npoints, \ + CCTK_REAL IN ARRAY rho, \ + CCTK_REAL INOUT ARRAY eps, \ + CCTK_REAL INOUT ARRAY temp, \ + CCTK_REAL IN ARRAY ye, \ + CCTK_REAL OUT ARRAY press, \ + CCTK_INT OUT ARRAY keyerr, \ + CCTK_INT OUT anyerr) +PROVIDES FUNCTION EOS_Omni_pressOMP WITH EOS_Omni_EOS_PressOMP LANGUAGE Fortran + + void FUNCTION EOS_Omni_DPressByDEps(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ CCTK_REAL IN rf_precision, \

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 536)
by schnetter＠cct.lsu.edu 13 Jun '13

13 Jun '13

User: eschnett Date: 2013/06/13 02:00 PM Modified: /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_EvolutionMask.F90 Log: Do not declare Fortran pointers explicitly Some compilers do not accept Fortran POINTER declarations if the pointer variable has already been declared to be a particular integer type. Instead, declare them (only) via a POINTER statement. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +0 -1 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2013-05-29 16:35:30 UTC (rev 535) +++ trunk/src/GRHydro_Con2Prim.F90 2013-06-13 19:00:01 UTC (rev 536) @@ -2296,7 +2296,6 @@ ! we skip points where evolution_mask vanishes CCTK_REAL, DIMENSION(cctk_ash1,cctk_ash2,cctk_ash3) :: evolution_mask - CCTK_POINTER_TO_CONST :: evolution_mask_ptr pointer (evolution_mask_ptr, evolution_mask) CCTK_INT :: check_evolution_mask File [modified]: GRHydro_EvolutionMask.F90 Delta lines: +2 -1 =================================================================== --- trunk/src/GRHydro_EvolutionMask.F90 2013-05-29 16:35:30 UTC (rev 535) +++ trunk/src/GRHydro_EvolutionMask.F90 2013-06-13 19:00:01 UTC (rev 536) @@ -76,7 +76,8 @@ DECLARE_CCTK_FUNCTIONS CCTK_POINTER_TO_CONST :: cctkGH - CCTK_POINTER :: evolution_mask + CCTK_REAL :: dummy + pointer (evolution_mask, dummy) CCTK_INT :: evolution_mask_valid integer, save :: evolution_mask_idx = -1

1 0

[svn:einsteintoolkit] TmunuBase/trunk/src/ (Rev. 24)
by schnetter＠cct.lsu.edu 13 Jun '13

13 Jun '13

User: eschnett Date: 2013/06/13 01:57 PM Modified: /trunk/src/ TmunuBase_CalcTmunu.inc Log: Correct array bounds checking for padded grid functions File Changes: Directory: /trunk/src/ ====================== File [modified]: TmunuBase_CalcTmunu.inc Delta lines: +1 -1 =================================================================== --- trunk/src/TmunuBase_CalcTmunu.inc 2013-05-27 22:32:17 UTC (rev 23) +++ trunk/src/TmunuBase_CalcTmunu.inc 2013-06-13 18:57:30 UTC (rev 24) @@ -13,7 +13,7 @@ { #ifndef NDEBUG - if ((ijk) < 0 || (ijk) >= cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2]) + if ((ijk) < 0 || (ijk) >= cctk_ash[0] * cctk_ash[1] * cctk_ash[2]) { CCTK_WARN (0, "Illegal array index"); }

1 0

[svn:einsteintoolkit] HydroBase/trunk/src/ (Rev. 67)
by schnetter＠cct.lsu.edu 13 Jun '13

13 Jun '13

User: eschnett Date: 2013/06/13 01:56 PM Modified: /trunk/src/ Initialisation.c Log: Initialise all grid points when grid functions are padded Use cctk_ash instead of cctk_lsh to determine total array size. File Changes: Directory: /trunk/src/ ====================== File [modified]: Initialisation.c Delta lines: +6 -6 =================================================================== --- trunk/src/Initialisation.c 2013-05-27 22:32:12 UTC (rev 66) +++ trunk/src/Initialisation.c 2013-06-13 18:56:08 UTC (rev 67) @@ -9,7 +9,7 @@ DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - int const np = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2]; + int const np = cctk_ash[0] * cctk_ash[1] * cctk_ash[2]; #pragma omp parallel for for (int i=0; i<np; ++i) { @@ -116,7 +116,7 @@ DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - int const np = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2]; + int const np = cctk_ash[0] * cctk_ash[1] * cctk_ash[2]; #pragma omp parallel for for (int i=0; i<np; ++i) { @@ -165,7 +165,7 @@ DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - int const np = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2]; + int const np = cctk_ash[0] * cctk_ash[1] * cctk_ash[2]; #pragma omp parallel for for (int i=0; i<np; ++i) { @@ -218,7 +218,7 @@ DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - int const np = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2]; + int const np = cctk_ash[0] * cctk_ash[1] * cctk_ash[2]; #pragma omp parallel for for (int i=0; i<np; ++i) { @@ -271,7 +271,7 @@ DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - int const np = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2]; + int const np = cctk_ash[0] * cctk_ash[1] * cctk_ash[2]; #pragma omp parallel for for (int i=0; i<np; ++i) { @@ -318,7 +318,7 @@ DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - int const np = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2]; + int const np = cctk_ash[0] * cctk_ash[1] * cctk_ash[2]; #pragma omp parallel for for (int i=0; i<np; ++i) {

1 0

[svn:einsteintoolkit] ADMBase/trunk/src/ (Rev. 74)
by schnetter＠cct.lsu.edu 13 Jun '13

13 Jun '13

User: eschnett Date: 2013/06/13 01:55 PM Modified: /trunk/src/ Initialisation.c, Static.c Log: Initialise all grid points when grid functions are padded Use cctk_ash instead of cctk_lsh to determine total array size. File Changes: Directory: /trunk/src/ ====================== File [modified]: Initialisation.c Delta lines: +17 -17 =================================================================== --- trunk/src/Initialisation.c 2013-05-27 22:32:00 UTC (rev 73) +++ trunk/src/Initialisation.c 2013-06-13 18:55:16 UTC (rev 74) @@ -75,7 +75,7 @@ DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { gxx[i] = 1.0; gyy[i] = 1.0; @@ -96,7 +96,7 @@ if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::metric") > 1) { - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { gxx_p[i] = 1.0; gyy_p[i] = 1.0; @@ -110,7 +110,7 @@ if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::metric") > 2) { - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { gxx_p_p[i] = 1.0; gyy_p_p[i] = 1.0; @@ -125,7 +125,7 @@ if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::curv") > 1) { - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { kxx_p[i] = 0.0; kyy_p[i] = 0.0; @@ -139,7 +139,7 @@ if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::curv") > 2) { - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { kxx_p_p[i] = 0.0; @@ -176,14 +176,14 @@ DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { alp[i] = 1.0; } if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::lapse") > 1) { - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { alp_p[i] = 1.0; } @@ -191,7 +191,7 @@ if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::lapse") > 2) { - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { alp_p_p[i] = 1.0; } @@ -218,7 +218,7 @@ DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { betax[i] = 0.0; betay[i] = 0.0; @@ -227,7 +227,7 @@ if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::shift") > 1) { - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { betax_p[i] = 0.0; betay_p[i] = 0.0; @@ -237,7 +237,7 @@ if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::shift") > 2) { - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { betax_p_p[i] = 0.0; betay_p_p[i] = 0.0; @@ -266,14 +266,14 @@ DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { dtalp[i] = 0.0; } if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::dtlapse") > 1) { - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { dtalp_p[i] = 0.0; } @@ -281,7 +281,7 @@ if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::dtlapse") > 2) { - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { dtalp_p_p[i] = 0.0; } @@ -308,7 +308,7 @@ DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { dtbetax[i] = 0.0; dtbetay[i] = 0.0; @@ -317,7 +317,7 @@ if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::dtshift") > 1) { - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { dtbetax_p[i] = 0.0; dtbetay_p[i] = 0.0; @@ -327,7 +327,7 @@ if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::dtshift") > 2) { - for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) + for(int i = 0; i < cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; i++) { dtbetax_p_p[i] = 0.0; dtbetay_p_p[i] = 0.0; File [modified]: Static.c Delta lines: +6 -6 =================================================================== --- trunk/src/Static.c 2013-05-27 22:32:00 UTC (rev 73) +++ trunk/src/Static.c 2013-06-13 18:55:16 UTC (rev 74) @@ -10,13 +10,13 @@ if (CCTK_ActiveTimeLevelsGN (cctkGH, "ADMBase::lapse") > 1) { - npoints = cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; + npoints = cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; memcpy (alp, alp_p, npoints * sizeof *alp); } if (CCTK_ActiveTimeLevelsGN (cctkGH, "ADMBase::dtlapse") > 1) { - npoints = cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; + npoints = cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; memcpy (dtalp, dtalp_p, npoints * sizeof *dtalp); } } @@ -28,7 +28,7 @@ if (CCTK_ActiveTimeLevelsGN (cctkGH, "ADMBase::shift") > 1) { - npoints = cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; + npoints = cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; memcpy (betax, betax_p, npoints * sizeof *betax); memcpy (betay, betay_p, npoints * sizeof *betay); memcpy (betaz, betaz_p, npoints * sizeof *betaz); @@ -36,7 +36,7 @@ if (CCTK_ActiveTimeLevelsGN (cctkGH, "ADMBase::dtshift") > 1) { - npoints = cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; + npoints = cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; memcpy (dtbetax, dtbetax_p, npoints * sizeof *dtbetax); memcpy (dtbetay, dtbetay_p, npoints * sizeof *dtbetay); memcpy (dtbetaz, dtbetaz_p, npoints * sizeof *dtbetaz); @@ -50,7 +50,7 @@ if (CCTK_ActiveTimeLevelsGN (cctkGH, "ADMBase::metric") > 1) { - npoints = cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; + npoints = cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; memcpy (gxx, gxx_p, npoints * sizeof *gxx); memcpy (gxy, gxy_p, npoints * sizeof *gxy); memcpy (gxz, gxz_p, npoints * sizeof *gxz); @@ -61,7 +61,7 @@ if (CCTK_ActiveTimeLevelsGN (cctkGH, "ADMBase::curv") > 1) { - npoints = cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; + npoints = cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; memcpy (kxx, kxx_p, npoints * sizeof *kxx); memcpy (kxy, kxy_p, npoints * sizeof *kxy); memcpy (kxz, kxz_p, npoints * sizeof *kxz);

1 0

[svn:einsteintoolkit] AMSS-NCKU/ (Rev. 2)
by knarf＠cct.lsu.edu 12 Jun '13

12 Jun '13

User: knarf Date: 2013/06/12 11:32 PM Added: / README Log: empty README (commit message test) File Changes: Directory: / ============ File [added]: README Delta lines: +0 -0 Added: README

1 0

[svn:einsteintoolkit] AMSS-NCKU/ (Rev. 1)
by knarf＠cct.lsu.edu 12 Jun '13

12 Jun '13

User: knarf Date: 2013/06/12 11:28 PM Added: /branches/ /tags/ /trunk/ Log: initial repo layout

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 1035)
by knarf＠cct.lsu.edu 12 Jun '13

12 Jun '13

User: knarf Date: 2013/06/12 10:09 PM Modified: /release-info/ spine_Cactus-gcc4.7__1_16.log Log: Test commit File Changes: Directory: /release-info/ ========================= File [modified]: spine_Cactus-gcc4.7__1_16.log Delta lines: +1 -0 =================================================================== --- release-info/spine_Cactus-gcc4.7__1_16.log 2013-06-12 18:22:25 UTC (rev 1034) +++ release-info/spine_Cactus-gcc4.7__1_16.log 2013-06-13 03:09:55 UTC (rev 1035) @@ -560,3 +560,4 @@ ======================================================================== +

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 1034)
by rhaas＠tapir.caltech.edu 12 Jun '13

12 Jun '13

User: rhaas Date: 2013/06/12 01:22 PM Modified: /release-info/ bethe__1_4.log, bethe__2_4.log, bethe__2_8.log Log: update bethe results File Changes: Directory: /release-info/ ========================= File [modified]: bethe__1_4.log Delta lines: +24 -26 =================================================================== --- release-info/bethe__1_4.log 2013-05-22 18:32:06 UTC (rev 1033) +++ release-info/bethe__1_4.log 2013-06-12 18:22:25 UTC (rev 1034) @@ -245,8 +245,6 @@ Tests with different number of test files: - Cartoon2D (test_cartoon_2) - Test created 1 extra files: Dissipation (test_ah) Test created 6 extra files: Dissipation (test_ob) @@ -1111,19 +1109,19 @@ AHFinderDirect: checkpointML-EE Success: 7 files compared, 7 differ in the last digits AHFinderDirect: misner1.2-025 - Success: 55 files compared, 8 differ in the last digits + Failure: 55 files compared, 8 differ, 1 differ significantly AHFinderDirect: recoverML Success: 5 files compared, 2 differ in the last digits AHFinderDirect: recoverML-EE Success: 5 files compared, 4 differ in the last digits CarpetEvolutionMask: CarpetEvolutionMask_test - Success: 70 files compared, 30 differ in the last digits + Success: 70 files compared, 31 differ in the last digits CarpetEvolutionMask: CarpetEvolutionMask_test_off - Success: 70 files compared, 30 differ in the last digits + Success: 70 files compared, 31 differ in the last digits CarpetIOHDF5: CarpetWaveToyNewRecover_test_1proc - Success: 12 files compared, 7 differ in the last digits + Success: 12 files compared, 3 differ in the last digits CarpetIOHDF5: CarpetWaveToyRecover_test_1proc - Success: 12 files compared, 7 differ in the last digits + Success: 12 files compared, 3 differ in the last digits CarpetIOHDF5: nobuffers Success: 0 files identical CarpetIOScalar: coords @@ -1149,9 +1147,9 @@ Cartoon2D: test_cartoon_3 Success: 144 files identical Dissipation: test_ah - Success: 190 files compared, 151 differ in the last digits + Success: 190 files compared, 155 differ in the last digits Dissipation: test_ob - Success: 190 files compared, 151 differ in the last digits + Success: 190 files compared, 154 differ in the last digits DistortedBHIVP: E2xeon_test_dbh Success: 100 files compared, 44 differ in the last digits EOS_Omni: eos_omni @@ -1183,13 +1181,13 @@ Extract: test_extract Success: 60 files compared, 50 differ in the last digits GRHydro: GRHydro_test_shock - Success: 48 files compared, 11 differ in the last digits + Failure: 48 files compared, 48 differ, 48 differ significantly GRHydro: GRHydro_test_shock_mp5 - Success: 48 files compared, 4 differ in the last digits + Failure: 48 files compared, 48 differ, 48 differ significantly GRHydro: GRHydro_test_shock_ppm - Success: 48 files compared, 15 differ in the last digits + Failure: 48 files compared, 48 differ, 48 differ significantly GRHydro: GRHydro_test_shock_weno - Failure: 48 files compared, 44 differ, 15 differ significantly + Success: 48 files compared, 41 differ in the last digits GRHydro: GRHydro_test_tov_ppm_ML Success: 180 files compared, 46 differ in the last digits GRHydro: GRHydro_test_tov_ppm_ML_disable_internal_excision @@ -1201,9 +1199,9 @@ GRHydro: tov_slowsector Success: 6 files identical Hydro_InitExcision: diag_flip_pugh_eno - Success: 76 files identical + Failure: 76 files compared, 7 differ, 7 differ significantly Hydro_InitExcision: diag_pugh_eno - Success: 76 files identical + Failure: 76 files compared, 7 differ, 7 differ significantly Hydro_InitExcision: halfsphere_pugh_ppm Success: 79 files compared, 2 differ in the last digits Hydro_InitExcision: sphere_pugh_ppm @@ -1412,7 +1410,7 @@ Summary for configuration sim - Time -> Mon Apr 29 13:49:24 PDT 2013 + Time -> Tue May 21 19:41:36 PDT 2013 Host -> bethe.tapir.caltech.edu Processes -> 1 User -> rhaas @@ -1422,10 +1420,10 @@ Runnable tests -> 186 Total number of thorns -> 193 Number of tested thorns -> 56 - Number of tests passed -> 185 + Number of tests passed -> 180 Number passed only to - set tolerance -> 118 - Number failed -> 1 + set tolerance -> 115 + Number failed -> 6 Tests passed: @@ -1467,7 +1465,6 @@ Kerr-selection-mean-coordinate-radius-EE (from AHFinderDirect) checkpointML (from AHFinderDirect) checkpointML-EE (from AHFinderDirect) - misner1.2-025 (from AHFinderDirect) recoverML (from AHFinderDirect) recoverML-EE (from AHFinderDirect) CarpetEvolutionMask_test (from CarpetEvolutionMask) @@ -1503,16 +1500,12 @@ de_Sitter (from Exact) extract_physical (from Extract) test_extract (from Extract) - GRHydro_test_shock (from GRHydro) - GRHydro_test_shock_mp5 (from GRHydro) - GRHydro_test_shock_ppm (from GRHydro) + GRHydro_test_shock_weno (from GRHydro) GRHydro_test_tov_ppm_ML (from GRHydro) GRHydro_test_tov_ppm_ML_disable_internal_excision (from GRHydro) GRHydro_test_tov_ppm_no_trp_ML (from GRHydro) test_one_hybrid (from GRHydro) tov_slowsector (from GRHydro) - diag_flip_pugh_eno (from Hydro_InitExcision) - diag_pugh_eno (from Hydro_InitExcision) halfsphere_pugh_ppm (from Hydro_InitExcision) sphere_pugh_ppm (from Hydro_InitExcision) x_flip_pugh_eno (from Hydro_InitExcision) @@ -1617,7 +1610,12 @@ Tests failed: - GRHydro_test_shock_weno (from GRHydro) + misner1.2-025 (from AHFinderDirect) + GRHydro_test_shock (from GRHydro) + GRHydro_test_shock_mp5 (from GRHydro) + GRHydro_test_shock_ppm (from GRHydro) + diag_flip_pugh_eno (from Hydro_InitExcision) + diag_pugh_eno (from Hydro_InitExcision) ======================================================================== File [modified]: bethe__2_4.log Delta lines: +24 -30 =================================================================== --- release-info/bethe__2_4.log 2013-05-22 18:32:06 UTC (rev 1033) +++ release-info/bethe__2_4.log 2013-06-12 18:22:25 UTC (rev 1034) @@ -162,6 +162,10 @@ (EinsteinExact/EinsteinExact_Test/test/Vaidya2.par) Requires 1 processors + testloop in TestLoop + (CactusTest/TestLoop/test/testloop.par) + Requires 1 processors + bhns_eval in TwoPunctures (EinsteinInitialData/TwoPunctures/test/bhns_eval.par) Requires 1 processors @@ -189,8 +193,6 @@ Tests with different number of test files: - Cartoon2D (test_cartoon_2) - Test created 1 extra files: IDAxiOddBrillBH (E2xeon_test_axioddbh) Test created 12 extra files: IDAxiOddBrillBH (test_axioddbh) @@ -312,8 +314,6 @@ TestLocalReduce [3] - TestLoop [1] - TestPar [1] TestTable [1] @@ -799,10 +799,6 @@ TestSum - TestLoop: - - testloop - TestPar: expressions @@ -981,6 +977,7 @@ TestFreeF90 TestInclude1 TestInclude2 + TestLoop TestMath TestReduce TestSchedule @@ -1126,13 +1123,13 @@ Extract: test_extract Success: 60 files compared, 50 differ in the last digits GRHydro: GRHydro_test_shock - Success: 48 files compared, 11 differ in the last digits + Failure: 48 files compared, 48 differ, 48 differ significantly GRHydro: GRHydro_test_shock_mp5 - Success: 48 files compared, 4 differ in the last digits + Failure: 48 files compared, 48 differ, 48 differ significantly GRHydro: GRHydro_test_shock_ppm - Success: 48 files compared, 15 differ in the last digits + Failure: 48 files compared, 48 differ, 48 differ significantly GRHydro: GRHydro_test_shock_weno - Failure: 48 files compared, 44 differ, 15 differ significantly + Success: 48 files compared, 41 differ in the last digits GRHydro: GRHydro_test_tov_ppm_ML Success: 180 files compared, 43 differ in the last digits GRHydro: GRHydro_test_tov_ppm_ML_disable_internal_excision @@ -1172,9 +1169,9 @@ GRHydro: tov_slowsector Success: 6 files identical Hydro_InitExcision: diag_flip_pugh_eno - Success: 76 files identical + Failure: 76 files compared, 7 differ, 7 differ significantly Hydro_InitExcision: diag_pugh_eno - Success: 76 files identical + Failure: 76 files compared, 7 differ, 7 differ significantly Hydro_InitExcision: halfsphere_pugh_ppm Success: 79 files compared, 2 differ in the last digits Hydro_InitExcision: sphere_pugh_ppm @@ -1371,8 +1368,6 @@ Success: 6 files identical TestLocalReduce: TestSum Success: 6 files identical - TestLoop: testloop - Success: 0 files identical TestPar: expressions Success: 1 files identical TestTable: test-table @@ -1409,20 +1404,20 @@ Summary for configuration sim - Time -> Mon Apr 29 13:46:46 PDT 2013 + Time -> Tue May 21 19:30:29 PDT 2013 Host -> bethe.tapir.caltech.edu Processes -> 2 User -> rhaas Total available tests -> 244 - Unrunnable tests -> 44 - Runnable tests -> 200 + Unrunnable tests -> 45 + Runnable tests -> 199 Total number of thorns -> 193 - Number of tested thorns -> 57 - Number of tests passed -> 199 + Number of tested thorns -> 56 + Number of tests passed -> 194 Number passed only to - set tolerance -> 132 - Number failed -> 1 + set tolerance -> 130 + Number failed -> 5 Tests passed: @@ -1487,9 +1482,7 @@ de_Sitter (from Exact) extract_physical (from Extract) test_extract (from Extract) - GRHydro_test_shock (from GRHydro) - GRHydro_test_shock_mp5 (from GRHydro) - GRHydro_test_shock_ppm (from GRHydro) + GRHydro_test_shock_weno (from GRHydro) GRHydro_test_tov_ppm_ML (from GRHydro) GRHydro_test_tov_ppm_ML_disable_internal_excision (from GRHydro) GRHydro_test_tov_ppm_no_trp_ML (from GRHydro) @@ -1509,8 +1502,6 @@ tov_carpetevolutionmask (from GRHydro) tov_carpetevolutionmask2 (from GRHydro) tov_slowsector (from GRHydro) - diag_flip_pugh_eno (from Hydro_InitExcision) - diag_pugh_eno (from Hydro_InitExcision) halfsphere_pugh_ppm (from Hydro_InitExcision) sphere_pugh_ppm (from Hydro_InitExcision) x_flip_pugh_eno (from Hydro_InitExcision) @@ -1609,7 +1600,6 @@ TestAvg (from TestLocalReduce) TestMax (from TestLocalReduce) TestSum (from TestLocalReduce) - testloop (from TestLoop) expressions (from TestPar) test-table (from TestTable) trigger (from Trigger) @@ -1628,7 +1618,11 @@ Tests failed: - GRHydro_test_shock_weno (from GRHydro) + GRHydro_test_shock (from GRHydro) + GRHydro_test_shock_mp5 (from GRHydro) + GRHydro_test_shock_ppm (from GRHydro) + diag_flip_pugh_eno (from Hydro_InitExcision) + diag_pugh_eno (from Hydro_InitExcision) ======================================================================== File [modified]: bethe__2_8.log Delta lines: +84 -90 =================================================================== --- release-info/bethe__2_8.log 2013-05-22 18:32:06 UTC (rev 1033) +++ release-info/bethe__2_8.log 2013-06-12 18:22:25 UTC (rev 1034) @@ -162,6 +162,10 @@ (EinsteinExact/EinsteinExact_Test/test/Vaidya2.par) Requires 1 processors + testloop in TestLoop + (CactusTest/TestLoop/test/testloop.par) + Requires 1 processors + bhns_eval in TwoPunctures (EinsteinInitialData/TwoPunctures/test/bhns_eval.par) Requires 1 processors @@ -189,8 +193,6 @@ Tests with different number of test files: - Cartoon2D (test_cartoon_2) - Test created 1 extra files: IDAxiOddBrillBH (E2xeon_test_axioddbh) Test created 12 extra files: IDAxiOddBrillBH (test_axioddbh) @@ -312,8 +314,6 @@ TestLocalReduce [3] - TestLoop [1] - TestPar [1] TestTable [1] @@ -799,10 +799,6 @@ TestSum - TestLoop: - - testloop - TestPar: expressions @@ -981,6 +977,7 @@ TestFreeF90 TestInclude1 TestInclude2 + TestLoop TestMath TestReduce TestSchedule @@ -1102,7 +1099,7 @@ CarpetIOScalar: coords4 Success: 1 files compared, 1 differ in the last digits Cartoon2D: schw-0050 - Failure: 280 files compared, 258 differ, 256 differ significantly + Success: 280 files compared, 17 differ in the last digits Cartoon2D: test_cartoon_2 Success: 144 files compared, 8 differ in the last digits Cartoon2D: test_cartoon_3 @@ -1112,7 +1109,7 @@ EOS_Omni: eos_omni Success: 1 files identical Exact: KS-tilted - Failure: 235 files compared, 148 differ, 146 differ significantly + Success: 235 files compared, 27 differ in the last digits Exact: Schwarzschild_EF Success: 112 files compared, 42 differ in the last digits Exact: bowl-evolution @@ -1126,19 +1123,19 @@ Extract: test_extract Success: 60 files compared, 50 differ in the last digits GRHydro: GRHydro_test_shock - Success: 48 files compared, 11 differ in the last digits + Failure: 48 files compared, 48 differ, 48 differ significantly GRHydro: GRHydro_test_shock_mp5 - Success: 48 files compared, 4 differ in the last digits + Failure: 48 files compared, 48 differ, 48 differ significantly GRHydro: GRHydro_test_shock_ppm - Success: 48 files compared, 15 differ in the last digits + Failure: 48 files compared, 48 differ, 48 differ significantly GRHydro: GRHydro_test_shock_weno - Failure: 48 files compared, 44 differ, 15 differ significantly + Success: 48 files compared, 41 differ in the last digits GRHydro: GRHydro_test_tov_ppm_ML - Success: 180 files compared, 55 differ in the last digits + Success: 180 files compared, 43 differ in the last digits GRHydro: GRHydro_test_tov_ppm_ML_disable_internal_excision - Success: 180 files compared, 55 differ in the last digits + Success: 180 files compared, 43 differ in the last digits GRHydro: GRHydro_test_tov_ppm_no_trp_ML - Success: 180 files compared, 48 differ in the last digits + Success: 180 files compared, 44 differ in the last digits GRHydro: balsara1_1d Success: 60 files identical GRHydro: balsara1_2d @@ -1172,9 +1169,9 @@ GRHydro: tov_slowsector Success: 6 files identical Hydro_InitExcision: diag_flip_pugh_eno - Success: 76 files identical + Failure: 76 files compared, 7 differ, 7 differ significantly Hydro_InitExcision: diag_pugh_eno - Success: 76 files identical + Failure: 76 files compared, 7 differ, 7 differ significantly Hydro_InitExcision: halfsphere_pugh_ppm Success: 79 files compared, 2 differ in the last digits Hydro_InitExcision: sphere_pugh_ppm @@ -1212,27 +1209,27 @@ InterpToArray: wavetoy2 Success: 17 files identical LoopControl: test-minkowski-carpet-1lev - Failure: 4 files missing, 0 files compared, 0 differ + Success: 4 files identical ML_BSSN_Test: ML_BSSN_EE_sgw3d - Failure: 32 files compared, 30 differ, 30 differ significantly + Success: 32 files compared, 30 differ in the last digits ML_BSSN_Test: ML_BSSN_EE_sgw3d_rhs - Failure: 171 files compared, 162 differ, 24 differ significantly + Success: 171 files compared, 162 differ in the last digits ML_BSSN_Test: ML_BSSN_NewRad - Failure: 52 files compared, 50 differ, 50 differ significantly + Success: 52 files compared, 50 differ in the last digits ML_BSSN_Test: ML_BSSN_O8_sgw3d - Failure: 32 files compared, 30 differ, 30 differ significantly + Success: 32 files compared, 30 differ in the last digits ML_BSSN_Test: ML_BSSN_sgw3d - Failure: 32 files compared, 30 differ, 30 differ significantly + Success: 32 files compared, 30 differ in the last digits ML_BSSN_Test: ML_BSSN_sgw3d_harmonic - Failure: 32 files compared, 30 differ, 30 differ significantly + Success: 32 files compared, 30 differ in the last digits ML_BSSN_Test: ML_BSSN_sgw3d_harmonic_phi - Failure: 32 files compared, 30 differ, 30 differ significantly + Success: 32 files compared, 30 differ in the last digits ML_BSSN_Test: ML_BSSN_sgw3d_rhs - Failure: 171 files compared, 162 differ, 24 differ significantly + Success: 171 files compared, 162 differ in the last digits ML_CCZ4_Test: ML_CCZ4_sgw3d - Failure: 37 files compared, 35 differ, 35 differ significantly + Success: 37 files compared, 35 differ in the last digits ML_CCZ4_Test: ML_CCZ4_sgw3d_rhs - Failure: 177 files compared, 165 differ, 24 differ significantly + Success: 177 files compared, 165 differ in the last digits ML_WaveToy_Test: gaussian-RK4 Success: 17 files compared, 17 differ in the last digits ML_WaveToy_Test: gaussian-RK45 @@ -1258,9 +1255,9 @@ Outflow: moving_tov Success: 8 files compared, 4 differ in the last digits PeriodicCarpet: ml-gw1d-small - Success: 196 files compared, 96 differ in the last digits + Success: 196 files identical PeriodicCarpet: ml-gw1d-small-amr - Failure: 160 files compared, 72 differ, 24 differ significantly + Success: 160 files compared, 14 differ in the last digits QuasiLocalMeasures: qlm-bl Success: 169 files compared, 160 differ in the last digits QuasiLocalMeasures: qlm-ks @@ -1280,33 +1277,33 @@ RotatingDBHIVP: test_rdbh Success: 120 files compared, 82 differ in the last digits RotatingSymmetry180: Kerr - Failure: 144 files compared, 94 differ, 92 differ significantly + Success: 144 files compared, 12 differ in the last digits RotatingSymmetry180: Kerr-EE - Failure: 204 files compared, 134 differ, 131 differ significantly + Success: 204 files compared, 32 differ in the last digits RotatingSymmetry180: Kerr-rotating-180 - Failure: 140 files compared, 93 differ, 91 differ significantly + Success: 140 files compared, 12 differ in the last digits RotatingSymmetry180: Kerr-rotating-180-EE - Failure: 204 files compared, 133 differ, 128 differ significantly + Success: 204 files compared, 25 differ in the last digits RotatingSymmetry180: Kerr-rotating-180-staggered - Failure: 140 files compared, 102 differ, 102 differ significantly + Success: 140 files compared, 12 differ in the last digits RotatingSymmetry180: Kerr-rotating-180-staggered-EE - Failure: 204 files compared, 166 differ, 145 differ significantly + Success: 204 files compared, 48 differ in the last digits RotatingSymmetry180: Kerr-staggered - Failure: 140 files compared, 102 differ, 102 differ significantly + Success: 140 files compared, 14 differ in the last digits RotatingSymmetry180: Kerr-staggered-EE - Failure: 204 files compared, 167 differ, 145 differ significantly + Success: 204 files compared, 54 differ in the last digits RotatingSymmetry180: KerrSchild-rotating-180 - Failure: 120 files compared, 104 differ, 104 differ significantly + Success: 120 files compared, 94 differ in the last digits RotatingSymmetry90: Kerr-rotating-90 - Failure: 140 files compared, 91 differ, 91 differ significantly + Success: 140 files compared, 9 differ in the last digits RotatingSymmetry90: Kerr-rotating-90-EE - Failure: 200 files compared, 135 differ, 130 differ significantly + Success: 200 files compared, 28 differ in the last digits RotatingSymmetry90: Kerr-rotating-90-staggered - Failure: 140 files compared, 104 differ, 102 differ significantly + Success: 140 files compared, 17 differ in the last digits RotatingSymmetry90: Kerr-rotating-90-staggered-EE - Failure: 200 files compared, 164 differ, 145 differ significantly + Success: 200 files compared, 49 differ in the last digits RotatingSymmetry90: KerrSchild-rotating-90 - Failure: 120 files compared, 104 differ, 104 differ significantly + Success: 120 files compared, 96 differ in the last digits SlabTest: slabtest Success: 1 files identical SphericalHarmonicRecon: regression_test @@ -1371,8 +1368,6 @@ Success: 6 files identical TestLocalReduce: TestSum Success: 6 files identical - TestLoop: testloop - Success: 0 files identical TestPar: expressions Success: 1 files identical TestTable: test-table @@ -1409,20 +1404,20 @@ Summary for configuration sim - Time -> Mon Apr 29 14:46:40 PDT 2013 + Time -> Tue May 21 19:18:50 PDT 2013 Host -> bethe.tapir.caltech.edu Processes -> 2 User -> rhaas Total available tests -> 244 - Unrunnable tests -> 44 - Runnable tests -> 200 + Unrunnable tests -> 45 + Runnable tests -> 199 Total number of thorns -> 193 - Number of tested thorns -> 57 - Number of tests passed -> 171 + Number of tested thorns -> 56 + Number of tests passed -> 194 Number passed only to - set tolerance -> 106 - Number failed -> 29 + set tolerance -> 130 + Number failed -> 5 Tests passed: @@ -1475,19 +1470,19 @@ coords2 (from CarpetIOScalar) coords3 (from CarpetIOScalar) coords4 (from CarpetIOScalar) + schw-0050 (from Cartoon2D) test_cartoon_2 (from Cartoon2D) test_cartoon_3 (from Cartoon2D) E2xeon_test_dbh (from DistortedBHIVP) eos_omni (from EOS_Omni) + KS-tilted (from Exact) Schwarzschild_EF (from Exact) bowl-evolution (from Exact) bowl-init (from Exact) de_Sitter (from Exact) extract_physical (from Extract) test_extract (from Extract) - GRHydro_test_shock (from GRHydro) - GRHydro_test_shock_mp5 (from GRHydro) - GRHydro_test_shock_ppm (from GRHydro) + GRHydro_test_shock_weno (from GRHydro) GRHydro_test_tov_ppm_ML (from GRHydro) GRHydro_test_tov_ppm_ML_disable_internal_excision (from GRHydro) GRHydro_test_tov_ppm_no_trp_ML (from GRHydro) @@ -1507,8 +1502,6 @@ tov_carpetevolutionmask (from GRHydro) tov_carpetevolutionmask2 (from GRHydro) tov_slowsector (from GRHydro) - diag_flip_pugh_eno (from Hydro_InitExcision) - diag_pugh_eno (from Hydro_InitExcision) halfsphere_pugh_ppm (from Hydro_InitExcision) sphere_pugh_ppm (from Hydro_InitExcision) x_flip_pugh_eno (from Hydro_InitExcision) @@ -1527,6 +1520,17 @@ test_recover (from IOHDF5) wavetoy (from InterpToArray) wavetoy2 (from InterpToArray) + test-minkowski-carpet-1lev (from LoopControl) + ML_BSSN_EE_sgw3d (from ML_BSSN_Test) + ML_BSSN_EE_sgw3d_rhs (from ML_BSSN_Test) + ML_BSSN_NewRad (from ML_BSSN_Test) + ML_BSSN_O8_sgw3d (from ML_BSSN_Test) + ML_BSSN_sgw3d (from ML_BSSN_Test) + ML_BSSN_sgw3d_harmonic (from ML_BSSN_Test) + ML_BSSN_sgw3d_harmonic_phi (from ML_BSSN_Test) + ML_BSSN_sgw3d_rhs (from ML_BSSN_Test) + ML_CCZ4_sgw3d (from ML_CCZ4_Test) + ML_CCZ4_sgw3d_rhs (from ML_CCZ4_Test) gaussian-RK4 (from ML_WaveToy_Test) gaussian-RK45 (from ML_WaveToy_Test) gaussian-RK45-adaptive (from ML_WaveToy_Test) @@ -1540,6 +1544,7 @@ nancount (from NaNChecker) moving_tov (from Outflow) ml-gw1d-small (from PeriodicCarpet) + ml-gw1d-small-amr (from PeriodicCarpet) qlm-bl (from QuasiLocalMeasures) qlm-ks (from QuasiLocalMeasures) qlm-ks-EE (from QuasiLocalMeasures) @@ -1549,6 +1554,20 @@ qlm-minkowski (from QuasiLocalMeasures) E2xeon_test_rdbh (from RotatingDBHIVP) test_rdbh (from RotatingDBHIVP) + Kerr (from RotatingSymmetry180) + Kerr-EE (from RotatingSymmetry180) + Kerr-rotating-180 (from RotatingSymmetry180) + Kerr-rotating-180-EE (from RotatingSymmetry180) + Kerr-rotating-180-staggered (from RotatingSymmetry180) + Kerr-rotating-180-staggered-EE (from RotatingSymmetry180) + Kerr-staggered (from RotatingSymmetry180) + Kerr-staggered-EE (from RotatingSymmetry180) + KerrSchild-rotating-180 (from RotatingSymmetry180) + Kerr-rotating-90 (from RotatingSymmetry90) + Kerr-rotating-90-EE (from RotatingSymmetry90) + Kerr-rotating-90-staggered (from RotatingSymmetry90) + Kerr-rotating-90-staggered-EE (from RotatingSymmetry90) + KerrSchild-rotating-90 (from RotatingSymmetry90) slabtest (from SlabTest) regression_test (from SphericalHarmonicRecon) test_one_boost_max (from TOVSolver) @@ -1581,7 +1600,6 @@ TestAvg (from TestLocalReduce) TestMax (from TestLocalReduce) TestSum (from TestLocalReduce) - testloop (from TestLoop) expressions (from TestPar) test-table (from TestTable) trigger (from Trigger) @@ -1600,35 +1618,11 @@ Tests failed: - schw-0050 (from Cartoon2D) - KS-tilted (from Exact) - GRHydro_test_shock_weno (from GRHydro) - test-minkowski-carpet-1lev (from LoopControl) - ML_BSSN_EE_sgw3d (from ML_BSSN_Test) - ML_BSSN_EE_sgw3d_rhs (from ML_BSSN_Test) - ML_BSSN_NewRad (from ML_BSSN_Test) - ML_BSSN_O8_sgw3d (from ML_BSSN_Test) - ML_BSSN_sgw3d (from ML_BSSN_Test) - ML_BSSN_sgw3d_harmonic (from ML_BSSN_Test) - ML_BSSN_sgw3d_harmonic_phi (from ML_BSSN_Test) - ML_BSSN_sgw3d_rhs (from ML_BSSN_Test) - ML_CCZ4_sgw3d (from ML_CCZ4_Test) - ML_CCZ4_sgw3d_rhs (from ML_CCZ4_Test) - ml-gw1d-small-amr (from PeriodicCarpet) - Kerr (from RotatingSymmetry180) - Kerr-EE (from RotatingSymmetry180) - Kerr-rotating-180 (from RotatingSymmetry180) - Kerr-rotating-180-EE (from RotatingSymmetry180) - Kerr-rotating-180-staggered (from RotatingSymmetry180) - Kerr-rotating-180-staggered-EE (from RotatingSymmetry180) - Kerr-staggered (from RotatingSymmetry180) - Kerr-staggered-EE (from RotatingSymmetry180) - KerrSchild-rotating-180 (from RotatingSymmetry180) - Kerr-rotating-90 (from RotatingSymmetry90) - Kerr-rotating-90-EE (from RotatingSymmetry90) - Kerr-rotating-90-staggered (from RotatingSymmetry90) - Kerr-rotating-90-staggered-EE (from RotatingSymmetry90) - KerrSchild-rotating-90 (from RotatingSymmetry90) + GRHydro_test_shock (from GRHydro) + GRHydro_test_shock_mp5 (from GRHydro) + GRHydro_test_shock_ppm (from GRHydro) + diag_flip_pugh_eno (from Hydro_InitExcision) + diag_pugh_eno (from Hydro_InitExcision) ========================================================================

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits June 2013