Commits April 2013

commits@lists.einsteintoolkit.org

10 participants
99 discussions

[svn:einsteintoolkit] WeylScal4/ (Rev. 133)
by schnetter＠cct.lsu.edu 15 Apr '13

15 Apr '13

User: eschnett Date: 2013/04/15 09:32 PM Modified: /trunk/ param.ccl Log: Undo accidental commit Directory Changes: Directory: /svn:mergeinfo/ ========================== - File Changes: Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +0 -4 =================================================================== --- trunk/param.ccl 2013-04-16 02:30:16 UTC (rev 132) +++ trunk/param.ccl 2013-04-16 02:32:24 UTC (rev 133) @@ -3,11 +3,7 @@ shares: GenericFD -USES CCTK_INT assume_stress_energy_state -USES CCTK_INT assume_use_jacobian USES CCTK_STRING jacobian_group -USES CCTK_STRING jacobian_determinant_group -USES CCTK_STRING jacobian_inverse_group USES CCTK_STRING jacobian_derivative_group USES CCTK_INT jacobian_identity_map Property changes on: trunk/param.ccl ___________________________________________________________________

1 0

[svn:einsteintoolkit] WeylScal4/trunk/ (Rev. 132)
by schnetter＠cct.lsu.edu 15 Apr '13

15 Apr '13

User: eschnett Date: 2013/04/15 09:30 PM Modified: /trunk/ param.ccl /trunk/m/ Makefile Log: Use grep -q instead of grep --silent File Changes: Directory: /trunk/m/ ==================== File [modified]: Makefile Delta lines: +1 -1 =================================================================== --- trunk/m/Makefile 2013-01-20 15:10:24 UTC (rev 131) +++ trunk/m/Makefile 2013-04-16 02:30:16 UTC (rev 132) @@ -8,7 +8,7 @@ WeylScal4.out: WeylScal4.m rm -rf WeylScal4 ./runmath.sh $^ - grep --silent 'Thorn ./WeylScal4 created successfully' WeylScal4.out + grep -q 'Thorn ./WeylScal4 created successfully' WeylScal4.out && \ for file in $$(ls WeylScal4); do \ ./copy-if-changed.sh WeylScal4/$$file ../$$file; \ done Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +4 -0 =================================================================== --- trunk/param.ccl 2013-01-20 15:10:24 UTC (rev 131) +++ trunk/param.ccl 2013-04-16 02:30:16 UTC (rev 132) @@ -3,7 +3,11 @@ shares: GenericFD +USES CCTK_INT assume_stress_energy_state +USES CCTK_INT assume_use_jacobian USES CCTK_STRING jacobian_group +USES CCTK_STRING jacobian_determinant_group +USES CCTK_STRING jacobian_inverse_group USES CCTK_STRING jacobian_derivative_group USES CCTK_INT jacobian_identity_map

1 0

[McLachlan]McLachlan branch, master, updated. d28dc270949233910c696d3860fbe3d0d6fe67de
by Carpet git repositories 15 Apr '13

