eschnett/cactusamrex - Change QDXKZFOO7RB5WYHYW4UMHPHTTRNWX32MQ4WLQHCLOBWSGMILDC4AC

TwoPunctures: Code cleanup

Created by Erik Schnetter on February 27, 2020

QDXKZFOO7RB5WYHYW4UMHPHTTRNWX32MQ4WLQHCLOBWSGMILDC4AC

Dependencies

In channels

master

main

Change contents

Replacement in TwoPunctures/README at line 5 [6.25]

B:BD[6.146] → [6.146:205]

Maintainer(s): Marcus Ansorg
               Erik Schnetter

[6.146]

[6.205]

Maintainer(s): Erik Schnetter

Replacement in TwoPunctures/README at line 12 [6.25]

B:BD[6.382] → [6.382:584]

spectral method.  This method is described in
Marcus Ansorg, Bernd Brügmann, Wolfgang Tichy,
"A single-domain spectral method for black hole puncture data",
PRD 70, 064011 (2004),
arXiv:gr-qc/0404056.

[6.382]

[6.584]

spectral method. This method is described in Marcus Ansorg, Bernd
Brügmann, Wolfgang Tichy, "A single-domain spectral method for black
hole puncture data", PRD 70, 064011 (2004), arXiv:gr-qc/0404056.

Replacement in TwoPunctures/README at line 16 [6.25]

B:BD[6.585] → [6.585:753]

This thorn was extended to include source terms to be able
to handle matter with the same restrictions as the BHs before plus
zero momentum/ang. momentum (K_{ij} = 0).

[6.585]

This thorn was extended to include source terms to be able to handle
matter with the same restrictions as the BHs before plus zero
momentum/angular momentum (K_{ij} = 0).

Deletion in TwoPunctures/interface.ccl at line 9 [6.5157]

B:BD[6.5271] → [7.0:162]

B:BD[7.162] → [5.0:81]

# TODO: this ought to be checkpointed since we are not recomputing it on
# recovery and it is not just a temp, but is is also not evolved or changing
# with time
REAL puncture_u TYPE=gf tags='checkpoint="no" prolongation="none" index={0 0 0}'

Insertion in TwoPunctures/interface.ccl at line 43 [6.5157]
[6.6669]
[6.6669]
```
CCTK_REAL puncture_u TYPE=gf tags='index={0 0 0}'
```
Replacement in TwoPunctures/interface.ccl at line 48 [6.5157]
B:BD[6.6670] → [6.6670:6679]
```
PRIVATE:
```
[6.6670]
[6.6679]
Replacement in TwoPunctures/interface.ccl at line 57 [6.5157]
B:BD[6.6800] → [6.6800:6813]
```
  J1, J2, J3
```
[6.6800]
[6.6813]
```
  J1 J2 J3
```
Deletion in TwoPunctures/interface.ccl at line 60 [6.5157]
B:BD[6.6863] → [6.6863:6872]
```
PUBLIC:
```
Deletion in TwoPunctures/interface.ccl at line 69 [6.5157]
B:BD[6.7081] → [6.7081:7082]
Insertion in TwoPunctures/param.ccl at line 23 [6.23356]
[6.24004]
[6.24004]

Deletion in TwoPunctures/param.ccl at line 180 [6.23356]

B:BD[6.26924] → [6.26924:27028]


BOOLEAN schedule_in_ADMBase_InitialData "Schedule in (instead of after) ADMBase_InitialData"
{
} "yes"

Deletion in TwoPunctures/param.ccl at line 184 [6.23356]
B:BD[6.27105] → [6.27105:27106]
Replacement in TwoPunctures/schedule.ccl at line 11 [6.27122]
B:BD[6.27338] → [6.27338:27387]
```
  SCHEDULE TwoPunctures_ParamCheck AT PARAMCHECK
```
[6.27338]
[6.27387]
```
  SCHEDULE TwoPunctures_ParamCheck AT paramcheck
```
Deletion in TwoPunctures/schedule.ccl at line 16 [6.27122]
B:BD[6.27443] → [6.27443:27486]
```
  if (schedule_in_ADMBase_InitialData)
  {
```

Deletion in TwoPunctures/schedule.ccl at line 17 [6.27122]

