Prepare parallel grid to merge into master.

All builds pass.
leixu-cfd · Apr 18, 2016 · 7ec5395 · 7ec5395
1 parent 7facb94
commit 7ec5395
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 56 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ option(PARALLEL_GRID "Use parallel grid" OFF)
 
 set(VALUE_TYPE "d" CACHE STRING "Defines type of values")
 set(TIME_STEPS "2" CACHE STRING "Defines number of time steps used")
-set(GRID_DIMENSION "2" CACHE STRING "Defines number dimension in grid")
+set(PARALLEL_GRID_DIMENSION "2" CACHE STRING "Defines number dimension in grid")
 set(PARALLEL_BUFFER_DIMENSION "x" CACHE STRING "Defines dimension of parallel grid")
 
 if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -61,45 +61,45 @@ endif ()
 
 message ("Time steps: ${TIME_STEPS}.")
 
-if ("${GRID_DIMENSION}" STREQUAL "1")
+if ("${PARALLEL_GRID_DIMENSION}" STREQUAL "1")
   add_definitions (-DGRID_1D="")
-elseif ("${GRID_DIMENSION}" STREQUAL "2")
+elseif ("${PARALLEL_GRID_DIMENSION}" STREQUAL "2")
   add_definitions (-DGRID_2D="")
-elseif ("${GRID_DIMENSION}" STREQUAL "3")
+elseif ("${PARALLEL_GRID_DIMENSION}" STREQUAL "3")
   add_definitions (-DGRID_3D="")
 else ()
-  #message(FATAL_ERROR "Unknown GRID_DIMENSION")
+  #message(FATAL_ERROR "Unknown PARALLEL_GRID_DIMENSION")
   add_definitions (-DGRID_2D="")
 endif ()
 
-message ("Grid dimension: ${GRID_DIMENSION}.")
+message ("Grid dimension: ${PARALLEL_GRID_DIMENSION}.")
 
 if ("${PARALLEL_GRID}")
   message ("Parallel grid: ON.")
   add_definitions (-DPARALLEL_GRID="")
 
-  if ("${GRID_DIMENSION}" STREQUAL "1")
+  if ("${PARALLEL_GRID_DIMENSION}" STREQUAL "1")
 
     if ("${PARALLEL_BUFFER_DIMENSION}" STREQUAL "x")
       add_definitions (-DPARALLEL_BUFFER_DIMENSION_1D_X="")
       message ("Parallel dimension: ${PARALLEL_BUFFER_DIMENSION}.")
     elseif ("${PARALLEL_BUFFER_DIMENSION}" STREQUAL "y")
-      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this GRID_DIMENSION")
+      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this PARALLEL_GRID_DIMENSION")
     elseif ("${PARALLEL_BUFFER_DIMENSION}" STREQUAL "z")
-      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this GRID_DIMENSION")
+      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this PARALLEL_GRID_DIMENSION")
     elseif ("${PARALLEL_BUFFER_DIMENSION}" STREQUAL "xy")
-      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this GRID_DIMENSION")
+      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this PARALLEL_GRID_DIMENSION")
     elseif ("${PARALLEL_BUFFER_DIMENSION}" STREQUAL "yz")
-      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this GRID_DIMENSION")
+      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this PARALLEL_GRID_DIMENSION")
     elseif ("${PARALLEL_BUFFER_DIMENSION}" STREQUAL "xy")
-      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this GRID_DIMENSION")
+      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this PARALLEL_GRID_DIMENSION")
     elseif ("${PARALLEL_BUFFER_DIMENSION}" STREQUAL "xyz")
-      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this GRID_DIMENSION")
+      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this PARALLEL_GRID_DIMENSION")
     else ()
       message(FATAL_ERROR "Unknown PARALLEL_BUFFER_DIMENSION")
     endif ()
 
-  elseif ("${GRID_DIMENSION}" STREQUAL "2")
+  elseif ("${PARALLEL_GRID_DIMENSION}" STREQUAL "2")
 
     if ("${PARALLEL_BUFFER_DIMENSION}" STREQUAL "x")
       message ("Parallel dimension: ${PARALLEL_BUFFER_DIMENSION}.")
