Changed reference to CHAOS2 to be just CHAOS.

This commit is contained in:
hill66 2005-12-15 18:53:28 +00:00
parent a7be4a6ef8
commit c998b978ef
6 changed files with 20 additions and 23 deletions

4
aclocal.m4 vendored
View File

@ -681,8 +681,8 @@ dnl * define type of architecture
;;
Linux | linux | LINUX)
case $HOSTNAME in
mcr* | thunder* | ilx*)
AC_DEFINE(HYPRE_LINUX_CHAOS2)
mcr* | thunder* | ilx* | peng*)
AC_DEFINE(HYPRE_LINUX_CHAOS)
;;
*)
AC_DEFINE(HYPRE_LINUX)

View File

@ -107,8 +107,8 @@
/* Define to 1 for Solaris. */
#undef HYPRE_SOLARIS
/* Define to 1 for Linux on platforms running Chaos2 with Elan. */
#undef HYPRE_LINUX_CHAOS2
/* Define to 1 for Linux on platforms running any version of CHAOS. */
#undef HYPRE_LINUX_CHAOS
/* Define to 1 for Linux platforms. */
#undef HYPRE_LINUX

View File

@ -668,8 +668,8 @@ dnl * define type of architecture
;;
Linux | linux | LINUX)
case $HOSTNAME in
mcr* | thunder* | ilx*)
AC_DEFINE(HYPRE_LINUX_CHAOS2)
mcr* | thunder* | ilx* | peng*)
AC_DEFINE(HYPRE_LINUX_CHAOS)
;;
*)
AC_DEFINE(HYPRE_LINUX)

4
configure vendored
View File

@ -9317,9 +9317,9 @@ _ACEOF
;;
Linux | linux | LINUX)
case $HOSTNAME in
mcr* | thunder* | ilx*)
mcr* | thunder* | ilx* | peng*)
cat >>confdefs.h <<\_ACEOF
#define HYPRE_LINUX_CHAOS2 1
#define HYPRE_LINUX_CHAOS 1
_ACEOF
;;

View File

@ -171,15 +171,12 @@ where:
-nocvs do not checkout latest source code; use existing \file{linear\_solvers} directory
-rev REV check out version REV from the source code repository
host current valid host options are:
-emperor Intel Linux, CHAOS2
-frost IBM, AIX
-frostmp IBM, AIX executing OpenMP
-gps Compaq system
-gpsmp Compaq system executing OpenMP
-ilx Intel Linux
-insure CASC Linux executing insure++
-mcr Intel Linux, CHAOS2
-pengra Intel Linux, CHAOS2
-mcr Intel Linux, CHAOS
-pengra Intel Linux, CHAOS
-tux149 CASC RedHat Enterprise Linux
-tuxgcc CASC RedHat Enterprise Linux - latest GCC compilers
-tuxpgi CASC RedHat Enterprise Linux - latest PGI compilers

View File

