Commits February 2012

commits@lists.einsteintoolkit.org

6 participants
32 discussions

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 314)
by reisswig＠tapir.caltech.edu 16 Feb '12

16 Feb '12

User: reisswig Date: 2012/02/16 05:18 PM Modified: /trunk/src/ GRHydro_Eigenproblem.F90, GRHydro_PPM.F90 Log: Cosmetic change to ePPM3. Improved handling of cs2 < 0. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2012-02-09 01:03:16 UTC (rev 313) +++ trunk/src/GRHydro_Eigenproblem.F90 2012-02-16 23:18:45 UTC (rev 314) @@ -87,7 +87,7 @@ if(cs2.lt.0.0d0) then if (abs(cs2) .gt. 1.0d-4) then - write(warnline,'(a50,6g16.7)') 'rho, dpdrho, press*dpdeps/rho**2, eps, press/rho: ', abs(cs2), rho, dpdrho, press * dpdeps / (rho**2), eps, press/rho + write(warnline,'(a50,6g16.7)') 'abs(cs2), rho, dpdrho, press*dpdeps/rho**2, eps, press/rho: ', abs(cs2), rho, dpdrho, press * dpdeps / (rho**2), eps, press/rho call CCTK_WARN(1,warnline) call CCTK_WARN(0,"cs2 < 0! Check speed of sound calculation!") else File [modified]: GRHydro_PPM.F90 Delta lines: +5 -5 =================================================================== --- trunk/src/GRHydro_PPM.F90 2012-02-09 01:03:16 UTC (rev 313) +++ trunk/src/GRHydro_PPM.F90 2012-02-16 23:18:45 UTC (rev 314) @@ -667,16 +667,16 @@ aplus(i) = a(i) &&\ endif &&\ endif &&\ - endif &&\ + endif &&\ trivial_rp(i-1) = .false. &&\ trivial_rp(i) = .false. &&\ else &&\ if (abs(daplus) .le. abs(a(i)) .and. abs(daminus) .le. abs(a(i))) then &&\ if (abs(daplus) .ge. 2.0d0*abs(daminus)) then &&\ - aplus(i) = a(i) - 2.0d0*(aminus(i) - a(i)) &&\ + aplus(i) = a(i) + 2.0d0*daminus &&\ else if (abs(daminus) .ge. 2.0d0*abs(daplus)) then &&\ - aminus(i) = a(i) - 2.0d0*(aplus(i) - a(i)) &&\ - end if &&\ + aminus(i) = a(i) - 2.0d0*daplus &&\ + end if &&\ else &&\ if (abs(daplus) .ge. 2.0d0*abs(daminus)) then &&\ aplus(i) = a(i) &&\ @@ -686,7 +686,7 @@ endif &&\ trivial_rp(i-1) = .false. &&\ trivial_rp(i) = .false. &&\ - endif + endif

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 13 Feb '12

13 Feb '12

changeset: 3443:66b62412ba15 tag: tip user: Erik Schnetter <schnetter(a)cct.lsu.edu> date: Mon Feb 13 21:32:31 2012 -0500 summary: CarpetLib: Only produce refluxing debug output with CarpetLib::verbose

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 13 Feb '12

13 Feb '12

changeset: 3441:05f574a33f5f user: Ian Hinder <ian.hinder(a)aei.mpg.de> date: Mon Feb 13 11:25:10 2012 +0100 summary: TimerNode.cc: Don't print "untimed" unless some child nodes have been printed changeset: 3442:b8f6509f865a tag: tip user: Ian Hinder <ian.hinder(a)aei.mpg.de> date: Mon Feb 13 11:25:13 2012 +0100 summary: Inform the Accelerator thorn that past timelevels have been filled on the host

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 313)
by cott＠tapir.caltech.edu 08 Feb '12

08 Feb '12

User: cott Date: 2012/02/08 07:03 PM Modified: /trunk/src/ GRHydro_EoSChangeGamma.F90 Log: make EOS change work with MP File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_EoSChangeGamma.F90 Delta lines: +53 -3 =================================================================== --- trunk/src/GRHydro_EoSChangeGamma.F90 2012-02-03 23:09:46 UTC (rev 312) +++ trunk/src/GRHydro_EoSChangeGamma.F90 2012-02-09 01:03:16 UTC (rev 313) @@ -148,6 +148,12 @@ implicit none + ! save memory when MP is not used + ! TARGET has to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + TARGET lvel, vel + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -158,6 +164,11 @@ CCTK_REAL, dimension(cctk_lsh(1),cctk_lsh(2),cctk_lsh(3)) :: Q + ! save memory when MP is not used + CCTK_INT :: GRHydro_UseGeneralCoordinates + CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 + CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup + !!$ Set up the fluid constants ! begin EOS Omni vars integer :: n,keytemp,anyerr,keyerr(1) @@ -174,12 +185,16 @@ local_Gamma = 1.0d0 + xpress/xeps local_K = xpress + call CCTK_INFO("Adjusting EOS via K change!") + if (abs(local_Gamma - 2.d0) < 1.d-10) then rho = -0.5d0/local_k+sqrt(0.25d0/local_k**2+(rho+initial_k*rho**2)/local_k) else if (abs(local_Gamma - 3.d0) < 1.d-10) then + call CCTK_WARN(0, "This part of the code is not tested!") + !!$ This code is probably just wrong. We have never used it anyway. Q = -9.d0 * local_k**2 * rho * (2.d0 + 3.d0 * initial_k * rho**2) + & sqrt(local_k**3 * (32.d0 + 81.d0 * local_k * rho**2 * & @@ -193,12 +208,47 @@ else call CCTK_WARN(0, "EoSChangeK only knows how to do Gamma=2 or 3!") end if - + press = local_k * rho**local_gamma - eps = local_k / (local_gamma - 1.d0) * rho**(local_gamma-1) + eps = local_k / (local_gamma - 1.d0) * rho**(local_gamma-1.0d0) - call Primitive2ConservativePolyCells(CCTK_ARGUMENTS) + ! save memory when MP is not used + if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then + g11 => gaa + g12 => gab + g13 => gac + g22 => gbb + g23 => gbc + g33 => gcc + vup => lvel + else + g11 => gxx + g12 => gxy + g13 => gxz + g22 => gyy + g23 => gyz + g33 => gzz + vup => vel + end if + do k = 1, cctk_lsh(3) + do j = 1, cctk_lsh(2) + do i = 1, cctk_lsh(1) + + det = SPATIAL_DETERMINANT(g11(i,j,k),g12(i,j,k),g13(i,j,k),\ + g22(i,j,k),g23(i,j,k),g33(i,j,k)) + call prim2conpolytype(GRHydro_polytrope_handle,g11(i,j,k),g12(i,j,k),& + g13(i,j,k),g22(i,j,k),g23(i,j,k),g33(i,j,k),& + det, dens(i,j,k),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)) + + end do + end do + end do + + + end subroutine GRHydro_EoSChangeK

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 08 Feb '12

08 Feb '12

changeset: 3439:7efc6383653e user: Erik Schnetter <schnetter(a)cct.lsu.edu> date: Wed Feb 08 14:08:15 2012 -0500 summary: Merge changeset: 3440:ec4a512b8ff8 tag: tip user: Erik Schnetter <schnetter(a)cct.lsu.edu> date: Wed Feb 08 14:10:19 2012 -0500 summary: CarpetRegrid2: Add periodic boundary conditions

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 07 Feb '12

07 Feb '12

changeset: 3438:345ca0edceba tag: tip user: roland.haas(a)physics.gatech.edu date: Tue Feb 07 13:17:14 2012 -0800 summary: CarpetLib: wrap some debugging-only assert statement in an if block

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 07 Feb '12

07 Feb '12

changeset: 3437:b262ebabc262 tag: tip user: roland.haas(a)physics.gatech.edu date: Tue Feb 07 00:27:36 2012 -0800 summary: CarpetIOHDF5: let the hdf5_slicer write out a cctk_nghostzones attribute which

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 06 Feb '12

06 Feb '12

changeset: 3436:00ae0c255b15 tag: tip user: Barry Wardell <barry.wardell(a)gmail.com> date: Mon Feb 06 20:41:09 2012 +0000 summary: CarpetLib: Improve prolongation with single precision.

1 0

[svn:einsteintoolkit] incoming/SphericalSlice/ (Rev. 59)
by roland.haas＠physics.gatech.edu 06 Feb '12

06 Feb '12

User: rhaas Date: 2012/02/06 01:24 PM Modified: /SphericalSlice/ schedule.ccl /SphericalSlice/src/ sync.cc Log: SphericalSlice: check fasterp_setup before use instead of relying on PostRegrid File Changes: Directory: /SphericalSlice/ =========================== File [modified]: schedule.ccl Delta lines: +0 -8 =================================================================== --- SphericalSlice/schedule.ccl 2011-11-29 19:54:16 UTC (rev 58) +++ SphericalSlice/schedule.ccl 2012-02-06 19:24:41 UTC (rev 59) @@ -68,11 +68,3 @@ OPTIONS: GLOBAL } "Check ss_info variables if those have been externally set and adapt internal variables accordingly." - - -SCHEDULE SphericalSlice_ForgetInterpSetup AT postregrid -{ - LANG: C - OPTIONS: global -} "Reset interpolator after regridding" - Directory: /SphericalSlice/src/ =============================== File [modified]: sync.cc Delta lines: +3 -28 =================================================================== --- SphericalSlice/src/sync.cc 2011-11-29 19:54:16 UTC (rev 58) +++ SphericalSlice/src/sync.cc 2012-02-06 19:24:41 UTC (rev 59) @@ -86,7 +86,9 @@ // set up the interpolation assert(interp_setups.size() > slices_1patch(INDEX1P(varno[0]), 0).ID()); interp_setup_t* &interp_setup = interp_setups[slices_1patch(INDEX1P(varno[0]), 0).ID()]; - if (not interp_setup) { + if (not interp_setup or interp_setup->fasterp_setup->outofdate()) { + if (interp_setup and interp_setup->fasterp_setup->outofdate()) + delete interp_setup; interp_setup = new interp_setup_t(slices_1patch(INDEX1P(varno[0]), 0).lsh(0)[0] * slices_1patch(INDEX1P(varno[0]), 0).lsh(0)[1]); // allocate storage for coordinates @@ -335,30 +337,3 @@ return 0; } - - - -extern"C" void SphericalSlice_ForgetInterpSetup(CCTK_ARGUMENTS) -{ - DECLARE_CCTK_ARGUMENTS; - DECLARE_CCTK_PARAMETERS; - - for (int i=0; i < interp_setups.size(); ++i) - { - - if (interp_setups.AT(i)) - { - //CCTK_VInfo (CCTK_THORNSTRING, - // "Forgetting interpolation setup for sphere ", - // i); - delete interp_setups.AT(i); - interp_setups.AT(i) = NULL; - } - } -} - - - - - -

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 05 Feb '12

05 Feb '12

changeset: 3435:7b0b7bf8dc00 tag: tip user: Erik Schnetter <schnetter(a)cct.lsu.edu> date: Sun Feb 05 21:57:12 2012 -0500 summary: CarpetLib: Allow larger errors in single precision

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits February 2012