ModSim ass4 taddeus: Merged conflicts.

modsim/ass4_taddeus/vibstring/Makefile

 CC=mpicc
-CFLAGS=-Wall -Wextra -pedantic -std=c99 -O0 -D_GNU_SOURCE
+CFLAGS=-Wall -Wextra -pedantic -std=c99 -O0 -D_GNU_SOURCE -g
 LDFLAGS=-lm
 
 all: seq par

modsim/ass4_taddeus/vibstring/par.c

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <math.h>
 #include <mpi.h>
+#include <assert.h>
 
 double **y = NULL;
 int tasks, rank, steps, start;

modsim/ass4_taddeus/vibstring/par.sh

-#!/bin/sh
+#!/bin/bash
 NUM_PROCESSES=${1-4} # Default: 4 processes
 RSH_AGENT=rsh
 MPI_HOSTFILE=~/.mpirun.machines