@ -210,10 +210,10 @@ aix_5_ll frost white, ice
aix_5_64_fed newberg uv, um
tru64_5 gps sc
sles_9_ppc64 bgl ---
chaos_2_ia32 ilx ace
chaos_2_ia32_elan3 pengra, alc, mcr, adelie, emperor,
chaos_3_x86 ilx ace
chaos_3_x86_elan3 pengra, alc, mcr, adelie, emperor,
pvc, bigdev lilac, gviz
chaos_2_ia32_elan4 thunder cub
chaos_3_x64_elan4 thunder cub
\end{verbatim}
To relieve the user of needing to know the SYS\_TYPE on each platform, the path
@ -260,7 +260,7 @@ to be installed.
\end{verbatim}
\item Move to the subdirectory for this platform, identified by SYS\_TYPE
\begin{verbatim}
Example: cd chaos_2_ia32_elan3
Example: cd chaos_3_ia32_elan3
\end{verbatim}
\item Build and install the library by runnning the \file{mklibs} script; which is
located in the \file{/usr/gapps/hypre} directory.
@ -320,7 +320,7 @@ to be installed.
\end{verbatim}
\item Move to the subdirectory for this platform, identified by SYS\_TYPE
\begin{verbatim}
Example: cd chaos_2_ia32_elan3
Example: cd chaos_3_ia32_elan3
\end{verbatim}
\item Build and install the library by runnning the \file{mklibs} script; which is
located in the \file{/usr/gapps/hypre} directory.
@ -383,7 +383,7 @@ On a local CASC platform:
lrwxrwxrwx 1 hil66 hypre 22 Apr 13 07:32 alphaev68-dec-osf5.1/hypre-1.9.0b.tar.gz -> ../hypre-1.9.0b.tar.gz
lrwxrwxrwx 1 hil66 hypre 22 Apr 13 07:32 i686-pc-linux-gnu/hypre-1.9.0b.tar.gz -> ../hypre-1.9.0b.tar.gz
lrwxrwxrwx 1 hil66 hypre 22 Apr 13 07:32 powerpc-ibm-aix5.2.0.0/hypre-1.9.0b.tar.gz -> ../hypre-1.9.0b.tar.gz
lrwxrwxrwx 1 hil66 hypre 22 Apr 13 07:32 chaos_2_ia32_elan3/hypre-1.9.0b.tar.gz -> ../hypre-1.9.0b.tar.gz
lrwxrwxrwx 1 hil66 hypre 22 Apr 13 07:32 chaos_3_ia32_elan3/hypre-1.9.0b.tar.gz -> ../hypre-1.9.0b.tar.gz
12. cd i686-pc-linux-gnu
@ -412,9 +412,9 @@ install \hypre{}.
17. ./mkdistlinks hypre-1.9.0b.tar.gz
lrwxrwxrwx 1 hil66 hypre 22 Apr 13 07:32 alphaev68-dec-osf5.1/hypre-1.9.0b.tar.gz -> ../hypre-1.9.0b.tar.gz
lrwxrwxrwx 1 hil66 hypre 22 Apr 13 07:32 powerpc-ibm-aix5.2.0.0/hypre-1.9.0b.tar.gz -> ../hypre-1.9.0b.tar.gz
lrwxrwxrwx 1 hil66 hypre 22 Apr 13 07:32 chaos_2_ia32_elan3/hypre-1.9.0b.tar.gz -> ../hypre-1.9.0b.tar.gz
lrwxrwxrwx 1 hil66 hypre 22 Apr 13 07:32 chaos_3_ia32_elan3/hypre-1.9.0b.tar.gz -> ../hypre-1.9.0b.tar.gz
18. cd chaos_2_ia32_elan3
18. cd chaos_3_ia32_elan3
19. ../mklibs -b hypre-1.9.0b.tar.gz install
checking the hostname... blue
@ -456,9 +456,9 @@ Now build and install \hypre{} on the SCF platform (adelie in this example).
24. ./mkdistlinks hypre-1.9.0b.tar.gz
lrwxrwxrwx 1 hil66 hypre 22 Apr 13 07:32 alphaev68-dec-osf5.1/hypre-1.9.0b.tar.gz -> ../hypre-1.9.0b.tar.gz
lrwxrwxrwx 1 hil66 hypre 22 Apr 13 07:32 powerpc-ibm-aix5.2.0.0/hypre-1.9.0b.tar.gz -> ../hypre-1.9.0b.tar.gz
lrwxrwxrwx 1 hil66 hypre 22 Apr 13 07:32 chaos_2_ia32_elan3/hypre-1.9.0b.tar.gz -> ../hypre-1.9.0b.tar.gz
lrwxrwxrwx 1 hil66 hypre 22 Apr 13 07:32 chaos_3_ia32_elan3/hypre-1.9.0b.tar.gz -> ../hypre-1.9.0b.tar.gz
25. cd chaos_2_ia32_elan3
25. cd chaos_3_ia32_elan3
26. ../mklibs -b hypre-1.9.0b.tar.gz install
checking the hostname... blue