eschnett/cactusamrex - Change 3JDQNCYHAZDHBEJLHKZXMW4AX5MKRCR4CUAMIOP47F7SZYZMLJEQC

TwoPunctures: Correct OpenMP parallelisation

Created by Erik Schnetter on May 29, 2020

3JDQNCYHAZDHBEJLHKZXMW4AX5MKRCR4CUAMIOP47F7SZYZMLJEQC

Dependencies

In channels

master

main

Change contents

Replacement in TwoPunctures/src/FuncAndJacobian.c at line 383 [5.40642]

B:BD[5.52428] → [5.52428:52539]

#pragma omp parallel for private (values,dU,U,i,j,k,al,A,be,B,phi,X,R,x,r,y,z,Am1,ivar,indx) schedule(dynamic)

[5.52428]

[5.52539]

// #pragma omp parallel for private (values,dU,U,i,j,k,al,A,be,B,phi,X,R,x,r,y,z,Am1,ivar,indx) schedule(dynamic)

Replacement in TwoPunctures/src/FuncAndJacobian.c at line 609 [5.40642]

B:BD[5.60441] → [5.60441:60509]

#pragma omp parallel for private (i,j,k,ivar,row) schedule(dynamic)

[5.60441]

[5.60509]

// #pragma omp parallel for private (i,j,k,ivar,row) schedule(dynamic)

Replacement in TwoPunctures/src/Newton.c at line 60 [5.73992]
B:BD[5.76261] → [5.76261:76282]
```
#pragma omp parallel
```
[5.76261]
[5.76282]
```
// #pragma omp parallel
```
Replacement in TwoPunctures/src/Newton.c at line 63 [5.73992]
B:BD[5.76312] → [5.76312:76328]
```
#pragma omp for
```
[5.76312]
[5.76328]
```
// #pragma omp for
```
Replacement in TwoPunctures/src/Newton.c at line 67 [5.73992]
B:BD[5.76425] → [5.76425:76446]
```
#pragma omp critical
```
[5.76425]
[5.76446]
```
// #pragma omp critical
```
Replacement in TwoPunctures/src/Newton.c at line 83 [5.73992]
B:BD[5.76916] → [5.76916:76941]
```
#pragma omp parallel for
```
[5.76916]
[5.76941]
```
// #pragma omp parallel for
```
Replacement in TwoPunctures/src/Newton.c at line 227 [5.73992]
B:BD[5.81358] → [5.81358:81401]
```
#pragma omp parallel for schedule(dynamic)
```
[5.81358]
[5.81401]
```
// #pragma omp parallel for schedule(dynamic)
```
Replacement in TwoPunctures/src/Newton.c at line 230 [5.73992]
B:BD[5.81505] → [5.81505:81548]
```
#pragma omp parallel for schedule(dynamic)
```
[5.81505]
[5.81548]
```
// #pragma omp parallel for schedule(dynamic)
```
Replacement in TwoPunctures/src/Newton.c at line 233 [5.73992]
B:BD[5.81652] → [5.81652:81695]
```
#pragma omp parallel for schedule(dynamic)
```
[5.81652]
[5.81695]
```
// #pragma omp parallel for schedule(dynamic)
```
Replacement in TwoPunctures/src/Newton.c at line 236 [5.73992]
B:BD[5.81799] → [5.81799:81842]
```
#pragma omp parallel for schedule(dynamic)
```
[5.81799]
[5.81842]
```
// #pragma omp parallel for schedule(dynamic)
```
Replacement in TwoPunctures/src/Newton.c at line 245 [5.73992]
B:BD[5.82038] → [5.82038:82081]
```
#pragma omp parallel for schedule(dynamic)
```
[5.82038]
[5.82081]
```
// #pragma omp parallel for schedule(dynamic)
```
Replacement in TwoPunctures/src/Newton.c at line 248 [5.73992]
B:BD[5.82185] → [5.82185:82228]
```
#pragma omp parallel for schedule(dynamic)
```
[5.82185]
[5.82228]
```
// #pragma omp parallel for schedule(dynamic)
```
Replacement in TwoPunctures/src/Newton.c at line 251 [5.73992]
B:BD[5.82332] → [5.82332:82375]
```
#pragma omp parallel for schedule(dynamic)
```
[5.82332]
[5.82375]
```
// #pragma omp parallel for schedule(dynamic)
```
Replacement in TwoPunctures/src/Newton.c at line 254 [5.73992]
B:BD[5.82479] → [5.82479:82522]
```
#pragma omp parallel for schedule(dynamic)
```
[5.82479]
[5.82522]
```
// #pragma omp parallel for schedule(dynamic)
```
Replacement in TwoPunctures/src/Newton.c at line 363 [5.73992]
B:BD[5.85751] → [5.85751:85776]
```
#pragma omp parallel for
```
[5.85751]
[5.85776]
```
// #pragma omp parallel for
```
Replacement in TwoPunctures/src/Newton.c at line 386 [5.73992]
B:BD[5.86225] → [5.86225:86250]
```
#pragma omp parallel for
```
[5.86225]
[5.86250]
```
// #pragma omp parallel for
```
Replacement in TwoPunctures/src/Newton.c at line 393 [5.73992]
B:BD[5.86369] → [5.86369:86394]
```
#pragma omp parallel for
```
[5.86369]
[5.86394]
```
// #pragma omp parallel for
```
Replacement in TwoPunctures/src/Newton.c at line 399 [5.73992]
B:BD[5.86551] → [5.86551:86576]
```
#pragma omp parallel for
```
[5.86551]
[5.86576]
```
// #pragma omp parallel for
```
Replacement in TwoPunctures/src/Newton.c at line 407 [5.73992]
B:BD[5.86877] → [5.86877:86902]
```
#pragma omp parallel for
```
[5.86877]
[5.86902]
```
// #pragma omp parallel for
```
Replacement in TwoPunctures/src/Newton.c at line 415 [5.73992]
B:BD[5.87075] → [5.87075:87100]
```
#pragma omp parallel for
```
[5.87075]
[5.87100]
```
// #pragma omp parallel for
```
Replacement in TwoPunctures/src/Newton.c at line 427 [5.73992]
B:BD[5.87437] → [5.87437:87462]
```
#pragma omp parallel for
```
[5.87437]
[5.87462]
```
// #pragma omp parallel for
```
Replacement in TwoPunctures/src/Newton.c at line 437 [5.73992]
B:BD[5.87830] → [5.87830:87855]
```
#pragma omp parallel for
```
[5.87830]
[5.87855]
```
// #pragma omp parallel for
```
Replacement in TwoPunctures/src/Newton.c at line 518 [5.73992]
B:BD[5.89843] → [5.89843:89868]
```
#pragma omp parallel for
```
[5.89843]
[5.89868]
```
// #pragma omp parallel for
```
Replacement in TwoPunctures/src/Newton.c at line 531 [5.73992]
B:BD[5.90237] → [5.90237:90262]
```
#pragma omp parallel for
```
[5.90237]
[5.90262]
```
// #pragma omp parallel for
```
Insertion in TwoPunctures/src/TwoPunctures.c at line 4 [5.106100]
[5.106165]
[5.106165]
```
#include <stdbool.h>
```
Insertion in TwoPunctures/src/TwoPunctures.c at line 217 [5.106100]
[5.112882]
[5.112882]
```
  static bool did_setup = false;
```
Replacement in TwoPunctures/src/TwoPunctures.c at line 223 [5.106100]
B:BD[5.112962] → [3.3112:3131]
∅:D[6.36] → [5.112962:112975]
∅:D[3.3131] → [5.112962:112975]
B:BD[5.112962] → [5.112962:112975]
```
#pragma omp single
  if (! F) {
```
[5.112962]
[5.112975]
```
  if (! did_setup) {
#pragma omp critical
    if (! did_setup) {
```

