--- trunk/scons/service0_options.py	2009/04/06 01:25:25	2365
+++ trunk/scons/service0_options.py	2009/04/06 03:10:55	2366
@@ -90,28 +90,28 @@
 
 usempi		= 'no'
 # MPI MPT (no module load required)
-mpi_path		= '/usr/include'
-mpi_lib_path		= '/usr/lib64'
-mpi_libs		= ['mpi']
-mpi_flavour     = "MPT"
+# mpi_path		= '/usr/include'
+# mpi_lib_path		= '/usr/lib64'
+# mpi_libs		= ['mpi']
+# mpi_flavour     = "MPT"
 
 # MPICH2 (to run Escript use: module load mpich2/gcc-4.1.2/mpich2-1.0.7)
 # mpi_path		= '/sw/libs/mpich2/x86_64/gcc-4.1.2/mpich2-1.0.7/include'
 # mpi_lib_path		= '/sw/libs/mpich2/x86_64/gcc-4.1.2/mpich2-1.0.7/lib'
 # mpi_libs		= ['mpich', 'rt']
-# mpi_falvour		= 'MPICH'
+# mpi_flavour		= 'MPICH'
 
 # MPICH2 for jumpshot (to run Escript use: module load mpich2/gcc-4.1.2/mpich2-1.0.7)
 # mpi_path		= '/sw/libs/mpich2/x86_64/gcc-4.1.2/mpich2-1.0.7/include'
 # mpi_lib_path		= '/sw/libs/mpich2/x86_64/gcc-4.1.2/mpich2-1.0.7/lib'
 # mpi_libs		= ['lmpe', 'mpe', 'mpich', 'rt']
-# mpi_falvour		= 'MPICH'
+# mpi_flavour		= 'MPICH'
 
 # Intel MPI (to run Escript use: module load intel-mpi/3.1.038)
-# mpi_path		= '/sw/sdev/intel/mpi/3.1.038/x86_64/include64'
-# mpi_lib_path		= '/sw/sdev/intel/mpi/3.1.038/x86_64/lib64'
-# mpi_libs		= ['mpi']
-# mpi_falvour		= 'INTELMPI'
+mpi_path		= '/sw/sdev/intel/mpi/3.1.038/x86_64/include64'
+mpi_lib_path		= '/sw/sdev/intel/mpi/3.1.038/x86_64/lib64'
+mpi_libs		= ['mpi']
+mpi_flavour		= 'INTELMPI'
 
 # ParMETIS setting needs to be overwritten in intel-mpi is used
 # parmetis_path = "/sw/libs/parmetis/x86_64/gcc-4.1.2/intelmpi/parmetis-3.1/include"
@@ -121,13 +121,13 @@
 # mpi_path		= '/usr/diags/mpi/mvapich/intel/include'
 # mpi_lib_path		= '/usr/diags/mpi/mvapich/intel/lib/shared'
 # mpi_libs		= ['mpich']
-# mpi_falvour		= 'MPICH'
+# mpi_flavour		= 'MPICH'
 
 # OpenMPI (to run Escript use: module load openmpi/gcc-4.1.2/openmpi-1.2.6) (This doesn't compile)
 # mpi_path		= '/sw/libs/openmpi/x86_64/gcc-4.1.2/openmpi-1.2.6/include'
 # mpi_lib_path		= '/sw/libs/openmpi/x86_64/gcc-4.1.2/openmpi-1.2.6/lib'
 # mpi_libs		= ['mpi']
-# mpi_falvour		= 'OPENMPI'
+# mpi_flavour		= 'OPENMPI'
 
 # PAPI
 # usepapi		= 'no'