Commits March 2013

commits@lists.einsteintoolkit.org

9 participants
84 discussions

[svn:einsteintoolkit] manifest/trunk/ (Rev. 219)
by rhaas＠tapir.caltech.edu 30 Mar '13

30 Mar '13

User: rhaas Date: 2013/03/30 11:41 AM Modified: /trunk/ einsteintoolkit.bib Log: correct typos in titles, format eprint entries, add URL to LRR entry (requested by LRR citing style) File Changes: Directory: /trunk/ ================== File [modified]: einsteintoolkit.bib Delta lines: +5 -4 =================================================================== --- trunk/einsteintoolkit.bib 2013-03-30 14:48:25 UTC (rev 218) +++ trunk/einsteintoolkit.bib 2013-03-30 16:41:32 UTC (rev 219) @@ -1418,7 +1418,8 @@ {G}eneral {R}elativity}", journal = "Living Rev. Relativity", volume = 11, - pages = "7. URL (cited on 01-01-2012)", + number = 7, + pages = "7. URL (cited on 01-01-2012): \url{http://www.livingreviews.org/lrr-2008-7}", year = 2008, } @@ -1512,9 +1513,9 @@ @misc{Giacomazzo:Riemann_code, author = "Giacomazzo, Bruno and Rezzolla, Luciano", - title = "{An Exact Tiemann Solver for + title = "{An Exact Riemann Solver for Relativistic MHD}", -url = {http://www.brunogiacomazzo.org/exactriemannsolv.html}, + url = {http://www.brunogiacomazzo.org/exactriemannsolv.html}, } @phdthesis{Giacomazzo:2007fe, @@ -2855,7 +2856,7 @@ booktitle = {Grid2010: Proceedings of the 11th IEEE/ACM International Conference on Grid Computing}, year = {2010}, location = {Brussels, Belgium}, - note = {(\href{http://lanl.arxiv.org/abs/1009.1341}{arXiv:1009.1341})}, + eprint = {arXiv:1009.1341 [cs.DC]}, }

1 0

[svn:einsteintoolkit] manifest/trunk/ (Rev. 218)
by rhaas＠tapir.caltech.edu 30 Mar '13

30 Mar '13

User: rhaas Date: 2013/03/30 09:48 AM Modified: /trunk/ einsteintoolkit.bib Log: fix eprint entry for some papers to conform to our formating File Changes: Directory: /trunk/ ================== File [modified]: einsteintoolkit.bib Delta lines: +18 -16 =================================================================== --- trunk/einsteintoolkit.bib 2013-03-27 23:42:50 UTC (rev 217) +++ trunk/einsteintoolkit.bib 2013-03-30 14:48:25 UTC (rev 218) @@ -10,8 +10,10 @@ We add an eprint entry, if available. This eprint entry should be complete, and should look like "arXiv:gr-qc/9908012" or "arXiv:0710.2335 [gr-qc]". We do not want archivePrefix or -primaryClass entries, since these are specific to the arXive, and are -not handled well by most bibtex styles. +primaryClass entries, since these are specific to the arXive, and are not +handled well by most bibtex styles. Do not add a fake joural entry to +preprints since some styles only show the preprint information if no +journal is defined. We add a DOI entry, if available. @@ -724,7 +726,7 @@ volume = "76", year = "2007", pages = "124038", - eprint = "0710.0158", + eprint = "arXiv:0710.0158 [gr-qc]", archivePrefix = "arXiv", primaryClass = "gr-qc", doi = "10.1103/PhysRevD.76.124038", @@ -1133,7 +1135,7 @@ title = "{General-Relativistic Resistive Magnetohydrodynamics in three dimensions: formulation and tests}", year = "2012", - eprint = "1208.3487", + eprint = "arXiv:1208.3487 [gr-qc]", archivePrefix = "arXiv", primaryClass = "gr-qc", SLACcitation = "%%CITATION = ARXIV:1208.3487;%%", @@ -1349,7 +1351,7 @@ pages = "064029", doi = "10.1103/PhysRevD.85.064029", year = "2012", - eprint = "1112.0568", + eprint = "arXiv:1112.0568 [astro-ph.HE]", archivePrefix = "arXiv", primaryClass = "astro-ph.HE", SLACcitation = "%%CITATION = ARXIV:1112.0568;%%", @@ -1364,7 +1366,7 @@ pages = "024013", doi = "10.1103/PhysRevD.85.024013", year = "2012", - eprint = "1110.4633", + eprint = "arXiv:1110.4633 [astro-ph.HE]", archivePrefix = "arXiv", primaryClass = "astro-ph.HE", SLACcitation = "%%CITATION = ARXIV:1110.4633;%%", @@ -1575,7 +1577,7 @@ volume = "752", pages = "L15", year = "2012", - eprint = "1203.6108", + eprint = "arXiv:1203.6108 [astro-ph.HE]", archivePrefix = "arXiv", primaryClass = "astro-ph.HE", SLACcitation = "%%CITATION = ARXIV:1203.6108;%%", @@ -1596,7 +1598,7 @@ volume = "98", year = "2007", pages = "091101", - eprint = "gr-qc/0610154", + eprint = "arXiv:gr-qc/0610154", } @Article{Gonzalez:2007hi, @@ -1607,7 +1609,7 @@ volume = "98", year = "2007", pages = "231101", - eprint = "gr-qc/0702052", + eprint = "arXiv:gr-qc/0702052", archivePrefix = "arXiv", doi = "10.1103/PhysRevLett.98.231101", } @@ -1782,7 +1784,7 @@ volume = "77", year = "2008", pages = "044020", - eprint = "0706.1305", + eprint = "arXiv:0706.1305 [gr-qc]", archivePrefix = "arXiv", primaryClass = "gr-qc", doi = "10.1103/PhysRevD.77.044020", @@ -1796,7 +1798,7 @@ journal = "Phys. Rev. D", volume = "79", pages = "084025", - eprint = "0901.2437", + eprint = "arXiv:0901.2437 [gr-qc]", archivePrefix = "arXiv", primaryClass = "gr-qc", } @@ -2177,7 +2179,7 @@ pages = "104035", doi = "10.1103/PhysRevD.86.104035", year = "2012", - eprint = "1112.2622", + eprint = "arXiv:1112.2622 [astro-ph.HE]", archivePrefix = "arXiv", primaryClass = "astro-ph.HE", SLACcitation = "%%CITATION = ARXIV:1112.2622;%%", @@ -2357,7 +2359,7 @@ pages = "5896-5920", doi = "10.1016/j.jcp.2010.04.013", year = "2010", - eprint = "1001.2832", + eprint = "arXiv:1001.2832 [astro-ph.HE]", archivePrefix = "arXiv", primaryClass = "astro-ph.HE", SLACcitation = "%%CITATION = ARXIV:1001.2832;%%", @@ -2525,7 +2527,7 @@ author = "Palenzuela, Carlos", title = "{Modeling magnetized neutron stars using resistive MHD}", year = "2012", - eprint = "1212.0130", + eprint = "arXiv:1212.0130 [astro-ph.HE]", archivePrefix = "arXiv", primaryClass = "astro-ph.HE", SLACcitation = "%%CITATION = ARXIV:1212.0130;%%", @@ -3111,7 +3113,7 @@ pages = "257", doi = "10.1143/PTP.118.257", year = "2007", - eprint = "0709.1766", + eprint = "arXiv:0709.1766 [astro-ph]", archivePrefix = "arXiv", primaryClass = "astro-ph", SLACcitation = "%%CITATION = ARXIV:0709.1766;%%", @@ -3165,7 +3167,7 @@ pages = "535", doi = "10.1143/PTP.127.535", year = "2012", - eprint = "1206.5911", + eprint = "arXiv:1206.5911 [astro-ph.HE]", archivePrefix = "arXiv", primaryClass = "astro-ph.HE", SLACcitation = "%%CITATION = ARXIV:1206.5911;%%",

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/src/nuc_eos/ (Rev. 80)
by schnetter＠cct.lsu.edu 28 Mar '13

28 Mar '13

User: eschnett Date: 2013/03/28 09:31 AM Modified: /trunk/src/nuc_eos/ linterp_many.F90 Log: Replace stop statements by calls to CCTK_ERROR Stop statements are deprecated in Fortran, and can only take integer arguments (not strings). The IBM compiler insists on this. Calling CCTK_ERROR is a simple work-around in Cactus. File Changes: Directory: /trunk/src/nuc_eos/ ============================== File [modified]: linterp_many.F90 Delta lines: +8 -6 =================================================================== --- trunk/src/nuc_eos/linterp_many.F90 2013-03-23 20:27:23 UTC (rev 79) +++ trunk/src/nuc_eos/linterp_many.F90 2013-03-28 14:31:06 UTC (rev 80) @@ -1,3 +1,5 @@ +#define CCTK_ERROR(msg) CCTK_Error(__LINE__,__FORTRANFILE__,"EOS_Omni",msg) + SUBROUTINE intp3d_many ( x, y, z, f, kt, ft, nx, ny, nz, nvars, xt, yt, zt) ! implicit none @@ -43,7 +45,7 @@ real*8 dx,dy,dz,dxi,dyi,dzi,dxyi,dxzi,dyzi,dxyzi integer n,ix,iy,iz - IF (kt .GT. ktx) STOP'***KTX**' + IF (kt .GT. ktx) call CCTK_ERROR('***KTX**') ! ! !------ determine spacing parameters of (equidistant!!!) table @@ -65,7 +67,7 @@ ! !------- loop over all points to be interpolated ! - dO n = 1, kt + do n = 1, kt ! !------- determine location in (equidistant!!!) table ! @@ -170,7 +172,7 @@ real*8 dx,dy,dz,dxi,dyi,dzi,dxyi,dxzi,dyzi,dxyzi integer n,ix,iy,iz - IF (kt .GT. ktx) STOP'***KTX**' + IF (kt .GT. ktx) call CCTK_ERROR('***KTX**') ! ! !------ determine spacing parameters of (equidistant!!!) table @@ -192,7 +194,7 @@ ! !------- loop over all points to be interpolated ! - dO n = 1, kt + do n = 1, kt ! !------- determine location in (equidistant!!!) table ! @@ -293,7 +295,7 @@ real*8 dx,dy,dz,dxi,dyi,dzi,dxyi,dxzi,dyzi,dxyzi integer n,ix,iy,iz - IF (kt .GT. ktx) STOP'***KTX**' + IF (kt .GT. ktx) call CCTK_ERROR('***KTX**') ! ! !------ determine spacing parameters of (equidistant!!!) table @@ -315,7 +317,7 @@ ! !------- loop over all points to be interpolated ! - dO n = 1, kt + do n = 1, kt ! !------- determine location in (equidistant!!!) table !

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 209)
by rhaas＠tapir.caltech.edu 28 Mar '13

28 Mar '13

User: rhaas Date: 2013/03/28 09:26 AM Modified: /trunk/src/ GRHydro_CylindricalExplosionM.F90 Log: GRHydro_InitData: fix turning cylexp options into parameters From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_CylindricalExplosionM.F90 Delta lines: +14 -0 =================================================================== --- trunk/src/GRHydro_CylindricalExplosionM.F90 2013-03-28 01:49:11 UTC (rev 208) +++ trunk/src/GRHydro_CylindricalExplosionM.F90 2013-03-28 14:26:34 UTC (rev 209) @@ -73,6 +73,20 @@ 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 + !!$Adiabatic index for test gam = gl_gamma

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 503)
by knarf＠cct.lsu.edu 27 Mar '13

27 Mar '13

User: knarf Date: 2013/03/27 10:02 PM Modified: /trunk/ param.ccl Log: Although probably often not wanted, there is no reason to have riemann_solver not steerable=always. File Changes: Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +1 -1 =================================================================== --- trunk/param.ccl 2013-03-28 02:50:08 UTC (rev 502) +++ trunk/param.ccl 2013-03-28 03:02:49 UTC (rev 503) @@ -281,7 +281,7 @@ 0:* :: "small and positive" } 1e-26 -keyword riemann_solver "Which Riemann solver to use" +keyword riemann_solver "Which Riemann solver to use" STEERABLE=always { "Roe" :: "Standard Roe solver" "Marquina" :: "Marquina flux"

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 502)
by knarf＠cct.lsu.edu 27 Mar '13

27 Mar '13

User: knarf Date: 2013/03/27 09:50 PM Modified: /trunk/ param.ccl Log: Mark GRHydro_NaN_verbose to be steerable. There is no reason this shouldn't be and odds are that you would like to enable this at some point for debugging... File Changes: Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +1 -1 =================================================================== --- trunk/param.ccl 2013-03-28 01:47:16 UTC (rev 501) +++ trunk/param.ccl 2013-03-28 02:50:08 UTC (rev 502) @@ -643,7 +643,7 @@ # NaN detection level -INT GRHydro_NaN_verbose "The warning level for NaNs occuring within GRHydro" +INT GRHydro_NaN_verbose "The warning level for NaNs occuring within GRHydro" STEERABLE=always { 0:* :: "The warning level" } 2

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 208)
by rhaas＠tapir.caltech.edu 27 Mar '13

27 Mar '13

User: rhaas Date: 2013/03/27 08:49 PM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_CylindricalExplosionM.F90 Log: GRHydro_InitData: make cylindrical explosion parameters parameters tie Gamma value used to that of eos_omni's gamma law eos From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_CylindricalExplosionM.F90 Delta lines: +3 -15 =================================================================== --- trunk/src/GRHydro_CylindricalExplosionM.F90 2013-03-28 01:49:10 UTC (rev 207) +++ trunk/src/GRHydro_CylindricalExplosionM.F90 2013-03-28 01:49:11 UTC (rev 208) @@ -74,22 +74,8 @@ bvczl = Bz_init !!$Adiabatic index for test - gam = (4.d0/3.d0) + gam = gl_gamma -!!$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 = 1.d-4 - pressl = 3.d-5 - -!!$Outer values - rhor = 1.d-2 - pressr = 1.d0 - nx = cctk_lsh(1) ny = cctk_lsh(2) nz = cctk_lsh(3) @@ -99,6 +85,8 @@ do k=1,nz !!$direction represents the cylindrical radius here. +!!$TODO: maybe switch these over so that shocktube_tube choses the axis of the +!!$cylinder instead of the apparently random mapping if (CCTK_EQUALS(shocktube_type,"xshock")) then direction = sqrt((x(i,j,k)-shock_xpos)**2+& (y(i,j,k)-shock_ypos)**2) Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +21 -0 =================================================================== --- trunk/param.ccl 2013-03-28 01:49:10 UTC (rev 207) +++ trunk/param.ccl 2013-03-28 01:49:11 UTC (rev 208) @@ -280,6 +280,27 @@ (0:* :: "Any positive number" } 1.0 +# the defaults are Komissarov's values +CCTK_REAL cyl_rho_inner "density in inner core" +{ + (0:* :: "any positive number" +} 1.d-4 + +CCTK_REAL cyl_press_inner "pressure in inner core" +{ + (0:* :: "any positive number" +} 3.d-5 + +CCTK_REAL cyl_rho_outer "density in outer region" +{ + (0:* :: "any positive number" +} 1.d-2 + +CCTK_REAL cyl_press_outer "pressure in outer region" +{ + (0:* :: "any positive number" +} 1.d0 + # For magnetic advected loop test: KEYWORD advectedloop_type "2-dimensional or 3-dimensional?"

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 207)
by rhaas＠tapir.caltech.edu 27 Mar '13

27 Mar '13

User: rhaas Date: 2013/03/27 08:49 PM Modified: /trunk/ param.ccl Log: GRHydro_InitData: fix some text only typos From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +2 -2 =================================================================== --- trunk/param.ccl 2013-03-28 01:49:08 UTC (rev 206) +++ trunk/param.ccl 2013-03-28 01:49:10 UTC (rev 207) @@ -18,7 +18,7 @@ "simple_wave" :: "Set initial data from Anile Miller Motta, Phys.Fluids. 26, 1450 (1983)" "monopole" :: "Monopole at the center" "cylexp" :: "Cylindrical Explosion" - "rotor" :: "Magnetic Rotor test from DelZanna,Bucciantini, and Londrillo A&A 400, 397â413 (2003)" + "rotor" :: "Magnetic Rotor test from DelZanna,Bucciantini, and Londrillo A&A 400, 397-413 (2003)" "advectedloop":: "Magnetic advected loop test" "alfvenwave" :: "Circularly polarized Alfven wave" "hydro_bondi_solution" :: "Spherical single black hole Bondi solution" @@ -275,7 +275,7 @@ (0:* :: "Any positive number" } 0.8 -CCTK_REAL cyl_r_outer "Inner Radius" +CCTK_REAL cyl_r_outer "Outer Radius" { (0:* :: "Any positive number" } 1.0

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 206)
by rhaas＠tapir.caltech.edu 27 Mar '13

27 Mar '13

User: rhaas Date: 2013/03/27 08:49 PM Modified: /trunk/src/ GRHydro_BondiM.c Log: GRHydro_Init_Data: remove sincos from Bondi ID routine From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_BondiM.c Delta lines: +5 -11 =================================================================== --- trunk/src/GRHydro_BondiM.c 2013-03-28 01:49:05 UTC (rev 205) +++ trunk/src/GRHydro_BondiM.c 2013-03-28 01:49:08 UTC (rev 206) @@ -67,13 +67,12 @@ #define DLOOP1 for(i=0 ;i<NDIM ;i++) #define DLOOP2 for(i=0 ;i<NDIM ;i++) for(j=0 ;j<NDIM ;j++) +static inline void sincos(double theta, CCTK_REAL *sth, CCTK_REAL *cth) +{ + *sth = sin(theta); + *cth = cos(theta); +} -#if !defined(__INTEL_COMPILER) -# define LOCAL_SINCOS -# define sincos( theta_ , sth_ , cth_ ) { *(sth_) = sin((theta_)) ; *(cth_) = cos((theta_)) ; } -#endif - - //Newton-Raphson parameters: #define NEWT_DIM_B (1 ) #define MAX_NEWT_ITER_B (30 ) /* Max. # of Newton-Raphson iterations for find_root_2D(); */ @@ -1349,8 +1348,3 @@ #undef COORD_ISOTROPIC #undef DLOOP1 #undef DLOOP2 - -#ifdef LOCAL_SINCOS -# undef sincos -# undef LOCAL_SINCOS -#endif

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 205)
by rhaas＠tapir.caltech.edu 27 Mar '13

27 Mar '13

User: rhaas Date: 2013/03/27 08:49 PM Modified: /trunk/ param.ccl, schedule.ccl /trunk/src/ GRHydro_BondiM.c Log: GRHydro_Init_Data: add routine to force boundary data to Bondi From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_BondiM.c Delta lines: +46 -8 =================================================================== --- trunk/src/GRHydro_BondiM.c 2013-03-28 01:49:03 UTC (rev 204) +++ trunk/src/GRHydro_BondiM.c 2013-03-28 01:49:05 UTC (rev 205) @@ -890,22 +890,41 @@ -- driver routine for the Bondi solution; ***********************************************************************************/ -static void GRHydro_BondiM_Internal(CCTK_ARGUMENTS, CCTK_REAL range_min, CCTK_REAL range_max); +static void GRHydro_BondiM_Internal(CCTK_ARGUMENTS, + CCTK_REAL range_min, CCTK_REAL range_max, + const int range_imin[], const int range_imax[]); void GRHydro_BondiM(CCTK_ARGUMENTS) { - GRHydro_BondiM_Internal(CCTK_PASS_CTOC, 1e100, -1e100); + DECLARE_CCTK_ARGUMENTS; + const int null[3] = {0,0,0}; + GRHydro_BondiM_Internal(CCTK_PASS_CTOC, 1e100, -1e100, cctk_lsh, null); } void GRHydro_BondiM_Range(CCTK_ARGUMENTS) { DECLARE_CCTK_PARAMETERS; + DECLARE_CCTK_ARGUMENTS; + const int null[3] = {0,0,0}; GRHydro_BondiM_Internal(CCTK_PASS_CTOC, bondi_freeze_inner_radius, - bondi_freeze_outer_radius); + bondi_freeze_outer_radius, + cctk_lsh, null); } +void GRHydro_BondiM_Boundary(CCTK_ARGUMENTS) +{ + DECLARE_CCTK_PARAMETERS; + DECLARE_CCTK_ARGUMENTS; + const int imax[3] = {cctk_lsh[0]-cctk_nghostzones[0], + cctk_lsh[1]-cctk_nghostzones[1], + cctk_lsh[2]-cctk_nghostzones[2]}; + GRHydro_BondiM_Internal(CCTK_PASS_CTOC, 1e100, -1e100, + cctk_nghostzones, imax); +} -static void GRHydro_BondiM_Internal(CCTK_ARGUMENTS, CCTK_REAL range_min, CCTK_REAL range_max) +static void GRHydro_BondiM_Internal(CCTK_ARGUMENTS, + CCTK_REAL range_min, CCTK_REAL range_max, + const int range_imin[], const int range_imax[]) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; @@ -920,7 +939,7 @@ int nbondi; - const int size = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2]; + const int size = cctk_ash[0] * cctk_ash[1] * cctk_ash[2]; int i, imin, j; # define velx(i_) vel[i_ + 0*size] @@ -952,7 +971,7 @@ } else if( CCTK_EQUALS(bondi_Bvec_method, "transform")) { bvec_method = BVEC_TRANSFORM; } else { - CCTK_VWarn(CCTK_WARN_ABORT, __LINE__, __FILE__, CCTK_THORNSTRING, + CCTK_VError(__LINE__, __FILE__, CCTK_THORNSTRING, "Unknown bvec setup method '%s'", bondi_Bvec_method); } @@ -1109,8 +1128,12 @@ *********************************************************************************/ xpos[TT] = 0.; - for(i=0; i < size; i++) { + for(int kk = 0 ; kk < cctk_lsh[2] ; kk++) { + for(int jj = 0 ; jj < cctk_lsh[1] ; jj++) { + for(int ii = 0 ; ii < cctk_lsh[0] ; ii++) { + i = CCTK_GFINDEX3D(cctkGH, ii,jj,kk); + xpos[XX] = x[i] ; xpos[YY] = y[i] ; xpos[ZZ] = z[i] ; @@ -1152,8 +1175,21 @@ rspher = x_spher[RR]; + // the conditions here are a bit strange. The logic goes like this: + // range_min,range_max (and range_imin, range_imax) are radii (and indices) + // bounding the volume where we want to evolve the fields. So during + // evolution we only reset to ID data if we are NOT inside this volume. For + // ID we pass special values for min/max such that these conditions never + // trigger. + // TODO: do this more nicely. The fact that a comment is needed should tell + // me that this is getting too complex. if(rspher > range_min && rspher < range_max) continue; + if(ii >= range_imin[0] && ii < range_imax[0] && + jj >= range_imin[1] && jj < range_imax[1] && + kk >= range_imin[2] && kk < range_imax[2]) { + continue; + } /* Find nearest point in the Bondi solution : */ j = (int) ( 0.5 + (log10(rspher) - logrmin) / dlogr ) ; @@ -1266,7 +1302,9 @@ if(psidc) psidc[i] = 0.; - } + } // ii + } // jj + } // kk free(r_bondi); free(logr_bondi); free(rho_bondi); free(u_bondi); free(v_bondi); Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +4 -0 =================================================================== --- trunk/param.ccl 2013-03-28 01:49:03 UTC (rev 204) +++ trunk/param.ccl 2013-03-28 01:49:05 UTC (rev 205) @@ -420,6 +420,10 @@ *:* :: "any value" } 1e300 +CCTK_BOOLEAN bondi_overwrite_boundary "reset data to initial data in outer boundary in boundary condition" +{ +} "no" + # For Poloidal Magnetic field test: CCTK_REAL poloidal_A_b "Vector potential strength" File [modified]: schedule.ccl Delta lines: +10 -0 =================================================================== --- trunk/schedule.ccl 2013-03-28 01:49:03 UTC (rev 204) +++ trunk/schedule.ccl 2013-03-28 01:49:05 UTC (rev 205) @@ -257,6 +257,16 @@ } "force analytic solution outside anulus" } +if(bondi_overwrite_boundary ) { +# this is a terrible HACK. We really should at least schedule ourselves in +# Boundaries and look at cctk_bbox and the symmetry flags +# by now Cactus is convenient CCTK_LOOP macros for this... +SCHEDULE GRHydro_BondiM_Boundary IN HydroBase_Boundaries BEFORE HydroBase_Select_Boundaries +{ + LANG: C +} "force analytic solution in boundaries" +} + if (CCTK_EQUALS(initial_Bvec, "poloidalmagfield") || CCTK_EQUALS(initial_Avec, "poloidalmagfield")) { # SCHEDULE GRHydro_PoloidalMagFieldM AT CCTK_INITIAL AFTER IN HydroBase_Initial AFTER rnsid_init AFTER TOV_Initial_Data after CCCC_StarMapper_InitialData

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits March 2013