Fixing jenkins script

build_pdata.sh

@@ -30,8 +30,6 @@ then
  ./install
  make
 
- ldd src/pdata
-
  if [ $? -ne 0 ]; then exit 1 ; fi
  mpirun -np 2 ./src/pdata
  if [ $? -ne 0 ]; then exit 1 ; fi
@@ -61,24 +59,16 @@ then
 
 ## produce the module path
 
- export MODULEPATH="/sw/apps/modules/modulefiles:$MODULEPATH"
-
- script="module load gcc/4.9.2\n 
-module load openmpi/1.8.1\n
-module load boost/1.54.0\n
-compile_options='--with-boost=/sw/apps/boost/1.54.0/'\n
-\n
-sh ./autogen.sh\n
-sh ./configure \"\$compile_options\"  CXX=mpic++\n
-make\n
-if [ \"\$?\" = "0" ]; then exit 1 ; fi\n
-exit(0)\n"
-
- echo $script | sed -r 's/\\n/\n/g' > compile_script
+ module load gcc/4.9.2
+ module load openmpi/1.8.1
+ module load boost/1.54.0
 
- bsub -o output_compile.%J -K -n 1 -J compile sh ./compile_script
+ sh ./autogen.sh
+ ./install --with-boost=/sw/apps/boost/1.54.0/  CXX=mpic++
+ make
+ if [ $? -ne 0 ]; then exit 1
 
-## Run on the cluster
+ ## Run on the cluster
  bsub -o output_run2.%J -K -n 2 -R "span[hosts=1]" "module load openmpi/1.8.1 ; module load gcc/4.9.2;  mpirun -np 2 ./src/pdata"
  if [ $? -ne 0 ]; then exit 1 ; fi
  bsub -o output_run3.%J -K -n 3 -R "span[hosts=1]" "module load openmpi/1.8.1 ; module load gcc/4.9.2;  mpirun -np 3 ./src/pdata"
@@ -89,15 +79,15 @@ exit(0)\n"
  if [ $? -ne 0 ]; then exit 1 ; fi
  bsub -o output_run6.%J -K -n 6 -R "span[hosts=1]" "module load openmpi/1.8.1 ; module load gcc/4.9.2;  mpirun -np 6 ./src/pdata"
  if [ $? -ne 0 ]; then exit 1 ; fi
- bsub -o output_run6.%J -K -n 7 -R "span[hosts=1]" "module load openmpi/1.8.1 ; module load gcc/4.9.2;  mpirun -np 7 ./src/pdata"
+ bsub -o output_run7.%J -K -n 7 -R "span[hosts=1]" "module load openmpi/1.8.1 ; module load gcc/4.9.2;  mpirun -np 7 ./src/pdata"
  if [ $? -ne 0 ]; then exit 1 ; fi
- bsub -o output_run6.%J -K -n 8 -R "span[hosts=1]" "module load openmpi/1.8.1 ; module load gcc/4.9.2;  mpirun -np 8 ./src/pdata"
+ bsub -o output_run8.%J -K -n 8 -R "span[hosts=1]" "module load openmpi/1.8.1 ; module load gcc/4.9.2;  mpirun -np 8 ./src/pdata"
  if [ $? -ne 0 ]; then exit 1 ; fi
- bsub -o output_run6.%J -K -n 9 -R "span[hosts=1]" "module load openmpi/1.8.1 ; module load gcc/4.9.2;  mpirun -np 9 ./src/pdata"
+ bsub -o output_run9.%J -K -n 9 -R "span[hosts=1]" "module load openmpi/1.8.1 ; module load gcc/4.9.2;  mpirun -np 9 ./src/pdata"
  if [ $? -ne 0 ]; then exit 1 ; fi
- bsub -o output_run6.%J -K -n 10 -R "span[hosts=1]" "module load openmpi/1.8.1 ; module load gcc/4.9.2;  mpirun -np 10 ./src/pdata"
+ bsub -o output_run10.%J -K -n 10 -R "span[hosts=1]" "module load openmpi/1.8.1 ; module load gcc/4.9.2;  mpirun -np 10 ./src/pdata"
  if [ $? -ne 0 ]; then exit 1 ; fi
- bsub -o output_run6.%J -K -n 11 -R "span[hosts=1]" "module load openmpi/1.8.1 ; module load gcc/4.9.2;  mpirun -np 11 ./src/pdata"
+ bsub -o output_run11.%J -K -n 11 -R "span[hosts=1]" "module load openmpi/1.8.1 ; module load gcc/4.9.2;  mpirun -np 11 ./src/pdata"
  if [ $? -ne 0 ]; then exit 1 ; fi
  bsub -o output_run12.%J -K -n 12 -R "span[hosts=1]" "module load openmpi/1.8.1 ; module load gcc/4.9.2;  mpirun -np 12 ./src/vcluster"
  if [ $? -ne 0 ]; then exit 1 ; fi