B:BD[6.27549] → [6.27549:27791]

      {
      } "TwoPunctures initial data group"
  }
  else
  {
      SCHEDULE GROUP TwoPunctures_Group AT Initial AFTER ADMBase_InitialData BEFORE ADMBase_PostInitial AFTER HydroBase_Initial before SetTmunu before HydroBase_Prim2ConInitial

Deletion in TwoPunctures/schedule.ccl at line 19 [6.27122]
B:BD[6.27841] → [6.27841:27845]
```
  }
```

Replacement in TwoPunctures/schedule.ccl at line 33 [6.27122]

B:BD[6.28036] → [6.28036:28110]

  SCHEDULE TwoPunctures_Metadata IN TwoPunctures_Group after TwoPunctures

[6.28036]

[6.28110]

  SCHEDULE TwoPunctures_Metadata IN TwoPunctures_Group AFTER TwoPunctures

Insertion in TwoPunctures/schedule.ccl at line 37 [6.27122]
[6.28146]
[6.28146]
```
    READS: mp, mm, mp_adm, mm_adm, E, J1, J2, J3
```
Deletion in TwoPunctures/src/Metadata.cc at line 1 [6.71156]
B:BD[6.71156] → [6.71157:71178]
```
#include <iostream>
```
Insertion in TwoPunctures/src/Metadata.cc at line 3 [6.71156]
[6.71216]
[6.71216]
```
#include <iostream>
```

Replacement in TwoPunctures/src/Metadata.cc at line 5 [6.71156]

B:BD[6.71217] → [6.71217:71292]

#include "cctk.h"
#include "cctk_Arguments.h"
#include "cctk_Parameters.h"

[6.71217]

[6.71292]

#include <cctk.h>
#include <cctk_Arguments_Checked.h>
#include <cctk_Parameters.h>

Replacement in TwoPunctures/src/Metadata.cc at line 14 [6.71156]
B:BD[6.71372] → [6.71372:71398]
```
  DECLARE_CCTK_ARGUMENTS;
```
[6.71372]
[6.71398]
```
  DECLARE_CCTK_ARGUMENTS_TwoPunctures_Metadata;
```
Replacement in TwoPunctures/src/Metadata.cc at line 22 [6.71156]
B:BD[6.71546] → [6.71546:71573]
```
    o << setprecision(19);
```
[6.71546]
[6.71573]
```
    o << setprecision(17);
```
Replacement in TwoPunctures/src/Metadata.cc at line 32 [6.71156]
B:BD[6.71919] → [6.71919:71930]
```
" << endl;
```
[6.71919]
[6.71930]
```
" << "\n";
```

Replacement in TwoPunctures/src/Metadata.cc at line 34 [6.71156]

B:BD[6.71931] → [6.71931:73974]

    o << "[metadata]" << endl;
    o << "initial-ADM-energy            = " << *E << endl;
    o << "initial-ADM-angular-momentumx = " << *J1 << endl;
    o << "initial-ADM-angular-momentumy = " << *J2 << endl;
    o << "initial-ADM-angular-momentumz = " << *J3 << endl;
    o << "initial-separation            = " << par_b * 2 << endl;
    o << "initial-data-type             = Bowen-York" << endl;
    o << "initial-data-bibtex-keys      = Bowen:1980yu Brandt:1997tf Ansorg:2004ds" << endl;
    o << "initial-bh-position1x         = " << par_b + center_offset[0] << endl;
    o << "initial-bh-position1y         = " << center_offset[1] << endl;
    o << "initial-bh-position1z         = " << center_offset[2] << endl;
    o << "initial-bh-position2x         = " << -par_b + center_offset[0] << endl;
    o << "initial-bh-position2y         = " << center_offset[1] << endl;
    o << "initial-bh-position2z         = " << center_offset[2] << endl;
    o << "initial-bh-momentum1x         = " << par_P_plus[0] << endl;
    o << "initial-bh-momentum1y         = " << par_P_plus[1] << endl;
    o << "initial-bh-momentum1z         = " << par_P_plus[2] << endl;
    o << "initial-bh-momentum2x         = " << par_P_minus[0] << endl;
    o << "initial-bh-momentum2y         = " << par_P_minus[1] << endl;
    o << "initial-bh-momentum2z         = " << par_P_minus[2] << endl;
    o << "initial-bh-spin1x             = " << par_S_plus[0] << endl;
    o << "initial-bh-spin1y             = " << par_S_plus[1] << endl;
    o << "initial-bh-spin1z             = " << par_S_plus[2] << endl;
    o << "initial-bh-spin2x             = " << par_S_minus[0] << endl;
    o << "initial-bh-spin2y             = " << par_S_minus[1] << endl;
    o << "initial-bh-spin2z             = " << par_S_minus[2] << endl;
    o << "initial-bh-puncture-adm-mass1 = " << *mp_adm << endl;
    o << "initial-bh-puncture-adm-mass2 = " << *mm_adm << endl;
    o << "initial-bh-puncture-bare-mass1 = " << *mp << endl;
    o << "initial-bh-puncture-bare-mass2 = " << *mm << endl;

[6.71931]

[6.73974]

    o << "[metadata]" << "\n";
    o << "initial-ADM-energy            = " << *E << "\n";
    o << "initial-ADM-angular-momentumx = " << *J1 << "\n";
    o << "initial-ADM-angular-momentumy = " << *J2 << "\n";
    o << "initial-ADM-angular-momentumz = " << *J3 << "\n";
    o << "initial-separation            = " << par_b * 2 << "\n";
    o << "initial-data-type             = Bowen-York" << "\n";
    o << "initial-data-bibtex-keys      = Bowen:1980yu Brandt:1997tf Ansorg:2004ds" << "\n";
    o << "initial-bh-position1x         = " << par_b + center_offset[0] << "\n";
    o << "initial-bh-position1y         = " << center_offset[1] << "\n";
    o << "initial-bh-position1z         = " << center_offset[2] << "\n";
    o << "initial-bh-position2x         = " << -par_b + center_offset[0] << "\n";
    o << "initial-bh-position2y         = " << center_offset[1] << "\n";
    o << "initial-bh-position2z         = " << center_offset[2] << "\n";
    o << "initial-bh-momentum1x         = " << par_P_plus[0] << "\n";
    o << "initial-bh-momentum1y         = " << par_P_plus[1] << "\n";
    o << "initial-bh-momentum1z         = " << par_P_plus[2] << "\n";
    o << "initial-bh-momentum2x         = " << par_P_minus[0] << "\n";
    o << "initial-bh-momentum2y         = " << par_P_minus[1] << "\n";
    o << "initial-bh-momentum2z         = " << par_P_minus[2] << "\n";
    o << "initial-bh-spin1x             = " << par_S_plus[0] << "\n";
    o << "initial-bh-spin1y             = " << par_S_plus[1] << "\n";
    o << "initial-bh-spin1z             = " << par_S_plus[2] << "\n";
    o << "initial-bh-spin2x             = " << par_S_minus[0] << "\n";
    o << "initial-bh-spin2y             = " << par_S_minus[1] << "\n";
    o << "initial-bh-spin2z             = " << par_S_minus[2] << "\n";
    o << "initial-bh-puncture-adm-mass1 = " << *mp_adm << "\n";
    o << "initial-bh-puncture-adm-mass2 = " << *mm_adm << "\n";
    o << "initial-bh-puncture-bare-mass1 = " << *mp << "\n";
    o << "initial-bh-puncture-bare-mass2 = " << *mm << "\n";

Replacement in TwoPunctures/src/TwoPunctures.c at line 9 [6.106100]
B:BD[6.106261] → [6.106261:106279]
B:BD[6.106279] → [4.93:129]
∅:D[4.129] → [6.106307:106336]
B:BD[6.106307] → [6.106307:106336]
```
#include "cctk.h"
#include "cctk_Arguments_Checked.h"
#include "cctk_Parameters.h"
```
[6.106261]
[6.106336]
```
#include <cctk.h>
#include <cctk_Arguments_Checked.h>
#include <cctk_Parameters.h>
#include <loopcontrol.h>
```
Deletion in TwoPunctures/src/TwoPunctures.c at line 15 [6.106100]
B:BD[6.106388] → [6.106388:106389]
B:BD[6.106389] → [2.0:25]
∅:D[2.25] → [6.106389:106390]
B:BD[6.106389] → [6.106389:106390]
```
#include "loopcontrol.h"
```

Replacement in TwoPunctures/src/TwoPunctures.c at line 18 [6.106100]

B:BD[6.106430] → [6.106430:106501]

void swap (CCTK_REAL * restrict const a, CCTK_REAL * restrict const b)

[6.106430]

[6.106501]

void tp_swap (CCTK_REAL * restrict const a, CCTK_REAL * restrict const b)

Replacement in TwoPunctures/src/TwoPunctures.c at line 23 [6.106100]
B:BD[6.106556] → [6.106556:106592]
```
#define SWAP(a,b) (swap(&(a),&(b)))
```
[6.106556]
[6.106592]
```
#define SWAP(a,b) (tp_swap(&(a),&(b)))
```
Replacement in TwoPunctures/src/TwoPunctures.c at line 221 [6.106100]
B:BD[6.112962] → [3.0:36]
```
#pragma omp critical (TwoPunctures)
```
[6.112962]
[6.112962]
```
#pragma omp single
```
Replacement in TwoPunctures/src/TwoPunctures.c at line 235 [6.106100]
B:BD[6.113364] → [6.113364:113416]
```
    CCTK_VInfo (CCTK_THORNSTRING, "b = %g", par_b);
```
[6.113364]
[6.113416]
```
    CCTK_VINFO ("b = %g", par_b);
```

Replacement in TwoPunctures/src/TwoPunctures.c at line 277 [6.106100]

B:BD[6.114465] → [6.114465:114613]

      CCTK_VInfo (CCTK_THORNSTRING, "Attempting to find bare masses.");
      CCTK_VInfo (CCTK_THORNSTRING, "Target ADM masses: M_p=%g and M_m=%g",

[6.114465]

[6.114613]

      CCTK_VINFO ("Attempting to find bare masses.");
      CCTK_VINFO ("Target ADM masses: M_p=%g and M_m=%g",

Replacement in TwoPunctures/src/TwoPunctures.c at line 280 [6.106100]

B:BD[6.114660] → [6.114660:114741]

      CCTK_VInfo (CCTK_THORNSTRING, "ADM mass tolerance: %g", (double) adm_tol);

[6.114660]

[6.114741]

      CCTK_VINFO ("ADM mass tolerance: %g", (double) adm_tol);

Replacement in TwoPunctures/src/TwoPunctures.c at line 284 [6.106100]

B:BD[6.114827] → [6.114827:114900]

        CCTK_VInfo (CCTK_THORNSTRING, "Bare masses: mp=%.15g, mm=%.15g",

[6.114827]

[6.114900]

        CCTK_VINFO ("Bare masses: mp=%.15g, mm=%.15g",

Replacement in TwoPunctures/src/TwoPunctures.c at line 300 [6.106100]

B:BD[6.115569] → [6.115569:115655]

        CCTK_VInfo (CCTK_THORNSTRING, "ADM mass error: M_p_err=%.15g, M_m_err=%.15g",

[6.115569]

[6.115655]

        CCTK_VINFO ("ADM mass error: M_p_err=%.15g, M_m_err=%.15g",

Replacement in TwoPunctures/src/TwoPunctures.c at line 321 [6.106100]
B:BD[6.116539] → [6.116539:116598]
```
      CCTK_VInfo (CCTK_THORNSTRING, "Found bare masses.");
```
[6.116539]
[6.116598]
```
      CCTK_VINFO ("Found bare masses.");
```

Replacement in TwoPunctures/src/TwoPunctures.c at line 330 [6.106100]

B:BD[6.116769] → [6.116769:116860]

    CCTK_VInfo (CCTK_THORNSTRING,
		  "The two puncture masses are mp=%.17g and mm=%.17g",

[6.116769]

[6.116860]

    CCTK_VINFO ("The two puncture masses are mp=%.17g and mm=%.17g",

Replacement in TwoPunctures/src/TwoPunctures.c at line 340 [6.106100]

B:BD[6.117242] → [6.117242:117406]

    CCTK_VInfo (CCTK_THORNSTRING, "Puncture 1 ADM mass is %g", (double) *mp_adm);
    CCTK_VInfo (CCTK_THORNSTRING, "Puncture 2 ADM mass is %g", (double) *mm_adm);

[6.117242]

[6.117406]

    CCTK_VINFO ("Puncture 1 ADM mass is %g", (double) *mp_adm);
    CCTK_VINFO ("Puncture 2 ADM mass is %g", (double) *mm_adm);

Replacement in TwoPunctures/src/TwoPunctures.c at line 346 [6.106100]

B:BD[6.117598] → [6.117598:117679]

    CCTK_VInfo (CCTK_THORNSTRING, "The total ADM mass is %g", (double) admMass);

[6.117598]

[6.117679]

    CCTK_VINFO ("The total ADM mass is %g", (double) admMass);

Replacement in TwoPunctures/src/TwoPunctures.c at line 404 [6.106100]
B:BD[6.119243] → [6.119243:119280]
```
    CCTK_WARN (0, "internal error");
```
[6.119243]
[6.119280]
```
    CCTK_ERROR ("internal error");
```

Replacement in TwoPunctures/src/TwoPunctures.c at line 411 [6.106100]

B:BD[6.119506] → [6.119506:119581]

		CCTK_VInfo(CCTK_THORNSTRING, "Setting initial lapse to psi^%f profile.",

[6.119506]

[6.119581]

		CCTK_VINFO("Setting initial lapse to psi^%f profile.",

Replacement in TwoPunctures/src/TwoPunctures.c at line 415 [6.106100]

B:BD[6.119723] → [6.119723:119828]

    CCTK_VInfo(CCTK_THORNSTRING, 
               "Setting initial lapse to a Brownsville-style profile "

[6.119723]

[6.119828]

    CCTK_VINFO("Setting initial lapse to a Brownsville-style profile "

Deletion in TwoPunctures/src/TwoPunctures.c at line 426 [6.106100]

B:BD[6.120752] → [6.120752:121203]

#if 0
        /* We can't output this when running in parallel */
        if (percent10 != 10*(i+j*cctk_lsh[0]+k*cctk_lsh[0]*cctk_lsh[1]) /
                            (cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2]))
        {
            percent10 = 10*(i+j*cctk_lsh[0]+k*cctk_lsh[0]*cctk_lsh[1]) /
                           (cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2]);
            CCTK_VInfo(CCTK_THORNSTRING, "%3d%% done", percent10*10);
        }
#endif

Deletion in TwoPunctures/src/TwoPunctures.c at line 631 [6.106100]

B:BD[6.128266] → [6.128266:128463]

  }
  if (0) {
    /* Keep the result around for the next time */
    free_dvector (F, 0, ntotal - 1);
    free_derivs (&u, ntotal);
    free_derivs (&v, ntotal);
    free_derivs (&cf_v, ntotal);

TwoPunctures: Code cleanup

Dependencies

In channels

Change contents

Replacement in TwoPunctures/README at line 5 [6.25]

Replacement in TwoPunctures/README at line 12 [6.25]

Replacement in TwoPunctures/README at line 16 [6.25]

Deletion in TwoPunctures/interface.ccl at line 9 [6.5157]

Insertion in TwoPunctures/interface.ccl at line 43 [6.5157]

Replacement in TwoPunctures/interface.ccl at line 48 [6.5157]

Replacement in TwoPunctures/interface.ccl at line 57 [6.5157]

Deletion in TwoPunctures/interface.ccl at line 60 [6.5157]

Deletion in TwoPunctures/interface.ccl at line 69 [6.5157]

Insertion in TwoPunctures/param.ccl at line 23 [6.23356]

Deletion in TwoPunctures/param.ccl at line 180 [6.23356]

Deletion in TwoPunctures/param.ccl at line 184 [6.23356]

Replacement in TwoPunctures/schedule.ccl at line 11 [6.27122]

Deletion in TwoPunctures/schedule.ccl at line 16 [6.27122]

Deletion in TwoPunctures/schedule.ccl at line 17 [6.27122]

Deletion in TwoPunctures/schedule.ccl at line 19 [6.27122]

Replacement in TwoPunctures/schedule.ccl at line 33 [6.27122]

Insertion in TwoPunctures/schedule.ccl at line 37 [6.27122]

Deletion in TwoPunctures/src/Metadata.cc at line 1 [6.71156]

Insertion in TwoPunctures/src/Metadata.cc at line 3 [6.71156]

Replacement in TwoPunctures/src/Metadata.cc at line 5 [6.71156]

Replacement in TwoPunctures/src/Metadata.cc at line 14 [6.71156]

Replacement in TwoPunctures/src/Metadata.cc at line 22 [6.71156]

Replacement in TwoPunctures/src/Metadata.cc at line 32 [6.71156]

Replacement in TwoPunctures/src/Metadata.cc at line 34 [6.71156]

Replacement in TwoPunctures/src/TwoPunctures.c at line 9 [6.106100]

Deletion in TwoPunctures/src/TwoPunctures.c at line 15 [6.106100]