@@ -108,21 +108,21 @@ if ("${PARALLEL_GRID}")
       message ("Parallel dimension: ${PARALLEL_BUFFER_DIMENSION}.")
       add_definitions (-DPARALLEL_BUFFER_DIMENSION_1D_Y="")
     elseif ("${PARALLEL_BUFFER_DIMENSION}" STREQUAL "z")
-      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this GRID_DIMENSION")
+      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this PARALLEL_GRID_DIMENSION")
     elseif ("${PARALLEL_BUFFER_DIMENSION}" STREQUAL "xy")
       message ("Parallel dimension: ${PARALLEL_BUFFER_DIMENSION}.")
       add_definitions (-DPARALLEL_BUFFER_DIMENSION_2D_XY="")
     elseif ("${PARALLEL_BUFFER_DIMENSION}" STREQUAL "yz")
-      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this GRID_DIMENSION")
+      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this PARALLEL_GRID_DIMENSION")
     elseif ("${PARALLEL_BUFFER_DIMENSION}" STREQUAL "xz")
-      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this GRID_DIMENSION")
+      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this PARALLEL_GRID_DIMENSION")
     elseif ("${PARALLEL_BUFFER_DIMENSION}" STREQUAL "xyz")
-      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this GRID_DIMENSION")
+      message(FATAL_ERROR "Unsupported PARALLEL_BUFFER_DIMENSION for this PARALLEL_GRID_DIMENSION")
     else ()
       message(FATAL_ERROR "Unknown PARALLEL_BUFFER_DIMENSION")
     endif ()
 
-  elseif ("${GRID_DIMENSION}" STREQUAL "3")
+  elseif ("${PARALLEL_GRID_DIMENSION}" STREQUAL "3")
 
     if ("${PARALLEL_BUFFER_DIMENSION}" STREQUAL "x")
       message ("Parallel dimension: ${PARALLEL_BUFFER_DIMENSION}.")
@@ -150,7 +150,7 @@ if ("${PARALLEL_GRID}")
     endif ()
 
   else ()
-    message(FATAL_ERROR "Unknown GRID_DIMENSION")
+    message(FATAL_ERROR "Unknown PARALLEL_GRID_DIMENSION")
   endif ()
 else ()
   message ("Parallel grid: OFF.")

diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ make
 main.cpp has example of parallel grid usage, independent of all build parameters. Build command for 3D grid:
 
 ```sh
-cmake .. -DCMAKE_BUILD_TYPE=Release -DVALUE_TYPE=d -DTIME_STEPS=2 -DGRID_DIMENSION=3 -DPRINT_MESSAGE=OFF -DPARALLEL_GRID=ON -DPARALLEL_BUFFER_DIMENSION=xyz
+cmake .. -DCMAKE_BUILD_TYPE=Release -DVALUE_TYPE=d -DTIME_STEPS=2 -DPARALLEL_GRID_DIMENSION=3 -DPRINT_MESSAGE=OFF -DPARALLEL_GRID=ON -DPARALLEL_BUFFER_DIMENSION=xyz
 ```
 
 ## Build using scripts
@@ -50,7 +50,7 @@ Example of build with scripts. This will build 2D parallel grid with x buffer, d
 -DCMAKE_BUILD_TYPE - build type (Debug or Release)
 -DVALUE_TYPE - use float (f), double (d) or long double (ld)
 -DTIME_STEPS - number of steps in time (1 or 2)
--DGRID_DIMENSION - number of dimensions in parallel grid (1, 2 or 3)
+-DPARALLEL_GRID_DIMENSION - number of dimensions in parallel grid (1, 2 or 3)
 -DPRINT_MESSAGE - print output (ON or OFF)
 -DPARALLEL_GRID - use parallel grid or not (ON or OFF)
 -DPARALLEL_BUFFER_DIMENSION - dimension of parallel buffers, i.e. actual coordinate systems (x, y, z, xy, yz, xz, xyz)

