Merge pull request #80 from Moritz921/master

Add partition for cesari scheduler and fix mpi scheduler

scripts/shell/schedulers/cesari

@@ -45,10 +45,15 @@ function UJS_Submit
 	local SlurmExclusive=""
 	if [ $exclusive == true ]; then
 		SlurmExclusive="--exclusive "
-	fi	
-	local additionalSlurm="$SlurmWalltime$SlurmMail$SlurmExclusive"
-
-	commandline="salloc -N $nnodes -n $npe $additionalSlurm --job-name=$jobname mpirun $executable $args"
+	fi
+	local SlurmPartition=""
+	if [ ! -z $partition ]; then
+		SlurmPartition="--partition=$partition "
+	fi
+
+	local additionalSlurm="$SlurmWalltime$SlurmMail$SlurmExclusive$SlurmPartition"
+
+	commandline="salloc -N $nnodes -n $npe $additionalSlurm --job-name=$jobname $optionalParameters mpirun $executable $args"
 	echo " command:      "$commandline >> info.txt
 
 	if [ $test == true ]; then

scripts/shell/schedulers/mpi

@@ -49,11 +49,9 @@ function UJS_Info
 	echo "ps aux | grep $USER | grep mpirun"
 	echo "JOBID STATE $(ps aux | sed -n 1p)"
 
-	ps aux | grep -E "$USER|$UID|${USER:0:8}+" | grep mpirun | while read -r line ; do
+	ps aux | grep -E "$USER|$UID|${USER:0:8}+" | grep "prterun\|mpirun" | grep -v grep | while read -r line ; do
 		jobid=$(echo $line | grep -Eo '\s[0-9]+\b' -o -m 1 -h -a | head -1 | cut -c2-)
-		if ! echo $line | grep -q "grep"; then
-			echo "$jobid RUNNING $line"
-		fi
+		echo "$jobid RUNNING $line"
 	done
 }