Merging the new branch

PoissonSolver/2D-seq/src/main.c

@@ -40,27 +40,30 @@ int main(int argc, char** argv)
 
     readParameter(&params, argv[1]);
     // printParameter(&params);
-
-    initSolver(&solver, &params, 2);
     if (argc == 3) {
         variant = atoi(argv[2]);
     }
+    if (argc == 4) {
+        sscanf("%lf", argv[2], &params.omg);
+        sscanf("%lf", argv[2], &params.rho);
+    }
 
+    initSolver(&solver, &params, 2);
     switch (variant) {
     case SOR:
-        // printf("Plain SOR\n");
+        printf("Plain SOR\n");
         LIKWID_PROFILE("SOR", solve);
         break;
     case RB:
-        // printf("Red-black SOR\n");
+        printf("Red-black SOR\n");
         LIKWID_PROFILE("RB", solveRB);
         break;
     case RBA:
-        // printf("Red-black SOR with acceleration\n");
+        printf("Red-black SOR with acceleration\n");
         LIKWID_PROFILE("RBA", solveRBA);
         break;
     }
-    printf("Solution took %.2fs\n", endTime - startTime);
+    printf(" %.2fs\n", endTime - startTime);
     // writeResult(&solver);
 
     LIKWID_MARKER_CLOSE;

PoissonSolver/2D-seq/src/solver.h

@@ -7,8 +7,6 @@
 #ifndef __SOLVER_H_
 #define __SOLVER_H_
 #include "parameter.h"
-#include "timing.h"
-
 
 typedef struct {
     double dx, dy;