15 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "McLachlan". The branch, master has been updated via d28dc270949233910c696d3860fbe3d0d6fe67de (commit) from 24fb409969654f964c10ac15894a8791680a6895 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d28dc270949233910c696d3860fbe3d0d6fe67de Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Mon Apr 15 16:26:47 2013 +0200 Add ML_BSSN_sgw3d_harmonic_phi test This is the same as ML_BSSN_sgw3d_harmonic apart from using conformalMethod = 0 instead of conformalMethod = 1. ----------------------------------------------------------------------- Summary of changes: ...harmonic.par => ML_BSSN_sgw3d_harmonic_phi.par} | 2 +- .../A.x.asc | 0 .../test/ML_BSSN_sgw3d_harmonic_phi/At11.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/At12.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/At13.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/At22.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/At23.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/At33.x.asc | 40 +++++++++++++++ .../B1.x.asc | 32 ++++++------ .../B2.x.asc | 32 ++++++------ .../B3.x.asc | 32 ++++++------ .../test/ML_BSSN_sgw3d_harmonic_phi/Xt1.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/Xt2.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/Xt3.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/alpha.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/beta1.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/beta2.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/beta3.x.asc | 40 +++++++++++++++ .../cA.x.asc | 52 ++++++++++---------- .../cS.x.asc | 0 .../test/ML_BSSN_sgw3d_harmonic_phi/cXt1.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/cXt2.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/cXt3.x.asc | 40 +++++++++++++++ .../gt11.x.asc} | 48 +++++++++--------- .../test/ML_BSSN_sgw3d_harmonic_phi/gt12.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/gt13.x.asc | 40 +++++++++++++++ .../gt22.x.asc | 52 ++++++++++---------- .../test/ML_BSSN_sgw3d_harmonic_phi/gt23.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi}/gt33.x.asc | 48 +++++++++--------- .../test/ML_BSSN_sgw3d_harmonic_phi/gxx.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/kxx.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/phi.x.asc | 40 +++++++++++++++ .../test/ML_BSSN_sgw3d_harmonic_phi/trK.x.asc | 40 +++++++++++++++ 33 files changed, 1069 insertions(+), 149 deletions(-) copy ML_BSSN_Test/test/{ML_BSSN_sgw3d_harmonic.par => ML_BSSN_sgw3d_harmonic_phi.par} (98%) copy ML_BSSN_Test/test/{ML_BSSN_EE_sgw3d => ML_BSSN_sgw3d_harmonic_phi}/A.x.asc (100%) create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/At11.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/At12.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/At13.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/At22.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/At23.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/At33.x.asc copy ML_BSSN_Test/test/{ML_BSSN_sgw3d_harmonic => ML_BSSN_sgw3d_harmonic_phi}/B1.x.asc (75%) copy ML_BSSN_Test/test/{ML_BSSN_sgw3d_harmonic => ML_BSSN_sgw3d_harmonic_phi}/B2.x.asc (75%) copy ML_BSSN_Test/test/{ML_BSSN_sgw3d_harmonic => ML_BSSN_sgw3d_harmonic_phi}/B3.x.asc (75%) create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/Xt1.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/Xt2.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/Xt3.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/alpha.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/beta1.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/beta2.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/beta3.x.asc copy ML_BSSN_Test/test/{ML_BSSN_sgw3d_harmonic => ML_BSSN_sgw3d_harmonic_phi}/cA.x.asc (52%) copy ML_BSSN_Test/test/{ML_BSSN_EE_sgw3d => ML_BSSN_sgw3d_harmonic_phi}/cS.x.asc (100%) create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/cXt1.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/cXt2.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/cXt3.x.asc copy ML_BSSN_Test/test/{ML_BSSN_sgw3d_harmonic/gt22.x.asc => ML_BSSN_sgw3d_harmonic_phi/gt11.x.asc} (56%) create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/gt12.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/gt13.x.asc copy ML_BSSN_Test/test/{ML_BSSN_sgw3d_harmonic => ML_BSSN_sgw3d_harmonic_phi}/gt22.x.asc (50%) create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/gt23.x.asc copy {ML_CCZ4_Test/test/ML_CCZ4_sgw3d => ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi}/gt33.x.asc (58%) create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/gxx.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/kxx.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/phi.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_sgw3d_harmonic_phi/trK.x.asc hooks/post-receive -- McLachlan

1 0

[McLachlan]McLachlan branch, master, updated. 24fb409969654f964c10ac15894a8791680a6895
by Carpet git repositories 15 Apr '13

