Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 367)
by rhaas＠tapir.caltech.edu 21 Jun '12

21 Jun '12

User: rhaas Date: 2012/06/21 09:29 PM Modified: /trunk/ interface.ccl Log: Revert "GRHydro: change prolongation type of real valued atmosphere mask to none" This reverts commit 7f01f5ce8acd6d03a3dd44637f627a17eb37c120. File Changes: Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- trunk/interface.ccl 2012-06-21 23:36:47 UTC (rev 366) +++ trunk/interface.ccl 2012-06-22 02:29:15 UTC (rev 367) @@ -427,7 +427,7 @@ # This real mask is set during UpdateAtmosphereMask and sync'ed afterwards (including possible interpatch interpolation) # After syn'ing and before any con2prim fun, we set the integer mask above based on the real-valued mask. # This ensures that any routine using the int mask is still correctly working. -real GRHydro_atmosphere_mask_real type = GF Timelevels = 1 tags='Prolongation="none" checkpoint="no"' +real GRHydro_atmosphere_mask_real type = GF Timelevels = 1 tags='Prolongation="copy" checkpoint="no"' { atmosphere_mask_real } "Flags to say whether a point needs to be reset to the atmosphere. This is sync'ed (and possibly interpolated)!"

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 366)
by rhaas＠tapir.caltech.edu 21 Jun '12

21 Jun '12

User: rhaas Date: 2012/06/21 06:36 PM Modified: /trunk/ interface.ccl Log: GRHydro: change prolongation type of real valued atmosphere mask to none this fixes the aborts by Carpet for vertex centered simulations in which it complained about the wrong order of prolongation being used. Me culpa, since I suggested using "copy" rather than "none". File Changes: Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- trunk/interface.ccl 2012-06-21 16:06:48 UTC (rev 365) +++ trunk/interface.ccl 2012-06-21 23:36:47 UTC (rev 366) @@ -427,7 +427,7 @@ # This real mask is set during UpdateAtmosphereMask and sync'ed afterwards (including possible interpatch interpolation) # After syn'ing and before any con2prim fun, we set the integer mask above based on the real-valued mask. # This ensures that any routine using the int mask is still correctly working. -real GRHydro_atmosphere_mask_real type = GF Timelevels = 1 tags='Prolongation="copy" checkpoint="no"' +real GRHydro_atmosphere_mask_real type = GF Timelevels = 1 tags='Prolongation="none" checkpoint="no"' { atmosphere_mask_real } "Flags to say whether a point needs to be reset to the atmosphere. This is sync'ed (and possibly interpolated)!"

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 365)
by rhaas＠tapir.caltech.edu 21 Jun '12

21 Jun '12

User: rhaas Date: 2012/06/21 11:06 AM Modified: /trunk/ interface.ccl Log: GRHYdro: don't checkpoint real atmo mask. File Changes: Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- trunk/interface.ccl 2012-06-21 08:55:58 UTC (rev 364) +++ trunk/interface.ccl 2012-06-21 16:06:48 UTC (rev 365) @@ -427,7 +427,7 @@ # This real mask is set during UpdateAtmosphereMask and sync'ed afterwards (including possible interpatch interpolation) # After syn'ing and before any con2prim fun, we set the integer mask above based on the real-valued mask. # This ensures that any routine using the int mask is still correctly working. -real GRHydro_atmosphere_mask_real type = GF Timelevels = 1 tags='Prolongation="copy"' +real GRHydro_atmosphere_mask_real type = GF Timelevels = 1 tags='Prolongation="copy" checkpoint="no"' { atmosphere_mask_real } "Flags to say whether a point needs to be reset to the atmosphere. This is sync'ed (and possibly interpolated)!"

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 364)
by rhaas＠tapir.caltech.edu 21 Jun '12

21 Jun '12

