updated Makefile

Author: SteliosAlegkakis

assignment2/Makefile

@@ -1,5 +1,6 @@
-all:
+parallel:
 gcc -fopenmp gameOfLife.c
-
+serial:
+gcc gameOfLife.c
 clean:
 del -f output.txt a.exe

assignment2/gameOfLife.c

@@ -80,17 +80,15 @@ char** make_array(int columns, int rows) {
 
 void copy_array_parallel(char** dst, char** src, int rows, int columns) {
 
- int i = 0, j = 0;
+ int i = 0;
 
- #pragma omp parallel for private (i, j)
+ #pragma omp parallel for private (i)
  for(i = 0; i < rows; i++){
- for(j = 0; j < columns; j++)
- dst[i][j] = src[i][j];
+ strcpy(dst[i],src[i]);
  }
 
 }
 
-
 char** read_file(const char* fileName, int* _rows, int* _columns) {
 
  FILE* file = fopen(fileName,"r");