fix openMP

Amazingkivas · Dec 5, 2023 · 7ef1cf0 · 7ef1cf0
1 parent 09ecacf
commit 7ef1cf0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/include/FDTD.h b/include/FDTD.h
@@ -39,8 +39,8 @@ class FDTD
 
     Field& get_field(Component);
 
-    void update_field(const int&);
-    void shifted_update_field(const int&);
+    void update_field(const int);
+    void shifted_update_field(const int);
 
     int get_Ni() { return Ni; }
     int get_Nj() { return Nj; }

diff --git a/src/FDTD.cpp b/src/FDTD.cpp
@@ -62,14 +62,13 @@ Field& FDTD::get_field(Component this_field)
     }
 }
 
-void FDTD::update_field(const int& time)
+void FDTD::update_field(const int time)
 {
     for (double t = 0; t <= time; ++t)
     {
-        #pragma omp parallel for
+        #pragma omp parallel for collapse(2)
         for (int j = 0; j < Nj; ++j)
         {
-            #pragma ivdep
             for (int i = 0; i < Ni; ++i)
             {
                 Ex(i, j) += FDTD_Const::C * dt * (Bz(i, j + 1) - Bz(i, j - 1)) / (2.0 * dy);
@@ -78,10 +77,9 @@ void FDTD::update_field(const int& time)
             }
         }
 
-        #pragma omp parallel for
+        #pragma omp parallel for collapse(2)
         for (int j = 0; j < Nj; ++j)
         {
-            #pragma ivdep
             for (int i = 0; i < Ni; ++i)
             {
                 Bx(i, j) -= FDTD_Const::C * dt * (Ez(i, j + 1) - Ez(i, j - 1)) / (2.0 * dy);
@@ -92,14 +90,13 @@ void FDTD::update_field(const int& time)
     }
 }
 
-void FDTD::shifted_update_field(const int& time)
+void FDTD::shifted_update_field(const int time)
 {
     for (double t = 0; t <= time; ++t)
     {
-        #pragma omp parallel for
+        #pragma omp parallel for collapse(2)
         for (int j = 0; j < Nj; ++j)
         {
-            #pragma ivdep
             for (int i = 0; i < Ni; ++i)
             {
                 Bx(i, j) -= FDTD_Const::C * dt / 2.0 * (Ez(i, j + 1) - Ez(i, j)) / dy;
@@ -108,10 +105,9 @@ void FDTD::shifted_update_field(const int& time)
             }
         }
 
-        #pragma omp parallel for
+        #pragma omp parallel for collapse(2)
         for (int j = 0; j < Nj; ++j)
         {
-            #pragma ivdep
             for (int i = 0; i < Ni; ++i)
             {
                 Ex(i, j) += FDTD_Const::C * dt * (Bz(i, j) - Bz(i, j - 1)) / dy;
@@ -120,10 +116,9 @@ void FDTD::shifted_update_field(const int& time)
             }
         }
 
-        #pragma omp parallel for
+        #pragma omp parallel for collapse(2)
         for (int j = 0; j < Nj; ++j)
         {
-            #pragma ivdep
             for (int i = 0; i < Ni; ++i)
             {
                 Bx(i, j) -= FDTD_Const::C * dt / 2.0 * (Ez(i, j + 1) - Ez(i, j)) / dy;