eschnett/cactusamrex - Change XQFT6DACFOMNNXDYUZRGRCMEPWF34KW5PRZ7RVMVJHYCS76JIZSAC

CarpetX: Use OpenMP critical for output

Created by Erik Schnetter on January 23, 2020

XQFT6DACFOMNNXDYUZRGRCMEPWF34KW5PRZ7RVMVJHYCS76JIZSAC

Dependencies

In channels

master

main

Change contents

Insertion in CarpetX/src/driver.cxx at line 247 [5.15972]
[4.1268]
[4.1268]
```
#pragma omp critical
```
Insertion in CarpetX/src/driver.cxx at line 293 [5.15972]
[6.357]
[6.357]
Insertion in CarpetX/src/driver.cxx at line 295 [5.15972]
[6.372]
[6.372]
```
#pragma omp critical
```
Insertion in CarpetX/src/driver.cxx at line 355 [5.15972]
[7.977]
[8.1409]
Insertion in CarpetX/src/driver.cxx at line 357 [5.15972]
[8.1424]
[8.1424]
```
#pragma omp critical
```
Insertion in CarpetX/src/driver.cxx at line 763 [5.15972]
[4.1843]
[4.1843]
Insertion in CarpetX/src/driver.cxx at line 765 [5.15972]
[4.1858]
[8.2517]
```
#pragma omp critical
```
Insertion in CarpetX/src/driver.cxx at line 783 [5.15972]
[4.1943]
[4.1943]
Insertion in CarpetX/src/driver.cxx at line 785 [5.15972]
[4.1958]
[8.2673]
```
#pragma omp critical
```
Insertion in CarpetX/src/driver.cxx at line 787 [5.15972]
[8.2731]
[8.2731]
Insertion in CarpetX/src/driver.cxx at line 873 [5.15972]
[4.2042]
[4.2042]
Insertion in CarpetX/src/driver.cxx at line 875 [5.15972]
[4.2057]
[8.4161]
```
#pragma omp critical
```
Insertion in CarpetX/src/driver.cxx at line 1000 [5.15972]
[4.2130]
[4.2130]
Insertion in CarpetX/src/driver.cxx at line 1002 [5.15972]
[4.2145]
[8.6498]
```
#pragma omp critical
```
Insertion in CarpetX/src/driver.cxx at line 1014 [5.15972]
[4.2217]
[4.2217]
Insertion in CarpetX/src/driver.cxx at line 1016 [5.15972]
[4.2232]
[4.2232]
```
#pragma omp critical
```
Insertion in CarpetX/src/driver.cxx at line 1090 [5.15972]
[4.2287]
[4.2287]
Insertion in CarpetX/src/driver.cxx at line 1092 [5.15972]
[4.2302]
[4.2302]
```
#pragma omp critical
```
Insertion in CarpetX/src/driver.cxx at line 1118 [5.15972]
[9.681]
[4.2330]
Insertion in CarpetX/src/driver.cxx at line 1120 [5.15972]
[4.2345]
[4.2345]
```
#pragma omp critical
```

Replacement in CarpetX/src/driver.cxx at line 1156 [5.15972]

B:BD[4.2889] → [4.2889:3099]

    int maxnumlevels = ghext->amrcore->maxLevel() + 1;
    for (int level = 0; level < maxnumlevels; ++level) {
      CCTK_VINFO("Geometry level %d:", level);
      cout << ghext->amrcore->Geom(level) << "\n";

[4.2889]

[4.3099]

#pragma omp critical
    {
      const int maxnumlevels = ghext->amrcore->maxLevel() + 1;
      for (int level = 0; level < maxnumlevels; ++level) {
        CCTK_VINFO("Geometry level %d:", level);
        cout << ghext->amrcore->Geom(level) << "\n";
      }

Insertion in CarpetX/src/driver.cxx at line 1166 [5.15972]
[10.2030]
[11.2328]
```
  // #pragma omp critical
  // {
```
Insertion in CarpetX/src/driver.cxx at line 1172 [5.15972]
[12.2616]
[11.2542]
```
  // }
```
Insertion in CarpetX/src/driver.cxx at line 1180 [5.15972]
[4.3291]
[4.3291]
Insertion in CarpetX/src/driver.cxx at line 1182 [5.15972]
[4.3306]
[2.0]
```
#pragma omp critical
```
Insertion in CarpetX/src/driver.cxx at line 1195 [5.15972]
[4.3411]
[4.3411]
Insertion in CarpetX/src/driver.cxx at line 1197 [5.15972]
[4.3426]
[4.3426]
```
#pragma omp critical
```

Replacement in CarpetX/src/linsolve.cxx at line 84 [13.115]

B:BD[13.2721] → [13.2721:3270]

  for (int level = 0; level < int(ghext->leveldata.size()); ++level)
    CCTK_VINFO("norm_inf rhs[%d]: %g", level,
               double(rhss.at(level)->norminf(0, 0, false, true)));
  for (int level = 0; level < int(ghext->leveldata.size()); ++level)
    CCTK_VINFO("norm_inf sol[%d]: %g", level,
               double(sols.at(level)->norminf(0, 0, false, true)));
  for (int level = 0; level < int(ghext->leveldata.size()); ++level)
    CCTK_VINFO("norm_inf res[%d]: %g", level,
               double(ress.at(level)->norminf(0, 0, false, true)));

[13.2721]

[13.3270]

#pragma omp critical
  {
    for (int level = 0; level < int(ghext->leveldata.size()); ++level)
      CCTK_VINFO("norm_inf rhs[%d]: %g", level,
                 double(rhss.at(level)->norminf(0, 0, false, true)));
    for (int level = 0; level < int(ghext->leveldata.size()); ++level)
      CCTK_VINFO("norm_inf sol[%d]: %g", level,
                 double(sols.at(level)->norminf(0, 0, false, true)));
    for (int level = 0; level < int(ghext->leveldata.size()); ++level)
      CCTK_VINFO("norm_inf res[%d]: %g", level,
                 double(ress.at(level)->norminf(0, 0, false, true)));
  }

Insertion in CarpetX/src/schedule.cxx at line 404 [15.531]
[14.2132]
[14.2132]
```
#pragma omp critical
    {
```

Replacement in CarpetX/src/schedule.cxx at line 412 [15.531]

B:BD[14.2403] → [14.2403:2605]

        nan_imin[2], nan_imax[0], nan_imax[1], nan_imax[2], double(nan_xmin[0]),
        double(nan_xmin[1]), double(nan_xmin[2]), double(nan_xmax[0]),
        double(nan_xmax[1]), double(nan_xmax[2]),

[14.2403]

[3.4758]

          nan_imin[2], nan_imax[0], nan_imax[1], nan_imax[2],
          double(nan_xmin[0]), double(nan_xmin[1]), double(nan_xmin[2]),
          double(nan_xmax[0]), double(nan_xmax[1]), double(nan_xmax[2]),

Replacement in CarpetX/src/schedule.cxx at line 828 [15.531]
B:BD[4.9407] → [4.9407:9454]
```
  mindx = mindx / (1 << (max_num_levels - 1));
```
[4.9407]
[15.1959]
```
  mindx /= 1 << (max_num_levels - 1);
```
Insertion in CarpetX/src/schedule.cxx at line 1186 [15.531]
[11.4623]
[4.10031]
```
#pragma omp critical
```
Insertion in CarpetX/src/schedule.cxx at line 1207 [15.531]
[11.5085]
[4.10081]
```
#pragma omp critical
```
Replacement in CarpetX/src/schedule.cxx at line 1214 [15.531]
B:BD[16.6346] → [16.6346:6388]
```
      CCTK_REAL time = 0.0; // dummy time
```
[16.6346]
[16.6388]
```
      const CCTK_REAL time = 0.0; // dummy time
```

Replacement in CarpetX/src/schedule.cxx at line 1224 [15.531]

B:BD[16.6661] → [16.6661:6777]

      const int *restrict gsh = cctkGH->cctk_gsh;
      const int *restrict nghostzones = cctkGH->cctk_nghostzones;

[16.6661]

[16.6777]

      const int *restrict const gsh = cctkGH->cctk_gsh;
      const int *restrict const nghostzones = cctkGH->cctk_nghostzones;

Insertion in CarpetX/src/schedule.cxx at line 1232 [15.531]
[16.7020]
[16.7020]
```
#pragma omp critical
      {
```

Replacement in CarpetX/src/schedule.cxx at line 1237 [15.531]

B:BD[16.7152] → [16.7152:7335]

      CCTK_VINFO("  xmin=[%g,%g,%g]", x0[0], x0[1], x0[2]);
      CCTK_VINFO("  xmax=[%g,%g,%g]", x1[0], x1[1], x1[2]);
      CCTK_VINFO("  base dx=[%g,%g,%g]", dx[0], dx[1], dx[2]);

[16.7152]

[16.7335]

        CCTK_VINFO("  xmin=[%.17g,%.17g,%.17g]", double(x0[0]), double(x0[1]),
                   double(x0[2]));
        CCTK_VINFO("  xmax=[%.17g,%.17g,%.17g]", double(x1[0]), double(x1[1]),
                   double(x1[2]));
        CCTK_VINFO("  base dx=[%.17g,%.17g,%.17g]", double(dx[0]),
                   double(dx[1]), double(dx[2]));

Replacement in CarpetX/src/schedule.cxx at line 1244 [15.531]

B:BD[16.7371] → [16.7371:7473]

      CCTK_VINFO("  t0=%g", cctkGH->cctk_time);
      CCTK_VINFO("  dt=%g", cctkGH->cctk_delta_time);

[16.7371]

[16.7473]

        CCTK_VINFO("  t0=%.17g", double(cctkGH->cctk_time));
        CCTK_VINFO("  dt=%.17g", double(cctkGH->cctk_delta_time));
      }

Insertion in CarpetX/src/schedule.cxx at line 1252 [15.531]
[8.7581]
[8.7581]
```
#pragma omp critical
```
Insertion in CarpetX/src/schedule.cxx at line 1262 [15.531]
[16.7600]
[17.0]
```
#pragma omp critical
```
Insertion in CarpetX/src/schedule.cxx at line 1279 [15.531]
[11.5624]
[18.0]
```
#pragma omp critical
      {
```
Insertion in CarpetX/src/schedule.cxx at line 1298 [15.531]
[18.797]
[19.792]
```
      }
```
Insertion in CarpetX/src/schedule.cxx at line 1307 [15.531]
[20.3122]
[4.10301]
```
#pragma omp critical
```
Insertion in CarpetX/src/schedule.cxx at line 1502 [15.531]
[20.5445]
[4.10371]
```
#pragma omp critical
```
Insertion in CarpetX/src/schedule.cxx at line 1511 [15.531]
[21.16926]
[8.7879]
```
#pragma omp critical
```
Insertion in CarpetX/src/schedule.cxx at line 1526 [15.531]
[16.8600]
[8.8129]
```
#pragma omp critical
      {
```
Insertion in CarpetX/src/schedule.cxx at line 1549 [15.531]
[19.1223]
[8.8275]
```
    }
```
Insertion in CarpetX/src/schedule.cxx at line 1586 [15.531]
[22.5782]
[4.10413]
```
#pragma omp critical
```
Insertion in CarpetX/src/schedule.cxx at line 1607 [15.531]
[4.10492]
[21.16976]
```
#pragma omp critical
```
Insertion in CarpetX/src/schedule.cxx at line 1935 [15.531]
[21.17718]
[21.17718]
```
#pragma omp critical
```

CarpetX: Use OpenMP critical for output

Dependencies

In channels

Change contents

Insertion in CarpetX/src/driver.cxx at line 247 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 293 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 295 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 355 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 357 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 763 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 765 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 783 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 785 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 787 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 873 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 875 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 1000 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 1002 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 1014 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 1016 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 1090 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 1092 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 1118 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 1120 [5.15972]

Replacement in CarpetX/src/driver.cxx at line 1156 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 1166 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 1172 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 1180 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 1182 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 1195 [5.15972]

Insertion in CarpetX/src/driver.cxx at line 1197 [5.15972]

Replacement in CarpetX/src/linsolve.cxx at line 84 [13.115]

Insertion in CarpetX/src/schedule.cxx at line 404 [15.531]

Replacement in CarpetX/src/schedule.cxx at line 412 [15.531]

Replacement in CarpetX/src/schedule.cxx at line 828 [15.531]

Insertion in CarpetX/src/schedule.cxx at line 1186 [15.531]

Insertion in CarpetX/src/schedule.cxx at line 1207 [15.531]

Replacement in CarpetX/src/schedule.cxx at line 1214 [15.531]

Replacement in CarpetX/src/schedule.cxx at line 1224 [15.531]

Insertion in CarpetX/src/schedule.cxx at line 1232 [15.531]

Replacement in CarpetX/src/schedule.cxx at line 1237 [15.531]

Replacement in CarpetX/src/schedule.cxx at line 1244 [15.531]

Insertion in CarpetX/src/schedule.cxx at line 1252 [15.531]

Insertion in CarpetX/src/schedule.cxx at line 1262 [15.531]

Insertion in CarpetX/src/schedule.cxx at line 1279 [15.531]

Insertion in CarpetX/src/schedule.cxx at line 1298 [15.531]

Insertion in CarpetX/src/schedule.cxx at line 1307 [15.531]

Insertion in CarpetX/src/schedule.cxx at line 1502 [15.531]

Insertion in CarpetX/src/schedule.cxx at line 1511 [15.531]

Insertion in CarpetX/src/schedule.cxx at line 1526 [15.531]

Insertion in CarpetX/src/schedule.cxx at line 1549 [15.531]

Insertion in CarpetX/src/schedule.cxx at line 1586 [15.531]

Insertion in CarpetX/src/schedule.cxx at line 1607 [15.531]

Insertion in CarpetX/src/schedule.cxx at line 1935 [15.531]