Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 224)
by cott＠tapir.caltech.edu 12 Mar '11

12 Mar '11

User: cott Date: 2011/03/12 09:05 AM Modified: /trunk/src/ GRHydro_Prim2Con.F90 Log: * optimize hot P2C routine a bit. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Prim2Con.F90 Delta lines: +14 -13 =================================================================== --- trunk/src/GRHydro_Prim2Con.F90 2011-03-12 14:25:11 UTC (rev 223) +++ trunk/src/GRHydro_Prim2Con.F90 2011-03-12 15:05:33 UTC (rev 224) @@ -227,6 +227,7 @@ deps(1), dpress(1), w, vlowx, vlowy, vlowz CCTK_REAL :: temp(1),ye(1), x, y, z CCTK_INT :: handle, GRHydro_reflevel, ii, jj, kk + CCTK_REAL :: sdet, h character(len=512) warnline ! begin EOS Omni vars @@ -253,7 +254,7 @@ drho,deps,temp,ye,dpress,keyerr,anyerr) keytemp=0 if(anyerr.ne.0) then - !OMP CRITICAL + !$OMP CRITICAL(p2c1) call CCTK_WARN(1,"EOS error in prim2con_hot: lev 2") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(1,warnline) @@ -263,14 +264,13 @@ call CCTK_WARN(1,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(1,warnline) - !OMP END CRITICAL + !$OMP END CRITICAL(p2c1) endif else ! This is a way of recovering even on finer refinement levels: ! Use the average temperature at the interface instead of the ! reconstructed specific internal energy. -!! !OMP CRITICAL -#if 0 + !$OMP CRITICAL(p2c2) call CCTK_WARN(1,"EOS error in prim2con_hot: NOW using averaged temp!") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(1,warnline) @@ -280,15 +280,14 @@ call CCTK_WARN(1,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(1,warnline) -#endif -!!! !OMP END CRITICAL + !$OMP END CRITICAL(p2c2) keytemp=1 temp = temp0 call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& drho,deps,temp,ye,dpress,keyerr,anyerr) keytemp=0 if(anyerr.ne.0) then - !OMP CRITICAL + !$OMP CRITICAL(p2c3) call CCTK_WARN(1,"EOS error in prim2con_hot") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(1,warnline) @@ -299,7 +298,7 @@ write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(1,warnline) call CCTK_WARN(0,"Aborting!!!") - !OMP END CRITICAL + !$OMP END CRITICAL(p2c3) endif endif endif @@ -309,11 +308,13 @@ vlowy = gxy*dvelx + gyy*dvely + gyz*dvelz vlowz = gxz*dvelx + gyz*dvely + gzz*dvelz - ddens = sqrt(det) * drho(1) * w - dsx = sqrt(det) * (drho(1)*(1+deps(1))+dpress(1))*w*w * vlowx - dsy = sqrt(det) * (drho(1)*(1+deps(1))+dpress(1))*w*w * vlowy - dsz = sqrt(det) * (drho(1)*(1+deps(1))+dpress(1))*w*w * vlowz - dtau = sqrt(det) * ((drho(1)*(1+deps(1))+dpress(1))*w*w - dpress(1)) - ddens + sdet = sqrt(det) + h = drho(1)*(1.0d0+deps(1))+dpress(1) + ddens = sdet * drho(1) * w + dsx = sdet * h*w*w * vlowx + dsy = sdet * h*w*w * vlowy + dsz = sdet * h*w*w * vlowz + dtau = sdet * (h*w*w - dpress(1)) - ddens end subroutine prim2con_hot

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 223)
by cott＠tapir.caltech.edu 12 Mar '11

12 Mar '11