diff --git a/main.cpp b/main.cpp
@@ -4,9 +4,9 @@
 
 #if defined (PARALLEL_GRID)
 #include "ParallelGrid.h"
-#else
+#else /* PARALLEL_GRID */
 #include "Grid.h"
-#endif
+#endif /* !PARALLEL_GRID */
 
 #include "BMPDumper.h"
 #include "BMPLoader.h"
@@ -25,13 +25,20 @@ int main (int argc, char** argv)
 
 #if PRINT_MESSAGE
   printf ("Start process %d of %d\n", rank, numProcs);
-#endif
-#endif
+#endif /* PRINT_MESSAGE */
+#endif /* PARALLEL_GRID */
 
+#if defined (PARALLEL_GRID)
+  ParallelGridCoordinate overallSize (100);
+  //GridCoordinate size (100, 100);
+  ParallelGridCoordinate bufferLeft (10);
+  ParallelGridCoordinate bufferRight (10);
+#else
   GridCoordinate3D overallSize (100);
   //GridCoordinate size (100, 100);
   GridCoordinate3D bufferLeft (10);
   GridCoordinate3D bufferRight (10);
+#endif
 
 #if defined (PARALLEL_GRID)
   ParallelGrid Eps (overallSize, bufferLeft, bufferRight, rank, numProcs, 0);
@@ -40,16 +47,18 @@ int main (int argc, char** argv)
   ParallelGrid Ez (overallSize, bufferLeft, bufferRight, rank, numProcs, 0);
   ParallelGrid Hx (overallSize, bufferLeft, bufferRight, rank, numProcs, 0);
   ParallelGrid Hy (overallSize, bufferLeft, bufferRight, rank, numProcs, 0);
+
+  ParallelGridCoordinate sizeTotal = Eps.getSize ();
 #else
   Grid<GridCoordinate3D> Eps (overallSize, 0);
   Grid<GridCoordinate3D> Mu (overallSize, 0);
 
   Grid<GridCoordinate3D> Ez (overallSize, 0);
   Grid<GridCoordinate3D> Hx (overallSize, 0);
   Grid<GridCoordinate3D> Hy (overallSize, 0);
-#endif
 
   GridCoordinate3D sizeTotal = Eps.getSize ();
+#endif
 
   FieldValue lambda = 0.000003;
   FieldValue stepLambda = 20;
@@ -59,18 +68,19 @@ int main (int argc, char** argv)
   FieldValue eps0 = 0.0000000000088541878176203892;
   FieldValue mu0 = 0.0000012566370614359173;
 