15 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "McLachlan". The branch, master has been updated via 24fb409969654f964c10ac15894a8791680a6895 (commit) via 976593d219b2e0785540b1168cd58cffb0e3c76d (commit) via d382b047ef15f6bcf81f75deb5f87e6c62c1e2d0 (commit) via 4987875d862b499f080cb4dc66f7d26c90cd52a8 (commit) via 118328bd10f592d82023deb27eac9ffe77aa75b2 (commit) from fdf77c07df6aa7b37ff9726219a29e50f5185645 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 24fb409969654f964c10ac15894a8791680a6895 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Mon Apr 15 16:11:58 2013 +0200 Regenerate code (Kranc commit 519f2cd182c4828e74429e883139fbb8b1a11d3c) Have tested convergence to exact solution for 3D shifted gauge wave with conformalMethod = 0. commit 976593d219b2e0785540b1168cd58cffb0e3c76d Author: Bernard Kelly <bernard.j.kelly(a)nasa.gov> Date: Mon Apr 15 09:25:41 2013 +0200 McLachlan_BSSN.m: Correct harmonic shift for conformalMethod = phi The harmonic shift equations implemented in 7f81c9901489f8a94493320a27437bd125b69010 are correct only for the W conformal method, and lead to wrong results if the phi conformal method is used. This commit corrects this. commit d382b047ef15f6bcf81f75deb5f87e6c62c1e2d0 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Mon Apr 15 15:53:31 2013 +0200 Regenerate ML_BSSN and ML_CCZ4 (Kranc commit 519f2cd182c4828e74429e883139fbb8b1a11d3c) commit 4987875d862b499f080cb4dc66f7d26c90cd52a8 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Mon Apr 15 15:48:29 2013 +0200 SetGroupTags.c: Ignore error if Prolongation table entry is already present Kranc now sets this in interface.ccl commit 118328bd10f592d82023deb27eac9ffe77aa75b2 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Mon Apr 15 12:21:28 2013 +0200 Regenerate code (Kranc commit 519f2cd182c4828e74429e883139fbb8b1a11d3c) ----------------------------------------------------------------------- Summary of changes: ML_ADM/interface.ccl | 8 +- ML_ADM/schedule.ccl | 369 +++--- ML_ADMConstraints/schedule.ccl | 65 +- ML_ADMQuantities/schedule.ccl | 81 +- ML_BSSN/interface.ccl | 18 +- ML_BSSN/schedule.ccl | 1211 ++++++++++---------- ML_BSSN/src/ML_BSSN_RHS1.cc | 33 +- .../src/ML_BSSN_convertToADMBaseDtLapseShift.cc | 36 +- ML_BSSN_Helper/src/SetGroupTags.c | 2 +- ML_CCZ4/interface.ccl | 20 +- ML_CCZ4/schedule.ccl | 1245 ++++++++++---------- ML_CCZ4/src/ML_CCZ4_RHS1.cc | 33 +- .../src/ML_CCZ4_convertToADMBaseDtLapseShift.cc | 36 +- ML_CCZ4_Helper/src/SetGroupTags.c | 2 +- ML_WaveToy/interface.ccl | 4 +- ML_WaveToy/schedule.ccl | 41 +- ML_WaveToy_CL/interface.ccl | 4 +- ML_WaveToy_CL/schedule.ccl | 41 +- m/McLachlan_BSSN.m | 37 +- m/prototype/ML_BSSN_Helper/src/SetGroupTags.c | 2 +- 20 files changed, 1689 insertions(+), 1599 deletions(-) hooks/post-receive -- McLachlan

1 0

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

13 Apr '13

User: eschnett Date: 2013/04/13 05:31 PM Modified: /trunk/src/ GRHydro_LastMoLPostStep.c Log: Set InLastMoLPostStep during initial data setup The previous code accessed MoL_Intermediate_Step, which is undefined during initial data setup. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_LastMoLPostStep.c Delta lines: +2 -1 =================================================================== --- trunk/src/GRHydro_LastMoLPostStep.c 2013-04-10 17:54:10 UTC (rev 505) +++ trunk/src/GRHydro_LastMoLPostStep.c 2013-04-13 22:31:17 UTC (rev 506) @@ -27,7 +27,8 @@ } // If counter becomes zero, the only thing left to do is to call PostStep! - if (*MoL_Intermediate_Step == 0) + // NOTE: MoL's counter is uninitialised during initial data setup! + if (cctk_iteration == 0 || *MoL_Intermediate_Step == 0) *InLastMoLPostStep = 1; else *InLastMoLPostStep = 0;

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 210)
by rhaas＠tapir.caltech.edu 10 Apr '13

