Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] DistortedBHIVP/trunk/ (Rev. 43)
by knarf＠cct.lsu.edu 24 May '10

24 May '10

User: knarf Date: 2010/05/24 01:02 PM Modified: /trunk/ param.ccl /trunk/src/ DistortedBHIVP.F, Stab3d.F Log: - add parameter 'tolerance' to be able to control this without recompile - correct intent of several function arguments File Changes: Directory: /trunk/src/ ====================== File [modified]: DistortedBHIVP.F Delta lines: +1 -1 =================================================================== --- trunk/src/DistortedBHIVP.F 2010-05-24 18:02:08 UTC (rev 42) +++ trunk/src/DistortedBHIVP.F 2010-05-24 18:02:56 UTC (rev 43) @@ -68,7 +68,7 @@ CCTK_POINTER, dimension(10) :: in_arrays, out_arrays CCTK_INT, dimension(10), parameter :: type_codes = CCTK_VARIABLE_REAL - dbh_eps = 1.0d-9 + dbh_eps = tolerance c Check if we should create and store conformal factor stuff File [modified]: Stab3d.F Delta lines: +13 -11 =================================================================== --- trunk/src/Stab3d.F 2010-05-24 18:02:08 UTC (rev 42) +++ trunk/src/Stab3d.F 2010-05-24 18:02:56 UTC (rev 43) @@ -9,7 +9,7 @@ integer,intent(in) :: im,jm,km real*8,intent(inout) :: cc(im,jm,km),cn(im,jm,km),cs(im,jm,km), $ ce(im,jm,km),cw(im,jm,km),ct(im,jm,km),cb(im,jm,km) - real*8,intent(out) :: eps + real*8,intent(in) :: eps real*8,intent(out) :: rmax real*8 :: u(im,jm,km),rhs(im,jm,km) c Local variable @@ -88,11 +88,12 @@ c integer,intent(in) :: im,jm,km integer,intent(in) :: ncyc - real*8,intent(out) :: cc(im*jm*km),cn(im*jm*km) - real*8,intent(out) :: cs(im*jm*km),ce(im*jm*km) - real*8,intent(out) :: cw(im*jm*km),ct(im*jm*km) - real*8,intent(out) :: cb(im*jm*km) - real*8,intent(out) :: tol,rnorm + real*8,intent(in) :: cc(im*jm*km),cn(im*jm*km) + real*8,intent(in) :: cs(im*jm*km),ce(im*jm*km) + real*8,intent(in) :: cw(im*jm*km),ct(im*jm*km) + real*8,intent(in) :: cb(im*jm*km) + real*8,intent(in) :: tol + real*8,intent(out) :: rnorm integer,intent(out) :: ier real*8 x(im*jm*km),r(im*jm*km) c Local variables @@ -257,11 +258,12 @@ implicit none c integer,intent(in) :: im,jm,km - real*8,intent(out) :: cc(im*jm*km),cn(im*jm*km) - real*8,intent(out) :: cs(im*jm*km),ce(im*jm*km) - real*8,intent(out) :: cw(im*jm*km),ct(im*jm*km) - real*8,intent(out) :: cb(im*jm*km) - real*8 :: x(im*jm*km), y(im*jm*km) + real*8,intent(in) :: cc(im*jm*km),cn(im*jm*km) + real*8,intent(in) :: cs(im*jm*km),ce(im*jm*km) + real*8,intent(in) :: cw(im*jm*km),ct(im*jm*km) + real*8,intent(in) :: cb(im*jm*km) + real*8,intent(in) :: x(im*jm*km) + real*8,intent(out) :: y(im*jm*km) c Local variables integer :: i, j, k * Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +4 -1 =================================================================== --- trunk/param.ccl 2010-05-24 18:02:08 UTC (rev 42) +++ trunk/param.ccl 2010-05-24 18:02:56 UTC (rev 43) @@ -73,4 +73,7 @@ 1:3 :: "Choose between first, second, and third-order" } 1 - +REAL tolerance "Tolerance" +{ + 0:* :: "Tolerance" +} 1.e-9

1 0

[svn:einsteintoolkit] DistortedBHIVP/trunk/test/ (Rev. 42)
by knarf＠cct.lsu.edu 24 May '10

24 May '10