User: cott Date: 2011/03/12 08:25 AM Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ GRHydro_Boundaries.F90, GRHydro_BoundariesM.F90, make.code.defn Log: * remove GZ patch system code * test suites pass File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +0 -156 =================================================================== --- trunk/src/GRHydro_Boundaries.F90 2011-03-12 04:06:44 UTC (rev 222) +++ trunk/src/GRHydro_Boundaries.F90 2011-03-12 14:25:11 UTC (rev 223) @@ -257,159 +257,3 @@ end subroutine GRHydro_Boundaries - /*@@ - @routine GRHydro_OutflowBoundaries - @date Tue May 17 16:58:06 2005 - @author Ian Hawke - @desc - Set outflow boundaries over only part of the domain. - This is designed to be used with GZPatchSystem. - @enddesc - @calls - @calledby - @history - - @endhistory - -@@*/ - -subroutine GRHydro_OutflowBoundaries(CCTK_ARGUMENTS) - - implicit none - - DECLARE_CCTK_ARGUMENTS - DECLARE_CCTK_PARAMETERS - DECLARE_CCTK_FUNCTIONS - - integer, dimension(3) :: sw - integer :: ierr - integer :: i,j,k - - CCTK_REAL, dimension(3) :: posn - - CCTK_REAL :: det,psi4pt - - sw = GRHydro_stencil - - if (r(1,1,1) < r(1,1,cctk_lsh(3))) then - - if (cctk_bbox(6) .ne. 0) then - - do k = cctk_lsh(3) - sw(3), cctk_lsh(3) - do j = 1, cctk_lsh(2) - do i = 1, cctk_lsh(1) - - posn(1) = x(i,j,k) - posn(2) = y(i,j,k) - posn(3) = z(i,j,k) - - if (dot_product(outflowboundary_normal, posn) > 0.d0) then - - rho(i,j,k) = rho(i,j,k-1) - velx(i,j,k) = velx(i,j,k-1) - vely(i,j,k) = vely(i,j,k-1) - velz(i,j,k) = velz(i,j,k-1) - eps(i,j,k) = eps(i,j,k-1) - press(i,j,k) = press(i,j,k-1) - w_lorentz(i,j,k) = w_lorentz(i,j,k-1) - if(evolve_mhd.ne.0) then - Bvecx(i,j,k) = Bvecx(i,j,k-1) - Bvecy(i,j,k) = Bvecy(i,j,k-1) - Bvecz(i,j,k) = Bvecz(i,j,k-1) - if(clean_divergence.ne.0) then - psidc(i,j,k) = psidc(i,j,k-1) - endif - endif - - psi4pt = 1.0d0 - det = SPATIAL_DETERMINANT(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),\ - gyy(i,j,k),gyz(i,j,k),gzz(i,j,k)) - - if(evolve_mhd.ne.0) then - call prim2conM(GRHydro_eos_handle,psi4pt*gxx(i,j,k),& - psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),& - psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k),& - det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& - rho(i,j,k),velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) - else - call prim2con(GRHydro_eos_handle,psi4pt*gxx(i,j,k),& - psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),& - psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*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)) - endif - end if - - end do - end do - end do - - end if - - else - - if (cctk_bbox(5) .ne. 0) then - - do k = sw(3), 1, -1 - do j = 1, cctk_lsh(2) - do i = 1, cctk_lsh(1) - - posn(1) = x(i,j,k) - posn(2) = y(i,j,k) - posn(3) = z(i,j,k) - - if (dot_product(outflowboundary_normal, posn) > 0.d0) then - - rho(i,j,k) = rho(i,j,k+1) - velx(i,j,k) = velx(i,j,k+1) - vely(i,j,k) = vely(i,j,k+1) - velz(i,j,k) = velz(i,j,k+1) - eps(i,j,k) = eps(i,j,k+1) - press(i,j,k) = press(i,j,k+1) - w_lorentz(i,j,k) = w_lorentz(i,j,k+1) - - if(evolve_mhd.ne.0) then - Bvecx(i,j,k) = Bvecx(i,j,k+1) - Bvecy(i,j,k) = Bvecy(i,j,k+1) - Bvecz(i,j,k) = Bvecz(i,j,k+1) - if(clean_divergence.ne.0) then - psidc(i,j,k) = psidc(i,j,k+1) - endif - endif - - psi4pt = 1.0d0 - det = SPATIAL_DETERMINANT(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),\ - gyy(i,j,k),gyz(i,j,k),gzz(i,j,k)) - if(evolve_mhd.ne.0) then - call prim2conM(GRHydro_eos_handle,psi4pt*gxx(i,j,k),& - psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),& - psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k),& - det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& - rho(i,j,k),velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) - else - call prim2con(GRHydro_eos_handle,psi4pt*gxx(i,j,k),& - psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),& - psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*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)) - endif - end if - - end do - end do - end do - - end if - - end if - -end subroutine GRHydro_OutflowBoundaries - - - File [modified]: GRHydro_BoundariesM.F90 Delta lines: +0 -131 =================================================================== --- trunk/src/GRHydro_BoundariesM.F90 2011-03-12 04:06:44 UTC (rev 222) +++ trunk/src/GRHydro_BoundariesM.F90 2011-03-12 14:25:11 UTC (rev 223) @@ -233,137 +233,6 @@ end subroutine GRHydro_BoundariesM - /*@@ - @routine GRHydro_OutflowBoundariesM - @date Aug 30, 2010 - @author Joshua Faber, Ian Hawke - @desc - Set outflow boundaries over only part of the domain. - This is designed to be used with GZPatchSystem. - @enddesc - @calls - @calledby - @history - - @endhistory -@@*/ -subroutine GRHydro_OutflowBoundariesM(CCTK_ARGUMENTS) - - implicit none - - DECLARE_CCTK_ARGUMENTS - DECLARE_CCTK_PARAMETERS - DECLARE_CCTK_FUNCTIONS - - integer, dimension(3) :: sw - integer :: ierr - integer :: i,j,k - - CCTK_REAL, dimension(3) :: posn - CCTK_REAL :: det,psi4pt - - sw = GRHydro_stencil - - if (r(1,1,1) < r(1,1,cctk_lsh(3))) then - - if (cctk_bbox(6) .ne. 0) then - - do k = cctk_lsh(3) - sw(3), cctk_lsh(3) - do j = 1, cctk_lsh(2) - do i = 1, cctk_lsh(1) - - posn(1) = x(i,j,k) - posn(2) = y(i,j,k) - posn(3) = z(i,j,k) - - if (dot_product(outflowboundary_normal, posn) > 0.d0) then - - rho(i,j,k) = rho(i,j,k-1) - velx(i,j,k) = velx(i,j,k-1) - vely(i,j,k) = vely(i,j,k-1) - velz(i,j,k) = velz(i,j,k-1) - eps(i,j,k) = eps(i,j,k-1) - press(i,j,k) = press(i,j,k-1) - w_lorentz(i,j,k) = w_lorentz(i,j,k-1) - Bvecx(i,j,k) = Bvecx(i,j,k-1) - Bvecy(i,j,k) = Bvecy(i,j,k-1) - Bvecz(i,j,k) = Bvecz(i,j,k-1) - if(clean_divergence.ne.0) then - psidc(i,j,k) = psidc(i,j,k-1) - endif - - psi4pt = 1.d0 - 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 prim2conM(GRHydro_eos_handle,psi4pt*gxx(i,j,k),& - psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),& - psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k),& - det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& - rho(i,j,k),velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) - - end if - - end do - end do - end do - - end if - - else - - if (cctk_bbox(5) .ne. 0) then - - do k = sw(3), 1, -1 - do j = 1, cctk_lsh(2) - do i = 1, cctk_lsh(1) - - posn(1) = x(i,j,k) - posn(2) = y(i,j,k) - posn(3) = z(i,j,k) - - if (dot_product(outflowboundary_normal, posn) > 0.d0) then - - rho(i,j,k) = rho(i,j,k+1) - velx(i,j,k) = velx(i,j,k+1) - vely(i,j,k) = vely(i,j,k+1) - velz(i,j,k) = velz(i,j,k+1) - eps(i,j,k) = eps(i,j,k+1) - press(i,j,k) = press(i,j,k+1) - w_lorentz(i,j,k) = w_lorentz(i,j,k+1) - Bvecx(i,j,k) = Bvecx(i,j,k+1) - Bvecy(i,j,k) = Bvecy(i,j,k+1) - Bvecz(i,j,k) = Bvecz(i,j,k+1) - if(clean_divergence.ne.0) then - psidc(i,j,k) = psidc(i,j,k+1) - endif - - psi4pt = 1.d0 - 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 prim2conM(GRHydro_eos_handle,psi4pt*gxx(i,j,k),& - psi4pt*gxy(i,j,k),psi4pt*gxz(i,j,k),& - psi4pt*gyy(i,j,k),psi4pt*gyz(i,j,k),psi4pt*gzz(i,j,k),& - det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& - rho(i,j,k),velx(i,j,k),vely(i,j,k),velz(i,j,k),& - eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) - - end if - - end do - end do - end do - - end if - - end if - -end subroutine GRHydro_OutflowBoundariesM - - - File [modified]: make.code.defn Delta lines: +0 -1 =================================================================== --- trunk/src/make.code.defn 2011-03-12 04:06:44 UTC (rev 222) +++ trunk/src/make.code.defn 2011-03-12 14:25:11 UTC (rev 223) @@ -28,7 +28,6 @@ GRHydro_Reconstruct.F90 \ GRHydro_ReconstructPoly.F90 \ GRHydro_RegisterMask.c \ - GRHydro_RegisterGZ.cc \ GRHydro_RegisterVars.cc \ GRHydro_RiemannSolve.F90 \ GRHydro_RoeAverage.F90 \ Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +0 -11 =================================================================== --- trunk/interface.ccl 2011-03-12 04:06:44 UTC (rev 222) +++ trunk/interface.ccl 2011-03-12 14:25:11 UTC (rev 223) @@ -206,18 +206,7 @@ CCTK_REAL IN z ) USES FUNCTION SetDriftCorrectPosition -############################################################## -### Functions provided by GZPatchSystem for registration ### -############################################################## -CCTK_INT FUNCTION GZPatchSystem_register_sync(CCTK_STRING IN cactus_group_name) -USES FUNCTION GZPatchSystem_register_sync -CCTK_INT FUNCTION \ - GZPatchSystem_register_cxform(CCTK_INT IN time_level, \ - CCTK_STRING IN cactus_group_name) -USES FUNCTION GZPatchSystem_register_cxform - - ####################################################### ### Functions provided by the Omni EOS interface ### ####################################################### File [modified]: param.ccl Delta lines: +0 -11 =================================================================== --- trunk/param.ccl 2011-03-12 04:06:44 UTC (rev 222) +++ trunk/param.ccl 2011-03-12 14:25:11 UTC (rev 223) @@ -515,17 +515,6 @@ ".*" :: "Should be in the full Thorn::GF format" } "" -#Setting outflow boundaries over only some of the domain for multipatch runs - -BOOLEAN outflow_boundaries "Use the outflow boundary conditions?" -{ -} "no" - -REAL outflowboundary_normal[3] "The normal to the plane; to the right of this outflow conditions will be set" -{ - *:* :: "Anything" -} 0.0 - # NaN detection level INT GRHydro_NaN_verbose "The warning level for NaNs occuring within GRHydro" File [modified]: schedule.ccl Delta lines: +0 -21 =================================================================== --- trunk/schedule.ccl 2011-03-12 04:06:44 UTC (rev 222) +++ trunk/schedule.ccl 2011-03-12 14:25:11 UTC (rev 223) @@ -212,20 +212,7 @@ # LANG: C # } "Set up the weighting terms for the fluxes" -################################### -### Register with GZPatchSystem ### -################################### -SCHEDULE GROUP GZPatchSystem_register -{ -} "Tell Cactus that this group exists, but is not scheduled from here" - -SCHEDULE GRHydro_register_GZPatchSystem IN GZPatchSystem_register -{ - LANG: C - OPTIONS: meta -} "register to-be-interpatch-synchronized variables with GZPatchSystem" - ################################# ### Set the handle for the EOS ### ################################## @@ -1002,14 +989,6 @@ STORAGE:GRHydro_tracer_rhs } -if (outflow_boundaries) -{ - schedule GRHydro_OutflowBoundaries IN HydroBase_PostStep BEFORE GRHydro_Bound - { - LANG: Fortran - } "Outflow boundaries over only some of the domain" -} - # This should not be used anymore and should be removed after some time schedule group Do_GRHydro_Boundaries IN HydroBase_Boundaries {