User: rhaas Date: 2012/06/21 03:55 AM Modified: /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_Eigenproblem.F90 Log: GRydro: avoid implict SAVE attribute in Con2PrimPolytype initializing a variable makes it SAVE which is incomaptible with OpenMP. Also fix some 1-element-array vs. scalar variable type issues. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +25 -9 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2012-06-21 03:51:18 UTC (rev 363) +++ trunk/src/GRHydro_Con2Prim.F90 2012-06-21 08:55:58 UTC (rev 364) @@ -349,6 +349,8 @@ uyz, uzz, det, x, y, z, r, epsnegative, GRHydro_rho_min, pmin, epsmin, & GRHydro_reflevel, GRHydro_C2P_failed) + use Con2Prim_fortran_interfaces + implicit none DECLARE_CCTK_PARAMETERS @@ -612,6 +614,8 @@ uyz, uzz, det, x, y, z, r, epsnegative, GRHydro_rho_min, pmin, epsmin, & GRHydro_reflevel, GRHydro_C2P_failed, local_perc_ptol) + use Con2Prim_fortran_interfaces + implicit none DECLARE_CCTK_PARAMETERS @@ -1342,6 +1346,8 @@ subroutine Conservative2PrimitivePolytype(CCTK_ARGUMENTS) + use Con2Prim_fortran_interfaces + implicit none ! save memory when MP is not used @@ -1470,6 +1476,8 @@ velx, vely, velz, epsilon, press, w_lorentz, uxx, uxy, uxz, uyy, & uyz, uzz, det, x, y, z, r, GRHydro_rho_min, GRHydro_reflevel, GRHydro_C2P_failed) + use Con2Prim_fortran_interfaces + implicit none DECLARE_CCTK_PARAMETERS @@ -1485,14 +1493,10 @@ character(len=200) warnline ! begin EOS Omni vars - integer :: n = 1 - integer :: keytemp = 0 - integer :: anyerr = 0 - integer :: keyerr(1) = 0 - real*8 :: xpress = 0.0d0 - real*8 :: xeps = 0.0d0 - real*8 :: xtemp = 0.0d0 - real*8 :: xye = 0.0d0 + integer :: n,keytemp,anyerr,keyerr(1) + real*8 :: xpress(1),xeps(1),xtemp(1),xye(1) + n = 1;keytemp = 0;anyerr = 0;keyerr(1) = 0 + xpress = 0.0d0;xeps = 0.0d0;xtemp = 0.0d0;xye = 0.0d0 ! end EOS Omni vars @@ -1516,7 +1520,7 @@ call EOS_Omni_EpsFromPress(handle,keytemp,GRHydro_eos_rf_prec,n,& rhoold,xeps,xtemp,xye,press,xeps,keyerr,anyerr) - enthalpy = 1.0d0 + xeps + press / rhoold + enthalpy = 1.0d0 + xeps(1) + press / rhoold w_lorentz = sqrt(1.d0 + s2 / ( (udens*enthalpy)**2 )) @@ -1727,6 +1731,8 @@ subroutine Con2PrimBoundsPolytype(CCTK_ARGUMENTS) + use Con2Prim_fortran_interfaces + implicit none ! save memory when MP is not used @@ -1842,6 +1848,8 @@ subroutine Con2PrimBoundsTracer(CCTK_ARGUMENTS) + use Con2Prim_fortran_interfaces + implicit none ! save memory when MP is not used @@ -1972,6 +1980,8 @@ subroutine Con2Prim_ptTracer(cons_tracer, tracer, dens) + use Con2Prim_fortran_interfaces + implicit none DECLARE_CCTK_PARAMETERS @@ -2000,6 +2010,8 @@ subroutine Con2Prim_ptBoundsTracer(cons_tracer, tracer, rho, one_over_w_lorentz, det) + use Con2Prim_fortran_interfaces + implicit none DECLARE_CCTK_PARAMETERS @@ -2014,6 +2026,8 @@ ! subroutines to manage the C2P failure mask subroutine reset_GRHydro_C2P_failed(CCTK_ARGUMENTS) + use Con2Prim_fortran_interfaces + implicit none DECLARE_CCTK_ARGUMENTS @@ -2038,6 +2052,8 @@ subroutine check_GRHydro_C2P_failed(CCTK_ARGUMENTS) + use Con2Prim_fortran_interfaces + implicit none ! save memory when MP is not used File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +8 -18 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2012-06-21 03:51:18 UTC (rev 363) +++ trunk/src/GRHydro_Eigenproblem.F90 2012-06-21 08:55:58 UTC (rev 364) @@ -239,14 +239,10 @@ !!$ Warning, warning. Nasty hack follows ! begin EOS Omni vars - integer :: n = 1 - integer :: keytemp = 0 - integer :: anyerr = 0 - integer :: keyerr(1) = 0 - real*8 :: xpress = 0.0d0 - real*8 :: xeps = 0.0d0 - real*8 :: xtemp = 0.0d0 - real*8 :: xye = 0.0d0 + integer :: n,keytemp,anyerr,keyerr(1) + real*8 :: xpress(1),xeps(1),xtemp(1),xye(1) + n = 1;keytemp = 0;anyerr = 0;keyerr(1) = 0 + xpress = 0.0d0;xeps = 0.0d0;xtemp = 0.0d0;xye = 0.0d0 ! end EOS Omni vars @@ -606,17 +602,11 @@ CCTK_REAL axp,axm,vxp,vxm,cxx,cxy,cxz,gam,xsi,dlt CCTK_INT handle -!!$ Warning, warning. Nasty hack follows - ! begin EOS Omni vars - integer :: n = 1 - integer :: keytemp = 0 - integer :: anyerr = 0 - integer :: keyerr(1) = 0 - real*8 :: xpress = 0.0d0 - real*8 :: xeps = 0.0d0 - real*8 :: xtemp = 0.0d0 - real*8 :: xye = 0.0d0 + integer :: n,keytemp,anyerr,keyerr(1) + real*8 :: xpress(1),xeps(1),xtemp(1),xye(1) + n = 1;keytemp = 0;anyerr = 0;keyerr(1) = 0 + xpress = 0.0d0;xeps = 0.0d0;xtemp = 0.0d0;xye = 0.0d0 ! end EOS Omni vars one = 1.0d0

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 363)
by rhaas＠tapir.caltech.edu 20 Jun '12