10 Apr '13

User: rhaas Date: 2013/04/10 12:54 PM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_CylindricalExplosionM.F90 Log: GRHydro: revert meaning of cyl_r_inner and cyl_r_outer so that they now make sense From: Roland Haas <rhaas(a)caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_CylindricalExplosionM.F90 Delta lines: +16 -16 =================================================================== --- trunk/src/GRHydro_CylindricalExplosionM.F90 2013-03-28 14:26:34 UTC (rev 209) +++ trunk/src/GRHydro_CylindricalExplosionM.F90 2013-04-10 17:54:27 UTC (rev 210) @@ -65,28 +65,28 @@ if (.not. CCTK_EQUALS(initial_Bvec, "cylexp")) then call CCTK_WARN(1, "When using the cyclindrical explosion initial data, please also select 'cylexp' for initial_Bvec. I will proceed as if this was set") end if - + !!$Uses Bx_init, By_init and Bz_init to set magnetic field strength !!$Original tests had Bx_init = 0.1, 1.0 with By_init=Bz_init = 0 - + bvcxl = Bx_init bvcyl = By_init bvczl = Bz_init - -!!$Inner radius and outer radius (Komissarov's defaults) -! r_inner = 8.d-1 -! r_outer = 1.d0 - r_inner = cyl_r_inner - r_outer = cyl_r_outer - -!!$Inner values - rhol = cyl_rho_inner - pressl = cyl_press_inner - -!!$Outer values - rhor = cyl_rho_outer - pressr = cyl_press_outer +!!$Inner radius and outer radius (Komissarov's defaults) +! r_inner = 8.d-1 +! r_outer = 1.d0 + r_inner = cyl_r_inner + r_outer = cyl_r_outer + +!!$Inner values + rhor = cyl_rho_inner + pressr = cyl_press_inner + +!!$Outer values + rhol = cyl_rho_outer + pressl = cyl_press_outer + !!$Adiabatic index for test gam = gl_gamma Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +4 -4 =================================================================== --- trunk/param.ccl 2013-03-28 14:26:34 UTC (rev 209) +++ trunk/param.ccl 2013-04-10 17:54:27 UTC (rev 210) @@ -284,22 +284,22 @@ CCTK_REAL cyl_rho_inner "density in inner core" { (0:* :: "any positive number" -} 1.d-4 +} 1.d-2 CCTK_REAL cyl_press_inner "pressure in inner core" { (0:* :: "any positive number" -} 3.d-5 +} 1.d0 CCTK_REAL cyl_rho_outer "density in outer region" { (0:* :: "any positive number" -} 1.d-2 +} 1.d-4 CCTK_REAL cyl_press_outer "pressure in outer region" { (0:* :: "any positive number" -} 1.d0 +} 3.d-5 # For magnetic advected loop test:

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 505)
by rhaas＠tapir.caltech.edu 10 Apr '13

10 Apr '13