User: knarf Date: 2010/05/24 01:02 PM Modified: /trunk/test/ E2xeon_test_dbh.par Log: remove evolution of testsuite File Changes: Directory: /trunk/test/ ======================= File [modified]: E2xeon_test_dbh.par Delta lines: +2 -13 =================================================================== --- trunk/test/E2xeon_test_dbh.par 2010-05-24 18:00:57 UTC (rev 41) +++ trunk/test/E2xeon_test_dbh.par 2010-05-24 18:02:08 UTC (rev 42) @@ -2,12 +2,10 @@ #!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 ADM SpaceMask DistortedBHIVP ioascii iobasic ioutil LocalReduce" +ActiveThorns = "coordgauge admanalysis admbase admmacros staticconformal time boundary ADMCoupling ADMconstraints pugh pughreduce pughslab pughinterp LocalInterp SymBase CoordBase cartgrid3d SpaceMask DistortedBHIVP ioascii iobasic ioutil LocalReduce" # GENERAL -admbase::evolution_method = "ADM" - driver::global_nx = 32 driver::global_ny = 32 driver::global_nz = 32 @@ -16,15 +14,8 @@ grid::dxyz = 0.4 grid::domain = "full" -time::dtfac = 0.25 +cactus::cctk_itlast = 0 -cactus::cctk_initial_time = 0. -cactus::cctk_itlast = 1 - -adm::method = "stagleap" -adm::bound = "static" -admconstraints::bound = "static" - # MODEL admbase::initial_data = "distortedbh" @@ -42,7 +33,6 @@ # GAUGE -admbase::lapse_evolution_method = "geodesic" admbase::metric_type = "static conformal" staticconformal::conformal_storage = "factor+derivs+2nd derivs" @@ -52,7 +42,6 @@ IO::new_filename_scheme = no IOASCII::out1d_every = 1 -#IOBasic::outScalar_vars = "admbase::metric admbase::curv admconstraints::ham" IOASCII::out1D_vars = "admbase::metric admbase::curv admbase::lapse admconstraints::ham admanalysis::grr staticconformal::psi staticconformal::psix staticconformal::psiy staticconformal::psiz staticconformal::psixx staticconformal::psixy staticconformal::psixz staticconformal::psiyy staticconformal::psiyz staticconformal::psizz" IOBasic::outInfo_every = 1 IOBasic::outInfo_vars = "admconstraints::ham admbase::gxx"

1 0

[svn:einsteintoolkit] DistortedBHIVP/trunk/test/E2xeon_test_dbh/ (Rev. 41)
by knarf＠cct.lsu.edu 24 May '10

24 May '10

User: knarf Date: 2010/05/24 01:00 PM Removed: /trunk/test/E2xeon_test_dbh/ 2test_dbh.par Modified: /trunk/test/E2xeon_test_dbh/ alp.dl, alp.xl, alp.yl, alp.zl, grr.dl, grr.xl, grr.yl, grr.zl, gxx.dl, gxx.xl, gxx.yl, gxx.zl, gxy.dl, gxy.xl, gxy.yl, gxy.zl, gxz.dl, gxz.xl, gxz.yl, gxz.zl, gyy.dl, gyy.xl, gyy.yl, gyy.zl, gyz.dl, gyz.xl, gyz.yl, gyz.zl, gzz.dl, gzz.xl, gzz.yl, gzz.zl, ham.dl, ham.xl, ham.yl, ham.zl, kxx.dl, kxx.xl, kxx.yl, kxx.zl, kxy.dl, kxy.xl, kxy.yl, kxy.zl, kxz.dl, kxz.xl, kxz.yl, kxz.zl, kyy.dl, kyy.xl, kyy.yl, kyy.zl, kyz.dl, kyz.xl, kyz.yl, kyz.zl, kzz.dl, kzz.xl, kzz.yl, kzz.zl, psi.dl, psi.xl, psi.yl, psi.zl, psix.dl, psix.xl, psix.yl, psix.zl, psixx.dl, psixx.xl, psixx.yl, psixx.zl, psixy.dl, psixy.xl, psixy.yl, psixy.zl, psixz.dl, psixz.xl, psixz.yl, psixz.zl, psiy.dl, psiy.xl, psiy.yl, psiy.zl, psiyy.dl, psiyy.xl, psiyy.yl, psiyy.zl, psiyz.dl, psiyz.xl, psiyz.yl, psiyz.zl, psiz.dl, psiz.xl, psiz.yl, psiz.zl, psizz.dl, psizz.xl, psizz.yl, psizz.zl Log: remove unused par-file limit testsuite data to initial data correct mime types File Changes: Directory: /trunk/test/E2xeon_test_dbh/ ======================================= File [removed]: 2test_dbh.par Delta lines: <Unavailable> File [modified]: alp.dl Delta lines: <Unavailable> File [modified]: alp.xl Delta lines: <Unavailable> File [modified]: alp.yl Delta lines: <Unavailable> File [modified]: alp.zl Delta lines: <Unavailable> File [modified]: grr.dl Delta lines: <Unavailable> File [modified]: grr.xl Delta lines: <Unavailable> File [modified]: grr.yl Delta lines: <Unavailable> File [modified]: grr.zl Delta lines: <Unavailable> File [modified]: gxx.dl Delta lines: <Unavailable> File [modified]: gxx.xl Delta lines: <Unavailable> File [modified]: gxx.yl Delta lines: <Unavailable> File [modified]: gxx.zl Delta lines: <Unavailable> File [modified]: gxy.dl Delta lines: <Unavailable> File [modified]: gxy.xl Delta lines: <Unavailable> File [modified]: gxy.yl Delta lines: <Unavailable> File [modified]: gxy.zl Delta lines: <Unavailable> File [modified]: gxz.dl Delta lines: <Unavailable> File [modified]: gxz.xl Delta lines: <Unavailable> File [modified]: gxz.yl Delta lines: <Unavailable> File [modified]: gxz.zl Delta lines: <Unavailable> File [modified]: gyy.dl Delta lines: <Unavailable> File [modified]: gyy.xl Delta lines: <Unavailable> File [modified]: gyy.yl Delta lines: <Unavailable> File [modified]: gyy.zl Delta lines: <Unavailable> File [modified]: gyz.dl Delta lines: <Unavailable> File [modified]: gyz.xl Delta lines: <Unavailable> File [modified]: gyz.yl Delta lines: <Unavailable> File [modified]: gyz.zl Delta lines: <Unavailable> File [modified]: gzz.dl Delta lines: <Unavailable> File [modified]: gzz.xl Delta lines: <Unavailable> File [modified]: gzz.yl Delta lines: <Unavailable> File [modified]: gzz.zl Delta lines: <Unavailable> File [modified]: ham.dl Delta lines: <Unavailable> File [modified]: ham.xl Delta lines: <Unavailable> File [modified]: ham.yl Delta lines: <Unavailable> File [modified]: ham.zl Delta lines: <Unavailable> File [modified]: kxx.dl Delta lines: <Unavailable> File [modified]: kxx.xl Delta lines: <Unavailable> File [modified]: kxx.yl Delta lines: <Unavailable> File [modified]: kxx.zl Delta lines: <Unavailable> File [modified]: kxy.dl Delta lines: <Unavailable> File [modified]: kxy.xl Delta lines: <Unavailable> File [modified]: kxy.yl Delta lines: <Unavailable> File [modified]: kxy.zl Delta lines: <Unavailable> File [modified]: kxz.dl Delta lines: <Unavailable> File [modified]: kxz.xl Delta lines: <Unavailable> File [modified]: kxz.yl Delta lines: <Unavailable> File [modified]: kxz.zl Delta lines: <Unavailable> File [modified]: kyy.dl Delta lines: <Unavailable> File [modified]: kyy.xl Delta lines: <Unavailable> File [modified]: kyy.yl Delta lines: <Unavailable> File [modified]: kyy.zl Delta lines: <Unavailable> File [modified]: kyz.dl Delta lines: <Unavailable> File [modified]: kyz.xl Delta lines: <Unavailable> File [modified]: kyz.yl Delta lines: <Unavailable> File [modified]: kyz.zl Delta lines: <Unavailable> File [modified]: kzz.dl Delta lines: <Unavailable> File [modified]: kzz.xl Delta lines: <Unavailable> File [modified]: kzz.yl Delta lines: <Unavailable> File [modified]: kzz.zl Delta lines: <Unavailable> File [modified]: psi.dl Delta lines: <Unavailable> File [modified]: psi.xl Delta lines: <Unavailable> File [modified]: psi.yl Delta lines: <Unavailable> File [modified]: psi.zl Delta lines: <Unavailable> File [modified]: psix.dl Delta lines: <Unavailable> File [modified]: psix.xl Delta lines: <Unavailable> File [modified]: psix.yl Delta lines: <Unavailable> File [modified]: psix.zl Delta lines: <Unavailable> File [modified]: psixx.dl Delta lines: <Unavailable> File [modified]: psixx.xl Delta lines: <Unavailable> File [modified]: psixx.yl Delta lines: <Unavailable> File [modified]: psixx.zl Delta lines: <Unavailable> File [modified]: psixy.dl Delta lines: <Unavailable> File [modified]: psixy.xl Delta lines: <Unavailable> File [modified]: psixy.yl Delta lines: <Unavailable> File [modified]: psixy.zl Delta lines: <Unavailable> File [modified]: psixz.dl Delta lines: <Unavailable> File [modified]: psixz.xl Delta lines: <Unavailable> File [modified]: psixz.yl Delta lines: <Unavailable> File [modified]: psixz.zl Delta lines: <Unavailable> File [modified]: psiy.dl Delta lines: <Unavailable> File [modified]: psiy.xl Delta lines: <Unavailable> File [modified]: psiy.yl Delta lines: <Unavailable> File [modified]: psiy.zl Delta lines: <Unavailable> File [modified]: psiyy.dl Delta lines: <Unavailable> File [modified]: psiyy.xl Delta lines: <Unavailable> File [modified]: psiyy.yl Delta lines: <Unavailable> File [modified]: psiyy.zl Delta lines: <Unavailable> File [modified]: psiyz.dl Delta lines: <Unavailable> File [modified]: psiyz.xl Delta lines: <Unavailable> File [modified]: psiyz.yl Delta lines: <Unavailable> File [modified]: psiyz.zl Delta lines: <Unavailable> File [modified]: psiz.dl Delta lines: <Unavailable> File [modified]: psiz.xl Delta lines: <Unavailable> File [modified]: psiz.yl Delta lines: <Unavailable> File [modified]: psiz.zl Delta lines: <Unavailable> File [modified]: psizz.dl Delta lines: <Unavailable> File [modified]: psizz.xl Delta lines: <Unavailable> File [modified]: psizz.yl Delta lines: <Unavailable> File [modified]: psizz.zl Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] TwoPunctures/branches/momentum_constraint/ (Rev. 104)
by roland.haas＠physics.gatech.edu 24 May '10

24 May '10

User: rhaas Date: 2010/05/24 12:50 PM Added: /branches/momentum_constraint/ Log: Creating feature branch to solve momentum constraint

1 0

[svn:einsteintoolkit] Exact/trunk/doc/ (Rev. 256)
by hinder＠einsteintoolkit.org 22 May '10

22 May '10