20 Jun '12

User: rhaas Date: 2012/06/20 10:51 PM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_Con2Prim.F90 Log: * introduce parameters GRHydro_Y_e_min and GRHydro_Y_e_max to fix issues with EOS tables that don't extend sufficiently far. Enforcement happens in Con2Prim. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +2 -1 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2012-06-21 03:51:16 UTC (rev 362) +++ trunk/src/GRHydro_Con2Prim.F90 2012-06-21 03:51:18 UTC (rev 363) @@ -150,7 +150,8 @@ endif if(evolve_Y_e.ne.0) then - Y_e(i,j,k) = Y_e_con(i,j,k) / dens(i,j,k) + Y_e(i,j,k) = max(min(Y_e_con(i,j,k) / dens(i,j,k),GRHydro_Y_e_max),& + GRHydro_Y_e_min) endif if ( dens(i,j,k) .le. sqrt(det)*GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +13 -2 =================================================================== --- trunk/param.ccl 2012-06-21 03:51:16 UTC (rev 362) +++ trunk/param.ccl 2012-06-21 03:51:18 UTC (rev 363) @@ -288,14 +288,25 @@ REAL GRHydro_hot_atmo_temp "Temperature of the hot atmosphere in MeV" STEERABLE=ALWAYS { - 0:* :: "Larger than 0 MeV" + 0.0:* :: "Larger than 0 MeV" } 0.5e0 REAL GRHydro_hot_atmo_Y_e "Y_e of the hot atmosphere" STEERABLE=ALWAYS { - 0:* :: "Larger than 0" + 0.0:* :: "Larger than 0" } 0.5e0 +REAL GRHydro_Y_e_min "minimum allowed Y_e" STEERABLE=ALWAYS +{ + 0.0:* :: "Larger than or equal to zero" +} 0.0 + +REAL GRHydro_Y_e_max "maximum allowed Y_e" STEERABLE=ALWAYS +{ + 1.0:* :: "Larger than or equal to zero; 1 is default" +} 1.0 + + ####################### Other Parameters ############################## #Parameters controlling conservative <-> primitive change.

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 362)
by rhaas＠tapir.caltech.edu 20 Jun '12

20 Jun '12