User: rhaas Date: 2013/04/10 12:54 PM Modified: /trunk/src/ GRHydro_Analysis.F90 Log: GRHydro: remove superfluous "divb(i,j,k) +" from divb computation From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Analysis.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_Analysis.F90 2013-04-10 17:54:08 UTC (rev 504) +++ trunk/src/GRHydro_Analysis.F90 2013-04-10 17:54:10 UTC (rev 505) @@ -41,7 +41,7 @@ if(track_divB.ne.0) then if(transport_constraints.ne.0) then ! edge based divergence (see WhiskyMHD & Bruno's thesis, Eq. 7.27) - divB(i,j,k) = divB(i,j,k) + & + divB(i,j,k) = & 0.25d0*(Bcons(i+1,j,k,1)-Bcons(i,j,k,1)+ & Bcons(i+1,j+1,k,1)-Bcons(i,j+1,k,1)+ & Bcons(i+1,j,k+1,1)-Bcons(i,j,k+1,1)+ & @@ -68,7 +68,7 @@ Bcons_r3 = 0.5d0 * (Bcons(i,j,k,3) + & Bcons(i,j,k+1,3)) - divB(i,j,k) = divB(i,j,k) + (Bcons_l1 - Bcons_r1) * idx + (Bcons_l2 - Bcons_r2) * idy + (Bcons_l3 - Bcons_r3) * idz + divB(i,j,k) = (Bcons_l1 - Bcons_r1) * idx + (Bcons_l2 - Bcons_r2) * idy + (Bcons_l3 - Bcons_r3) * idz endif endif

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 504)
by rhaas＠tapir.caltech.edu 10 Apr '13

10 Apr '13

User: rhaas Date: 2013/04/10 12:54 PM Modified: /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_HLLE.F90 Log: GRHydro: Critical bugfix: Con2Prim was probably never executed in post_recover_variables or for new points in post_regrid since excision mask does typically not get initialized before MoL_PostStep! Also: Instead of aborting Con2Prim, set points to atmopshere for a point where hydro_excision_mask > 0. From: Christian Reisswig <reisswig(a)scriwalker.(none)> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +58 -7 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2013-03-28 03:02:49 UTC (rev 503) +++ trunk/src/GRHydro_Con2Prim.F90 2013-04-10 17:54:08 UTC (rev 504) @@ -117,6 +117,24 @@ do i = 1, nx #if 0 + if (dens(i,j,k).ne.dens(i,j,k)) then + !$OMP CRITICAL + call CCTK_WARN(1,"dens NAN at entry of Con2Prim") + write(warnline,"(A10,i5)") "reflevel: ",GRHydro_reflevel + call CCTK_WARN(1,warnline) + write(warnline,"(3i5,1P10E15.6)") i,j,k,x(i,j,k),y(i,j,k),z(i,j,k) + call CCTK_WARN(1,warnline) + write(warnline,"(1P10E15.6)") rho(i,j,k),dens(i,j,k),eps(i,j,k) + call CCTK_WARN(1,warnline) + write(warnline,'(a32,2i3)') 'hydro_excision_mask, atmosphere_mask: ', hydro_excision_mask(i,j,k), atmosphere_mask(i,j,k) + call CCTK_WARN(1,warnline) + call CCTK_WARN(0,"Aborting!!!") + !$OMP END CRITICAL + endif +#endif + + +#if 0 !$OMP CRITICAL if (rho(i,j,k).le.0.0d0) then call CCTK_WARN(1,"rho less than zero at entry of Con2Prim") @@ -131,10 +149,10 @@ !$OMP END CRITICAL #endif - !do not compute if in atmosphere or in excised region - if ((atmosphere_mask(i,j,k) .ne. 0) .or. & - (hydro_excision_mask(i,j,k) .ne. 0)) cycle - + + !do not compute if in atmosphere region! + if (atmosphere_mask(i,j,k) .gt. 0) cycle + epsnegative = .false. det = SPATIAL_DETERMINANT(g11(i,j,k),g12(i,j,k),g13(i,j,k), \ @@ -143,6 +161,38 @@ g11(i,j,k),g12(i,j,k),g13(i,j,k),g22(i,j,k),& g23(i,j,k),g33(i,j,k)) + ! In excised region, set to atmosphere! + if (GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .gt. 0)) then + 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 + + if(evolve_temper.ne.0) then + ! set hot atmosphere values + temperature(i,j,k) = grhydro_hot_atmo_temp + y_e(i,j,k) = grhydro_hot_atmo_Y_e + y_e_con(i,j,k) = y_e(i,j,k) * dens(i,j,k) + keytemp = 1 + call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),eps(i,j,k),temperature(i,j,k),y_e(i,j,k),& + press(i,j,k),keyerr,anyerr) + else + keytemp = 0 + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr) + + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),eps(i,j,k),keyerr,anyerr) + endif + + ! w_lorentz=1, so the expression for tau reduces to: + tau(i,j,k) = sqrt(det) * (rho(i,j,k)+rho(i,j,k)*eps(i,j,k)) - dens(i,j,k) + + cycle + endif + !!$ if (det < 0.e0) then !!$ call CCTK_WARN(0, "nan produced (det negative)") !!$ end if @@ -169,7 +219,6 @@ !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 - 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 @@ -429,7 +478,8 @@ n=1;keytemp=0;anyerr=0;keyerr(1)=0 xpress=0.0d0;xtemp=0.0d0;xye=0.0d0 ! end EOS Omni vars - + + !!$ Undensitize the variables udens = dens /sqrt(det) @@ -439,7 +489,8 @@ utau = tau /sqrt(det) s2 = usx*usx*uxx + usy*usy*uyy + usz*usz*uzz + 2.*usx*usy*uxy + & 2.*usx*usz*uxz + 2.*usy*usz*uyz - + + !!$ Set initial guess for pressure: call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,epsilon,xtemp,xye,xpress,keyerr,anyerr) File [modified]: GRHydro_HLLE.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_HLLE.F90 2013-03-28 03:02:49 UTC (rev 503) +++ trunk/src/GRHydro_HLLE.F90 2013-04-10 17:54:08 UTC (rev 504) @@ -108,7 +108,7 @@ !do not compute if in atmosphere or in excised region if ((atmosphere_mask(i,j,k) .ne. 0) .or. & - (hydro_excision_mask(i,j,k) .ne. 0)) cycle + (GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .gt. 0))) cycle !!$ Set required fluid quantities if (evolve_temper.ne.1) then

1 0

[Carpet] branch, master, updated. carpet-6-init-225-gc35f19d
by Carpet git repositories 10 Apr '13

10 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via c35f19d61efd8d93b4d58882cf1ad7c8481c2f3a (commit) from 2432ebfa38bc1cb69e3ed08f134fa38c757ca43e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c35f19d61efd8d93b4d58882cf1ad7c8481c2f3a Author: Erik Schnetter <schnetter(a)gmail.com> Date: Wed Apr 10 12:12:25 2013 -0400 CarpetLib: Vectors is currently required, not optional Vectors is supposed to be an optional dependency, but building currently fails without this thorn. ----------------------------------------------------------------------- Summary of changes: Carpet/CarpetLib/configuration.ccl | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[svn:einsteintoolkit] HydroBase/trunk/ (Rev. 60)
by reisswig＠tapir.caltech.edu 10 Apr '13

10 Apr '13

User: reisswig Date: 2013/04/10 10:51 AM Modified: /trunk/ schedule.ccl Log: Schedule HydroExcisionMask ini bin before MoL_PostStep. File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +3 -3 =================================================================== --- trunk/schedule.ccl 2012-11-21 20:50:20 UTC (rev 59) +++ trunk/schedule.ccl 2013-04-10 15:51:25 UTC (rev 60) @@ -211,13 +211,13 @@ schedule GROUP HydroBase_ExcisionMaskSetup in HydroBase_Initial { } "Set up hydro excision mask" - schedule GROUP HydroBase_ExcisionMaskSetup at PostRegridInitial + schedule GROUP HydroBase_ExcisionMaskSetup at PostRegridInitial BEFORE MoL_PostStep { } "Set up hydro excision mask" - schedule GROUP HydroBase_ExcisionMaskSetup at PostRegrid + schedule GROUP HydroBase_ExcisionMaskSetup at PostRegrid BEFORE MoL_PostStep { } "Set up hydro excision mask" - schedule GROUP HydroBase_ExcisionMaskSetup at Post_Recover_Variables + schedule GROUP HydroBase_ExcisionMaskSetup at Post_Recover_Variables BEFORE MoL_PostStep { } "Set up hydro excision mask"

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 April 2013