User: hinder Date: 2010/05/22 08:28 AM Modified: /trunk/doc/ documentation.tex Log: Replace \text{...} with {\text{...}} in documentation to work with htlatex. Patch by Barry Wardell. File Changes: Directory: /trunk/doc/ ====================== File [modified]: documentation.tex Delta lines: +2 -2 =================================================================== --- trunk/doc/documentation.tex 2010-04-28 20:04:51 UTC (rev 255) +++ trunk/doc/documentation.tex 2010-05-22 13:28:53 UTC (rev 256) @@ -567,7 +567,7 @@ coordinates defined as follows: First take the flat metric in polar spherical coordinates, then define a new radial coordinate by \begin{equation} -r = r_\text{new} \big(1 - a \Gaussian(r_\text{new})\big) +r = r_{\text{w}} \big(1 - a \Gaussian(r_{\text{w}})\big) \end{equation} where $\Gaussian(r) = \exp(-\half r^2/\sigma^2)$ is a Gaussian centered at $r=0$. @@ -585,7 +585,7 @@ follows: First take the flat 4-metric in polar spherical coordinates, then define a new time coordinate by \begin{equation} -t_\text{new} = t - a \Gaussian(r) +t_{\text{w}} = t - a \Gaussian(r) \end{equation} $\Gaussian(r) = \exp(-\half r^2/\sigma^2)$ is a Gaussian centered at $r=0$. Note this gives a time-indpendent 4-metric.

1 0

[svn:einsteintoolkit] AHFinderDirect/trunk/doc/ (Rev. 1544)
by hinder＠einsteintoolkit.org 22 May '10

22 May '10

User: hinder Date: 2010/05/22 08:24 AM Modified: /trunk/doc/ documentation.tex Log: Replace \text{...} with {\text{...}} in documentation to work with htlatex. Patch by Barry Wardell. File Changes: Directory: /trunk/doc/ ====================== File [modified]: documentation.tex Delta lines: +18 -18 =================================================================== --- trunk/doc/documentation.tex 2010-04-28 19:46:23 UTC (rev 1543) +++ trunk/doc/documentation.tex 2010-05-22 13:24:42 UTC (rev 1544) @@ -910,7 +910,7 @@ The 3~regions are defined as follows: For a grid point a distance $r[i]$ from horizon~$i$'s local coordinate origin, with horizon~$i$'s radius in this same direction (again, measured from its local coordinate origin) -being $r_\text{horizon}[i]$,%%% +being $r_{\text horizon}[i]$,%%% \footnote{%%% Note that these are flat-space distances $[(x-x_0)^2 + (y - y_0)^2 + (z-z_0)^2]^{1/2}$ @@ -920,15 +920,15 @@ \begin{equation} \renewcommand{\arraystretch}{1.333} \begin{tabular}{l@{~}lll@{~}lll} -$r[i] \le r_\text{inner}[i]$ & \text{for some $i$} +$r[i] \le r{ ext{r}}[i]$ & \text{for some $i$} & & & & $\Rightarrow$ & \text{inner} \\ -$r[i] > r_\text{inner}[i]$ & \text{for all $i$} +$r[i] > r_{\text{r}}[i]$ & \text{for all $i$} & \text{and} & - $r[i] \le r_\text{outer}[i]$ & \text{for some $i$} + $r[i] \le r_{\text{r}}[i]$ & \text{for some $i$} & $\Rightarrow$ & \text{buffer} \\ -$r[i] > r_\text{outer}[i]$ & \text{for all $i$} +$r[i] > r_{\text{r}}[i]$ & \text{for all $i$} & & & & $\Rightarrow$ & \text{outer} %%%\\ @@ -938,20 +938,20 @@ \begin{equation} \renewcommand{\arraystretch}{1.333} \begin{array}{lcl} -r_\text{inner} - & = & \verb|mask_radius_multiplier| \times r_\text{horizon} +r_{\text{r}} + & = & \verb|mask_radius_multiplier| \times r_{\text{n}} \,\,+\,\, - \verb|mask_radius_offset| \times {\Delta x}_\text{base} + \verb|mask_radius_offset| \times {\Delta x}_{\text{e}} \\ -r_\text{outer} - & = & r_\text{inner} +r_{\text{r}} + & = & r_{\text{r}} \,\,+\,\, - \verb|mask_buffer_thickness| \times {\Delta x}_\text{base} + \verb|mask_buffer_thickness| \times {\Delta x}_{\text{e}} %%%\\ \end{array} \label{AHFinderDirect/eqn-r-inside-outside} \end{equation} -and where ${\Delta x}_\text{base}$ is the base-grid Cactus grid spacing +and where ${\Delta x}_{\text{e}}$ is the base-grid Cactus grid spacing (more precisely, the geometric mean of the base grid's $x$, $y$, and $z$ Cactus grid spacings)%%% \footnote{%%% @@ -971,8 +971,8 @@ \end{tabular} ] \mbox{}\\ - These parameters are used to define the radia $r_\text{inner}$ - and $r_\text{outer}$ in + These parameters are used to define the radia $r_{\text{r}}$ + and $r_{\text{r}}$ in equation~\eqref{AHFinderDirect/eqn-r-inside-outside} above. Note that the sign convention here is that @@ -1051,7 +1051,7 @@ * {\Delta x}_{\text{current},\max} \end{equation} where $r_{\text{inner},\min}$ is the minimum over all angles - of $r_\text{inner}$ as defined by + of $r_{\text{r}}$ as defined by equation~\eqref{AHFinderDirect/eqn-r-inside-outside}, and ${\Delta x}_{\text{current},\max}$ is the maximum of the Cactus $x$, $y$, and~$z$ grid spacings on the current Cactus @@ -1060,7 +1060,7 @@ Note that this is the {\bf current\/} Cactus grid spacing, not the {\bf base\/} Cactus grid spacing that's used when calculating - $r_\text{outer}$ and $r_\text{inner}$ by + $r_{\text{r}}$ and $r_{\text{r}}$ by equation~\eqref{AHFinderDirect/eqn-r-inside-outside}. }%%% {} If this condition isn't satisfied, then \thorn{AHFinderDirect} @@ -1582,11 +1582,11 @@ black hole diagnostics file(s), are typically computed to accuracies on the order of a part per million or so. -Note, however, that the irreducible mass $m_\text{irreducible}$ +Note, however, that the irreducible mass $m_{\text{e}}$ may differ considerably from the black hole's local mass or its contribution to the slice's ADM mass. For example, for Kerr spacetime in Kerr-Schild coordinates, -$m_\text{irreducible}/m_\text{ADM} = 0.949$, $0.894$, and $0.723$ +$m_{\text{e}}/m_{\text{M}} = 0.949$, $0.894$, and $0.723$ for spin parameters $a \equiv J/m^2 = 0.6$, $0.8$, and $0.999$, respectively. It would be better to (also) use the ``isolated horizons'' formalism of \cite{AHFinderDirect/Dreyer-etal-2002-isolated-horizons};

1 0

[svn:einsteintoolkit] www/ (Rev. 172)
by roland.haas＠physics.gatech.edu 17 May '10

17 May '10

User: rhaas Date: 2010/05/17 12:03 PM Modified: / credits.php Log: add Barry Wardell to credits File Changes: Directory: / ============ File [modified]: credits.php Delta lines: +1 -0 =================================================================== --- credits.php 2010-05-17 15:29:03 UTC (rev 171) +++ credits.php 2010-05-17 17:03:52 UTC (rev 172) @@ -51,6 +51,7 @@ <li>Jonathan Thornburg</li> <li>Aaryn Tonita</li> <li>Paul Walker</li> +<li>Barry Wardell</li> </ul>

1 0

[svn:einsteintoolkit] www/ (Rev. 171)
by schnetter＠cct.lsu.edu 17 May '10

17 May '10

User: eschnett Date: 2010/05/17 10:29 AM Modified: / credits.php Log: Reformat credits File Changes: Directory: / ============ File [modified]: credits.php Delta lines: +14 -14 =================================================================== --- credits.php 2010-05-04 19:19:48 UTC (rev 170) +++ credits.php 2010-05-17 15:29:03 UTC (rev 171) @@ -6,43 +6,43 @@ </p> <ul> - <li>Miguel Alcubierre</li> - <li>Gabrielle Allen</li> -<li> Marcus Ansorg</li> +<li>Miguel Alcubierre</li> +<li>Gabrielle Allen</li> +<li>Marcus Ansorg</li> <li>Luca Baiotti</li> - <li>Eloisa Bentivegna</li> +<li>Eloisa Bentivegna</li> <li>Sebastiano Bernuzzi</li> <li>Tanja Bode</li> - <li>Steven Brandt</li> +<li>Steven R. Brandt</li> <li>Giovanni Corvino</li> <li>Roberto De Pietri</li> - <li>Peter Diener</li> +<li>Peter Diener</li> <li>Harry Dimmelmeier</li> <li>Yaakoub El Khamra</li> <li>Tony Font</li> <li>Joachim Frieben</li> <li>Bruno Giacomazzo</li> - <li>Tom Goodale</li> +<li>Tom Goodale</li> <li>Carsten Gundlach</li> - <li>Roland Haas</li> +<li>Roland Haas</li> <li>Ian Hawke</li> <li>Scott Hawley</li> - <li>Ian Hinder</li> +<li>Ian Hinder</li> <li>Colby Jordan</li> <li>Thorsten Kellermann</li> <li>Gerd Lanfermann</li> - <li>Frank LÃ¶ffler</li> +<li>Frank LÃ¶ffler</li> <li>Joan Masso</li> <li>Mark Miller</li> <li>Pedro Montero</li> - <li>Christian Ott</li> - <li>Ravi Paruchuri</li> +<li>Christian D. Ott</li> +<li>Ravi Paruchuri</li> <li>Denis Pollney</li> <li>Thomas Radke</li> <li>Luciano Rezzolla</li> - <li>David Rideout</li> +<li>David Rideout</li> <li>Matei Ripeanu</li> - <li>Erik Schnetter</li> +<li>Erik Schnetter</li> <li>Edward Seidel</li> <li>Eric Seidel</li> <li>John Shalf</li>

1 0

[svn:einsteintoolkit] TwoPunctures/trunk/ (Rev. 103)
by roland.haas＠physics.gatech.edu 16 May '10

16 May '10

User: rhaas Date: 2010/05/16 02:54 PM Modified: /trunk/ param.ccl /trunk/src/ Newton.c, TwoPunctures.c Log: TwoPunctures: improve search for ADM masses of black holes Incorporates the additions by Barry Wardell: 1) When the bare masses are not given as parameters (give_bare_mass=no), they are calculated at double precision, but the par_m_plus and par_m_minus parameters are then only set at single precision. 2) When the bare masses have been calculated, they are printed to stdout. In some cases, the initial guess for the bare mass is printed rather than the final calculated bare mass. 3) After looking at this section of code further, it seems that the termination criterion for the bare mass search could be improved. Attached is an updated patch which implements and improved check. It now continues trying to find the bare masses until the ADM masses are within a specified tolerance of their target. Other than the change in termination criterion, the algorithm is unchanged, although I have simplified the calculation of a new bare mass guess somewhat. File Changes: Directory: /trunk/src/ ====================== File [modified]: Newton.c Delta lines: +10 -3 =================================================================== --- trunk/src/Newton.c 2010-05-04 04:04:03 UTC (rev 102) +++ trunk/src/Newton.c 2010-05-16 19:54:00 UTC (rev 103) @@ -518,8 +518,12 @@ #pragma omp parallel for for (int j = 0; j < ntotal; j++) dv.d0[j] = 0; - printf ("Newton: it=%d \t |F|=%e\n", it, (double)dmax); - printf ("bare mass: mp=%g \t mm=%g\n", (double) par_m_plus, (double) par_m_minus); + + if(verbose==1){ + printf ("Newton: it=%d \t |F|=%e\n", it, (double)dmax); + printf ("bare mass: mp=%g \t mm=%g\n", (double) par_m_plus, (double) par_m_minus); + } + fflush(stdout); ii = bicgstab (cctkGH, @@ -536,7 +540,10 @@ F_of_v (cctkGH, nvar, n1, n2, n3, v, F, u); dmax = norm_inf (F, ntotal); } - printf ("Newton: it=%d \t |F|=%e \n", it, (double)dmax); + + if(verbose==1) + printf ("Newton: it=%d \t |F|=%e \n", it, (double)dmax); + fflush(stdout); free_dvector (F, 0, ntotal - 1); File [modified]: TwoPunctures.c Delta lines: +56 -40 =================================================================== --- trunk/src/TwoPunctures.c 2010-05-04 04:04:03 UTC (rev 102) +++ trunk/src/TwoPunctures.c 2010-05-16 19:54:00 UTC (rev 103) @@ -216,7 +216,7 @@ #endif static CCTK_REAL *F = NULL; static derivs u, v; - CCTK_REAL admMass, M_p, M_m, tmp_p, tmp_m, um, up, new_mass, old_mass; + CCTK_REAL admMass; if (! F) { /* Solve only when called for the first time */ @@ -251,59 +251,75 @@ set_initial_guess(cctkGH, v); } + /* If bare masses are not given, iteratively solve for them given the + target ADM masses target_M_plus and target_M_minus and with initial + guesses given by par_m_plus and par_m_minus. */ if(!(give_bare_mass)) { - * mp = target_M_plus; - * mm = target_M_minus; - - M_p= target_M_plus; - M_m= target_M_minus; + CCTK_REAL tmp, Mp_adm, Mm_adm, Mp_adm_err, Mm_adm_err, up, um; + char valbuf[100]; - new_mass = 0; - old_mass = 1.; - while (new_mass<old_mass) { - old_mass = (double)*mp + (double)*mm; - Newton (cctkGH, nvar, n1, n2, n3, v, Newton_tol, 1); + CCTK_REAL M_p = target_M_plus; + CCTK_REAL M_m = target_M_minus; - F_of_v (cctkGH, nvar, n1, n2, n3, v, F, u); + CCTK_VInfo (CCTK_THORNSTRING, "Attempting to find bare masses."); + CCTK_VInfo (CCTK_THORNSTRING, "Target ADM masses: M_p=%g and M_m=%g", + (double) M_p, (double) M_m); + CCTK_VInfo (CCTK_THORNSTRING, "ADM mass tolerance: %g", (double) adm_tol); - up = PunctIntPolAtArbitPosition - (0, nvar, n1, n2, n3, v, par_b, 0., 0.); - um = PunctIntPolAtArbitPosition - (0, nvar, n1, n2, n3, v, -par_b, 0., 0.); + /* Loop until both ADM masses are within adm_tol of their target */ + do { + CCTK_VInfo (CCTK_THORNSTRING, "Bare masses: mp=%g, mm=%g", + (double)*mp, (double)*mm); + Newton (cctkGH, nvar, n1, n2, n3, v, Newton_tol, 1); - for(int l=0; l<32;l++) { - tmp_p=(4*par_b*um+ *mp +4*par_b); - tmp_m=(4*par_b*up+ *mm +4*par_b); - *mp = *mp - ((*mp*(up+1+M_m/tmp_p)-M_p)/ - (up+1+(M_m/tmp_p)-(*mp*M_m)/(pow(tmp_p,2)))); - *mm = *mm - ((*mm*(um+1+M_p/tmp_m)-M_m)/ - (um+1+(M_p/tmp_m)-(*mm*M_p)/(pow(tmp_m,2)))); - } - char valbuf_p[100], valbuf_m[100]; - - sprintf (valbuf_p,"%f", (float) *mp); - CCTK_ParameterSet ("par_m_plus", "twopunctures", valbuf_p); - sprintf (valbuf_m,"%f", (float) *mm); - CCTK_ParameterSet ("par_m_minus", "twopunctures", valbuf_m); - new_mass = (double)*mp + (double)*mm; - } - } - admMass = (*mp + *mm - - 4*par_b*PunctEvalAtArbitPosition(v.d0, 1, 0, 0, n1, n2, n3)); - CCTK_VInfo (CCTK_THORNSTRING, "ADM mass is %g\n", (double)admMass); + F_of_v (cctkGH, nvar, n1, n2, n3, v, F, u); + up = PunctIntPolAtArbitPosition(0, nvar, n1, n2, n3, v, par_b, 0., 0.); + um = PunctIntPolAtArbitPosition(0, nvar, n1, n2, n3, v,-par_b, 0., 0.); + + /* Calculate the ADM masses from the current bare mass guess */ + Mp_adm = (1 + up) * *mp + *mp * *mm / (4. * par_b); + Mm_adm = (1 + um) * *mm + *mp * *mm / (4. * par_b); + + /* Check how far the current ADM masses are from the target */ + Mp_adm_err = fabs(M_p-Mp_adm); + Mm_adm_err = fabs(M_m-Mm_adm); + CCTK_VInfo (CCTK_THORNSTRING, "ADM mass error: M_p_err=%.4g, M_m_err=%.4g", + (double)Mp_adm_err, (double)Mm_adm_err); + + /* Invert the ADM mass equation and update the bare mass guess so that + it gives the correct target ADM masses */ + tmp = -4*par_b*( 1 + um + up + um*up ) + + sqrt(16*par_b*M_m*(1 + um)*(1 + up) + + pow(-M_m + M_p + 4*par_b*(1 + um)*(1 + up),2)); + *mp = (tmp + M_p - M_m)/(2.*(1 + up)); + *mm = (tmp - M_p + M_m)/(2.*(1 + um)); + + /* Set the par_m_plus and par_m_minus parameters */ + sprintf (valbuf,"%.17g", (double) *mp); + CCTK_ParameterSet ("par_m_plus", "twopunctures", valbuf); + + sprintf (valbuf,"%.17g", (double) *mm); + CCTK_ParameterSet ("par_m_minus", "twopunctures", valbuf); + + } while ( (Mp_adm_err > adm_tol) || + (Mm_adm_err > adm_tol) ); + + CCTK_VInfo (CCTK_THORNSTRING, "Found bare masses."); + } + Newton (cctkGH, nvar, n1, n2, n3, v, Newton_tol, Newton_maxit); F_of_v (cctkGH, nvar, n1, n2, n3, v, F, u); CCTK_VInfo (CCTK_THORNSTRING, - "The two puncture masses are %g and %g", - (double) par_m_minus, (double) par_m_plus); + "The two puncture masses are mp=%.17g and mm=%.17g", + (double) *mp, (double) *mm); /* print out ADM mass, eq.: \Delta M_ADM=2*r*u=4*b*V for A=1,B=0,phi=0 */ admMass = (*mp + *mm - - 4*par_b*PunctEvalAtArbitPosition(v.d0, 1, 0, 0, n1, n2, n3)); - CCTK_VInfo (CCTK_THORNSTRING, "ADM mass is %g", (double)admMass); + - 4*par_b*PunctEvalAtArbitPosition(v.d0, 1, 0, 0, n1, n2, n3));; + CCTK_VInfo (CCTK_THORNSTRING, "The total ADM mass is %g", (double) admMass); } if (CCTK_EQUALS(grid_setup_method, "Taylor expansion")) Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +4 -0 =================================================================== --- trunk/param.ccl 2010-05-04 04:04:03 UTC (rev 102) +++ trunk/param.ccl 2010-05-16 19:54:00 UTC (rev 103) @@ -39,6 +39,10 @@ { } "yes" +CCTK_REAL adm_tol "Tolerance of ADM masses when give_bare_mass=no" +{ + (0:*) :: "" +} 1.0e-10 KEYWORD grid_setup_method "How to fill the 3D grid from the spectral grid" {

1 0

[svn:einsteintoolkit] WeylScal4/trunk/m/ (Rev. 53)
by tanja.bode＠physics.gatech.edu 07 May '10

07 May '10

User: tbode Date: 2010/05/07 10:14 AM Added: /trunk/m/ WeylScal4.patch Log: WeylScal4: Add missing patch file required for regenerating thorn. File Changes: Directory: /trunk/m/ ==================== File [added]: WeylScal4.patch Delta lines: +181 -0 =================================================================== --- trunk/m/WeylScal4.patch (rev 0) +++ trunk/m/WeylScal4.patch 2010-05-07 15:14:08 UTC (rev 53) @@ -0,0 +1,181 @@ +diff -r -c a/interface.ccl b/interface.ccl +*** a/interface.ccl 2010-05-03 23:48:16.810592882 -0400 +--- b/interface.ccl 2010-05-03 23:51:37.206592882 -0400 +*************** +*** 34,48 **** + { + Psi4r + } "Psi4r_group" +- +- public: +- CCTK_REAL Psi4i_grouprhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1 tensorparity=-1' +- { +- Psi4irhs +- } "Psi4i_grouprhs" +- +- public: +- CCTK_REAL Psi4r_grouprhs type=GF timelevels=3 tags='tensortypealias="Scalar" tensorweight=1 tensorparity=1' +- { +- Psi4rrhs +- } "Psi4r_grouprhs" +--- 34,36 ---- +diff -r -c a/param.ccl b/param.ccl +*** a/param.ccl 2010-05-03 23:48:16.811592882 -0400 +--- b/param.ccl 2010-05-03 23:51:37.207592882 -0400 +*************** +*** 52,75 **** + } "2nd" + + restricted: +- CCTK_INT WeylScal4_MaxNumEvolvedVars "Number of evolved variables used by this thorn" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Evolved_Vars +- { +- 2:2 :: "Number of evolved variables used by this thorn" +- } 2 +- +- restricted: + CCTK_INT timelevels "Number of active timelevels" + { + 0:3 :: "" + } 3 + + restricted: +- CCTK_INT rhs_timelevels "Number of active RHS timelevels" +- { +- 0:3 :: "" +- } 1 +- +- restricted: + CCTK_INT psis_calc_2nd_calc_every "psis_calc_2nd_calc_every" + { + *:* :: "" +--- 52,63 ---- +diff -r -c a/schedule.ccl b/schedule.ccl +*** a/schedule.ccl 2010-05-03 23:48:16.811592882 -0400 +--- b/schedule.ccl 2010-05-03 23:51:37.206592882 -0400 +*************** +*** 27,58 **** + STORAGE: Psi4r_group[3] + } + +- if (rhs_timelevels == 1) +- { +- STORAGE: Psi4i_grouprhs[1] +- } +- if (rhs_timelevels == 2) +- { +- STORAGE: Psi4i_grouprhs[2] +- } +- if (rhs_timelevels == 3) +- { +- STORAGE: Psi4i_grouprhs[3] +- } +- +- if (rhs_timelevels == 1) +- { +- STORAGE: Psi4r_grouprhs[1] +- } +- if (rhs_timelevels == 2) +- { +- STORAGE: Psi4r_grouprhs[2] +- } +- if (rhs_timelevels == 3) +- { +- STORAGE: Psi4r_grouprhs[3] +- } +- + schedule WeylScal4_Startup at STARTUP + { + LANG: C +--- 27,32 ---- +*************** +*** 72,77 **** +--- 46,55 ---- + } "register symmetries" + + ++ schedule group WeylScal4_Calculate in MoL_PseudoEvolution ++ { ++ } "Calculate the Newman-Penrose quantities" ++ + if (CCTK_EQUALS(fd_order, "2nd")) + { + schedule psis_calc_2nd in WeylScal4_Calculate as calc_np +*************** +*** 93,104 **** + } "psis_calc_4th" + } + +! schedule dummycalc in Nowhere_Nevertoberun +! { +! LANG: C +! } "dummycalc" +! +! schedule WeylScal4_SelectBoundConds in MoL_PostStep + { + LANG: C + OPTIONS: level +--- 70,76 ---- + } "psis_calc_4th" + } + +! schedule WeylScal4_SelectBoundConds in WeylScal4_Boundaries + { + LANG: C + OPTIONS: level +*************** +*** 112,118 **** + OPTIONS: meta + } "check boundaries treatment" + +! schedule group ApplyBCs as WeylScal4_ApplyBCs in MoL_PostStep after WeylScal4_SelectBoundConds + { + # no language specified + } "Apply boundary conditions controlled by thorn Boundary" +--- 84,105 ---- + OPTIONS: meta + } "check boundaries treatment" + +! schedule group ApplyBCs as WeylScal4_ApplyBCs in WeylScal4_Boundaries after WeylScal4_SelectBoundConds +! { +! # no language specified +! } "Apply boundary conditions controlled by thorn Boundary" +! +! schedule group WeylScal4_Boundaries in WeylScal4_Calculate after calc_np +! { +! # no language specified +! } "Apply boundary conditions controlled by thorn Boundary" +! +! schedule group WeylScal4_Boundaries in CCTK_POSTRESTRICTINITIAL +! { +! # no language specified +! } "Apply boundary conditions controlled by thorn Boundary" +! +! schedule group WeylScal4_Boundaries in CCTK_POSTRESTRICT + { + # no language specified + } "Apply boundary conditions controlled by thorn Boundary" +diff -r -c a/src/RegisterMoL.c b/src/RegisterMoL.c +*** a/src/RegisterMoL.c 2010-05-03 23:48:16.811592882 -0400 +--- b/src/RegisterMoL.c 2010-05-03 23:51:37.206592882 -0400 +*************** +*** 12,18 **** + CCTK_INT ierr = 0; + + /* Register all the evolved grid functions with MoL */ +- ierr += MoLRegisterEvolved(CCTK_VarIndex("WeylScal4::Psi4i"), CCTK_VarIndex("WeylScal4::Psi4irhs")); +- ierr += MoLRegisterEvolved(CCTK_VarIndex("WeylScal4::Psi4r"), CCTK_VarIndex("WeylScal4::Psi4rrhs")); + return; + } +--- 12,16 ---- +diff -r -c a/src/make.code.defn b/src/make.code.defn +*** a/src/make.code.defn 2010-05-03 23:48:16.811592882 -0400 +--- b/src/make.code.defn 2010-05-03 23:51:37.206592882 -0400 +*************** +*** 1,3 **** + # File produced by Kranc + +! SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c psis_calc_2nd.c psis_calc_4th.c dummycalc.c Boundaries.c +--- 1,3 ---- + # File produced by Kranc + +! SRCS = Startup.c RegisterMoL.c RegisterSymmetries.c psis_calc_2nd.c psis_calc_4th.c Boundaries.c

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits