Commit 642c4172 authored by cyrush's avatar cyrush

merge cscs host profs from 2.7RC

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23392 18c085ea-50e0-402c-830e-de6fd14e8384
parent de26991b
......@@ -25,6 +25,7 @@ list of changes in release 2.7.</p>
<li>The VisIt installations that used the CHAOS operating system at LLNL were modified so that they use an older version of the NVIDIA driver that works properly with the desktop systems at LLNL.</li>
<li>The gateway host was changed to red-wtrw.lanl.gov in the host profile for LANL's <i>cielo</i> system since the old gateway cluster was retired.</li>
<li>A host profile was added for LLNL's <i>zindev</i> system.</li>
<li>Host profiles for Swiss National Supercomputing Center's <i>rosa</i> and <i>daint</i> systems were added.</li>
</ul>
<p><b><font size="4">Bugs fixed in version 2.7.3</font></b></p>
......
......@@ -14,6 +14,7 @@ Sandia National Laboratory (SNL) closed network:sandia_closed
Sandia National Laboratory (SNL) open network:sandia
Stanford Linear Accelerator Center (SLAC) network:slac
Swiss Federal Institue of Technology Zurich:eth_zurich
Swiss National Supercomputing Center (CSCS) network:cscs
Texas Advanced Computing Center (TACC) network:tacc
University of Michigan Center for Advanced Computing network:umich
University of Utah Center for High Performance Computing network:utah
......@@ -8,11 +8,13 @@
# Date: October 26, 1996
#
# Usage
# visit-install [-c anag | anl | llnl_open | llnl_open_rz | llnl_open_cz |
# llnl_closed | nersc | ornl | princeton | sandia |
# tacc | umich | nics | lsu]
# [-g group] [-gw] [-l] [-dmg] [-beta | -private]
# version platform directory
# visit-install [-c anag | anl | arl | asu | awe | clemson | cscs |"
# eth_zurich | llnl_open | llnl_open_rz |"
# llnl_open_cz | llnl_closed | lsu | nersc |"
# nics | ornl | princeton | sandia |"
# sandia_closed | tacc | umich]"
# [-g group] [-b bank] [-gw] [-l] [-dmg] [-test]"
# [-beta | -private] version platform directory"
#
# The default is to install this version as the current version.
# The -beta flag makes this version the current beta version instead.
......@@ -353,6 +355,8 @@
# I added missing -c options and added a -test argument that tests
# all the -c options.
#
# Cyrus Harrison, Fri May 30 10:42:10 PDT 2014
# Added option for Swiss National Supercomputing Center (CSCS).
#-----------------------------------------------------------------------
Compress=COMPRESS
......@@ -423,7 +427,7 @@ while [ "$option_found" = "true" ]; do
done
if [ "$#" != "3" ]; then
echo "Usage: visit-install [-c anag | anl | arl | asu | awe | clemson |"
echo "Usage: visit-install [-c anag | anl | arl | asu | awe | clemson | cscs |"
echo " eth_zurich | llnl_open | llnl_open_rz |"
echo " llnl_open_cz | llnl_closed | lsu | nersc |"
echo " nics | ornl | princeton | sandia |"
......@@ -592,6 +596,14 @@ if [ "$test" = "true" ]; then
echo "failed"
exit 1
fi
echo "Testing cscs configuration..."
rm -rf $dir
$0 -c cscs $version $platform $dir > /dev/null 2>&1
files=`ls $dir/$version/.visit/hosts/host_cscs*`
if [ "$files" == "" ]; then
echo "failed"
exit 1
fi
echo "Testing eth_zurich configuration..."
rm -rf $dir
$0 -c eth_zurich $version $platform $dir > /dev/null 2>&1
......@@ -734,8 +746,9 @@ while [ "$config" = "prompt" ]; do
echo " 17) Princeton network"
echo " 18) Sandia network"
echo " 19) Sandia closed network"
echo " 20) TACC network"
echo " 21) U of Michigan Center for Advanced Computing network"
echo " 20) Swiss National Supercomputing Center (CSCS) network"
echo " 22) TACC network"
echo " 22) U of Michigan Center for Advanced Computing network"
echo ""
echo "Enter (1-21):"
......@@ -799,9 +812,12 @@ while [ "$config" = "prompt" ]; do
config=sandia_closed
;;
20)
config=tacc
config=cscs
;;
21)
config=tacc
;;
22)
config=umich
;;
*)
......@@ -849,13 +865,15 @@ case "$config" in
;;
sandia_closed)
;;
cscs)
;;
tacc)
;;
umich)
;;
*)
echo "Illegal configuration option, choices are none, anag, anl,"
echo "arl, asu, awe, clemson, eth_zurich, llnl_open, llnl_open_rz,"
echo "arl, asu, awe, clemson, cscs, eth_zurich, llnl_open, llnl_open_rz,"
echo "llnl_open_cz, llnl_closed, lsu, nersc, nics, ornl, princeton,"
echo "sandia, sandia_closed, tacc, umich"
exit 4
......@@ -980,6 +998,8 @@ elif [ "$config" = "awe" ]; then
elif [ "$config" = "clemson" ]; then
cp "$dir"/$version+/$platformDir/resources/hosts/$config/*.xml "$dir"/$version+/.visit/hosts/
cp "$dir"/$version+/$platformDir/resources/hosts/$config/customlauncher "$dir"/$version+/bin/
elif [ "$config" = "cscs" ]; then
cp "$dir"/$version+/$platformDir/resources/hosts/$config/*.xml "$dir"/$version+/.visit/hosts/
elif [ "$config" = "eth_zurich" ]; then
cp "$dir"/$version+/$platformDir/resources/hosts/$config/customlauncher "$dir"/$version+/bin/
elif [ "$config" = "llnl_open" ]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment