Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] Paper_EinsteinToolkit_2010/ (Rev. 9)
by knarf＠cct.lsu.edu 19 Jan '11

19 Jan '11

User: knarf Date: 2011/01/19 04:15 PM Modified: / ET.tex Log: something on base modules - probably too much File Changes: Directory: / ============ File [modified]: ET.tex Delta lines: +30 -11 =================================================================== --- ET.tex 2011-01-19 21:39:18 UTC (rev 8) +++ ET.tex 2011-01-19 22:15:54 UTC (rev 9) @@ -247,7 +247,7 @@ \section{Core Technologies} \subsection{Cactus Framework} -\todo{Gab} +\todo{1/2 page Gab} The \textbf{Cactus Framework}~\cite{CS_cactus_web,CS_Goodale02a,CS_cactususersguide} is @@ -279,7 +279,7 @@ combined with contributions from the community. \subsection{Carpet Mesh Refinement} -\todo{Erik} +\todo{1/2 page Erik} While Cactus is distributed with a structured-mesh unigrid MPI parallel driver (\codename{PUGH}\footnote{Recent results with a @@ -303,24 +303,43 @@ \subsection{Simulation Factory} -\todo{Erik} +\todo{1/3 page Erik} \subsection{Kranc} -\todo{Ian} +\todo{1/3 page Ian} \section{Components} \subsection{Base Modules} -\todo{Frank} +\todo{1/3 page Frank} +A modular design has many advantages for distributed development of a +complex software system, but it also requires standards to be defined +and followed. Low-level interoperability can be and is provided by +the Cactus infrastructure. One example of this is using one module +from within another, e.g. by calling a function within another thorn +without the knowledge about the programming language this function +is actually implemented in. +However, certain other standards are very hard or impossible to +enforce on a technical level. Examples for this are the exact +definitions of physical variables, their units, but also on the more +technical level the variable names used for the physical quantities. +The Einstein Toolkit provides modules with the sole purpose to +declare variables which are commonly used in many modules, and to +define their meaning and unit. The latter however, is not strictly +enforced, and instead provided by the module documentation. Two +of the those base modules are described in the following in more +detail, because general relativistic codes use different conventions +in especially those areas. + \paragraph{Vacuum Spacetimes} \paragraph{Relativistic Matter Spacetimes} \subsection{Initial Data} -\todo{Josh} +\todo{1/2 page Josh} \paragraph{Gravitational Waves} @@ -330,7 +349,7 @@ \subsection{Evolution Methods} -\todo{Christian} +\todo{1/2 page Christian} \paragraph{Spacetime} @@ -338,7 +357,7 @@ \subsection{Analysis} -\todo{Tanja} +\todo{1/2 page Tanja} \paragraph{Masses} @@ -348,7 +367,7 @@ \subsection{Relativity Tools} -\todo{Peter} +\todo{1/2 page Peter} \paragraph{Black Hole Excision} @@ -358,7 +377,7 @@ \subsection{Infrastructure and Numerical Methods} -\todo{Erik} +\todo{1/2 page Erik} \paragraph{Domains and Coordinates} @@ -368,7 +387,7 @@ \section{Examples} -\todo{Frank} +\todo{2 pages Frank} \paragraph{Kerr-Schild}

1 0

[svn:einsteintoolkit] Paper_EinsteinToolkit_2010/ (Rev. 8)
by knarf＠cct.lsu.edu 19 Jan '11

19 Jan '11

User: knarf Date: 2011/01/19 03:39 PM Modified: / ET.tex Log: move paragraph File Changes: Directory: / ============ File [modified]: ET.tex Delta lines: +12 -14 =================================================================== --- ET.tex 2011-01-18 16:01:24 UTC (rev 7) +++ ET.tex 2011-01-19 21:39:18 UTC (rev 8) @@ -265,6 +265,18 @@ \S\ref{broader} describes the growing impact of Cactus in other application domains. +The Cactus Framework was developed by the +numerical relativity community, and although it is a general component +framework that supports different application domains its core user +group has remained from numerical relativity. The Cactus team has +traditionally developed and supported a set of core modules for numerical +relativity, as part of the {\tt CactusEinstein} arrangement. Over the +last few years however, the relevance of many of the modules has declined, +and more and more of the basic infrastructure for numerical relativity +has been provided by open modules provided and distributed by research +groups in the community. +The Einstein Toolkit now collects the widely used parts of CactusEinstein, +combined with contributions from the community. \subsection{Carpet Mesh Refinement} \todo{Erik} @@ -289,21 +301,7 @@ source and is openly developed, with the main development located at LSU (co-PI Schnetter) and contributions from AEI and others. -\subsection{CactusEinstein} \todo{remove extra subsection for this, -move further up} The Cactus Framework was developed by the -numerical relativity community, and although it is a general component -framework that supports different application domains its core user -group has remained from numerical relativity. The Cactus Team have -traditionally developed and supported a set of core modules for numerical -relativity, as part of the {\tt CactusEinstein} arrangement. Over the -last few years however, the relevance of many of the modules has declined, -and more and more of the basic infrastructure for numerical relativity -has been provided by open modules provided and distributed by research -groups in the community. -The Einstein Toolkit collects the widely used parts of CactusEinstein, -combined with contributions from the community. - \subsection{Simulation Factory} \todo{Erik}

1 0

[svn:einsteintoolkit] manifest/trunk/ (Rev. 63)
by knarf＠cct.lsu.edu 18 Jan '11

18 Jan '11

User: knarf Date: 2011/01/18 12:20 PM Modified: /trunk/ einsteintoolkit.bib Log: 1k lines of references File Changes: Directory: /trunk/ ================== File [modified]: einsteintoolkit.bib Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] Paper_EinsteinToolkit_2010/ (Rev. 7)
by knarf＠cct.lsu.edu 18 Jan '11

18 Jan '11

User: knarf Date: 2011/01/18 10:01 AM Modified: / ET.tex, make Log: a bit of cleanup File Changes: Directory: / ============ File [modified]: ET.tex Delta lines: +10 -10 =================================================================== --- ET.tex 2011-01-17 19:35:08 UTC (rev 6) +++ ET.tex 2011-01-18 16:01:24 UTC (rev 7) @@ -17,12 +17,8 @@ \usepackage{wrapfig} \usepackage{multicol} -%\setcounter{secnumdepth}{3} -%\setcounter{tocdepth}{3} - \usepackage[bookmarks, bookmarksopen, bookmarksnumbered]{hyperref} \usepackage[all]{hypcap} -\urlstyle{rm} \graphicspath{{figures/}} @@ -31,28 +27,33 @@ \def\bh#1{black hole#1 (BH#1)\gdef\bh{BH}} \def\ns#1{neutron star#1 (NS#1)\gdef\ns{NS}} \def\gt#1{Georgia Tech#1 (GaTech#1)\gdef\gt{GaTech}} + \newcommand{\codename}[1]{\texttt{#1}} - \newcommand{\todo}[1]{{\color{blue}$\blacksquare$~\textsf{[TODO: #1]}}} % Don't use tt font for urls \urlstyle{rm} +% Why are we setting these sizes? This is almost (but not quite) A4 format. +% If we are supposed to use A4, we should do it properly, and if we are not, +% why don't we just use the letter format then? + % 15 characters / 2.5 cm => 100 characters / line % Using 11 pt => 94 characters / line \setlength{\paperwidth}{216 mm} % 6 lines / 2.5 cm => 55 lines / page % Using 11pt => 48 lines / pages \setlength{\paperheight}{279 mm} + \usepackage[top=2.5cm, bottom=2.5cm, left=2.5cm, right=2.5cm]{geometry} % You can use a baselinestretch of down to 0.9 -\renewcommand{\baselinestretch}{0.96} +%\renewcommand{\baselinestretch}{0.96} \sloppypar \begin{document} -\title[]{The Einstein Toolkit: A Community Computational Infrastructure for Relativistic Astrophysics} +\title[The Einstein Toolkit]{The Einstein Toolkit: A Community Computational Infrastructure for Relativistic Astrophysics} \author{\textbf{TBD}} @@ -77,16 +78,15 @@ \thanks{{}$^{(3)}$ Center for Computation \& Technology, Louisiana State University, Baton Rouge, LA 70803, USA} +% TODO: Already add a few affiliations which we know are going +% to be used \begin{abstract} \todo{ADDME} \end{abstract} - \maketitle -%\setcounter{tocdepth}{3} -%\tableofcontents \newpage \section{Introduction} File [modified]: make Delta lines: +11 -0 =================================================================== --- make 2011-01-17 19:35:08 UTC (rev 6) +++ make 2011-01-18 16:01:24 UTC (rev 7) @@ -1,10 +1,21 @@ #!/bin/bash +REFRESH_HOSTS="numrel07.cct.lsu.edu topf.wg" + function pdf { pdflatex $1.tex bibtex $1 pdflatex $1.tex pdflatex $1.tex + # Only use/refresh xpdf on some hosts + if echo "$REFRESH_HOSTS" | grep -q `hostname`; then + pgrep -f "xpdf -remote 127.0.0.1 $1.pdf" 2>&1 > /dev/null + if [ $? == 0 ]; then + xpdf -remote 127.0.0.1 -reload -raise + else + xpdf -remote 127.0.0.1 $1.pdf & + fi + fi } pdf ET

1 0

[svn:einsteintoolkit] manifest/trunk/ (Rev. 62)
by schnetter＠cct.lsu.edu 17 Jan '11

17 Jan '11

User: eschnett Date: 2011/01/17 01:56 PM Added: /trunk/ apsrev-titles-manyauthors.bst, einsteintoolkit.tex Log: Add latex file that produces the complete Einstein Toolkit bibliography. Add corresponding bibliography style. File Changes: Directory: /trunk/ ================== File [added]: apsrev-titles-manyauthors.bst Delta lines: <Unavailable> File [added]: einsteintoolkit.tex Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] Paper_EinsteinToolkit_2010/ (Rev. 6)
by schnetter＠cct.lsu.edu 17 Jan '11

17 Jan '11

User: eschnett Date: 2011/01/17 01:35 PM Modified: / ET.tex Log: Correct latex error. Put author list into comment. Remove all other bibliography files File Changes: Directory: / ============ File [modified]: ET.tex Delta lines: +15 -4 =================================================================== --- ET.tex 2011-01-17 16:49:52 UTC (rev 5) +++ ET.tex 2011-01-17 19:35:08 UTC (rev 6) @@ -54,9 +54,20 @@ \title[]{The Einstein Toolkit: A Community Computational Infrastructure for Relativistic Astrophysics} -\author{\textbf{check, sort}} +\author{\textbf{TBD}} +% POTENTIAL AUTHORS: M. Alcubierre, G. Allen, M. Ansorg, L. Baiotti, +% E. Bentivegna, S. Bernuzzi, T. Bode, S. Brandt, G. Corvino, R. De +% Pietri, P. Diener, H. Dimmelmeier, Y. El Khamra, T. Font, J. +% Frieben, B. Giacomazzo, T. Goodale, C. Gundlach, R. Haas, I. Hawke, +% S. Hawley, I. Hinder, T. Kellermann, G. Lanfermann, F. L\"{o}ffler, +% J. Masso, M. Miller, P. Montero, C. Ott, R. Paruchuri, D. Pollney, +% T. Radke, L. Rezzolla, D. Rideout, M. Ripeanu, E. Schnetter, E. +% Seidel, E. L. Seidel, J. Shalf, N. Stergioulas, R. Takahashi, J. +% Thornburg, A. Tonita, P. Walker + + \thanks{{}$^{(1)}$ Department of Computer Science, Louisiana State University, Baton Rouge, LA 70803, USA} @@ -361,7 +372,7 @@ \section{Examples} \todo{Frank} -\pararaph{Kerr-Schild} +\paragraph{Kerr-Schild} \paragraph{BH-binary} @@ -377,9 +388,9 @@ \section*{Acknowledgments} \todo{Frank, ADDME} + \bibliographystyle{amsplain-url} +\bibliography{manifest/einsteintoolkit} -%\bibliography{manifest/einsteintoolkit.bib,local_bibtex/CCT_CS,local_bibtex/references,local_bibtex/gw_references} -\bibliography{manifest/einsteintoolkit.bib,local_bibtex/CCT_CS,local_bibtex/references} \end{document}

1 0

[svn:einsteintoolkit] Paper_EinsteinToolkit_2010/ (Rev. 5)
by knarf＠cct.lsu.edu 17 Jan '11

17 Jan '11

User: knarf Date: 2011/01/17 10:49 AM Modified: / ET.tex Log: assignements, restructuring File Changes: Directory: / ============ File [modified]: ET.tex Delta lines: +24 -16 =================================================================== --- ET.tex 2011-01-17 15:55:53 UTC (rev 4) +++ ET.tex 2011-01-17 16:49:52 UTC (rev 5) @@ -54,12 +54,7 @@ \title[]{The Einstein Toolkit: A Community Computational Infrastructure for Relativistic Astrophysics} -\author{M. Alcubierre, G. Allen$^{(1,2,3)}$, M. Ansorg, L. Baiotti, E. Bentivegna$^{(1,2)}$, S. Bernuzzi, T. Bode, S. Brandt, -G. Corvino, R. De Pietri, P. Diener, H. Dimmelmeier, Y. El Khamra, T. Font, J. Frieben, -B. Giacomazzo, T. Goodale, C. Gundlach, R. Haas, I. Hawke, S. Hawley, I. Hinder, T. Kellermann, -G. Lanfermann, F. L\"{o}ffler$^{(3)}$, J. Masso, M. Miller, P. Montero, C. Ott, - R. Paruchuri$^{(3)}$, D. Pollney, T. Radke, L. Rezzolla, D. Rideout, M. Ripeanu, E. Schnetter$^{(2,3)}$, -E. Seidel, E. L. Seidel, J. Shalf, N. Stergioulas, R. Takahashi, J. Thornburg, A. Tonita, P. Walker\textbf{check, sort}} +\author{\textbf{check, sort}} \thanks{{}$^{(1)}$ Department of Computer Science, @@ -241,6 +236,7 @@ \section{Core Technologies} \subsection{Cactus Framework} +\todo{Gab} The \textbf{Cactus Framework}~\cite{CS_cactus_web,CS_Goodale02a,CS_cactususersguide} is @@ -260,6 +256,7 @@ \subsection{Carpet Mesh Refinement} +\todo{Erik} While Cactus is distributed with a structured-mesh unigrid MPI parallel driver (\codename{PUGH}\footnote{Recent results with a @@ -281,7 +278,8 @@ source and is openly developed, with the main development located at LSU (co-PI Schnetter) and contributions from AEI and others. -\subsection{CactusEinstein} The Cactus Framework was developed by the +\subsection{CactusEinstein} \todo{remove extra subsection for this, +move further up} The Cactus Framework was developed by the numerical relativity community, and although it is a general component framework that supports different application domains its core user group has remained from numerical relativity. The Cactus Team have @@ -295,17 +293,17 @@ The Einstein Toolkit collects the widely used parts of CactusEinstein, combined with contributions from the community. -\subsection{Whisky Code} - \subsection{Simulation Factory} +\todo{Erik} \subsection{Kranc} +\todo{Ian} - \section{Components} \subsection{Base Modules} +\todo{Frank} \paragraph{Vacuum Spacetimes} @@ -313,6 +311,7 @@ \subsection{Initial Data} +\todo{Josh} \paragraph{Gravitational Waves} @@ -322,6 +321,7 @@ \subsection{Evolution Methods} +\todo{Christian} \paragraph{Spacetime} @@ -329,6 +329,7 @@ \subsection{Analysis} +\todo{Tanja} \paragraph{Masses} @@ -338,6 +339,7 @@ \subsection{Relativity Tools} +\todo{Peter} \paragraph{Black Hole Excision} @@ -345,8 +347,10 @@ \paragraph{Object tracking} -\subsection{Numerical Methods} +\subsection{Infrastructure and Numerical Methods} +\todo{Erik} + \paragraph{Domains and Coordinates} \paragraph{Adaptive Mesh Refinement} @@ -355,19 +359,23 @@ \section{Examples} +\todo{Frank} -kerr-schild, BH-binary, TOV +\pararaph{Kerr-Schild} -\section{Results} +\paragraph{BH-binary} -Some success stories ... state of art of what Toolkit can do now, scaling results. +\paragraph{TOV+EOS} +\paragraph{Collapse} + + \section{Future Work} +\todo{Frank} - \section*{Acknowledgments} -\todo{ADDME} +\todo{Frank, ADDME} \bibliographystyle{amsplain-url}

1 0

[svn:einsteintoolkit] Paper_EinsteinToolkit_2010/ (Rev. 4)
by knarf＠cct.lsu.edu 17 Jan '11

17 Jan '11

User: knarf Date: 2011/01/17 09:55 AM Modified: / ET.tex Log: change structure a bit File Changes: Directory: / ============ File [modified]: ET.tex Delta lines: +41 -24 =================================================================== --- ET.tex 2010-12-14 21:49:21 UTC (rev 3) +++ ET.tex 2011-01-17 15:55:53 UTC (rev 4) @@ -59,7 +59,7 @@ B. Giacomazzo, T. Goodale, C. Gundlach, R. Haas, I. Hawke, S. Hawley, I. Hinder, T. Kellermann, G. Lanfermann, F. L\"{o}ffler$^{(3)}$, J. Masso, M. Miller, P. Montero, C. Ott, R. Paruchuri$^{(3)}$, D. Pollney, T. Radke, L. Rezzolla, D. Rideout, M. Ripeanu, E. Schnetter$^{(2,3)}$, -E. Seidel, E. L. Seidel, J. Shalf, N. Stergioulas, R. Takahashi, J. Thornburg, A. Tonita, P. Walker} +E. Seidel, E. L. Seidel, J. Shalf, N. Stergioulas, R. Takahashi, J. Thornburg, A. Tonita, P. Walker\textbf{check, sort}} \thanks{{}$^{(1)}$ Department of Computer Science, @@ -84,9 +84,13 @@ \section{Introduction} -Scientific progress in the field of numerical relativity has always been closely tied with the availability and ease-of-use of enabling software and computational infrastructure. This document describes the Einstein Toolkit. +Scientific progress in the field of numerical relativity has always +been closely tied with the availability and ease-of-use of enabling +software and computational infrastructure. This document describes +the Einstein Toolkit, which aims at providing such an infrastructure, +developed openly and available freely. -This is a particularly exciting time for numerical relativity and +Now is a particularly exciting time for numerical relativity and relativistic astrophysics. Recent computational breakthroughs~\cite{Pretorius:2005gq, Campanelli:2005dd, Baker:2005vv} have transformed the field with our ability to @@ -137,8 +141,8 @@ collaborators, including co-PI Faber, e.g., \cite{Etienne:2007jg,Liu:2008xy}), LSU (Lehner et al., \cite{Anderson:2007kz,Anderson:2008zp}), Caltech-Cornell (Duez et -al.~\cite{Duez:2008rb}), and at the AEI~(Rezzolla and collaborators, -\cite{Baiotti:2008ra,loeffler:06}). The first simulations in 3D GRHD +al.~\cite{Duez:2008rb}), and at the AEI and Sissa~(Rezzolla and collaborators, +\cite{Baiotti:2008ra,Loeffler06a}). The first simulations in 3D GRHD of massive star collapse to protoneutron stars have been carried out by co-PI Ott and collaborators \cite{ott:07prl,ott:07cqg} and by Shibata~et~al.~\cite{shibata:053D}. The collapse of rotating, @@ -223,11 +227,9 @@ \subsection{Academic and Social} \begin{itemize} - -\item A primary concern for research groups is securing reliable funding to maintain graduate students and postdoctoral researchers. - +\item A primary concern for research groups is securing reliable funding + to maintain graduate students and postdoctoral researchers. \item - \end{itemize} \section{Design and Strategy for the Einstein Toolkit} @@ -257,7 +259,7 @@ application domains. -\subsection{Carpet} +\subsection{Carpet Mesh Refinement} While Cactus is distributed with a structured-mesh unigrid MPI parallel driver (\codename{PUGH}\footnote{Recent results with a @@ -279,10 +281,20 @@ source and is openly developed, with the main development located at LSU (co-PI Schnetter) and contributions from AEI and others. +\subsection{CactusEinstein} The Cactus Framework was developed by the +numerical relativity community, and although it is a general component +framework that supports different application domains its core user +group has remained from numerical relativity. The Cactus Team have +traditionally developed and supported a set of core modules for numerical +relativity, as part of the {\tt CactusEinstein} arrangement. Over the +last few years however, the relevance of many of the modules has declined, +and more and more of the basic infrastructure for numerical relativity +has been provided by open modules provided and distributed by research +groups in the community. +The Einstein Toolkit collects the widely used parts of CactusEinstein, +combined with contributions from the community. -\subsection{CactusEinstein} The Cactus Framework was developed by the numerical relativity community, and although it is a general component framework that supports different application domains its core user group has remained from numerical relativity. The Cactus Team have traditionally developed and supported a set of core modules for numerical relativity, as part of the {\tt CactusEinstein} arrangement. Over the last few years however, the relevance of many of the modules has declined, and more and more of the basic infrastructure for numerical relativity has been provided by open modules provided and distributed by research groups in the community. - \subsection{Whisky Code} \subsection{Simulation Factory} @@ -291,27 +303,31 @@ +\section{Components} +\subsection{Base Modules} +\paragraph{Vacuum Spacetimes} -\section{Components} +\paragraph{Relativistic Matter Spacetimes} -\subsection{Vacuum Spacetimes} -\subsection{Relativistic Matter Spacetimes} - -\subsection{Gauge Conditions} - \subsection{Initial Data} \paragraph{Gravitational Waves} -\paragraph{Black Hole} +\paragraph{Black Holes} -\paragraph{Perturbed Black Hole} - \paragraph{Neutron Stars} + +\subsection{Evolution Methods} + +\paragraph{Spacetime} + +\paragraph{Relativistic Matter} + + \subsection{Analysis} \paragraph{Masses} @@ -320,13 +336,15 @@ \paragraph{Gravitational Waves} + \subsection{Relativity Tools} \paragraph{Black Hole Excision} - \paragraph{Vacuum-Matter Coupling} +\paragraph{Object tracking} + \subsection{Numerical Methods} \paragraph{Domains and Coordinates} @@ -336,10 +354,9 @@ \paragraph{Boundary Conditions} - \section{Examples} -kerr-schild, binary, TOV +kerr-schild, BH-binary, TOV \section{Results}

1 0

[svn:einsteintoolkit] manifest/trunk/ (Rev. 61)
by knarf＠cct.lsu.edu 17 Jan '11

17 Jan '11

User: knarf Date: 2011/01/17 09:33 AM Modified: /trunk/ einsteintoolkit.th Log: add the PunctureTracker to the ET File Changes: Directory: /trunk/ ================== File [modified]: einsteintoolkit.th Delta lines: +1 -0 =================================================================== --- trunk/einsteintoolkit.th 2010-12-28 17:13:56 UTC (rev 60) +++ trunk/einsteintoolkit.th 2011-01-17 15:33:57 UTC (rev 61) @@ -232,6 +232,7 @@ !URL = http://svn.aei.mpg.de/numrel/$1/$2/trunk !CHECKOUT = AEIThorns/AEILocalInterp +AEIThorns/PunctureTracker # Various thorns from LSU

1 0

[svn:einsteintoolkit] TwoPunctures/trunk/src/ (Rev. 119)
by knarf＠cct.lsu.edu 10 Jan '11

10 Jan '11

User: knarf Date: 2011/01/10 01:25 PM Modified: /trunk/src/ TwoPunctures.c Log: remove compiler warnings (declare functions, rename x1,y1,z1 (because of bessel functions in math libraries), initialize variables) File Changes: Directory: /trunk/src/ ====================== File [modified]: TwoPunctures.c Delta lines: +18 -17 =================================================================== --- trunk/src/TwoPunctures.c 2011-01-10 19:20:14 UTC (rev 118) +++ trunk/src/TwoPunctures.c 2011-01-10 19:25:56 UTC (rev 119) @@ -193,6 +193,7 @@ } /* -------------------------------------------------------------------*/ +void TwoPunctures(CCTK_ARGUMENTS); void TwoPunctures (CCTK_ARGUMENTS) { @@ -402,10 +403,10 @@ const int ind = CCTK_GFINDEX3D (cctkGH, i, j, k); - CCTK_REAL x1, y1, z1; - x1 = x[ind] - center_offset[0]; - y1 = y[ind] - center_offset[1]; - z1 = z[ind] - center_offset[2]; + CCTK_REAL xx, yy, zz; + xx = x[ind] - center_offset[0]; + yy = y[ind] - center_offset[1]; + zz = z[ind] - center_offset[2]; /* We implement swapping the x and z coordinates as follows. The bulk of the code that performs the actual calculations @@ -415,24 +416,24 @@ main loop-- we swap everything back. */ if (swap_xz) { /* Swap the x and z coordinates */ - SWAP (x1, z1); + SWAP (xx, zz); } CCTK_REAL r_plus - = sqrt(pow(x1 - par_b, 2) + pow(y1, 2) + pow(z1, 2)); + = sqrt(pow(xx - par_b, 2) + pow(yy, 2) + pow(zz, 2)); CCTK_REAL r_minus - = sqrt(pow(x1 + par_b, 2) + pow(y1, 2) + pow(z1, 2)); + = sqrt(pow(xx + par_b, 2) + pow(yy, 2) + pow(zz, 2)); CCTK_REAL U; switch (gsm) { case GSM_Taylor_expansion: U = PunctTaylorExpandAtArbitPosition - (0, nvar, n1, n2, n3, v, x1, y1, z1); + (0, nvar, n1, n2, n3, v, xx, yy, zz); break; case GSM_evaluation: U = PunctIntPolAtArbitPosition - (0, nvar, n1, n2, n3, v, x1, y1, z1); + (0, nvar, n1, n2, n3, v, xx, yy, zz); break; default: assert (0); @@ -463,9 +464,9 @@ CCTK_REAL static_psi = 1; CCTK_REAL Aij[3][3]; - BY_Aijofxyz (x1, y1, z1, Aij); + BY_Aijofxyz (xx, yy, zz, Aij); - CCTK_REAL old_alp; + CCTK_REAL old_alp=1.0; if (multiply_old_lapse) old_alp = alp[ind]; @@ -480,9 +481,9 @@ pyy = pyz = pzz = 0.0; /* first puncture */ - xp = x1 - par_b; - yp = y1; - zp = z1; + xp = xx - par_b; + yp = yy; + zp = zz; rp = sqrt (xp*xp + yp*yp + zp*zp); rp = pow (pow (rp, 4) + pow (TP_epsilon, 4), 0.25); if (rp < TP_Tiny) @@ -511,9 +512,9 @@ pzz += zp*zp*s5 + s3; /* second puncture */ - xp = x1 + par_b; - yp = y1; - zp = z1; + xp = xx + par_b; + yp = yy; + zp = zz; rp = sqrt (xp*xp + yp*yp + zp*zp); rp = pow (pow (rp, 4) + pow (TP_epsilon, 4), 0.25); if (rp < TP_Tiny)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits