From 999ed8812cc189c99b092702089690ee2332b42e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 15 Jul 2009 12:26:12 +0200
Subject: [PATCH] removed last remnants of LAM support

---
 bin/foamJob                        | 18 ---------------
 bin/mpirunDebug                    |  6 -----
 etc/bashrc                         |  4 ++--
 etc/cshrc                          |  4 ++--
 etc/settings.csh                   | 15 +------------
 etc/settings.sh                    | 35 ++++++++++--------------------
 wmake/rules/linux64Gcc/mplibLAM    |  3 ---
 wmake/rules/linux64Gcc42/mplibLAM  |  3 ---
 wmake/rules/linux64Gcc43/mplibLAM  |  3 ---
 wmake/rules/linux64Icc/mplibLAM    |  3 ---
 wmake/rules/linuxGcc/mplibLAM      |  3 ---
 wmake/rules/linuxGcc42/mplibLAM    |  3 ---
 wmake/rules/linuxGcc43/mplibLAM    |  3 ---
 wmake/rules/linuxIA64Gcc/mplibLAM  |  3 ---
 wmake/rules/linuxIA64Icc/mplibLAM  |  3 ---
 wmake/rules/linuxIcc/mplibLAM      |  3 ---
 wmake/rules/linuxPPC64Gcc/mplibLAM |  3 ---
 wmake/rules/linuxmingw32/mplibLAM  |  3 ---
 wmake/rules/solarisGcc/mplibLAM    |  3 ---
 19 files changed, 16 insertions(+), 105 deletions(-)
 delete mode 100644 wmake/rules/linux64Gcc/mplibLAM
 delete mode 100644 wmake/rules/linux64Gcc42/mplibLAM
 delete mode 100644 wmake/rules/linux64Gcc43/mplibLAM
 delete mode 100644 wmake/rules/linux64Icc/mplibLAM
 delete mode 100644 wmake/rules/linuxGcc/mplibLAM
 delete mode 100644 wmake/rules/linuxGcc42/mplibLAM
 delete mode 100644 wmake/rules/linuxGcc43/mplibLAM
 delete mode 100644 wmake/rules/linuxIA64Gcc/mplibLAM
 delete mode 100644 wmake/rules/linuxIA64Icc/mplibLAM
 delete mode 100644 wmake/rules/linuxIcc/mplibLAM
 delete mode 100644 wmake/rules/linuxPPC64Gcc/mplibLAM
 delete mode 100644 wmake/rules/linuxmingw32/mplibLAM
 delete mode 100644 wmake/rules/solarisGcc/mplibLAM

diff --git a/bin/foamJob b/bin/foamJob
index 0f679d7275..289d430d83 100755
--- a/bin/foamJob
+++ b/bin/foamJob
@@ -204,24 +204,6 @@ else
 #
    echo "Parallel processing using $WM_MPLIB with $NPROCS processors"
    case "$WM_MPLIB" in
-   LAM)
-      lamPid=`getPID lamd`
-      if [ ! "$lamPid" ] ; then
-         echo "No LAM daemon running."
-         if [ -r system/machines ] ; then
-            echo "system/machines file exists"
-            echo "Try starting the LAM multicomputer with \"lamboot -v system/machines\""
-            exit 1
-         else
-            echo "Cannot find a 'machines' file for LAM in system/"
-            echo "required to start a LAM multicomputer"
-            consultGuide
-            exit 1
-         fi
-      else
-         echo "LAM daemon running (PID $lamPid).  Proceeding with MPI run."
-      fi
-      ;;
    OPENMPI)
       # add hostfile info
       for hostfile in \
diff --git a/bin/mpirunDebug b/bin/mpirunDebug
index 66bc86e42b..57df760873 100755
--- a/bin/mpirunDebug
+++ b/bin/mpirunDebug
@@ -162,10 +162,6 @@ do
 
     if [ .$WM_MPLIB = .OPENMPI ]; then
         node="-np 1 "
-    elif [ .$WM_MPLIB = .LAM ]; then
-        if [ "$spawn" -eq 2 ]; then
-            node="c${proc} "
-        fi
     fi
 
     echo "#!/bin/sh" > $procCmdFile
@@ -210,8 +206,6 @@ done
 cmd=""
 if [ .$WM_MPLIB = .OPENMPI ]; then
     cmd="mpirun -app $PWD/mpirun.schema </dev/null"
-elif [ .$WM_MPLIB = .LAM ]; then
-    cmd="mpirun $PWD/mpirun.schema </dev/null"
 fi
 
 echo "Constructed $PWD/mpirun.schema file."
diff --git a/etc/bashrc b/etc/bashrc
index f906c99080..218880e311 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -33,7 +33,7 @@
 #------------------------------------------------------------------------------
 
 export WM_PROJECT=OpenFOAM
-# export WM_PROJECT_VERSION=1.5.x
+# export WM_PROJECT_VERSION=1.6.x
 : ${WM_PROJECT_VERSION:=dev}; export WM_PROJECT_VERSION
 
 ################################################################################
@@ -105,7 +105,7 @@ export WM_COMPILER_LIB_ARCH=
 # WM_JAVAC_OPTION = Opt | Debug
 : ${WM_JAVAC_OPTION:=Opt}; export WM_JAVAC_OPTION
 
-# WM_MPLIB = | OPENMPI | LAM | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
+# WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
 : ${WM_MPLIB:=OPENMPI}; export WM_MPLIB
 
 
diff --git a/etc/cshrc b/etc/cshrc
index e1960e39dc..0ead9b1a65 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -32,7 +32,7 @@
 #------------------------------------------------------------------------------
 
 setenv WM_PROJECT OpenFOAM
-# setenv WM_PROJECT_VERSION 1.5.x
+# setenv WM_PROJECT_VERSION 1.6.x
 if ( ! $?WM_PROJECT_VERSION ) setenv WM_PROJECT_VERSION dev
 
 ################################################################################
@@ -99,7 +99,7 @@ if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
 # WM_JAVAC_OPTION = Opt | Debug
 if ( ! $?WM_JAVAC_OPTION ) setenv WM_JAVAC_OPTION Opt
 
-# WM_MPLIB = | OPENMPI | LAM | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
+# WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
 if ( ! $?WM_MPLIB ) setenv WM_MPLIB OPENMPI
 
 
diff --git a/etc/settings.csh b/etc/settings.csh
index 639f2eac63..edafa90716 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -118,6 +118,7 @@ unset MPI_ARCH_PATH
 
 switch ("$WM_MPLIB")
 case OPENMPI:
+    # set mpi_version=openmpi-1.3.3
     set mpi_version=openmpi-1.3.2
     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
     setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
@@ -132,20 +133,6 @@ case OPENMPI:
     unset mpi_version
     breaksw
 
-case LAM:
-    set mpi_version=lam-7.1.4
-    setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
-    setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS
-    setenv LAMHOME $WM_THIRD_PARTY_DIR/$mpi_version
-    # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
-
-    _foamAddPath $MPI_ARCH_PATH/bin
-    _foamAddLib  $MPI_ARCH_PATH/lib
-
-    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
-    unset mpi_version
-    breaksw
-
 case MPICH:
     set mpi_version=mpich-1.2.4
     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version
diff --git a/etc/settings.sh b/etc/settings.sh
index aacd41f8bc..1203a843a0 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -34,21 +34,21 @@
 # prefix to PATH
 _foamAddPath()
 {
-   while [ $# -ge 1 ]
-   do
-      export PATH=$1:$PATH
-      shift
-   done
+    while [ $# -ge 1 ]
+    do
+        export PATH=$1:$PATH
+        shift
+    done
 }
 
 # prefix to LD_LIBRARY_PATH
 _foamAddLib()
 {
-   while [ $# -ge 1 ]
-   do
-      export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
-      shift
-   done
+    while [ $# -ge 1 ]
+    do
+        export LD_LIBRARY_PATH=$1:$LD_LIBRARY_PATH
+        shift
+    done
 }
 
 
@@ -142,6 +142,7 @@ unset MPI_ARCH_PATH
 
 case "$WM_MPLIB" in
 OPENMPI)
+    # mpi_version=openmpi-1.3.3
     mpi_version=openmpi-1.3.2
     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
     export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
@@ -156,20 +157,6 @@ OPENMPI)
     unset mpi_version
     ;;
 
-LAM)
-    mpi_version=lam-7.1.4
-    export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
-    export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS
-    export LAMHOME=$WM_THIRD_PARTY_DIR/$mpi_version
-    # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too
-
-    _foamAddPath $MPI_ARCH_PATH/bin
-    _foamAddLib  $MPI_ARCH_PATH/lib
-
-    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
-    unset mpi_version
-    ;;
-
 MPICH)
     mpi_version=mpich-1.2.4
     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version
diff --git a/wmake/rules/linux64Gcc/mplibLAM b/wmake/rules/linux64Gcc/mplibLAM
deleted file mode 100644
index 6762b843c1..0000000000
--- a/wmake/rules/linux64Gcc/mplibLAM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linux64Gcc42/mplibLAM b/wmake/rules/linux64Gcc42/mplibLAM
deleted file mode 100644
index 6762b843c1..0000000000
--- a/wmake/rules/linux64Gcc42/mplibLAM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linux64Gcc43/mplibLAM b/wmake/rules/linux64Gcc43/mplibLAM
deleted file mode 100644
index 6762b843c1..0000000000
--- a/wmake/rules/linux64Gcc43/mplibLAM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linux64Icc/mplibLAM b/wmake/rules/linux64Icc/mplibLAM
deleted file mode 100644
index 9fa7c2752e..0000000000
--- a/wmake/rules/linux64Icc/mplibLAM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lutil
diff --git a/wmake/rules/linuxGcc/mplibLAM b/wmake/rules/linuxGcc/mplibLAM
deleted file mode 100644
index 6762b843c1..0000000000
--- a/wmake/rules/linuxGcc/mplibLAM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linuxGcc42/mplibLAM b/wmake/rules/linuxGcc42/mplibLAM
deleted file mode 100644
index 6762b843c1..0000000000
--- a/wmake/rules/linuxGcc42/mplibLAM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linuxGcc43/mplibLAM b/wmake/rules/linuxGcc43/mplibLAM
deleted file mode 100644
index 6762b843c1..0000000000
--- a/wmake/rules/linuxGcc43/mplibLAM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linuxIA64Gcc/mplibLAM b/wmake/rules/linuxIA64Gcc/mplibLAM
deleted file mode 100644
index 6762b843c1..0000000000
--- a/wmake/rules/linuxIA64Gcc/mplibLAM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linuxIA64Icc/mplibLAM b/wmake/rules/linuxIA64Icc/mplibLAM
deleted file mode 100644
index 9fa7c2752e..0000000000
--- a/wmake/rules/linuxIA64Icc/mplibLAM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lutil
diff --git a/wmake/rules/linuxIcc/mplibLAM b/wmake/rules/linuxIcc/mplibLAM
deleted file mode 100644
index 9fa7c2752e..0000000000
--- a/wmake/rules/linuxIcc/mplibLAM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lutil
diff --git a/wmake/rules/linuxPPC64Gcc/mplibLAM b/wmake/rules/linuxPPC64Gcc/mplibLAM
deleted file mode 100644
index 6762b843c1..0000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibLAM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/linuxmingw32/mplibLAM b/wmake/rules/linuxmingw32/mplibLAM
deleted file mode 100644
index 6762b843c1..0000000000
--- a/wmake/rules/linuxmingw32/mplibLAM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam -lpthread -lutil
diff --git a/wmake/rules/solarisGcc/mplibLAM b/wmake/rules/solarisGcc/mplibLAM
deleted file mode 100644
index fc109a63b5..0000000000
--- a/wmake/rules/solarisGcc/mplibLAM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi -llam