User: rhaas Date: 2012/06/20 10:51 PM Modified: /trunk/ schedule.ccl Log: GRHydro: Fix a scheduling issue related to previous atmosphere patch. File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +5 -4 =================================================================== --- trunk/schedule.ccl 2012-06-20 16:27:09 UTC (rev 361) +++ trunk/schedule.ccl 2012-06-21 03:51:16 UTC (rev 362) @@ -1158,20 +1158,21 @@ ### This is executed in the last MoL_PosStep ### ################################################################ -# First we need to convert real (and synchronized mask) to an integer mask! -schedule GRHydroPostSyncAtmosphereMask IN HydroBase_PostStep AFTER HydroBase_Boundaries +# First (right after sync) we need to convert real (and synchronized mask) to an integer mask! +schedule GRHydroPostSyncAtmosphereMask IN HydroBase_PostStep AFTER HydroBase_Boundaries BEFORE HydroBase_Con2Prim { LANG: Fortran } "Set integer atmosphere mask from synchronized real atmosphere mask" +# Afterwards, reset mask! if (CCTK_Equals(Bvec_evolution_method,"GRHydro")) { - schedule GRHydro_AtmosphereResetM IN HydroBase_PostStep BEFORE HydroBase_Con2Prim IF GRHydro::InLastMoLPostStep + schedule GRHydro_AtmosphereResetM IN HydroBase_PostStep AFTER GRHydroPostSyncAtmosphereMask BEFORE HydroBase_Con2Prim IF GRHydro::InLastMoLPostStep { LANG: Fortran } "Reset the atmosphere - MHD version" } else { - schedule GRHydro_AtmosphereReset IN HydroBase_PostStep BEFORE HydroBase_Con2Prim IF GRHydro::InLastMoLPostStep + schedule GRHydro_AtmosphereReset IN HydroBase_PostStep AFTER GRHydroPostSyncAtmosphereMask BEFORE HydroBase_Con2Prim IF GRHydro::InLastMoLPostStep { LANG: Fortran } "Reset the atmosphere"

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 20 Jun '12

20 Jun '12

changeset: 3588:0820f19d4551 tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Jun 20 16:53:27 2012 -0700 summary: Carpet: CCTK_ActiveTimeLevels: Return minimum instead of sum

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 20 Jun '12

20 Jun '12

changeset: 3586:aa8b136e9bde user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Jun 20 16:23:37 2012 -0700 summary: Carpet: Choose epsilon depending on precision changeset: 3587:0f93e25a8bdd tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Jun 20 16:23:50 2012 -0700 summary: CarpetLib: Comment out unused variable

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 20 Jun '12

20 Jun '12

changeset: 3584:b3da6ac7b72a user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Sat Apr 28 14:46:40 2012 -0700 summary: CarpetLibs: shift vertex centered directions in restrict_3d_vc_rf2 changeset: 3585:a5f32a94867b tag: tip user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Sat May 05 15:15:09 2012 -0700 summary: CarpetLib: add index checking on source array in mixed restriction operator

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 361)
by rhaas＠tapir.caltech.edu 20 Jun '12

20 Jun '12

User: rhaas Date: 2012/06/20 11:27 AM Modified: /trunk/src/ GRHydro_Eigenproblem.F90 Log: really improve handling of cs2 < 0 in the "standard" (non-MHD, non-hot EOS) eigenvalue routine. the previous patch with this same commit message (r359) has the wrong commit message. It should instead read: --8<-- Introduce real-valued atmo mask that can be interpolated. Synchronize real-valued atmo mask and update integer-valued atmo mask based on synchronized value. This fix ensures that the results are independent of the number of processors used. It also gets rid of some extra primitive syncs that are otherwise necessary when sync_conserved_only = yes. Does not cause any new test failures (Roland). Patch by Christian Reisswig. --8<-- Patch by Christian Ott. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +5 -2 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2012-06-20 16:19:10 UTC (rev 360) +++ trunk/src/GRHydro_Eigenproblem.F90 2012-06-20 16:27:09 UTC (rev 361) @@ -86,13 +86,16 @@ (1.0d0 + eps + press/rho) if(cs2.lt.0.0d0) then + !$OMP CRITICAL if (abs(cs2) .gt. 1.0d-4) then 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!") + call CCTK_WARN(1,"cs2 < 0! Check speed of sound calculation!") + cs2 = 0.0d0 else - cs2 = 0 + cs2 = 0.0d0 endif + !$OMP END CRITICAL endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits