Commits January 2013

commits@lists.einsteintoolkit.org

9 participants
94 discussions

[svn:einsteintoolkit] Exact/trunk/test/ (Rev. 288)
by rhaas＠tapir.caltech.edu 17 Jan '13

17 Jan '13

User: rhaas Date: 2013/01/17 11:03 AM Modified: /trunk/test/ de_Sitter.par Log: activate TmunuBase in test parfiles required since ADMConstraints inherits from TmunuBase since rev 154. File Changes: Directory: /trunk/test/ ======================= File [modified]: de_Sitter.par Delta lines: +1 -1 =================================================================== --- trunk/test/de_Sitter.par 2012-12-19 15:12:36 UTC (rev 287) +++ trunk/test/de_Sitter.par 2013-01-17 17:03:58 UTC (rev 288) @@ -3,7 +3,7 @@ # $Header$ # Required thorns -ActiveThorns = "CartGrid3D CoordBase SymBase Boundary Time PUGH PUGHReduce PUGHSlab IOAscii IOUtil IOBasic LocalReduce ADMBase ADMMacros ADMConstraints ADMCoupling StaticConformal CoordGauge SpaceMask ReflectionSymmetry Exact" +ActiveThorns = "CartGrid3D CoordBase SymBase Boundary Time PUGH PUGHReduce PUGHSlab IOAscii IOUtil IOBasic LocalReduce TmunuBase ADMBase ADMMacros ADMConstraints ADMCoupling StaticConformal CoordGauge SpaceMask ReflectionSymmetry Exact" # Grid driver::global_nx = 10

1 0

[svn:einsteintoolkit] DistortedBHIVP/trunk/test/ (Rev. 60)
by rhaas＠tapir.caltech.edu 17 Jan '13

17 Jan '13

User: rhaas Date: 2013/01/17 11:03 AM Modified: /trunk/test/ E2xeon_test_dbh.par, test_dbh.par Log: activate TmunuBase in test parfiles required since ADMConstraints inherits from TmunuBase since rev 154. File Changes: Directory: /trunk/test/ ======================= File [modified]: E2xeon_test_dbh.par Delta lines: +1 -1 =================================================================== --- trunk/test/E2xeon_test_dbh.par 2012-11-05 14:46:10 UTC (rev 59) +++ trunk/test/E2xeon_test_dbh.par 2013-01-17 17:03:27 UTC (rev 60) @@ -2,7 +2,7 @@ #!DESC "Initial data for axisymmetric distored black hole" ###################################################################### -ActiveThorns = "coordgauge admanalysis admbase admmacros staticconformal time boundary ADMCoupling ADMconstraints pugh pughreduce pughslab pughinterp LocalInterp SymBase CoordBase cartgrid3d SpaceMask DistortedBHIVP ioascii iobasic ioutil LocalReduce" +ActiveThorns = "coordgauge admanalysis tmunubase admbase admmacros staticconformal time boundary ADMCoupling ADMconstraints pugh pughreduce pughslab pughinterp LocalInterp SymBase CoordBase cartgrid3d SpaceMask DistortedBHIVP ioascii iobasic ioutil LocalReduce" # GENERAL File [modified]: test_dbh.par Delta lines: +1 -1 =================================================================== --- trunk/test/test_dbh.par 2012-11-05 14:46:10 UTC (rev 59) +++ trunk/test/test_dbh.par 2013-01-17 17:03:27 UTC (rev 60) @@ -2,7 +2,7 @@ # single rotating black hole #============================================================================== -ActiveThorns = " DistortedBHIVP adm coordbase coordgauge staticconformal spacemask admbase admcoupling admmacros admanalysis ellbase cartgrid3d time pugh pughreduce pughslab ioascii ioutil iobasic adm admconstraints symbase boundary pughinterp LocalInterp flexio nanchecker LocalReduce" +ActiveThorns = " DistortedBHIVP adm coordbase coordgauge staticconformal spacemask tmunubase admbase admcoupling admmacros admanalysis ellbase cartgrid3d time pugh pughreduce pughslab ioascii ioutil iobasic adm admconstraints symbase boundary pughinterp LocalInterp flexio nanchecker LocalReduce" IOBasic::outScalar_vars = " admbase::metric admbase::curv admbase::lapse admbase::shift admconstraints::momy admconstraints::ham " IOBasic::outInfo_vars = " admconstraints::ham admbase::alp " IOASCII::out1D_vars = " admbase::metric admbase::curv admbase::lapse admbase::shift admconstraints::momy admconstraints::ham "

1 0

[svn:einsteintoolkit] ADMConstraints/trunk/ (Rev. 154)
by rhaas＠tapir.caltech.edu 17 Jan '13

17 Jan '13

User: rhaas Date: 2013/01/17 10:59 AM Modified: /trunk/ interface.ccl /trunk/src/ ADMConstraints.F /trunk/test/ ADMConstraints_Mask.par, ADMConstraints_Physical.par, ADMConstraints_Shift.par, test_ADM.par Log: support "new" interface to TmunuBase we check at runtime if storage was allocated for Tmunu and use the data stored there rather than re-computing it using hte include file. Note: this requires that we inherit from TmunuBase, hence all runs even vacuum runs using ADMConstraints need to activate TmunuBase (but need not allocate storage for it). File Changes: Directory: /trunk/src/ ====================== File [modified]: ADMConstraints.F Delta lines: +20 -7 =================================================================== --- trunk/src/ADMConstraints.F 2012-11-05 14:44:50 UTC (rev 153) +++ trunk/src/ADMConstraints.F 2013-01-17 16:59:32 UTC (rev 154) @@ -157,16 +157,29 @@ c Initialize stress-energy tensor components. - Ttt = 0.0D0 - - Ttx = 0.0D0; Tty = 0.0D0; Ttz = 0.0D0 - - Txx = 0.0D0; Tyy = 0.0D0; Tzz = 0.0D0 - Txy = 0.0D0; Txz = 0.0D0; Tyz = 0.0D0 + if (stress_energy_state .ne. 0) then -c Include macro for stress energy tensor. + Ttt = eTtt(i,j,k) + Ttx = eTtx(i,j,k); Tty = eTty(i,j,k); Ttz = eTtz(i,j,k) + + Txx = eTxx(i,j,k); Tyy = eTyy(i,j,k); Tzz = eTzz(i,j,k) + + + else + + Ttt = 0.0D0 + + Ttx = 0.0D0; Tty = 0.0D0; Ttz = 0.0D0 + + Txx = 0.0D0; Tyy = 0.0D0; Tzz = 0.0D0 + Txy = 0.0D0; Txz = 0.0D0; Tyz = 0.0D0 + +c Include macro for stress energy tensor. + #include "CalcTmunu.inc" + + end if c Calculate the hamiltonian constraint c ------------------------------------ Directory: /trunk/test/ ======================= File [modified]: ADMConstraints_Mask.par Delta lines: +1 -1 =================================================================== --- trunk/test/ADMConstraints_Mask.par 2012-11-05 14:44:50 UTC (rev 153) +++ trunk/test/ADMConstraints_Mask.par 2013-01-17 16:59:32 UTC (rev 154) @@ -12,7 +12,7 @@ # @@*/ # Required thorns -ActiveThorns = "ADMCoupling Boundary Time ADMconstraints pugh ADM CoordGauge pughreduce CartGrid3D CoordBase SymBase ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic localreduce" +ActiveThorns = "ADMCoupling Boundary Time ADMconstraints pugh ADM CoordGauge pughreduce CartGrid3D CoordBase SymBase TmunuBase ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic localreduce" # GENERAL File [modified]: ADMConstraints_Physical.par Delta lines: +1 -1 =================================================================== --- trunk/test/ADMConstraints_Physical.par 2012-11-05 14:44:50 UTC (rev 153) +++ trunk/test/ADMConstraints_Physical.par 2013-01-17 16:59:32 UTC (rev 154) @@ -12,7 +12,7 @@ # @@*/ # Required thorns -ActiveThorns = "ADMCoupling Boundary Time ADMconstraints ADM CoordGauge pugh pughreduce CartGrid3D CoordBase SymBase ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic localreduce" +ActiveThorns = "ADMCoupling Boundary Time ADMconstraints ADM CoordGauge pugh pughreduce CartGrid3D CoordBase SymBase TmunuBase ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic localreduce" # GENERAL File [modified]: ADMConstraints_Shift.par Delta lines: +1 -1 =================================================================== --- trunk/test/ADMConstraints_Shift.par 2012-11-05 14:44:50 UTC (rev 153) +++ trunk/test/ADMConstraints_Shift.par 2013-01-17 16:59:32 UTC (rev 154) @@ -12,7 +12,7 @@ # @@*/ # Required thorns -ActiveThorns = "ADMCoupling Boundary Time ADMconstraints ADM CoordGauge pugh pughreduce CartGrid3D CoordBase SymBase ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic localreduce" +ActiveThorns = "ADMCoupling Boundary Time ADMconstraints ADM CoordGauge pugh pughreduce CartGrid3D CoordBase SymBase TmunuBase ADMBase StaticConformal admmacros spacemask idanalyticbh ioutil iobasic localreduce" # GENERAL File [modified]: test_ADM.par Delta lines: +1 -1 =================================================================== --- trunk/test/test_ADM.par 2012-11-05 14:44:50 UTC (rev 153) +++ trunk/test/test_ADM.par 2013-01-17 16:59:32 UTC (rev 154) @@ -12,7 +12,7 @@ # @@*/ # Required thorns -ActiveThorns = "ADMCoupling Boundary Time ADMconstraints pugh pughreduce CartGrid3D CoordBase SymBase ADMBase StaticConformal admmacros coordgauge spacemask ADM idanalyticbh ioutil iobasic localreduce" +ActiveThorns = "ADMCoupling Boundary Time ADMconstraints pugh pughreduce CartGrid3D CoordBase SymBase TmunuBase ADMBase StaticConformal admmacros coordgauge spacemask ADM idanalyticbh ioutil iobasic localreduce" # GENERAL Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- trunk/interface.ccl 2012-11-05 14:44:50 UTC (rev 153) +++ trunk/interface.ccl 2013-01-17 16:59:32 UTC (rev 154) @@ -2,7 +2,7 @@ # $Header$ implements: admconstraints -inherits: ADMBase, StaticConformal, SpaceMask, grid, ADMMacros +inherits: ADMBase, StaticConformal, SpaceMask, grid, ADMMacros, TmunuBase friend: ADMCoupling USES INCLUDE: CalcTmunu.inc

1 0

[svn:einsteintoolkit] manifest/trunk/ (Rev. 201)
by eloisa.bentivegna＠aei.mpg.de 16 Jan '13

16 Jan '13

User: bentivegna Date: 2013/01/16 10:00 AM Modified: /trunk/ einsteintoolkit.bib Log: Added publications Bentivegna:2012ei and Hinder:2011xx. File Changes: Directory: /trunk/ ================== File [modified]: einsteintoolkit.bib Delta lines: +24 -0 =================================================================== --- trunk/einsteintoolkit.bib 2012-11-19 01:54:37 UTC (rev 200) +++ trunk/einsteintoolkit.bib 2013-01-16 16:00:08 UTC (rev 201) @@ -634,6 +634,18 @@ adsnote = {Provided by the SAO/NASA Astrophysics Data System} } +@article{Bentivegna:2012ei, + author = "Bentivegna, Eloisa and Korzynski, Mikolaj", + title = "{Evolution of a periodic eight-black-hole lattice in + numerical relativity}", + journal = "Class.Quant.Grav.", + volume = "29", + pages = "165007", + year = "2012", + eprint = "arXiv:1204.3568 [gr-qc]", + doi = "10.1088/0264-9381/29/16/165007" +} + @article{Berger:1984zza, author = "Berger, Marsha J. and Oliger, Joseph", title = "{Adaptive Mesh Refinement for Hyperbolic Partial @@ -1857,6 +1869,18 @@ SLACcitation = "%%CITATION = 0710.5167;%%" } +@article{Hinder:2011xx, + author = "Hinder, Ian and Wardell, Barry and Bentivegna, Eloisa", + title = "{Falloff of the Weyl scalars in binary black hole + spacetimes}", + journal = "Phys.Rev.", + volume = "D84", + pages = "024036", + year = "2011", + eprint = "arXiv:1105.0781 [gr-qc]", + doi = "10.1103/PhysRevD.84.024036" +} + @Article{HolleyBockelmann:2007eh, author = "Holley-Bockelmann, Kelly and Gultekin, Kayhan and Shoemaker, Deirdre and Yunes, Nico",

1 0

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

14 Jan '13

User: rhaas Date: 2013/01/14 07:48 PM Modified: /trunk/test/ diag_flip_pugh_eno.par, diag_pugh_eno.par, halfsphere_pugh_ppm.par, sphere_pugh_ppm.par, x_flip_pugh_eno.par, x_pugh_eno.par /trunk/test/diag_flip_pugh_eno/ dens_3D_diagonal.asc, dens_minimum.asc, eps_3D_diagonal.asc, eps_minimum.asc, press_3D_diagonal.asc, press_minimum.asc, rho_3D_diagonal.asc, rho_minimum.asc, tau_3D_diagonal.asc, tau_minimum.asc /trunk/test/diag_pugh_eno/ dens_3D_diagonal.asc, dens_minimum.asc, eps_3D_diagonal.asc, eps_minimum.asc, press_3D_diagonal.asc, press_minimum.asc, rho_3D_diagonal.asc, rho_minimum.asc, tau_3D_diagonal.asc, tau_minimum.asc /trunk/test/halfsphere_pugh_ppm/ dens_minimum.asc, dens_x_[19][19].asc, eps_minimum.asc, eps_x_[19][19].asc, press_minimum.asc, press_x_[19][19].asc, rho_minimum.asc, rho_x_[19][19].asc, tau_minimum.asc, tau_x_[19][19].asc /trunk/test/sphere_pugh_ppm/ dens_3D_diagonal.asc, dens_minimum.asc, dens_x_[19][19].asc, dens_y_[19][19].asc, dens_z_[19][19].asc, eps_3D_diagonal.asc, eps_minimum.asc, eps_x_[19][19].asc, eps_y_[19][19].asc, eps_z_[19][19].asc, press_3D_diagonal.asc, press_minimum.asc, press_x_[19][19].asc, press_y_[19][19].asc, press_z_[19][19].asc, rho_3D_diagonal.asc, rho_minimum.asc, rho_x_[19][19].asc, rho_y_[19][19].asc, rho_z_[19][19].asc, tau_3D_diagonal.asc, tau_minimum.asc, tau_x_[19][19].asc, tau_y_[19][19].asc, tau_z_[19][19].asc /trunk/test/x_flip_pugh_eno/ dens_3D_diagonal.asc, dens_minimum.asc, dens_x_[2][2].asc, eps_3D_diagonal.asc, eps_minimum.asc, eps_x_[2][2].asc, press_3D_diagonal.asc, press_minimum.asc, press_x_[2][2].asc, rho_3D_diagonal.asc, rho_minimum.asc, rho_x_[2][2].asc, tau_3D_diagonal.asc, tau_minimum.asc, tau_x_[2][2].asc /trunk/test/x_pugh_eno/ dens_minimum.asc, dens_x_[2][2].asc, eps_minimum.asc, eps_x_[2][2].asc, press_minimum.asc, press_x_[2][2].asc, rho_minimum.asc, rho_x_[2][2].asc, tau_minimum.asc, tau_x_[2][2].asc Log: Hydro_InitiExcision: update test data after GRhydro rev 447 which already applied the atmosphere reset at cctk_iteration==0 File Changes: Directory: /trunk/test/diag_flip_pugh_eno/ ========================================== File [modified]: dens_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: dens_minimum.asc Delta lines: <Unavailable> File [modified]: eps_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: eps_minimum.asc Delta lines: <Unavailable> File [modified]: press_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: press_minimum.asc Delta lines: <Unavailable> File [modified]: rho_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: rho_minimum.asc Delta lines: <Unavailable> File [modified]: tau_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: tau_minimum.asc Delta lines: <Unavailable> Directory: /trunk/test/diag_pugh_eno/ ===================================== File [modified]: dens_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: dens_minimum.asc Delta lines: <Unavailable> File [modified]: eps_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: eps_minimum.asc Delta lines: <Unavailable> File [modified]: press_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: press_minimum.asc Delta lines: <Unavailable> File [modified]: rho_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: rho_minimum.asc Delta lines: <Unavailable> File [modified]: tau_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: tau_minimum.asc Delta lines: <Unavailable> Directory: /trunk/test/halfsphere_pugh_ppm/ =========================================== File [modified]: dens_minimum.asc Delta lines: <Unavailable> File [modified]: dens_x_[19][19].asc Delta lines: <Unavailable> File [modified]: eps_minimum.asc Delta lines: <Unavailable> File [modified]: eps_x_[19][19].asc Delta lines: <Unavailable> File [modified]: press_minimum.asc Delta lines: <Unavailable> File [modified]: press_x_[19][19].asc Delta lines: <Unavailable> File [modified]: rho_minimum.asc Delta lines: <Unavailable> File [modified]: rho_x_[19][19].asc Delta lines: <Unavailable> File [modified]: tau_minimum.asc Delta lines: <Unavailable> File [modified]: tau_x_[19][19].asc Delta lines: <Unavailable> Directory: /trunk/test/sphere_pugh_ppm/ ======================================= File [modified]: dens_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: dens_minimum.asc Delta lines: <Unavailable> File [modified]: dens_x_[19][19].asc Delta lines: <Unavailable> File [modified]: dens_y_[19][19].asc Delta lines: <Unavailable> File [modified]: dens_z_[19][19].asc Delta lines: <Unavailable> File [modified]: eps_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: eps_minimum.asc Delta lines: <Unavailable> File [modified]: eps_x_[19][19].asc Delta lines: <Unavailable> File [modified]: eps_y_[19][19].asc Delta lines: <Unavailable> File [modified]: eps_z_[19][19].asc Delta lines: <Unavailable> File [modified]: press_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: press_minimum.asc Delta lines: <Unavailable> File [modified]: press_x_[19][19].asc Delta lines: <Unavailable> File [modified]: press_y_[19][19].asc Delta lines: <Unavailable> File [modified]: press_z_[19][19].asc Delta lines: <Unavailable> File [modified]: rho_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: rho_minimum.asc Delta lines: <Unavailable> File [modified]: rho_x_[19][19].asc Delta lines: <Unavailable> File [modified]: rho_y_[19][19].asc Delta lines: <Unavailable> File [modified]: rho_z_[19][19].asc Delta lines: <Unavailable> File [modified]: tau_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: tau_minimum.asc Delta lines: <Unavailable> File [modified]: tau_x_[19][19].asc Delta lines: <Unavailable> File [modified]: tau_y_[19][19].asc Delta lines: <Unavailable> File [modified]: tau_z_[19][19].asc Delta lines: <Unavailable> Directory: /trunk/test/ ======================= File [modified]: diag_flip_pugh_eno.par Delta lines: <Unavailable> File [modified]: diag_pugh_eno.par Delta lines: <Unavailable> File [modified]: halfsphere_pugh_ppm.par Delta lines: <Unavailable> File [modified]: sphere_pugh_ppm.par Delta lines: <Unavailable> File [modified]: x_flip_pugh_eno.par Delta lines: <Unavailable> File [modified]: x_pugh_eno.par Delta lines: <Unavailable> Directory: /trunk/test/x_flip_pugh_eno/ ======================================= File [modified]: dens_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: dens_minimum.asc Delta lines: <Unavailable> File [modified]: dens_x_[2][2].asc Delta lines: <Unavailable> File [modified]: eps_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: eps_minimum.asc Delta lines: <Unavailable> File [modified]: eps_x_[2][2].asc Delta lines: <Unavailable> File [modified]: press_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: press_minimum.asc Delta lines: <Unavailable> File [modified]: press_x_[2][2].asc Delta lines: <Unavailable> File [modified]: rho_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: rho_minimum.asc Delta lines: <Unavailable> File [modified]: rho_x_[2][2].asc Delta lines: <Unavailable> File [modified]: tau_3D_diagonal.asc Delta lines: <Unavailable> File [modified]: tau_minimum.asc Delta lines: <Unavailable> File [modified]: tau_x_[2][2].asc Delta lines: <Unavailable> Directory: /trunk/test/x_pugh_eno/ ================================== File [modified]: dens_minimum.asc Delta lines: <Unavailable> File [modified]: dens_x_[2][2].asc Delta lines: <Unavailable> File [modified]: eps_minimum.asc Delta lines: <Unavailable> File [modified]: eps_x_[2][2].asc Delta lines: <Unavailable> File [modified]: press_minimum.asc Delta lines: <Unavailable> File [modified]: press_x_[2][2].asc Delta lines: <Unavailable> File [modified]: rho_minimum.asc Delta lines: <Unavailable> File [modified]: rho_x_[2][2].asc Delta lines: <Unavailable> File [modified]: tau_minimum.asc Delta lines: <Unavailable> File [modified]: tau_x_[2][2].asc Delta lines: <Unavailable>

1 0

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

14 Jan '13

User: rhaas Date: 2013/01/14 07:45 PM Modified: /trunk/test/ test.ccl Log: GRHydro: restrict carpetevolutionmask test to 2 processes this fixes a test failure introduced in r454 File Changes: Directory: /trunk/test/ ======================= File [modified]: test.ccl Delta lines: +5 -0 =================================================================== --- trunk/test/test.ccl 2013-01-14 14:23:54 UTC (rev 466) +++ trunk/test/test.ccl 2013-01-15 01:45:36 UTC (rev 467) @@ -1,6 +1,11 @@ ABSTOL 1.e-11 RELTOL 1.e-11 +TEST tov_carpetevolutionmask +{ + NPROCS 2 +} + TEST test_tov_carpet_refined_nosync { NPROCS 2

1 0

[svn:einsteintoolkit] NewRad/trunk/src/ (Rev. 19)
by schnetter＠cct.lsu.edu 14 Jan '13

14 Jan '13

User: eschnett Date: 2013/01/14 11:53 AM Modified: /trunk/src/ extrap.cc, newrad.cc Log: Support array padding (take cctk_ash into account) File Changes: Directory: /trunk/src/ ====================== File [modified]: extrap.cc Delta lines: +7 -3 =================================================================== --- trunk/src/extrap.cc 2013-01-10 23:25:45 UTC (rev 18) +++ trunk/src/extrap.cc 2013-01-14 17:53:39 UTC (rev 19) @@ -24,14 +24,18 @@ int const nj = cctkGH->cctk_lsh[1]; int const nk = cctkGH->cctk_lsh[2]; + int const ai = cctkGH->cctk_ash[0]; + int const aj = cctkGH->cctk_ash[1]; + int const ak = cctkGH->cctk_ash[2]; + int const si = -dir[0]; int const sj = -dir[1]; int const sk = -dir[2]; int const di = 1; - int const dj = ni; - int const dk = ni*nj; - int const np = ni*nj*nk; + int const dj = ai; + int const dk = ai*aj; + int const np = ai*aj*ak; int const dind = si*di + sj*dj + sk*dk; File [modified]: newrad.cc Delta lines: +6 -2 =================================================================== --- trunk/src/newrad.cc 2013-01-10 23:25:45 UTC (rev 18) +++ trunk/src/newrad.cc 2013-01-14 17:53:39 UTC (rev 19) @@ -32,13 +32,17 @@ int const nj = cctkGH->cctk_lsh[1]; int const nk = cctkGH->cctk_lsh[2]; + int const ai = cctkGH->cctk_ash[0]; + int const aj = cctkGH->cctk_ash[1]; + int const ak = cctkGH->cctk_ash[2]; + int const si = dir[0]; int const sj = dir[1]; int const sk = dir[2]; int const di = 1; - int const dj = ni; - int const dk = ni*nj; + int const dj = ai; + int const dk = ai*aj; CCTK_REAL const dx = cctkGH->cctk_delta_space[0] / cctkGH->cctk_levfac[0]; CCTK_REAL const dy = cctkGH->cctk_delta_space[1] / cctkGH->cctk_levfac[1];

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 466)
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_Eigenproblem.F90, GRHydro_Reconstruct.F90, GRHydro_WENOReconstruct.F90 Log: GRHydro: Improved WENO implementation: (i) Pick adaptive epsilon-parameter according to WHAM code paper, (ii) Catch epsilon<0 for non-microphysical EOS. Tested with shock tube and TOV. From: Christian Reisswig <reisswig(a)scriwalker.(none)> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2013-01-14 14:23:52 UTC (rev 465) +++ trunk/src/GRHydro_Eigenproblem.F90 2013-01-14 14:23:54 UTC (rev 466) @@ -88,7 +88,7 @@ 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 + write(warnline,'(a60,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(1,"cs2 < 0! Check speed of sound calculation!") cs2 = 0.0d0 File [modified]: GRHydro_Reconstruct.F90 Delta lines: +14 -1 =================================================================== --- trunk/src/GRHydro_Reconstruct.F90 2013-01-14 14:23:52 UTC (rev 465) +++ trunk/src/GRHydro_Reconstruct.F90 2013-01-14 14:23:54 UTC (rev 466) @@ -49,6 +49,7 @@ CCTK_REAL :: local_min_tracer, dummy1, dummy2 CCTK_INT :: type_bits, not_trivial CCTK_REAL :: agxx, agxy, agxz, agyy, agyz, agzz, w + character*256 :: warnline ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates @@ -130,7 +131,7 @@ 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 - + !.or. epsplus(i,j,k) .lt. 0.0d0 .or. epsminus(i,j,k) .lt. 0.0d0) then rhoplus(i,j,k) = rho(i,j,k) rhominus(i,j,k) = rho(i,j,k) epsplus(i,j,k) = eps(i,j,k) @@ -198,9 +199,21 @@ end where end if end if + + ! Check if epsilon became negative for ideal gas EOS. + if (evolve_temper.eq.0) then + if (epsplus(i,j,k) .lt. 0.0d0) then + epsplus(i,j,k) = eps(i,j,k) + endif + if (epsminus(i,j,k) .lt. 0.0d0) then + epsminus(i,j,k) = eps(i,j,k) + endif + endif + ! Riemann problem might not be trivial anymore!!!! SpaceMask_SetStateBitsF90(space_mask, i-xoffset, j-yoffset, k-zoffset, type_bits, not_trivial) SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bits, not_trivial) + enddo enddo enddo File [modified]: GRHydro_WENOReconstruct.F90 Delta lines: +39 -19 =================================================================== --- trunk/src/GRHydro_WENOReconstruct.F90 2013-01-14 14:23:52 UTC (rev 465) +++ trunk/src/GRHydro_WENOReconstruct.F90 2013-01-14 14:23:54 UTC (rev 466) @@ -158,14 +158,15 @@ CCTK_INT :: order, nx, i, j, k, r CCTK_REAL, dimension(nx) :: v, vplus, vminus - CCTK_REAL, dimension(order, 1-order:nx+order) :: vdiff CCTK_INT, dimension(nx) :: hydro_excision_mask logical, dimension(nx) :: trivial_rp logical, dimension(nx) :: excise logical :: normal_weno - CCTK_REAL :: large = 1.d10, gamma1, gamma2, gamma3, beta1, beta2, beta3, w1, w2, w3, wbar1, wbar2, wbar3 + CCTK_REAL :: large = 1.d10, gamma1, gamma2, gamma3, beta1, beta2, beta3, vnorm, betanorm + CCTK_REAL :: wplus1, wplus2, wplus3, wbarplus1, wbarplus2, wbarplus3 + CCTK_REAL :: wminus1, wminus2, wminus3, wbarminus1, wbarminus2, wbarminus3 vminus = 0.d0 vplus = 0.d0 @@ -173,12 +174,9 @@ excise = .false. trivial_rp = .false. - - !!$ Initialize excision do i = 1, nx if (GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i) .ne. 0)) then - vdiff(1, i) = large * (-1.d0*(1.d0+mod(i,10)))**i trivial_rp(i) = .true. excise(i) = .true. if (i > 1) then @@ -208,6 +206,7 @@ if (normal_weno) then !!$ Compute smoothness indicators +!!$ This is from Tchekhovskoy et al 2007 (WHAM code paper). beta1 = beta_shu(1,1)*v(i-2)**2 & + beta_shu(1,2)*v(i-2)*v(i-1) & + beta_shu(1,3)*v(i-1)**2 & @@ -230,25 +229,46 @@ + beta_shu(3,6)*v(i+2)**2 - wbar1 = 1.0d0/16.d0 / (weno_eps + beta1)**2 - wbar2 = 5.0d0/8.d0 / (weno_eps + beta2)**2 - wbar3 = 5.0d0/16.d0 / (weno_eps + beta3)**2 + vnorm = (v(i-2)**2 + v(i-1)**2 + v(i)**2 + v(i+1)**2 + v(i+2)**2) + + beta1 = beta1 + 100.0d0*weno_eps*(vnorm + 1.0d0) + beta2 = beta2 + 100.0d0*weno_eps*(vnorm + 1.0d0) + beta3 = beta3 + 100.0d0*weno_eps*(vnorm + 1.0d0) + + betanorm = beta1 + beta2 + beta3 + + beta1 = beta1 / betanorm + beta2 = beta2 / betanorm + beta3 = beta3 / betanorm + + wbarplus1 = 1.0d0/16.0d0 / (weno_eps + beta1)**2 + wbarplus2 = 5.0d0/8.0d0 / (weno_eps + beta2)**2 + wbarplus3 = 5.0d0/16.0d0 / (weno_eps + beta3)**2 - w1 = wbar1 / (wbar1 + wbar2 + wbar3) - w2 = wbar2 / (wbar1 + wbar2 + wbar3) - w3 = wbar3 / (wbar1 + wbar2 + wbar3) + wplus1 = wbarplus1 / (wbarplus1 + wbarplus2 + wbarplus3) + wplus2 = wbarplus2 / (wbarplus1 + wbarplus2 + wbarplus3) + wplus3 = wbarplus3 / (wbarplus1 + wbarplus2 + wbarplus3) + + wbarminus1 = 5.0d0/16.0d0 / (weno_eps + beta1)**2 + wbarminus2 = 5.0d0/8.0d0 / (weno_eps + beta2)**2 + wbarminus3 = 1.0d0/16.0d0 / (weno_eps + beta3)**2 + wminus1 = wbarminus1 / (wbarminus1 + wbarminus2 + wbarminus3) + wminus2 = wbarminus2 / (wbarminus1 + wbarminus2 + wbarminus3) + wminus3 = wbarminus3 / (wbarminus1 + wbarminus2 + wbarminus3) + !!$ Calculate the reconstruction do j = 1, 5 - vplus(i) = vplus(i) + w1 * weno_coeffs(1,j)*v(i-3+j) & - + w2 * weno_coeffs(2,j)*v(i-3+j) & - + w3 * weno_coeffs(3,j)*v(i-3+j) - vminus(i) = vminus(i) + w1 * weno_coeffs(3,6-j)*v(i-3+j) & - + w2 * weno_coeffs(2,6-j)*v(i-3+j) & - + w3 * weno_coeffs(1,6-j)*v(i-3+j) - + vplus(i) = vplus(i) + wplus1 * weno_coeffs(1,j)*v(i-3+j) & + + wplus2 * weno_coeffs(2,j)*v(i-3+j) & + + wplus3 * weno_coeffs(3,j)*v(i-3+j) + vminus(i) = vminus(i) + wminus1 * weno_coeffs(3,6-j)*v(i-3+j) & + + wminus2 * weno_coeffs(2,6-j)*v(i-3+j) & + + wminus3 * weno_coeffs(1,6-j)*v(i-3+j) end do - + !vminus(i) = v(i) + !vplus(i) = v(i) + end if end do Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +1 -1 =================================================================== --- trunk/param.ccl 2013-01-14 14:23:52 UTC (rev 465) +++ trunk/param.ccl 2013-01-14 14:23:54 UTC (rev 466) @@ -265,7 +265,7 @@ real weno_eps "WENO epsilon parameter" { 0:* :: "small and positive" -} 1e-6 +} 1e-26 keyword riemann_solver "Which Riemann solver to use" {

1 0

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

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Added: /trunk/src/ GRHydro_WENOReconstruct.F90, GRHydro_WENOReconstruct_drv.F90, GRHydro_WENOScalars.F90 Modified: /trunk/ param.ccl, schedule.ccl /trunk/src/ GRHydro_Reconstruct.F90, make.code.defn Log: GRHydro: Implemented WENO5. Tested with a shock tube. From: Christian Reisswig <reisswig(a)scriwalker.(none)> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Reconstruct.F90 Delta lines: <Unavailable> File [added]: GRHydro_WENOReconstruct.F90 Delta lines: <Unavailable> File [added]: GRHydro_WENOReconstruct_drv.F90 Delta lines: <Unavailable> File [added]: GRHydro_WENOScalars.F90 Delta lines: <Unavailable> File [modified]: make.code.defn Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: <Unavailable> File [modified]: schedule.ccl Delta lines: <Unavailable>

1 0

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

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/src/ GRHydro_Prim2ConM.F90 Log: GRHydro: output v2 when warning about NaN in w_lorentz From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Prim2ConM.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_Prim2ConM.F90 2013-01-14 14:23:48 UTC (rev 463) +++ trunk/src/GRHydro_Prim2ConM.F90 2013-01-14 14:23:49 UTC (rev 464) @@ -255,8 +255,8 @@ call CCTK_WARN(1, NaN_WarnLine) write(NaN_WarnLine,'(a100,3g15.6)') 'NaN produced in sqrt(): (x,y,z)', x, y, z call CCTK_WARN(1, NaN_WarnLine) - !write(NaN_WarnLine,'(a100,g15.6)') 'NaN produced in sqrt(): w', w - !call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) + write(NaN_WarnLine,'(a100,g15.6)') 'NaN produced in sqrt(): v2', DOT2(dvelx(1),dvely(1),dvelz(1)) + call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) !$OMP END CRITICAL endif !!$ END: Check for NaN value

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