-//#if defined (GRID_1D) || defined (GRID_2D) || defined (GRID_3D)
+#if (defined (GRID_1D) || defined (GRID_2D) || defined (GRID_3D)) && defined (PARALLEL_GRID) || \
+    (! defined (PARALLEL_GRID))
   for (int i = 0; i < sizeTotal.getX (); ++i)
   {
-//#endif
-//#if defined (GRID_2D) || defined (GRID_3D)
+#endif
+#if (defined (GRID_2D) || defined (GRID_3D)) && defined (PARALLEL_GRID) || (! defined (PARALLEL_GRID))
     for (int j = 0; j < sizeTotal.getY (); ++j)
     {
-//#endif
-//#if defined (GRID_3D)
+#endif
+#if (defined (GRID_3D)) && defined (PARALLEL_GRID) || (! defined (PARALLEL_GRID))
       for (int k = 0; k < sizeTotal.getZ (); ++k)
       {
-//#endif
+#endif
 
 #if defined (TWO_TIME_STEPS)
         FieldPointValue* eps = new FieldPointValue (1*eps0, 1*eps0, 1*eps0);
@@ -95,13 +105,13 @@ int main (int argc, char** argv)
         FieldPointValue* valHy = new FieldPointValue (0);
 #endif
 
-#if defined (GRID_1D)
+#if defined (GRID_1D) && defined (PARALLEL_GRID)
         GridCoordinate1D pos (i);
 #endif
-#if defined (GRID_2D)
+#if defined (GRID_2D) && defined (PARALLEL_GRID)
         GridCoordinate2D pos (i, j);
 #endif
-#if defined (GRID_3D)
+#if defined (GRID_3D) && defined (PARALLEL_GRID) || (! defined (PARALLEL_GRID))
         GridCoordinate3D pos (i, j, k);
 #endif
 
@@ -111,15 +121,16 @@ int main (int argc, char** argv)
         Ez.setFieldPointValue(valE, pos);
         Hx.setFieldPointValue(valHx, pos);
         Hy.setFieldPointValue(valHy, pos);
-//#if defined (GRID_3D)
+#if (defined (GRID_3D)) && defined (PARALLEL_GRID) || (! defined (PARALLEL_GRID))
       }
-//#endif
-//#if defined (GRID_2D) || defined (GRID_3D)
+#endif
+#if (defined (GRID_2D) || defined (GRID_3D)) && defined (PARALLEL_GRID) || (! defined (PARALLEL_GRID))
     }
-//#endif
-//#if defined (GRID_1D) || defined (GRID_2D) || defined (GRID_3D)
+#endif
+#if (defined (GRID_1D) || defined (GRID_2D) || defined (GRID_3D)) && defined (PARALLEL_GRID) || \
+    (! defined (PARALLEL_GRID))
   }
-//#endif
+#endif
 
 #if defined (PARALLEL_GRID)
   MPI_Barrier (MPI_COMM_WORLD);

diff --git a/tools/build.sh b/tools/build.sh
@@ -7,7 +7,7 @@ BUILD_DIR="${2}"
 BUILD_TYPE="${3}"
 VALUES_TYPE="${4}"
 TIME_STEPS="${5}"
-GRID_DIMENSION="${6}"
+PARALLEL_GRID_DIMENSION="${6}"
 PRINT_MESSAGE="${7}"
 PARALLEL_GRID="${8}"
 PARALLEL_BUFFER="${9}"
@@ -29,7 +29,7 @@ if [ "${VALUES_TYPE}" == "long_double" ]; then
   VALUES_TYPE="ld"
 fi
 
-cmake ${SOURCE_PATH} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DVALUE_TYPE=${VALUES_TYPE} -DTIME_STEPS=${TIME_STEPS} -DGRID_DIMENSION=${GRID_DIMENSION} -DPRINT_MESSAGE=${PRINT_MESSAGE} -DPARALLEL_GRID=${PARALLEL_GRID} -DPARALLEL_BUFFER_DIMENSION=${PARALLEL_BUFFER}
+cmake ${SOURCE_PATH} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DVALUE_TYPE=${VALUES_TYPE} -DTIME_STEPS=${TIME_STEPS} -DPARALLEL_GRID_DIMENSION=${PARALLEL_GRID_DIMENSION} -DPRINT_MESSAGE=${PRINT_MESSAGE} -DPARALLEL_GRID=${PARALLEL_GRID} -DPARALLEL_BUFFER_DIMENSION=${PARALLEL_BUFFER}
 STATUS_CODE=$?
 
 if [ $STATUS_CODE -ne 0 ]; then

diff --git a/tools/build_and_run.sh b/tools/build_and_run.sh
@@ -8,7 +8,7 @@ RUN_SCRIPT="${SOURCE_PATH}/tools/run.sh"
 BUILD_TYPE="${2}"
 VALUES_TYPE="${3}"
 TIME_STEPS="${4}"
-GRID_DIMENSION="${5}"
+PARALLEL_GRID_DIMENSION="${5}"
 PRINT_MESSAGE="${6}"
 PARALLEL_GRID="${7}"
 PARALLEL_BUFFER="${8}"
@@ -18,7 +18,7 @@ NUMBER_PROCESSES="${10}"
 BUILD_DIR=$(pwd)
 BUILD_DIR="${BUILD_DIR}/${BUILD_TYPE}"
 
-${BUILD_SCRIPT} ${SOURCE_PATH} ${BUILD_DIR} ${BUILD_TYPE} ${VALUES_TYPE} ${TIME_STEPS} ${GRID_DIMENSION} ${PRINT_MESSAGE} ${PARALLEL_GRID} ${PARALLEL_BUFFER}
+${BUILD_SCRIPT} ${SOURCE_PATH} ${BUILD_DIR} ${BUILD_TYPE} ${VALUES_TYPE} ${TIME_STEPS} ${PARALLEL_GRID_DIMENSION} ${PRINT_MESSAGE} ${PARALLEL_GRID} ${PARALLEL_BUFFER}
 
 STATUS_CODE=$?
 

diff --git a/tools/build_and_run_1.sh b/tools/build_and_run_1.sh
@@ -5,7 +5,7 @@
 
 SOURCE_PATH="${1}"
 BUILD_TYPE="${2}"
-GRID_DIMENSION="${3}"
+PARALLEL_GRID_DIMENSION="${3}"
 PARALLEL_GRID="${4}"
 PARALLEL_BUFFER="${5}"
 NUMBER_PROCESSES="${6}"
@@ -30,7 +30,7 @@ BUILD_TEST_SCRIPT="${SOURCE_PATH}/tools/build_and_run.sh"
 count=$((0))
 
 # ==== 1D non parallel ====
-${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} float 0 ${GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
+${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} float 0 ${PARALLEL_GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
 STATUS_CODE=$?
 count=$((count+1))
 
@@ -39,7 +39,7 @@ if [ $STATUS_CODE -ne 0 ]; then
   exit 1
 fi
 
-${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} float 1 ${GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
+${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} float 1 ${PARALLEL_GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
 STATUS_CODE=$?
 count=$((count+1))
 
@@ -48,7 +48,7 @@ if [ $STATUS_CODE -ne 0 ]; then
   exit 1
 fi
 
-${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} float 2 ${GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
+${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} float 2 ${PARALLEL_GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
 STATUS_CODE=$?
 count=$((count+1))
 
@@ -57,7 +57,7 @@ if [ $STATUS_CODE -ne 0 ]; then
   exit 1
 fi
 
-${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} double 0 ${GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
+${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} double 0 ${PARALLEL_GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
 STATUS_CODE=$?
 count=$((count+1))
 
@@ -66,7 +66,7 @@ if [ $STATUS_CODE -ne 0 ]; then
   exit 1
 fi
 
-${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} double 1 ${GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
+${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} double 1 ${PARALLEL_GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
 STATUS_CODE=$?
 count=$((count+1))
 
@@ -75,7 +75,7 @@ if [ $STATUS_CODE -ne 0 ]; then
   exit 1
 fi
 
-${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} double 2 ${GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
+${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} double 2 ${PARALLEL_GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
 STATUS_CODE=$?
 count=$((count+1))
 
@@ -84,7 +84,7 @@ if [ $STATUS_CODE -ne 0 ]; then
   exit 1
 fi
 
-${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} long_double 0 ${GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
+${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} long_double 0 ${PARALLEL_GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
 STATUS_CODE=$?
 count=$((count+1))
 
@@ -93,7 +93,7 @@ if [ $STATUS_CODE -ne 0 ]; then
   exit 1
 fi
 
-${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} long_double 1 ${GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
+${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} long_double 1 ${PARALLEL_GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
 STATUS_CODE=$?
 count=$((count+1))
 
@@ -102,7 +102,7 @@ if [ $STATUS_CODE -ne 0 ]; then
   exit 1
 fi
 
-${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} long_double 2 ${GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
+${BUILD_TEST_SCRIPT} ${SOURCE_PATH} ${BUILD_TYPE} long_double 2 ${PARALLEL_GRID_DIMENSION} OFF ${PARALLEL_GRID} ${PARALLEL_BUFFER} ${EXECUTABLE} ${NUMBER_PROCESSES}
 STATUS_CODE=$?
 count=$((count+1))