Replacement in TwoPunctures/src/TwoPunctures.c at line 385 [5.106100]

B:BD[2.631] → [2.631:897]

  } else {
    // before each call CarpetX wipes the grid scalars so I need to restore them
    *mp = mp_saved;
    *mm = mm_saved;
    *mp_adm = mp_adm_saved;
    *mm_adm = mm_adm_saved;
    *E = E_saved;
    *J1 = J1_saved;
    *J2 = J2_saved;
    *J3 = J3_saved;

[2.631]

[5.119038]


    did_setup = true;
    }

Insertion in TwoPunctures/src/TwoPunctures.c at line 390 [5.106100]

[5.119043]

  // before each call CarpetX wipes the grid scalars so I need to restore them
  *mp = mp_saved;
  *mm = mm_saved;
  *mp_adm = mp_adm_saved;
  *mm_adm = mm_adm_saved;
  *E = E_saved;
  *J1 = J1_saved;
  *J2 = J2_saved;
  *J3 = J3_saved;

Insertion in TwoPunctures/src/TwoPunctures.c at line 632 [5.106100]
[5.128024]
[4.87]
```
    assert(0);                  // TODO: Implement via critical region
```

TwoPunctures: Correct OpenMP parallelisation

Dependencies

In channels

Change contents

Replacement in TwoPunctures/src/FuncAndJacobian.c at line 383 [5.40642]

Replacement in TwoPunctures/src/FuncAndJacobian.c at line 609 [5.40642]

Replacement in TwoPunctures/src/Newton.c at line 60 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 63 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 67 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 83 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 227 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 230 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 233 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 236 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 245 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 248 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 251 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 254 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 363 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 386 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 393 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 399 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 407 [5.73992]

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

Replacement in TwoPunctures/src/Newton.c at line 427 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 437 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 518 [5.73992]

Replacement in TwoPunctures/src/Newton.c at line 531 [5.73992]

Insertion in TwoPunctures/src/TwoPunctures.c at line 4 [5.106100]

Insertion in TwoPunctures/src/TwoPunctures.c at line 217 [5.106100]

Replacement in TwoPunctures/src/TwoPunctures.c at line 223 [5.106100]

Replacement in TwoPunctures/src/TwoPunctures.c at line 385 [5.106100]

Insertion in TwoPunctures/src/TwoPunctures.c at line 390 [5.106100]

Insertion in TwoPunctures/src/TwoPunctures.c at line 632 [5.106100]