1 0

[svn:einsteintoolkit] GRHydro/trunk/test/ (Rev. 222)
by cott＠tapir.caltech.edu 11 Mar '11

11 Mar '11

User: cott Date: 2011/03/11 10:06 PM Modified: /trunk/test/ GRHydro_test_shock.par, GRHydro_test_shock_ppm.par, GRHydro_test_tov_ppm.par, GRHydro_test_tov_ppm_ML.par, GRHydro_test_tov_ppm_ML_disable_internal_excision.par, GRHydro_test_tov_ppm_disable_internal_excision.par, GRHydro_test_tov_ppm_no_trp.par, GRHydro_test_tov_ppm_no_trp_ML.par Log: * modify test suite parameter files: * those using carpet now activate loopcontrol * change GRHydro::w_lorentz to HydroBase::w_lorentz File Changes: Directory: /trunk/test/ ======================= File [modified]: GRHydro_test_shock.par Delta lines: +1 -1 =================================================================== --- trunk/test/GRHydro_test_shock.par 2011-03-12 03:16:20 UTC (rev 221) +++ trunk/test/GRHydro_test_shock.par 2011-03-12 04:06:44 UTC (rev 222) @@ -28,7 +28,7 @@ IOBasic::outInfo_vars = "HydroBase::rho" IOASCII::out1D_every = 1 -IOASCII::out1D_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon" +IOASCII::out1D_vars = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon" ActiveThorns = "nanchecker mol" File [modified]: GRHydro_test_shock_ppm.par Delta lines: +1 -1 =================================================================== --- trunk/test/GRHydro_test_shock_ppm.par 2011-03-12 03:16:20 UTC (rev 221) +++ trunk/test/GRHydro_test_shock_ppm.par 2011-03-12 04:06:44 UTC (rev 222) @@ -28,7 +28,7 @@ IOBasic::outInfo_vars = "HydroBase::rho" IOASCII::out1D_every = 1 -IOASCII::out1D_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon" +IOASCII::out1D_vars = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon" ActiveThorns = "nanchecker mol" File [modified]: GRHydro_test_tov_ppm.par Delta lines: +2 -2 =================================================================== --- trunk/test/GRHydro_test_tov_ppm.par 2011-03-12 03:16:20 UTC (rev 221) +++ trunk/test/GRHydro_test_tov_ppm.par 2011-03-12 04:06:44 UTC (rev 222) @@ -74,8 +74,8 @@ IO::out_dir = "GRHydro_test_tov_ppm" IOBasic::outScalar_every = 1 -IOBasic::outScalar_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum" +IOBasic::outScalar_vars = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum" IOASCII::out1D_every = 1 -IOASCII::out1D_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum" +IOASCII::out1D_vars = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum" IOASCII::out_format = ".10e" File [modified]: GRHydro_test_tov_ppm_ML.par Delta lines: +3 -3 =================================================================== --- trunk/test/GRHydro_test_tov_ppm_ML.par 2011-03-12 03:16:20 UTC (rev 221) +++ trunk/test/GRHydro_test_tov_ppm_ML.par 2011-03-12 04:06:44 UTC (rev 222) @@ -1,6 +1,6 @@ !DESC "TOV from TOVSolverC, ICN, Marquina, PPM, Polytrope" -ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni ML_BSSN_O2 ML_BSSN_O2_Helper GenericFD TmunuBase NewRad admconstraints Constants localreduce InitBase" +ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni ML_BSSN_O2 ML_BSSN_O2_Helper GenericFD TmunuBase NewRad admconstraints Constants localreduce InitBase LoopControl" TmunuBase::stress_energy_storage = yes TmunuBase::stress_energy_at_RHS = yes @@ -89,8 +89,8 @@ IO::out_dir = $parfile IOBasic::outScalar_every = 1 -IOBasic::outScalar_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum" +IOBasic::outScalar_vars = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum" IOASCII::out1D_every = 1 -IOASCII::out1D_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum" +IOASCII::out1D_vars = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum" IOASCII::out_format = ".10e" File [modified]: GRHydro_test_tov_ppm_ML_disable_internal_excision.par Delta lines: +3 -3 =================================================================== --- trunk/test/GRHydro_test_tov_ppm_ML_disable_internal_excision.par 2011-03-12 03:16:20 UTC (rev 221) +++ trunk/test/GRHydro_test_tov_ppm_ML_disable_internal_excision.par 2011-03-12 04:06:44 UTC (rev 222) @@ -1,6 +1,6 @@ !DESC "TOV from TOVSolverC, ICN, Marquina, PPM, Polytrope" -ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni ML_BSSN_O2 ML_BSSN_O2_Helper GenericFD TmunuBase NewRad admconstraints Constants localreduce InitBase" +ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni ML_BSSN_O2 ML_BSSN_O2_Helper GenericFD TmunuBase NewRad admconstraints Constants localreduce InitBase LoopControl" TmunuBase::stress_energy_storage = yes TmunuBase::stress_energy_at_RHS = yes @@ -91,8 +91,8 @@ IO::out_dir = $parfile IOBasic::outScalar_every = 1 -IOBasic::outScalar_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum" +IOBasic::outScalar_vars = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum" IOASCII::out1D_every = 1 -IOASCII::out1D_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum" +IOASCII::out1D_vars = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum" IOASCII::out_format = ".10e" File [modified]: GRHydro_test_tov_ppm_disable_internal_excision.par Delta lines: +2 -2 =================================================================== --- trunk/test/GRHydro_test_tov_ppm_disable_internal_excision.par 2011-03-12 03:16:20 UTC (rev 221) +++ trunk/test/GRHydro_test_tov_ppm_disable_internal_excision.par 2011-03-12 04:06:44 UTC (rev 222) @@ -76,8 +76,8 @@ IO::out_dir = $parfile IOBasic::outScalar_every = 1 -IOBasic::outScalar_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum" +IOBasic::outScalar_vars = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum" IOASCII::out1D_every = 1 -IOASCII::out1D_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum" +IOASCII::out1D_vars = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum" IOASCII::out_format = ".10e" File [modified]: GRHydro_test_tov_ppm_no_trp.par Delta lines: +2 -2 =================================================================== --- trunk/test/GRHydro_test_tov_ppm_no_trp.par 2011-03-12 03:16:20 UTC (rev 221) +++ trunk/test/GRHydro_test_tov_ppm_no_trp.par 2011-03-12 04:06:44 UTC (rev 222) @@ -75,8 +75,8 @@ IO::out_fileinfo="none" IOBasic::outScalar_every = 1 -IOBasic::outScalar_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum" +IOBasic::outScalar_vars = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum" IOASCII::out1D_every = 1 -IOASCII::out1D_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum" +IOASCII::out1D_vars = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum" IOASCII::out_format = ".10e" File [modified]: GRHydro_test_tov_ppm_no_trp_ML.par Delta lines: +3 -3 =================================================================== --- trunk/test/GRHydro_test_tov_ppm_no_trp_ML.par 2011-03-12 03:16:20 UTC (rev 221) +++ trunk/test/GRHydro_test_tov_ppm_no_trp_ML.par 2011-03-12 04:06:44 UTC (rev 222) @@ -1,6 +1,6 @@ !DESC "TOV from TOVSolverC, ICN, Marquina, PPM, Polytrope" -ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni ML_BSSN_O2 ML_BSSN_O2_Helper GenericFD TmunuBase NewRad admconstraints Constants localreduce Tmunubase InitBase" +ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni ML_BSSN_O2 ML_BSSN_O2_Helper GenericFD TmunuBase NewRad admconstraints Constants localreduce Tmunubase InitBase LoopControl" TmunuBase::stress_energy_storage = yes TmunuBase::stress_energy_at_RHS = yes @@ -90,8 +90,8 @@ IO::out_fileinfo="none" IOBasic::outScalar_every = 1 -IOBasic::outScalar_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum" +IOBasic::outScalar_vars = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum" IOASCII::out1D_every = 1 -IOASCII::out1D_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum" +IOASCII::out1D_vars = "hydrobase::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum" IOASCII::out_format = ".10e"

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 221)
by cott＠tapir.caltech.edu 11 Mar '11

11 Mar '11

User: cott Date: 2011/03/11 09:16 PM Modified: /trunk/src/ GRHydro_Con2Prim.F90 Log: * fix OMP bug in _hot part of c2p File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +20 -31 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2011-03-02 14:57:32 UTC (rev 220) +++ trunk/src/GRHydro_Con2Prim.F90 2011-03-12 03:16:20 UTC (rev 221) @@ -179,6 +179,7 @@ z(i,j,k),r(i,j,k),epsnegative,GRHydro_rho_min,pmin, epsmin, & GRHydro_reflevel, GRHydro_C2P_failed(i,j,k), local_perc_ptol) if(GRHydro_C2P_failed(i,j,k).eq.2) then + !$OMP CRITICAL(c2po1) if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then call CCTK_WARN(1,"Convergence problem in c2p") write(warnline,"(A10,i5)") "reflevel: ",GRHydro_reflevel @@ -190,6 +191,7 @@ call CCTK_WARN(1,warnline) call CCTK_WARN(0,"Aborting!!!") endif + !$OMP END CRITICAL(c2po1) endif endif endif @@ -525,7 +527,7 @@ integer :: nfudgemax,nf n=1;keytemp=0;anyerr=0;keyerr(1)=0 temp0 = 0.0d0;xpress = 0.0d0 - nf=0;nfudgemax=10 + nf=0;nfudgemax=15 ! end EOS Omni vars failinfomode = 1 @@ -536,11 +538,12 @@ epsminl = 1.0e-5 if(con2prim_oct_hack.ne.0.and.& - x .lt. 0.0d0 .or.& - y .lt. 0.0d0 .or.& - z .lt. 0.0d0) then - failwarnmode = 2 - failinfomode = 2 + (x .lt. -1.0d-12 .or.& + y .lt. -1.0d-12 .or.& + z .lt. -1.0d-12)) then + return +! failwarnmode = 2 +! failinfomode = 2 endif !!$ Undensitize the variables @@ -560,8 +563,8 @@ pold = max(1.d-15,xpress) ! error handling if(anyerr.ne.0) then + !$OMP CRITICAL(c2p0) if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then - !OMP CRITICAL call CCTK_WARN(failinfomode,"EOS error in c2p 0") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) @@ -570,8 +573,7 @@ write(warnline,"(A7,i8)") "code: ",keyerr(1) call CCTK_WARN(failinfomode,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel - write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel - !OMP END CRITICAL + call CCTK_WARN(failinfomode,warnline) if(keyerr(1).eq.667.and.GRHydro_eos_hot_eps_fix.ne.0) then ! Handling of the case when no new temperature can be ! found for a given epsilon. The amount of times @@ -585,14 +587,11 @@ rho,epsilon,temp,ye,xpress,keyerr,anyerr) nf = nf + 1 enddo - !OMP CRITICAL write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf call CCTK_WARN(failinfomode,warnline) write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) - !OMP END CRITICAL if(nf.gt.nfudgemax) then - !OMP CRITICAL call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) @@ -603,15 +602,14 @@ write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") - !OMP END CRITICAL endif else - !OMP CRITICAL call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") - !OMP END CRITICAL + endif endif + !$OMP END CRITICAL(c2p0) endif !!$ Check that the variables have a chance of being physical @@ -644,8 +642,8 @@ rho,epsilon,temp,ye,xpress,keyerr,anyerr) ! error handling if(anyerr.ne.0) then + !$OMP CRITICAL(c2p1) if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then - !OMP CRITICAL call CCTK_WARN(failinfomode,"EOS error in c2p 1") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) @@ -655,7 +653,6 @@ call CCTK_WARN(failinfomode,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(failinfomode,warnline) - !OMP END CRITICAL if(keyerr(1).eq.667.and.GRHydro_eos_hot_eps_fix.ne.0) then ! Handling of the case when no new temperature can be ! found for a given epsilon. The amount of times @@ -669,14 +666,11 @@ rho,epsilon,temp,ye,xpress,keyerr,anyerr) nf = nf + 1 enddo - !OMP CRITICAL write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf call CCTK_WARN(failinfomode,warnline) write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) - !OMP END CRITICAL if(nf.gt.nfudgemax) then - !OMP CRITICAL call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) @@ -687,15 +681,13 @@ write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") - !OMP END CRITICAL endif else - !OMP CRITICAL call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") - !OMP END CRITICAL endif endif + !$OMP END CRITICAL(c2p1) endif f = pold - xpress @@ -746,8 +738,8 @@ rho,epsilon,temp,ye,xpress,keyerr,anyerr) ! error handling if(anyerr.ne.0) then + !$OMP CRITICAL(c2p2) if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then - !OMP CRITICAL call CCTK_WARN(failinfomode,"EOS error in c2p 2") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) @@ -757,7 +749,6 @@ call CCTK_WARN(failinfomode,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(failinfomode,warnline) - !OMP END CRITICAL if(keyerr(1).eq.667.and.GRHydro_eos_hot_eps_fix.ne.0) then ! Handling of the case when no new temperature can be ! found for a given epsilon. The amount of times @@ -771,14 +762,11 @@ rho,epsilon,temp,ye,xpress,keyerr,anyerr) nf = nf + 1 enddo - !OMP CRITICAL write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf call CCTK_WARN(failinfomode,warnline) write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) - !OMP END CRITICAL if(nf.gt.nfudgemax) then - !OMP CRITICAL call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) @@ -789,15 +777,14 @@ write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") - !OMP END CRITICAL endif else - !OMP CRITICAL call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") - !OMP END CRITICAL + endif endif + !$OMP END CRITICAL(c2p2) endif f = pnew - xpress @@ -836,6 +823,7 @@ ! error handling if(anyerr.ne.0) then + !$OMP CRITICAL(c2p3) if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then call CCTK_WARN(failinfomode,"EOS error in c2p 3") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z @@ -848,6 +836,7 @@ call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") endif + !$OMP END CRITICAL(c2p3) endif f = pold - xpress

1 0

[svn:einsteintoolkit] www/about/members/ (Rev. 465)
by knarf＠cct.lsu.edu 09 Mar '11

09 Mar '11

User: knarf Date: 2011/03/09 10:11 AM Modified: /about/members/ members.txt Log: add Peter Kalmus File Changes: Directory: /about/members/ ========================== File [modified]: members.txt Delta lines: +1 -0 =================================================================== --- about/members/members.txt 2011-03-04 17:30:29 UTC (rev 464) +++ about/members/members.txt 2011-03-09 16:11:15 UTC (rev 465) @@ -18,6 +18,7 @@ http://www.tapir.caltech.edu/ California Institute of Technology http://www.tapir.caltech.edu/~cott/ Christian D. Ott + Peter Kalmus Christian Reisswig BÃ©la SzilÃ¡gyi

1 0

[svn:einsteintoolkit] IDAnalyticBH/trunk/src/ (Rev. 179)
by schnetter＠cct.lsu.edu 08 Mar '11

08 Mar '11

User: eschnett Date: 2011/03/08 11:04 AM Modified: /trunk/src/ Kerr.c Log: The Kerr initial data (in EinsteinInitialData?/IDAnalyticBH/src/Kerr.c) has a defect along the z-axis (that is, the spin axis of the hole). The three-metric (for instance) is not smooth across this axis, leading to discontinuities in second spatial derivatives near there. This appears to be due to overly crude safety measures protecting from division by zero when calculating this data. Tweaking these measures for more self-consistency leads to much smoother behaviour. I'm attaching a simple patch that fixes the problem at least for metric_type = physical. [Patch from Bernard Kelly] File Changes: Directory: /trunk/src/ ====================== File [modified]: Kerr.c Delta lines: +5 -1 =================================================================== --- trunk/src/Kerr.c 2011-02-28 20:09:09 UTC (rev 178) +++ trunk/src/Kerr.c 2011-03-08 17:04:33 UTC (rev 179) @@ -117,8 +117,12 @@ /* Define coordinate functions */ xx=x[i]; yy=y[i]; zz=z[i]; rho_2=xx*xx+yy*yy; - if (rho_2<epsilon) rho_2=epsilon; rho=sqrt(rho_2); + if (rho<epsilon) { + xx=epsilon; + rho_2=xx*xx+yy*yy; + rho=sqrt(rho_2); + } R_2=rho_2+zz*zz; R=sqrt(R_2); R_3=R*R_2;

1 0

[svn:einsteintoolkit] Paper_EinsteinToolkit_2010/ (Rev. 33)
by knarf＠cct.lsu.edu 07 Mar '11

07 Mar '11

User: knarf Date: 2011/03/07 09:53 AM Added: /examples/tov/ tov.rpar Log: tov parameter file generator Directory Changes: Directory: /svn:executable/ =========================== + * File Changes: Directory: /examples/tov/ ========================= File [added]: tov.rpar Delta lines: +239 -0 =================================================================== --- examples/tov/tov.rpar (rev 0) +++ examples/tov/tov.rpar 2011-03-07 15:53:14 UTC (rev 33) @@ -0,0 +1,239 @@ +#!/usr/bin/perl -w +use strict; + +foreach my $res ((8, 4, 2)) { + + my $out_every = 256/$res; + my $par = <<PAR_EOF; +## mclachlan tov_static +ActiveThorns = "Time MoL" +ActiveThorns = "Coordbase CartGrid3d Boundary StaticConformal" +ActiveThorns = "SymBase ADMBase TmunuBase HydroBase InitBase ADMCoupling ADMMacros" +ActiveThorns = "IOUtil" +#ActiveThorns = "Formaline" +ActiveThorns = "SpaceMask CoordGauge Constants LocalReduce aeilocalinterp LoopControl" +ActiveThorns = "Carpet CarpetLib CarpetReduce CarpetRegrid2 CarpetInterp" +ActiveThorns = "CarpetIOASCII CarpetIOScalar CarpetIOHDF5 CarpetIOBasic" + +ActiveThorns = "ADMConstraints" + +# grid parameters +CartGrid3D::type = "coordbase" +CartGrid3D::domain = "full" +CartGrid3D::avoid_origin = "no" +CoordBase::xmin = 0.0 +CoordBase::ymin = 0.0 +CoordBase::zmin = 0.0 +CoordBase::xmax = 240.0 +CoordBase::ymax = 240.0 +CoordBase::zmax = 240.0 +CoordBase::dx = $res +CoordBase::dy = $res +CoordBase::dz = $res + +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 = 1 +CoordBase::boundary_shiftout_y_lower = 1 +CoordBase::boundary_shiftout_z_lower = 1 +CoordBase::boundary_shiftout_x_upper = 0 +CoordBase::boundary_shiftout_y_upper = 0 +CoordBase::boundary_shiftout_z_upper = 0 + + + + +ActiveThorns = "ReflectionSymmetry" + +ReflectionSymmetry::reflection_x = "yes" +ReflectionSymmetry::reflection_y = "yes" +ReflectionSymmetry::reflection_z = "yes" +ReflectionSymmetry::avoid_origin_x = "no" +ReflectionSymmetry::avoid_origin_y = "no" +ReflectionSymmetry::avoid_origin_z = "no" + + + +TmunuBase::stress_energy_storage = yes +TmunuBase::stress_energy_at_RHS = yes +TmunuBase::timelevels = 1 +TmunuBase::prolongation_type = none + +HydroBase::timelevels = 3 + +ADMMacros::spatial_order = 4 + +ADMBase::metric_type = "physical" + +ADMConstraints::bound = "static" +ADMConstraints::constraints_timelevels = 3 +ADMConstraints::constraints_persist = yes + +SpaceMask::use_mask = "yes" + +Cactus::terminate = "time" +Cactus::cctk_final_time = 1000 + +Carpet::domain_from_coordbase = "yes" +Carpet::enable_all_storage = no +Carpet::use_buffer_zones = "yes" + +Carpet::poison_new_timelevels = "yes" +Carpet::check_for_poison = "no" +Carpet::poison_value = 113 + +Carpet::init_3_timelevels = no +Carpet::init_fill_timelevels = "yes" + +CarpetLib::poison_new_memory = "yes" +CarpetLib::poison_value = 114 + +# system specific Carpet paramters +Carpet::max_refinement_levels = 10 +driver::ghost_size = 3 +Carpet::prolongation_order_space = 3 +Carpet::prolongation_order_time = 2 + +CarpetRegrid2::regrid_every = 0 +CarpetRegrid2::num_centres = 1 + +CarpetRegrid2::num_levels_1 = 5 +CarpetRegrid2::radius_1[1] =120.0 +CarpetRegrid2::radius_1[2] = 60.0 +CarpetRegrid2::radius_1[3] = 30.0 +CarpetRegrid2::radius_1[4] = 15.0 + + +time::dtfac = 0.25 +MoL::ODE_Method = "rk4" +MoL::MoL_Intermediate_Steps = 4 +MoL::MoL_Num_Scratch_Levels = 1 + +# check all physical variables for NaNs +ActiveThorns = "NaNChecker" +#NaNChecker::check_every = 1 +#NaNChecker::action_if_found = "just warn" #"terminate", "just warn", "abort" +#NaNChecker::check_vars = "ADMBase::metric ADMBase::lapse ADMBase::shift HydroBase::rho HydroBase::eps HydroBase::press HydroBase::vel" + +## Lapse Condition: \\partial_t alpha = - alpha K +## Shift Condition: \\partial_t beta^i = 0 + +# Hydro paramters +ActiveThorns = "EOS_Omni" +ActiveThorns = "GRHydro" + +HydroBase::evolution_method = "GRHydro" + +GRHydro::riemann_solver = "Marquina" +GRHydro::GRHydro_eos_type = "Polytype" +GRHydro::GRHydro_eos_table = "2D_Polytrope" +GRHydro::recon_method = "ppm" +GRHydro::GRHydro_stencil = 3 +GRHydro::bound = "none" +GRHydro::rho_abs_min = 1.e-10 +#GRHydro::GRHydro = 18 # Tmunu(10), rho,press,eps,w_lorentz,vel, tau +#GRHydro::GRHydro = 10 # gij(6), alpha, beta(3) + + +ActiveThorns = "GenericFD NewRad" +ActiveThorns = "ML_BSSN ML_BSSN_Helper" +ADMBase::evolution_method = "ML_BSSN" +ADMBase::lapse_evolution_method = "ML_BSSN" +ADMBase::shift_evolution_method = "ML_BSSN" +ADMBase::dtlapse_evolution_method= "ML_BSSN" +ADMBase::dtshift_evolution_method= "ML_BSSN" + +TmunuBase::support_old_CalcTmunu_mechanism = "no" + +ML_BSSN::timelevels = 3 + +ML_BSSN::harmonicN = 1 # 1+log +ML_BSSN::harmonicF = 1.0 # 1+log +ML_BSSN::LapseACoeff = 1.0 +ML_BSSN::ShiftBCoeff = 1.0 +ML_BSSN::ShiftGammaCoeff = 0.0 +ML_BSSN::AlphaDriver = 0.0 +ML_BSSN::BetaDriver = 0.0 +ML_BSSN::LapseAdvectionCoeff = 0.0 +ML_BSSN::ShiftAdvectionCoeff = 0.0 + +ML_BSSN::MinimumLapse = 1.0e-8 + +ML_BSSN::my_initial_boundary_condition = "extrapolate-gammas" +ML_BSSN::my_rhs_boundary_condition = "NewRad" + +ML_BSSN::ML_log_confac_bound = "none" +ML_BSSN::ML_metric_bound = "none" +ML_BSSN::ML_Gamma_bound = "none" +ML_BSSN::ML_trace_curv_bound = "none" +ML_BSSN::ML_curv_bound = "none" +ML_BSSN::ML_lapse_bound = "none" +ML_BSSN::ML_dtlapse_bound = "none" +ML_BSSN::ML_shift_bound = "none" +ML_BSSN::ML_dtshift_bound = "none" + + + +# init parameters +InitBase::initial_data_setup_method = "init_some_levels" + +ActiveThorns = "TOVSolver" + +ADMBase::initial_data = "tov" +ADMBase::initial_lapse = "tov" +ADMBase::initial_shift = "tov" +ADMBase::initial_dtlapse = "zero" +ADMBase::initial_dtshift = "zero" + +TOVSolver::TOV_Rho_Central[0] = 1.28e-3 +TOVSolver::TOV_Gamma[0] = 2.0 +TOVSolver::TOV_K[0] = 100.0 + +# I/O + +IO::out_dir = \$parfile + +IOBasic::outInfo_every = $out_every +IOBasic::outInfo_vars = "HydroBase::rho ADMBase::lapse" + +IOScalar::outScalar_every = $out_every +IOScalar::one_file_per_group = yes +IOScalar::outScalar_vars = " + HydroBase::rho + HydroBase::press + HydroBase::eps + HydroBase::vel + ADMBase::lapse + ADMBase::metric + ADMBase::curv + ADMConstraints::ham + ADMConstraints::momentum +" + +IOASCII::out1D_every = $out_every +IOASCII::one_file_per_group = yes +IOASCII::output_symmetry_points = no +IOASCII::out3D_ghosts = no +IOASCII::out3D_outer_ghosts = no +IOASCII::out1D_vars = " + HydroBase::rho + HydroBase::press + HydroBase::eps + HydroBase::vel + ADMBase::lapse + ADMBase::metric + ADMBase::curv + ADMConstraints::ham + ADMConstraints::momentum +" +PAR_EOF + + open(OUT, ">tov_${res}.par"); + print OUT "$par"; + close(OUT); +} + Property changes on: examples/tov/tov.rpar ___________________________________________________________________

1 0

[svn:einsteintoolkit] www/about/members/ (Rev. 464)
by knarf＠cct.lsu.edu 04 Mar '11

04 Mar '11

User: knarf Date: 2011/03/04 11:30 AM Modified: /about/members/ members.txt Log: add Wolfgang Kastaun File Changes: Directory: /about/members/ ========================== File [modified]: members.txt Delta lines: +3 -0 =================================================================== --- about/members/members.txt 2011-02-13 04:02:21 UTC (rev 463) +++ about/members/members.txt 2011-03-04 17:30:29 UTC (rev 464) @@ -81,6 +81,9 @@ Seoul National University Hee Il Kim +http://www.sissa.it/main/ SISSA - International School for Advanced Studies + Wolfgang Kastaun + http://www.uib.es/ Universitat de les Illes Balears Sascha Husa Denis Pollney

1 0

[svn:einsteintoolkit] Multipole/trunk/src/ (Rev. 77)
by ian.hinder＠aei.mpg.de 03 Mar '11

03 Mar '11

User: hinder Date: 2011/03/03 09:42 AM Modified: /trunk/src/ multipole.cc Log: Remove extra debug output Increase max number of spin weights File Changes: Directory: /trunk/src/ ====================== File [modified]: multipole.cc Delta lines: +1 -4 =================================================================== --- trunk/src/multipole.cc 2011-03-03 15:42:47 UTC (rev 76) +++ trunk/src/multipole.cc 2011-03-03 15:42:59 UTC (rev 77) @@ -19,7 +19,7 @@ static const int var_name_length = 30; static const int max_vars = 10; -static const int max_spin_weights = 3; +static const int max_spin_weights = 10; static const int max_l_modes = 10; static const int max_m_modes = 2 * max_l_modes + 1; @@ -67,9 +67,6 @@ char buffer[buffer_length]; Util_TableGetInt(table, &v->spin_weight , "sw"); -///////////////////////////////////////////////////////////// -CCTK_VInfo(CCTK_THORNSTRING,"spinweight %d", v->spin_weight); -///////////////////////////////////////////////////////////// if (Util_TableGetString(table, buffer_length, buffer , "cmplx") >= 0) { v->imag_index = CCTK_VarIndex(buffer);

1 0

[svn:einsteintoolkit] Multipole/trunk/src/ (Rev. 76)
by ian.hinder＠aei.mpg.de 03 Mar '11

03 Mar '11

User: hinder Date: 2011/03/03 09:42 AM Modified: /trunk/src/ utils.cc Log: Correct check for whether to truncate output HDF5 file Previously a "first_time" variable was used to determine if truncation should happen. When decomposing multiple variables, this logic is incorrect. We now store the first_time information per output file. File Changes: Directory: /trunk/src/ ====================== File [modified]: utils.cc Delta lines: +21 -6 =================================================================== --- trunk/src/utils.cc 2011-02-23 14:23:41 UTC (rev 75) +++ trunk/src/utils.cc 2011-03-03 15:42:47 UTC (rev 76) @@ -2,6 +2,7 @@ #include <string.h> #include <math.h> #include <string> +#include <map> #include <sys/stat.h> #include <errno.h> #include <iostream> @@ -152,6 +153,12 @@ #ifdef HAVE_CAPABILITY_HDF5 +static bool file_exists(const string &name) +{ + struct stat sts; + return !(stat(name.c_str(), &sts) == -1 && errno == ENOENT); +} + bool dataset_exists(hid_t file, const string &dataset_name) { // To test whether a dataset exists, the recommended way in API 1.6 @@ -182,15 +189,23 @@ string output_name = out_dir + string("/") + basename; int status = 0; - static int first_time = true; + static map<string,bool> checked; // Has the given file been checked + // for truncation? map<*,bool> + // defaults to false - hid_t file = - (first_time && IO_TruncateOutputFiles(cctkGH)) ? - H5Fcreate(output_name.c_str(), H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT) : - H5Fopen(output_name.c_str(), H5F_ACC_RDWR, H5P_DEFAULT); + hid_t file; - first_time = false; + if (!file_exists(output_name) || (!checked[output_name] && IO_TruncateOutputFiles(cctkGH))) + { + file = H5Fcreate(output_name.c_str(), H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); + } + else + { + file = H5Fopen(output_name.c_str(), H5F_ACC_RDWR, H5P_DEFAULT); + } + checked[output_name] = true; + hid_t dataset = -1; if (dataset_exists(file, datasetname))

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits