Commits January 2013

commits@lists.einsteintoolkit.org

9 participants
94 discussions

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 453)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_Macros.h, GRHydro_Minima.F90, GRHydro_Reconstruct.F90, GRHydro_UpdateMask.F90 Log: GRHydro: Introduce variable atmopshere level / tolerance as function of radius. Off by default. From: Christian Reisswig <reisswig(a)scriwalker.(none)> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +28 -20 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2013-01-14 14:23:24 UTC (rev 452) +++ trunk/src/GRHydro_Con2Prim.F90 2013-01-14 14:23:27 UTC (rev 453) @@ -56,7 +56,7 @@ integer :: CCTK_MyProc integer :: i, j, k, itracer, nx, ny, nz - CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, det, pmin, epsmin + CCTK_REAL :: uxx, uxy, uxz, uyy, uyz, uzz, det, pmin, epsmin, dummy1, dummy2 logical :: epsnegative character*256 :: warnline @@ -112,7 +112,7 @@ !$OMP PARALLEL DO PRIVATE(i,j,k,itracer,& !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det, epsnegative, anyerr, keyerr, keytemp,& - !$OMP warnline) + !$OMP warnline, dummy1, dummy2) do k = 1, nz do j = 1, ny do i = 1, nx @@ -168,10 +168,11 @@ GRHydro_Y_e_min) endif - if ( dens(i,j,k) .le. sqrt(det)*GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then + !if ( dens(i,j,k) .le. sqrt(det)*GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then + IF_BELOW_ATMO(dens(i,j,k), sqrt(det)*GRHydro_rho_min, GRHydro_atmo_tolerance, r(i,j,k)) then - dens(i,j,k) = sqrt(det)*GRHydro_rho_min !/(1.d0+GRHydro_atmo_tolerance) - rho(i,j,k) = GRHydro_rho_min + SET_ATMO_MIN(dens(i,j,k), sqrt(det)*GRHydro_rho_min, r(i,j,k)) !sqrt(det)*GRHydro_rho_min !/(1.d0+GRHydro_atmo_tolerance) + SET_ATMO_MIN(rho(i,j,k), GRHydro_rho_min, r(i,j,k)) !GRHydro_rho_min scon(i,j,k,:) = 0.d0 vup(i,j,k,:) = 0.d0 w_lorentz(i,j,k) = 1.d0 @@ -272,8 +273,8 @@ !$OMP END CRITICAL ! for safety, let's set the point to atmosphere - dens(i,j,k) = sqrt(det)*GRHydro_rho_min !/(1.d0+GRHydro_atmo_tolerance) - rho(i,j,k) = GRHydro_rho_min + dens(i,j,k) = ATMOMIN(sqrt(det)*GRHydro_rho_min, r(i,j,k)) !sqrt(det)*GRHydro_rho_min !/(1.d0+GRHydro_atmo_tolerance) + rho(i,j,k) = ATMOMIN(GRHydro_rho_min, r(i,j,k)) !GRHydro_rho_min scon(i,j,k,:) = 0.d0 vup(i,j,k,:) = 0.d0 w_lorentz(i,j,k) = 1.d0 @@ -413,7 +414,7 @@ CCTK_REAL s2, c0, c1, c2, c3, c4, f, df, ftol, v2, w, vlowx, vlowy, vlowz CCTK_INT count, i, handle, GRHydro_reflevel - CCTK_REAL GRHydro_C2P_failed + CCTK_REAL GRHydro_C2P_failed, dummy1, dummy2 CCTK_REAL udens, usx, usy, usz, utau, pold, pnew, epsold, epsnew, w2, & w2mhalf, temp1, drhobydpress, depsbydpress, dpressbydeps, dpressbydrho, pmin, epsmin character(len=200) warnline @@ -511,7 +512,7 @@ ! for safety, let's set the point to atmosphere - rho = GRHydro_rho_min + SET_ATMO_MIN(rho, GRHydro_rho_min, r) udens = rho dens = sqrt(det) * rho pnew = pmin @@ -682,8 +683,9 @@ !!$ Calculate primitive variables from root - if (rho .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then - rho = GRHydro_rho_min + !if (rho .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then + IF_BELOW_ATMO(rho, GRHydro_rho_min, GRHydro_atmo_tolerance, r) then + SET_ATMO_MIN(rho, GRHydro_rho_min, r) !GRHydro_rho_min udens = rho dens = sqrt(det) * rho ! epsilon = (sqrt( (utau + pnew + udens)**2) - pnew - udens)/udens @@ -777,7 +779,7 @@ CCTK_REAL GRHydro_C2P_failed CCTK_REAL udens, usx, usy, usz, utau, pold, pnew, epsold, epsnew, w2, & w2mhalf, temp1, drhobydpress, depsbydpress, dpressbydeps, dpressbydrho, pmin, epsmin - CCTK_REAL epsminl,pminl,plow,tmp + CCTK_REAL epsminl,pminl,plow,tmp, dummy1, dummy2 CCTK_REAL local_perc_ptol character(len=256) warnline @@ -1218,8 +1220,9 @@ !!$ Calculate primitive variables from root - if (rho .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then - rho = GRHydro_rho_min + !if (rho .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then + IF_BELOW_ATMO(rho, GRHydro_rho_min, GRHydro_atmo_tolerance, r) then + SET_ATMO_MIN(rho, GRHydro_rho_min, r) !GRHydro_rho_min udens = rho dens = sqrt(det) * rho temp = GRHydro_hot_atmo_temp @@ -1660,7 +1663,7 @@ CCTK_REAL s2, f, df, vlowx, vlowy, vlowz CCTK_INT count, handle, GRHydro_reflevel CCTK_REAL udens, usx, usy, usz, rhoold, rhonew, epsold, epsnew, & - enthalpy, denthalpy, sqrtdet, invsqrtdet, invfac, GRHydro_C2P_failed + enthalpy, denthalpy, sqrtdet, invsqrtdet, invfac, GRHydro_C2P_failed, dummy1, dummy2 character(len=200) warnline ! begin EOS Omni vars @@ -1727,7 +1730,7 @@ !$OMP END CRITICAL ! for safety, let's set the point to atmosphere - rhonew = GRHydro_rho_min + SET_ATMO_MIN(rhonew, GRHydro_rho_min, r) udens = rhonew dens = sqrtdet * rhonew @@ -1792,8 +1795,10 @@ !!$ Calculate primitive variables from root - if (rhonew .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then - rhonew = GRHydro_rho_min + + !if (rhonew .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then + IF_BELOW_ATMO(rhonew, GRHydro_rho_min, GRHydro_atmo_tolerance, r) then + SET_ATMO_MIN(rhonew, GRHydro_rho_min, r) !GRHydro_rho_min udens = rhonew ! before 2009/10/07 dens was not reset and was used with its negative ! value below; this has since been changed, but the change produces @@ -2232,6 +2237,8 @@ integer :: i, j, k, nx, ny, nz character(len=300) warnline + CCTK_REAL :: dummy1, dummy2 + ! call CCTK_INFO("Checking the C2P failure mask.") @@ -2242,7 +2249,7 @@ ! do not check if told not to if(GRHydro_reflevel .lt. GRHydro_c2p_warn_from_reflevel) return - !$OMP PARALLEL DO PRIVATE(i,j,k) + !$OMP PARALLEL DO PRIVATE(i,j,k, dummy1, dummy2) do k = 1, nz do j = 1, ny do i = 1, nx @@ -2256,7 +2263,8 @@ cycle endif - if ( rho(i,j,k) .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then + !if ( rho(i,j,k) .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then + IF_BELOW_ATMO(rho(i,j,k), GRHydro_rho_min, GRHydro_atmo_tolerance, r(i,j,k)) then cycle end if File [modified]: GRHydro_Macros.h Delta lines: +28 -0 =================================================================== --- trunk/src/GRHydro_Macros.h 2013-01-14 14:23:24 UTC (rev 452) +++ trunk/src/GRHydro_Macros.h 2013-01-14 14:23:27 UTC (rev 453) @@ -10,3 +10,31 @@ #define DOTP2(gxx_,gxy_,gxz_,gyy_,gyz_,gzz_,x_,y_,z_) \ ( (gxx_)*(x_)**2+(gyy_)*(y_)**2+(gzz_)*(z_)**2+ \ 2.0*( (gxy_)*(x_)*(y_)+(gxz_)*(x_)*(z_)+(gyz_)*(y_)*(z_) ) ) + + +#define IF_BELOW_ATMO(rho, rho_min, rho_tol, r) \ + dummy1 = atmo_tolerance_radius &&\ + dummy2 = atmo_falloff_radius &&\ + if (r .gt. atmo_tolerance_radius) then &&\ + dummy1 = r &&\ + endif &&\ + if (r .gt. atmo_falloff_radius) then &&\ + dummy2 = r &&\ + endif &&\ + if (rho .le. rho_min*(1.0d0 + rho_tol * (dummy1/atmo_tolerance_radius)**atmo_tolerance_power) * (atmo_falloff_radius/dummy2)**atmo_falloff_power) + + + +!#define ATMOCHECK(rho, rho_min, rho_tol, r) \ +! (atmo_type .eq. 0 .and. rho .le. rho_min*(1.0d0 + rho_tol)) .or. \ +! (atmo_type .eq. 1 .and. rho .le. rho_min*(1.0d0 + rho_tol * (atmo_tolerance_radius/r)**atmo_tolerance_power)) .or. \ +! (atmo_type .eq. 2 .and. rho .le. rho_min*(1.d00 + rho_tol) * (atmo_falloff_radius/r)**atmo_falloff_power) .or. \ +! (atmo_type .eq. 3 .and. rho .le. rho_min*(1.0d0 + rho_tol * (r/atmo_tolerance_radius)**atmo_tolerance_power) * (r/atmo_falloff_radius)**atmo_falloff_power) + + +#define SET_ATMO_MIN(rho_, rho_min, r) &&\ + dummy1 = atmo_falloff_radius &&\ + if (r .gt. atmo_falloff_radius) then &&\ + dummy1 = r &&\ + endif &&\ + rho_ = rho_min * (atmo_falloff_radius/dummy1)**atmo_falloff_power File [modified]: GRHydro_Minima.F90 Delta lines: +6 -2 =================================================================== --- trunk/src/GRHydro_Minima.F90 2013-01-14 14:23:24 UTC (rev 452) +++ trunk/src/GRHydro_Minima.F90 2013-01-14 14:23:27 UTC (rev 453) @@ -11,6 +11,8 @@ #include "cctk_Parameters.h" #include "cctk_Arguments.h" +#include "GRHydro_Macros.h" + /*@@ @routine GRHydro_Minima_Setup @date Mon Feb 25 11:25:27 2002 @@ -74,17 +76,19 @@ DECLARE_CCTK_PARAMETERS CCTK_INT i,j,k + CCTK_REAL dummy1 character(len=100) warnline do i=1,cctk_lsh(1) do j=1,cctk_lsh(2) do k=1,cctk_lsh(3) - if (rho(i,j,k) < GRHydro_rho_min) then + SET_ATMO_MIN(dummy1, GRHydro_rho_min, r(i,j,k)) + if (rho(i,j,k) < dummy1) then call CCTK_WARN(2,"rho<GRHydro_rho_min!!!") write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel call CCTK_WARN(2,warnline) - write(warnline,'(a25,g15.6)') 'GRHydro_rho_min: ',GRHydro_rho_min + write(warnline,'(a25,g15.6)') 'GRHydro_rho_min: ', dummy1 call CCTK_WARN(2,warnline) write(warnline,'(a25,g15.6)') 'rho: ',rho(i,j,k) call CCTK_WARN(2,warnline) File [modified]: GRHydro_Reconstruct.F90 Delta lines: +6 -4 =================================================================== --- trunk/src/GRHydro_Reconstruct.F90 2013-01-14 14:23:24 UTC (rev 452) +++ trunk/src/GRHydro_Reconstruct.F90 2013-01-14 14:23:27 UTC (rev 453) @@ -12,6 +12,7 @@ #include "cctk_Parameters.h" #include "cctk_Functions.h" +#include "GRHydro_Macros.h" #include "SpaceMask.h" /*@@ @@ -45,7 +46,7 @@ DECLARE_CCTK_FUNCTIONS CCTK_INT :: i,j,k - CCTK_REAL :: local_min_tracer + CCTK_REAL :: local_min_tracer, dummy1, dummy2 CCTK_INT :: type_bits, not_trivial CCTK_REAL :: agxx, agxy, agxz, agyy, agyz, agzz, w @@ -117,12 +118,13 @@ call CCTK_WARN(0, "Flux direction not x,y,z") end if - !$OMP PARALLEL DO PRIVATE(i,j,k, agxx, agxy, agxz, agyy, agyz, agzz, w) + !$OMP PARALLEL DO PRIVATE(i,j,k, agxx, agxy, agxz, agyy, agyz, agzz, w, dummy1, dummy2) do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 1 do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 1 do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 1 - if(rhoplus(i,j,k).lt.GRHydro_rho_min .or. & - rhominus(i,j,k).lt.GRHydro_rho_min) then + SET_ATMO_MIN(dummy2, GRHydro_rho_min, r(i,j,k)) + if(rhoplus(i,j,k).lt.dummy2 .or. & + rhominus(i,j,k).lt.dummy2) then rhoplus(i,j,k) = rho(i,j,k) rhominus(i,j,k) = rho(i,j,k) File [modified]: GRHydro_UpdateMask.F90 Delta lines: +18 -14 =================================================================== --- trunk/src/GRHydro_UpdateMask.F90 2013-01-14 14:23:24 UTC (rev 452) +++ trunk/src/GRHydro_UpdateMask.F90 2013-01-14 14:23:27 UTC (rev 453) @@ -198,14 +198,17 @@ implicit none DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS CCTK_INT :: i,j,k - - !$OMP PARALLEL DO PRIVATE(i,j,k) + CCTK_REAL :: dummy1, dummy2 + + !$OMP PARALLEL DO PRIVATE(i,j,k, dummy1,dummy2) do k = 1, cctk_lsh(3) do j = 1, cctk_lsh(2) do i = 1, cctk_lsh(1) - if (rho(i,j,k) .le. GRHydro_rho_min) then + !if (rho(i,j,k) .le. GRHydro_rho_min) then + IF_BELOW_ATMO(rho(i,j,k), GRHydro_rho_min, 0.0, r(i,j,k)) then atmosphere_mask(i,j,k) = 1 atmosphere_mask_real(i,j,k) = 1 end if @@ -247,7 +250,7 @@ DECLARE_CCTK_PARAMETERS CCTK_INT :: i, j, k - CCTK_REAL :: det + CCTK_REAL :: det, dummy1, dummy2 ! save memory when MP is not used @@ -283,14 +286,14 @@ if (verbose.eq.1) call CCTK_INFO("Entering AtmosphereReset.") -!$OMP PARALLEL DO PRIVATE(det,keytemp,i,j,k,anyerr,keyerr) +!$OMP PARALLEL DO PRIVATE(det,keytemp,i,j,k,anyerr,keyerr, dummy1, dummy2) do k = 1, cctk_lsh(3) do j = 1, cctk_lsh(2) do i = 1, cctk_lsh(1) if (atmosphere_mask(i, j, k) .ne. 0) then - rho(i,j,k) = GRHydro_rho_min + SET_ATMO_MIN(rho(i,j,k), GRHydro_rho_min, r(i,j,k)) velx(i,j,k) = 0.0d0 vely(i,j,k) = 0.0d0 velz(i,j,k) = 0.0d0 @@ -359,7 +362,7 @@ CCTK_INT :: i, j, k CCTK_REAL :: det - CCTK_REAL :: rho_min + CCTK_REAL :: rho_min, dummy1, dummy2 CCTK_INT :: eos_handle @@ -447,15 +450,16 @@ rho_min = rho_min * initial_atmosphere_factor endif -!$OMP PARALLEL DO PRIVATE(det,keytemp,i,j,k,anyerr,keyerr) +!$OMP PARALLEL DO PRIVATE(det,keytemp,i,j,k,anyerr,keyerr, dummy1, dummy2) do k = 1, cctk_lsh(3) do j = 1, cctk_lsh(2) do i = 1, cctk_lsh(1) - if (rho(i,j,k) .le. rho_min .or. & + SET_ATMO_MIN(dummy2, rho_min, r(i,j,k)) + if (rho(i,j,k) .le. dummy2 .or. & GRHydro_enable_internal_excision /= 0 .and. & hydro_excision_mask(i,j,k) .ne. 0) then - rho(i,j,k) = rho_min + SET_ATMO_MIN(rho(i,j,k), dummy2, r(i,j,k)) 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)) @@ -496,8 +500,8 @@ endif end if if (timelevels .gt. 1) then - if (rho_p(i,j,k) .le. rho_min) then - rho_p(i,j,k) = rho_min + if (rho_p(i,j,k) .le. dummy2) then + SET_ATMO_MIN(rho_p(i,j,k), dummy2, r(i,j,k)) velx_p(i,j,k) = 0.0d0 vely_p(i,j,k) = 0.0d0 velz_p(i,j,k) = 0.0d0 @@ -540,8 +544,8 @@ endif end if if (timelevels .gt. 2) then - if (rho_p_p(i,j,k) .le. rho_min) then - rho_p_p(i,j,k) = rho_min + if (rho_p_p(i,j,k) .le. dummy2) then + SET_ATMO_MIN(rho_p_p(i,j,k), dummy2, r(i,j,k)) velx_p_p(i,j,k) = 0.0d0 vely_p_p(i,j,k) = 0.0d0 velz_p_p(i,j,k) = 0.0d0 Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +20 -0 =================================================================== --- trunk/param.ccl 2013-01-14 14:23:24 UTC (rev 452) +++ trunk/param.ccl 2013-01-14 14:23:27 UTC (rev 453) @@ -455,6 +455,26 @@ 0.0: :: "Zero or larger. A useful value could be 0.0001" } 0.0 +REAL atmo_falloff_radius "The radius for which the atmosphere starts to falloff as (atmo_falloff_radius/r)**atmo_falloff_power" +{ + 0:* :: "Anything positive" +} 50.0 + +REAL atmo_falloff_power "The power at which the atmosphere level falls off as (atmo_falloof_radius/r)**atmo_falloff_power" +{ + 0:* :: "Anything positive" +} 0.0 + +REAL atmo_tolerance_radius "The radius for which the atmosphere tolerance starts to increase as (r/atmo_tolerance_radius)**atmo_tolerance_power" +{ + 0:* :: "Anything positive" +} 50.0 + +REAL atmo_tolerance_power "The power at which the atmosphere tolerance increases as (r/atmo_tolerance_radius)**atmo_tolerance_power" +{ + 0:* :: "Anything positive" +} 0.0 + BOOLEAN wk_atmosphere "Use some of Wolfgang Kastauns atmosphere tricks" { } "no"

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 452)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_Con2PrimM.F90 Log: GRHydro: disable in-AH polytrope call by default From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimM.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:23 UTC (rev 451) +++ trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:24 UTC (rev 452) @@ -270,7 +270,7 @@ if(evolve_temper.eq.0) then - if(sdet.ge.sqrtdet_thr) then + if(sqrtdet_thr.gt.0d0 .and. sdet.ge.sqrtdet_thr) then d2 = dens(i,j,k)**2 s2 = uxx*scon(i,j,k,1)**2 + uyy*scon(i,j,k,2)**2 & + uzz*scon(i,j,k,3)**2 & @@ -359,7 +359,7 @@ local_pgam=log(xpress(1)/local_K)/log(xrho(1)) sc = local_K*dens(i,j,k) - if(sdet.ge.sqrtdet_thr) then + if(sqrtdet_thr.gt.0d0 .and. sdet.ge.sqrtdet_thr) then GRHydro_C2P_failed(i,j,k) = 0 rho_tmp = rho(i,j,k) Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +2 -1 =================================================================== --- trunk/param.ccl 2013-01-14 14:23:23 UTC (rev 451) +++ trunk/param.ccl 2013-01-14 14:23:24 UTC (rev 452) @@ -354,7 +354,8 @@ REAL sqrtdet_thr "Threshold to apply cons rescalings deep inside the horizon" STEERABLE=ALWAYS { 1.0: :: "Larger values guarantees this sort of rescaling only deep inside the horizon" -} 30.0 + -1.0 :: "Do not apply limit" +} -1.0 REAL max_magnetic_to_gas_pressure_ratio "consider pressure to be magnetically dominated if magnetic pressure to gas pressure ratio is higher than this" STEERABLE=ALWAYS {

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 451)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_Con2PrimM.F90 Log: GRHydro: call polytrope EOS in a region dominated by mag. field. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimM.F90 Delta lines: +60 -12 =================================================================== --- trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:21 UTC (rev 450) +++ trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:23 UTC (rev 451) @@ -93,6 +93,8 @@ CCTK_REAL :: velx_tmp, vely_tmp, velz_tmp, w_lorentz_tmp CCTK_REAL :: Bvecx_tmp, Bvecy_tmp, Bvecz_tmp + CCTK_REAL :: bdotv, magpress + ! Assume 3-metric is positive definite. Check deep inside the horizon ! if this is actually satisfied and if it is not then cast the metric !as conformally flat only for con2prim inversion purposes. @@ -166,7 +168,7 @@ !$OMP sdet,d2,s2,oob,bscon,bxhat,byhat,bzhat, & !$OMP bhatscon,Wm,Wm0,Wm_resid,Wmold,s2m,s2m0,s2m_resid,s2mold,s2max, & !$OMP taum,niter,rho_tmp,press_tmp,eps_tmp,velx_tmp,vely_tmp,velz_tmp, & - !$OMP w_lorentz_tmp,Bvecx_tmp,Bvecy_tmp,Bvecz_tmp) + !$OMP w_lorentz_tmp,Bvecx_tmp,Bvecy_tmp,Bvecz_tmp,bdotv,magpress) do k = 1, nz do j = 1, ny do i = 1, nx @@ -345,6 +347,18 @@ epsnegative,GRHydro_C2P_failed(i,j,k)) if(GRHydro_C2P_failed(i,j,k).ne.0) then + + xrho=1.0d0; xtemp=0.0d0; xeps=1.0d0 + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + xrho,xeps,xtemp,xye,xpress,keyerr,anyerr) + local_K = xpress(1); + + xrho=10.0d0; xeps=1.0d0 + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + xrho,xeps,xtemp,xye,xpress,keyerr,anyerr) + local_pgam=log(xpress(1)/local_K)/log(xrho(1)) + sc = local_K*dens(i,j,k) + if(sdet.ge.sqrtdet_thr) then GRHydro_C2P_failed(i,j,k) = 0 @@ -358,18 +372,7 @@ Bvecx_tmp = Bprim(i,j,k,1) Bvecy_tmp = Bprim(i,j,k,2) Bvecz_tmp = Bprim(i,j,k,3) - - xrho=1.0d0; xtemp=0.0d0; xeps=1.0d0 - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& - xrho,xeps,xtemp,xye,xpress,keyerr,anyerr) - local_K = xpress(1); - xrho=10.0d0; xeps=1.0d0 - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& - xrho,xeps,xtemp,xye,xpress,keyerr,anyerr) - local_pgam=log(xpress(1)/local_K)/log(xrho(1)) - sc = local_K*dens(i,j,k) - call GRHydro_Con2PrimM_Polytype_pt(GRHydro_eos_handle, local_pgam, & dens(i,j,k),scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), sc, & Bcons(i,j,k,1), Bcons(i,j,k,2), Bcons(i,j,k,3),rho_tmp,& @@ -391,6 +394,51 @@ cycle end if end if + + bdotv=g11(i,j,k)*Bprim(i,j,k,1)*vup(i,j,k,1)+ & + g22(i,j,k)*Bprim(i,j,k,2)*vup(i,j,k,2)+ & + g33(i,j,k)*Bprim(i,j,k,3)*vup(i,j,k,3)+ & + 2.0*(g12(i,j,k)*Bprim(i,j,k,1)*vup(i,j,k,2)+ & + g13(i,j,k)*Bprim(i,j,k,1)*vup(i,j,k,3)+ & + g23(i,j,k)*Bprim(i,j,k,2)*vup(i,j,k,3)) + + magpress = 0.5d0*(b2/w_lorentz(i,j,k)**2+bdotv**2) + + if(rho(i,j,k)*eps(i,j,k)*max_magnetic_to_gas_pressure_ratio.le.magpress) then + GRHydro_C2P_failed(i,j,k) = 0 + + rho_tmp = rho(i,j,k) + press_tmp = press(i,j,k) + eps_tmp = eps(i,j,k) + velx_tmp = vup(i,j,k,1) + vely_tmp = vup(i,j,k,2) + velz_tmp = vup(i,j,k,3) + w_lorentz_tmp = w_lorentz(i,j,k) + Bvecx_tmp = Bprim(i,j,k,1) + Bvecy_tmp = Bprim(i,j,k,2) + Bvecz_tmp = Bprim(i,j,k,3) + + call GRHydro_Con2PrimM_Polytype_pt(GRHydro_eos_handle, local_pgam, & + dens(i,j,k),scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), sc, & + Bcons(i,j,k,1), Bcons(i,j,k,2), Bcons(i,j,k,3),rho_tmp,& + velx_tmp,vely_tmp,velz_tmp,eps_tmp,press_tmp,& + Bvecx_tmp,Bvecy_tmp,Bvecz_tmp,b2,w_lorentz_tmp,& + g11(i,j,k),g12(i,j,k),g13(i,j,k),g22(i,j,k),g23(i,j,k),g33(i,j,k), & + uxx,uxy,uxz,uyy,uyz,uzz,det, & + epsnegative,GRHydro_C2P_failed(i,j,k)) + + rho(i,j,k) = rho_tmp + press(i,j,k) = press_tmp + eps(i,j,k) = eps_tmp + vup(i,j,k,1) = velx_tmp + vup(i,j,k,2) = vely_tmp + vup(i,j,k,3) = velz_tmp + w_lorentz(i,j,k) = w_lorentz_tmp + Bprim(i,j,k,1) = Bvecx_tmp + Bprim(i,j,k,2) = Bvecy_tmp + Bprim(i,j,k,3) = Bvecz_tmp + cycle + end if end if else ! if(evolve_temper.eq.0) then Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +5 -0 =================================================================== --- trunk/param.ccl 2013-01-14 14:23:21 UTC (rev 450) +++ trunk/param.ccl 2013-01-14 14:23:23 UTC (rev 451) @@ -356,6 +356,11 @@ 1.0: :: "Larger values guarantees this sort of rescaling only deep inside the horizon" } 30.0 +REAL max_magnetic_to_gas_pressure_ratio "consider pressure to be magnetically dominated if magnetic pressure to gas pressure ratio is higher than this" STEERABLE=ALWAYS +{ + (0:* :: "any positive value, eg. 100." + -1.0 :: "disable" +} -1.0 boolean c2p_reset_pressure "If the pressure guess is unphysical should we recompute it?" {

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 450)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/src/ GRHydro_Con2PrimM.F90 Log: GRHydro: Call pointwise polytype upon con2primM failure. If it fails just use previous primitive values and get the cons from them. Basically freezing their values at previous time step. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimM.F90 Delta lines: +31 -19 =================================================================== --- trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:19 UTC (rev 449) +++ trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:21 UTC (rev 450) @@ -344,8 +344,8 @@ uxx,uxy,uxz,uyy,uyz,uzz,det, & epsnegative,GRHydro_C2P_failed(i,j,k)) - if(sdet.ge.sqrtdet_thr) then - if(GRHydro_C2P_failed(i,j,k).ne.0) then + if(GRHydro_C2P_failed(i,j,k).ne.0) then + if(sdet.ge.sqrtdet_thr) then GRHydro_C2P_failed(i,j,k) = 0 rho_tmp = rho(i,j,k) @@ -358,17 +358,38 @@ Bvecx_tmp = Bprim(i,j,k,1) Bvecy_tmp = Bprim(i,j,k,2) Bvecz_tmp = Bprim(i,j,k,3) + + xrho=1.0d0; xtemp=0.0d0; xeps=1.0d0 + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + xrho,xeps,xtemp,xye,xpress,keyerr,anyerr) + local_K = xpress(1); - call GRHydro_Con2PrimM_pt(GRHydro_polytrope_handle, keytemp, & - GRHydro_eos_rf_prec, local_gam(1), dens(i,j,k), & - scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), tau(i,j,k), & - Bcons(i,j,k,1),Bcons(i,j,k,2),Bcons(i,j,k,3),xye(1), & - xtemp(1),rho_tmp,velx_tmp,vely_tmp,velz_tmp,& - eps_tmp,press_tmp,Bvecx_tmp,Bvecy_tmp,Bvecz_tmp,b2,& - w_lorentz_tmp,g11(i,j,k),g12(i,j,k),g13(i,j,k),& - g22(i,j,k),g23(i,j,k),g33(i,j,k), & + xrho=10.0d0; xeps=1.0d0 + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + xrho,xeps,xtemp,xye,xpress,keyerr,anyerr) + local_pgam=log(xpress(1)/local_K)/log(xrho(1)) + sc = local_K*dens(i,j,k) + + call GRHydro_Con2PrimM_Polytype_pt(GRHydro_eos_handle, local_pgam, & + dens(i,j,k),scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), sc, & + Bcons(i,j,k,1), Bcons(i,j,k,2), Bcons(i,j,k,3),rho_tmp,& + velx_tmp,vely_tmp,velz_tmp,eps_tmp,press_tmp,& + Bvecx_tmp,Bvecy_tmp,Bvecz_tmp,b2,w_lorentz_tmp,& + g11(i,j,k),g12(i,j,k),g13(i,j,k),g22(i,j,k),g23(i,j,k),g33(i,j,k), & uxx,uxy,uxz,uyy,uyz,uzz,det, & epsnegative,GRHydro_C2P_failed(i,j,k)) + + if(GRHydro_C2P_failed(i,j,k).ne.0) then + GRHydro_C2P_failed(i,j,k) = 0 + call prim2conM(GRHydro_eos_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),scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), & + tau(i,j,k),Bcons(i,j,k,1),Bcons(i,j,k,2),Bcons(i,j,k,3), & + rho(i,j,k),vup(i,j,k,1),vup(i,j,k,2),vup(i,j,k,3), & + eps(i,j,k),press(i,j,k), & + Bprim(i,j,k,1),Bprim(i,j,k,2),Bprim(i,j,k,3),w_lorentz(i,j,k)) + cycle + end if end if end if @@ -526,15 +547,6 @@ uxx,uxy,uxz,uyy,uyz,uzz,det, & epsnegative,GRHydro_C2P_failed(i,j,k)) - -! call GRHydro_Con2PrimM_Polytype_pt(GRHydro_eos_handle, local_pgam, dens(i,j,k), & -! scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), sc, & -! Bcons(i,j,k,1), Bcons(i,j,k,2), Bcons(i,j,k,3), rho(i,j,k),& -! vup(i,j,k,1),vup(i,j,k,2),vup(i,j,k,3),eps(i,j,k),press(i,j,k),& -! Bprim(i,j,k,1), Bprim(i,j,k,2), Bprim(i,j,k,3),b2, w_lorentz(i,j,k),& -! g11(i,j,k),g12(i,j,k),g13(i,j,k),g22(i,j,k),g23(i,j,k),g33(i,j,k), & -! uxx,uxy,uxz,uyy,uyz,uzz,det, & - #endif end if ! if (epsnegative .ne. 0) then

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 449)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/src/ GRHydro_Con2PrimM.F90 Log: GRHydro: call pointwise con2primM with polytrope eos handle deep inside AH upon inversion failure of gamma law eos. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimM.F90 Delta lines: +28 -0 =================================================================== --- trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:16 UTC (rev 448) +++ trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:19 UTC (rev 449) @@ -344,6 +344,34 @@ uxx,uxy,uxz,uyy,uyz,uzz,det, & epsnegative,GRHydro_C2P_failed(i,j,k)) + if(sdet.ge.sqrtdet_thr) then + if(GRHydro_C2P_failed(i,j,k).ne.0) then + GRHydro_C2P_failed(i,j,k) = 0 + + rho_tmp = rho(i,j,k) + press_tmp = press(i,j,k) + eps_tmp = eps(i,j,k) + velx_tmp = vup(i,j,k,1) + vely_tmp = vup(i,j,k,2) + velz_tmp = vup(i,j,k,3) + w_lorentz_tmp = w_lorentz(i,j,k) + Bvecx_tmp = Bprim(i,j,k,1) + Bvecy_tmp = Bprim(i,j,k,2) + Bvecz_tmp = Bprim(i,j,k,3) + + call GRHydro_Con2PrimM_pt(GRHydro_polytrope_handle, keytemp, & + GRHydro_eos_rf_prec, local_gam(1), dens(i,j,k), & + scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), tau(i,j,k), & + Bcons(i,j,k,1),Bcons(i,j,k,2),Bcons(i,j,k,3),xye(1), & + xtemp(1),rho_tmp,velx_tmp,vely_tmp,velz_tmp,& + eps_tmp,press_tmp,Bvecx_tmp,Bvecy_tmp,Bvecz_tmp,b2,& + w_lorentz_tmp,g11(i,j,k),g12(i,j,k),g13(i,j,k),& + g22(i,j,k),g23(i,j,k),g33(i,j,k), & + uxx,uxy,uxz,uyy,uyz,uzz,det, & + epsnegative,GRHydro_C2P_failed(i,j,k)) + end if + end if + else ! if(evolve_temper.eq.0) then rho_tmp = rho(i,j,k)

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 448)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/src/ GRHydro_Con2PrimM_pt.c Log: GRHydro: Let the driver functions to take care of retval initialization From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimM_pt.c Delta lines: +2 -1 =================================================================== --- trunk/src/GRHydro_Con2PrimM_pt.c 2013-01-14 14:23:14 UTC (rev 447) +++ trunk/src/GRHydro_Con2PrimM_pt.c 2013-01-14 14:23:16 UTC (rev 448) @@ -229,7 +229,8 @@ gammaeos = *gamma_eos; /* Assume ok initially: */ - *retval = 0.; + // BCM: But let the driver function take care of its initialization + //*retval = 0.; *epsnegative = 0; #if(DEBUG_CON2PRIMM)

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 447)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/src/ GRHydro_UpdateMask.F90, GRHydro_UpdateMaskM.F90 Log: GRHydro: reset points inside the excision region to atmosphere in InitialAtmosphereReset(M) so that the ID thorns do not have to know about he excised region. From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_UpdateMask.F90 Delta lines: +3 -1 =================================================================== --- trunk/src/GRHydro_UpdateMask.F90 2013-01-14 14:23:12 UTC (rev 446) +++ trunk/src/GRHydro_UpdateMask.F90 2013-01-14 14:23:14 UTC (rev 447) @@ -452,7 +452,9 @@ do j = 1, cctk_lsh(2) do i = 1, cctk_lsh(1) - if (rho(i,j,k) .le. rho_min) then + if (rho(i,j,k) .le. rho_min .or. & + GRHydro_enable_internal_excision /= 0 .and. & + hydro_excision_mask(i,j,k) .ne. 0) then rho(i,j,k) = rho_min 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)) File [modified]: GRHydro_UpdateMaskM.F90 Delta lines: +3 -1 =================================================================== --- trunk/src/GRHydro_UpdateMaskM.F90 2013-01-14 14:23:12 UTC (rev 446) +++ trunk/src/GRHydro_UpdateMaskM.F90 2013-01-14 14:23:14 UTC (rev 447) @@ -323,7 +323,9 @@ do j = 1, cctk_lsh(2) do i = 1, cctk_lsh(1) - if (rho(i,j,k) .le. rho_min) then + if (rho(i,j,k) .le. rho_min .or. & + (GRHydro_enable_internal_excision .ne. 0 .and. & + hydro_excision_mask(i,j,k) .ne. 0) ) then rho(i,j,k) = rho_min vup(i,j,k,1) = 0.0d0 vup(i,j,k,2) = 0.0d0

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 446)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Removed: /trunk/src/ GRHydro_Con2PrimM_pt_EOSOmni.c.hopefullyfixed Log: GRHydro: remove old "hopefullyfixed" con2primM_pt version. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [removed]: GRHydro_Con2PrimM_pt_EOSOmni.c.hopefullyfixed Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 445)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 07:54 AM Modified: /trunk/ schedule.ccl Log: GRHydro: use timelevels parameter in STORAGE statement rather than if cascade to test for each value From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +32 -83 =================================================================== --- trunk/schedule.ccl 2013-01-14 13:54:06 UTC (rev 444) +++ trunk/schedule.ccl 2013-01-14 13:54:08 UTC (rev 445) @@ -49,57 +49,28 @@ ### use of MoL with Einstein ### ################################################# -if (timelevels == 3) +STORAGE:dens[timelevels] +STORAGE:tau[timelevels] +STORAGE:scon[timelevels] +if (number_of_particles) { - STORAGE:dens[3] - STORAGE:tau[3] - STORAGE:scon[3] - if (number_of_particles) - { - STORAGE:particles[3] - } - STORAGE: ADMBase::metric[3], ADMBase::curv[3] - STORAGE: ADMBase::lapse[3] - if(CCTK_Equals(Y_e_evolution_method,"GRHydro")) - { - STORAGE: Y_e_con[3] - STORAGE: Y_e_con_rhs, Y_e_con_flux, Y_e_plus, Y_e_minus - } - if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) - { - STORAGE: HydroBase::Bvec[3] - STORAGE: GRHydro::Bcons[3] - if (clean_divergence) - { - STORAGE:psidc[3] - } - } + STORAGE:particles[timelevels] } -else +STORAGE: ADMBase::metric[timelevels], ADMBase::curv[timelevels] +STORAGE: ADMBase::lapse[timelevels] +if(CCTK_Equals(Y_e_evolution_method,"GRHydro")) { - STORAGE:dens[2] - STORAGE:tau[2] - STORAGE:scon[2] - if (number_of_particles) + STORAGE: Y_e_con[timelevels] + STORAGE: Y_e_con_rhs, Y_e_con_flux, Y_e_plus, Y_e_minus +} +if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) +{ + STORAGE: HydroBase::Bvec[timelevels] + STORAGE: GRHydro::Bcons[timelevels] + if (clean_divergence) { - STORAGE:particles[2] + STORAGE:psidc[timelevels] } - STORAGE: ADMBase::metric[2], ADMBase::curv[2] - STORAGE: ADMBase::lapse[2] - if(CCTK_Equals(Y_e_evolution_method,"GRHydro")) - { - STORAGE: Y_e_con[2] - STORAGE: Y_e_con_rhs, Y_e_con_flux, Y_e_plus, Y_e_minus - } - if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) - { - STORAGE: HydroBase::Bvec[2] - STORAGE: GRHydro::Bcons[2] - if (clean_divergence) - { - STORAGE:psidc[2] - } - } } STORAGE:evolve_MHD STORAGE:evolve_Y_e @@ -123,9 +94,9 @@ } if (calculate_bcom) { - STORAGE:GRHydro::bcom[3] - STORAGE:GRHydro::bcom0[3] - STORAGE:GRHydro::bcom_sq[3] + STORAGE:GRHydro::bcom[timelevels] + STORAGE:GRHydro::bcom0[timelevels] + STORAGE:GRHydro::bcom_sq[timelevels] } } STORAGE:GRHydro_eos_scalars @@ -141,8 +112,8 @@ if (evolve_tracer) { - STORAGE:GRHydro_tracers[3] - STORAGE:GRHydro_cons_tracers[3] + STORAGE:GRHydro_tracers[timelevels] + STORAGE:GRHydro_cons_tracers[timelevels] STORAGE:GRHydro_tracer_rhs } @@ -183,36 +154,14 @@ ### use of MoL with Einstein ### ################################################# -if (timelevels == 3) -{ - STORAGE: ADMBase::metric[3], ADMBase::curv[3] - STORAGE: ADMBase::lapse[3] -} -else -{ - STORAGE: ADMBase::metric[2], ADMBase::curv[2] - STORAGE: ADMBase::lapse[2] -} +STORAGE: ADMBase::metric[timelevels], ADMBase::curv[timelevels] +STORAGE: ADMBase::lapse[timelevels] if (!CCTK_Equals(initial_shift,"none")) { - if (timelevels == 3) - { - STORAGE: ADMBase::shift[3] - } - else - { - STORAGE: ADMBase::shift[2] - } + STORAGE: ADMBase::shift[timelevels] if (CCTK_Equals(shift_evolution_method,"Comoving")) { - if (timelevels == 3) - { - STORAGE: GRHydro_coords[3] - } - else - { - STORAGE: GRHydro_coords[2] - } + STORAGE: GRHydro_coords[timelevels] STORAGE: GRHydro_coords_rhs schedule GRHydro_SetUpCoords IN HydroBase_Initial @@ -243,11 +192,11 @@ # _and_ we really want to safe this memory then it has to be turned off at # runtime via CCTK_GroupStorageDecrease if(CCTK_IsImplementationActive("Coordinates")) { - STORAGE: lvel[3] + STORAGE: lvel[timelevels] if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) { - STORAGE: lBvec[3] + STORAGE: lBvec[timelevels] } - STORAGE: local_metric[3] + STORAGE: local_metric[timelevels] STORAGE: local_extrinsic_curvature STORAGE: local_shift } @@ -830,7 +779,7 @@ { -##########################################3 +########################################## ### MHD not implemented yet for Flux split FD !!! ########################################## STORAGE:fs_alpha @@ -1034,8 +983,8 @@ if (evolve_tracer) { - STORAGE:GRHydro_tracers[3] - STORAGE:GRHydro_cons_tracers[3] + STORAGE:GRHydro_tracers[timelevels] + STORAGE:GRHydro_cons_tracers[timelevels] STORAGE:GRHydro_tracer_rhs }

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 444)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 07:54 AM Modified: /trunk/ interface.ccl Log: GRHydro: remove any traces of non-functional Fisheye support From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +0 -23 =================================================================== --- trunk/interface.ccl 2013-01-14 13:54:02 UTC (rev 443) +++ trunk/interface.ccl 2013-01-14 13:54:06 UTC (rev 444) @@ -9,7 +9,6 @@ implements: GRHydro inherits: ADMBase, Boundary, SpaceMask, ADMMacros, Tmunubase, HydroBase -USES INCLUDE: FishEye.h USES INCLUDE: SpaceMask.h USES INCLUDE HEADER: carpet.hh @@ -537,28 +536,6 @@ int whichpsidcspeed type = SCALAR tags='checkpoint="no"' "Which speed to set for psidc? Set in ParamCheck" -# real fluxweightvolume type = GF Timelevels = 1 -# { -# cell_volume -# cell_jdet -# } "Weighting factors for the interfaces for using FishEye" -# -# real cell_surface[3] type = GF Timelevels = 1 -# -# real GRHydro_fisheye_scalars type=GF timelevels=1 -# { -# frho -# fpress -# feps -# } "GRHydro scalars in physical coordinates" -# -# real GRHydro_fisheye_vectors type=GF timelevels=1 -# { -# fvelx -# fvely -# fvelz -# } "GRHydro vectors in physical coordinates" - real GRHydro_coords type=GF timelevels=3 { GRHydro_x

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits January 2013