[svn:einsteintoolkit] ADMBase/trunk/src/ (Rev. 68) - Commits

25 May 2012

User: knarf
Date: 2012/05/25 01:19 PM
Modified:
 /trunk/src/
  Initialisation.c
Log:
 declare loop variables inside openmp loops (to make them private)
File Changes:
Directory: /trunk/src/
======================
File [modified]: Initialisation.c
Delta lines: +17 -39
===================================================================

--- trunk/src/Initialisation.c	2012-05-14 22:09:01 UTC (rev 67)
+++ trunk/src/Initialisation.c	2012-05-25 18:19:18 UTC (rev 68)
@@ -72,12 +72,10 @@
  @@*/
 void ADMBase_CartesianMinkowski(CCTK_ARGUMENTS)
 {
-  int i;
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
-#pragma omp parallel for
-  for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+  for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
   {
     gxx[i] = 1.0;
     gyy[i] = 1.0;
@@ -98,8 +96,7 @@
if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::metric") > 1)
   {
-#pragma omp parallel for
-    for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+    for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
     {
       gxx_p[i] = 1.0;
       gyy_p[i] = 1.0;
@@ -113,8 +110,7 @@
if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::metric") > 2)
   {
-#pragma omp parallel for
-    for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+    for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
     {
       gxx_p_p[i] = 1.0;
       gyy_p_p[i] = 1.0;
@@ -129,8 +125,7 @@
if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::curv") > 1)
   {
-#pragma omp parallel for
-    for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+    for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
     {
       kxx_p[i] = 0.0;
       kyy_p[i] = 0.0;
@@ -144,8 +139,7 @@
if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::curv") > 2)
   {
-#pragma omp parallel for
-    for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+    for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
     {
kxx_p_p[i] = 0.0;
@@ -179,20 +173,17 @@
  @@*/
 void ADMBase_LapseOne(CCTK_ARGUMENTS)
 {
-  int i;
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
-#pragma omp parallel for
-  for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+  for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
   {
     alp[i] = 1.0;
   }
if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::lapse") > 1)
   {
-#pragma omp parallel for
-    for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+    for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
     {
       alp_p[i] = 1.0;
     }
@@ -200,8 +191,7 @@
if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::lapse") > 2)
   {
-#pragma omp parallel for
-    for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+    for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
     {
       alp_p_p[i] = 1.0;
     }
@@ -225,12 +215,10 @@
  @@*/
 void ADMBase_ShiftZero(CCTK_ARGUMENTS)
 {
-  int i;
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
-#pragma omp parallel for
-  for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+  for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
   {
     betax[i] = 0.0;
     betay[i] = 0.0;
@@ -239,8 +227,7 @@
if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::shift") > 1)
   {
-#pragma omp parallel for
-    for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+    for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
     {
       betax_p[i] = 0.0;
       betay_p[i] = 0.0;
@@ -250,8 +237,7 @@
if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::shift") > 2)
   {
-#pragma omp parallel for
-    for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+    for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
     {
       betax_p_p[i] = 0.0;
       betay_p_p[i] = 0.0;
@@ -277,20 +263,17 @@
  @@*/
 void ADMBase_DtLapseZero(CCTK_ARGUMENTS)
 {
-  int i;
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
-#pragma omp parallel for
-  for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+  for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
   {
     dtalp[i] = 0.0;
   }
if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::dtlapse") > 1)
   {
-#pragma omp parallel for
-    for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+    for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
     {
       dtalp_p[i] = 0.0;
     }
@@ -298,8 +281,7 @@
if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::dtlapse") > 2)
   {
-#pragma omp parallel for
-    for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+    for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
     {
       dtalp_p_p[i] = 0.0;
     }
@@ -323,12 +305,10 @@
  @@*/
 void ADMBase_DtShiftZero(CCTK_ARGUMENTS)
 {
-  int i;
   DECLARE_CCTK_ARGUMENTS;
   DECLARE_CCTK_PARAMETERS;
-#pragma omp parallel for
-  for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+  for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
   {
     dtbetax[i] = 0.0;
     dtbetay[i] = 0.0;
@@ -337,8 +317,7 @@
if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::dtshift") > 1)
   {
-#pragma omp parallel for
-    for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+    for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
     {
       dtbetax_p[i] = 0.0;
       dtbetay_p[i] = 0.0;
@@ -348,8 +327,7 @@
if (CCTK_ActiveTimeLevels(cctkGH, "ADMBase::dtshift") > 2)
   {
-#pragma omp parallel for
-    for(i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
+    for(int i = 0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++)
     {
       dtbetax_p_p[i] = 0.0;
       dtbetay_p_p[i] = 0.0;

    