Commit 5c256061 authored by hrchilds's avatar hrchilds

Add support for TACC machines.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7162 18c085ea-50e0-402c-830e-de6fd14e8384
parent 70384c72
#! /bin/sh
exec perl -x $0 ${1+"$@"};
#!perl
#!/bin/sh
# Do a little magic to run perl from anywhere in your path.
lines=`cat $0 | wc -l`
lines=`expr $lines - 20`
if (test -n "$TMPDIR") then
if (test ! -d "$TMPDIR") then
TMPDIR=$HOME
fi
else
TMPDIR=$HOME
fi
tail -$lines $0 1> $TMPDIR/visitilperl$$ 2>/dev/null
if (test $? -ne 0) then
tail --lines=$lines $0 1>> $TMPDIR/visitilperl$$
fi
echo "__END__" >> $TMPDIR/visitilperl$$
echo "$0 $*" >> $TMPDIR/visitilperl$$
exec perl $TMPDIR/visitilperl$$ $0 ${1+"$@"}
unlink $0;
$0 = shift @ARGV;
###############################################################################
#
......@@ -447,6 +467,11 @@ exec perl -x $0 ${1+"$@"};
# Added environemnt variable VISITULTRAHOME, so that VisIt knows where to
# find the ultra wrapper.
#
# Hank Childs, Sat Apr 25 11:35:31 CDT 2009
# (1) Undo Perl magic that Sean put in about a year ago. It seemed like a
# more elegant solution, but it was biting LLNL and TACC and Perl experts
# were not able to figure it out. (2) Add support for TACC.
#
# Hank Childs, Sun Apr 26 21:18:36 CDT 2009
# Add support for Argonne machine "gadzooks", which has a weird connection
# system similar to eureka.
......@@ -1395,6 +1420,22 @@ if ( ($parallel) and $exe_name eq "engine" and $host =~ /lens/ )
}
}
# ----
# HACK for ranger/spur @ TACC
# ----
$IsRunningOnTexasRanger = 0;
# Hostnames are of the form spur.tacc.utexas.edu or login#.ranger.tacc.utexas.edu
if ( ($parallel) and $exe_name eq "engine" and (($host =~ /spur/) or ($host =~ /login/)))
{
chomp($domain = `hostname -d`);
if ( ($domain eq "tacc.utexas.edu") or ($domain eq "ranger.tacc.utexas.edu") )
{
$IsRunningOnTexasRanger = 1;
print STDERR "\n\nAttempting to launch parallel engine at TACC\n\n";
print STDERR "If your job cannot launch, please see http://www.visitusers.org/index.php?title=TACC for help\n\n";
}
}
# ----
# HACK for jaguarcnl @ ORNL
#
......@@ -2124,6 +2165,17 @@ if ($procs_set or ($parallel and $parlaunch_set))
push @parcmd, @post_args;
chomp($printcmd[0] = `basename $printcmd[0]`);
}
# ibrun
elsif ($launch eq "ibrun")
{
@parcmd = ("ibrun");
push @parcmd, @visitcmd;
@printcmd = @parcmd;
if ($security_key_set) { push @parcmd, "-key", $security_key; }
push @parcmd, @post_args;
chomp($printcmd[0] = `basename $printcmd[0]`);
}
# prun
elsif ($launch eq "prun")
{
......@@ -2306,6 +2358,11 @@ if ($procs_set or ($parallel and $parlaunch_set))
}
push @mpicmd, "@visitcmd\n";
}
elsif ($sublauncher eq "ibrun")
{
@mpicmd = ("ibrun");
push @mpicmd, "@visitcmd\n";
}
elsif ($sublauncher eq "")
{
@mpicmd = "@visitcmd\n";
......@@ -2341,7 +2398,10 @@ if ($procs_set or ($parallel and $parlaunch_set))
@parcmd = ($plauncher);
# Add the env variables.
push @parcmd, "-v LIBPATH=$ENV{LIBPATH},LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH},VISITPLUGINDIR=$ENV{VISITPLUGINDIR}";
if (! $IsRunningOnTexasRanger)
{
push @parcmd, "-v LIBPATH=$ENV{LIBPATH},LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH},VISITPLUGINDIR=$ENV{VISITPLUGINDIR}";
}
# parse for '-l vis' so it can be separated from the
# launchargs
......@@ -2367,23 +2427,45 @@ if ($procs_set or ($parallel and $parlaunch_set))
push @parcmd, @newlaunchargs if $newlaunchargs_set;
$nodes = $procs if (!$nodes_set);
$ppn = ceil($procs / $nodes);
$qsubNumNodeStr = "nodes";
$qsubPPNStr = "ppn";
$qsubSeparator = ":";
if ( $IsRunningOnJaguarCNL_ORNL ) {$qsubNumNodeStr = "size";}
if ( $IsRunningOnFranklinNERSC ) {
$qsubNumNodeStr = "mppwidth";
$qsubPPNStr = "mppnppn";
$qsubSeparator = ",";
if (! $IsRunningOnTexasRanger)
{
$qsubNumNodeStr = "nodes";
$qsubPPNStr = "ppn";
$qsubSeparator = ":";
if ( $IsRunningOnJaguarCNL_ORNL ) {$qsubNumNodeStr = "size";}
if ( $IsRunningOnFranklinNERSC ) {
$qsubNumNodeStr = "mppwidth";
$qsubPPNStr = "mppnppn";
$qsubSeparator = ",";
}
if ( $IsRunningOnLens_ORNL ) {$qsubPPNStr = "ppn";}
if ( $use_vis ) { push @parcmd, "-l", "$qsubNumNodeStr=$nodes$qsubSeparator$qsubPPNStr=$ppn:vis";}
else { push @parcmd, "-l", "$qsubNumNodeStr=$nodes$qsubSeparator$qsubPPNStr=$ppn"; }
}
else
{
$fake_procs=$nodes*16;
$str= "${ppn}way";
push @parcmd, "-pe", $str, $fake_procs;
}
if (! $IsRunningOnTexasRanger)
{
push @parcmd, "-l", "walltime=$time" if $time_set;
}
else
{
if ($time_set)
{
$hours=sprintf("%02d", $time/60);
$minutes=sprintf("%02d", $time%60);
push @parcmd, "-l", "h_rt=$hours:$minutes:00";
}
}
if ( $IsRunningOnLens_ORNL ) {$qsubPPNStr = "ppn";}
if ( $use_vis ) { push @parcmd, "-l", "$qsubNumNodeStr=$nodes$qsubSeparator$qsubPPNStr=$ppn:vis";}
else { push @parcmd, "-l", "$qsubNumNodeStr=$nodes$qsubSeparator$qsubPPNStr=$ppn"; }
push @parcmd, "-l", "walltime=$time" if $time_set;
if ($UseTTC) { push @parcmd, "-l", "ttc=$procs"; }
push @parcmd, "-q", $part if $part_set;
push @parcmd, "-A", $bank if $bank_set;
@printcmd = @parcmd;
push @parcmd, $tfilename;
push @printcmd, $cdcmd;
......
##
## build_visit generated host.conf
## created: Fri Mar 20 19:01:05 CDT 2009
## system: Linux spur.tacc.utexas.edu 2.6.9-67.0.22.EL_lustre.1.6.7smp #1 SMP Mon Mar 16 15:37:03 CDT 2009 x86_64 x86_64 x86_64 GNU/Linux
## by: tg456630
##
## Set the VISITHOME environment variable.
##
VISITHOME=/share/home/00382/tg456630/visit
VISITARCH=linux-x86_64_gcc
##
## Specify the location of the mesa include files and libraries.
##
MESA=$VISITHOME/mesa/5.0/$VISITARCH
##
## Specify the location of the vtk include files and libraries.
##
VTK=$VISITHOME/vtk/5.0.0c/$VISITARCH
##
## Specify the location of cmake.
##
DEFAULT_CMAKE=$VISITHOME/cmake/2.4.5/$VISITARCH/bin/cmake
##
## Specify the location of the qt include files and libraries.
##
QT_BIN=$VISITHOME/qt/4.4.3/$VISITARCH/bin
QT_INCLUDE=$VISITHOME/qt/4.4.3/$VISITARCH/include
QT_LIB=$VISITHOME/qt/4.4.3/$VISITARCH/lib
##
## Specify the location of the python include and libraries.
##
PYDIR=$VISITHOME/python/2.5/$VISITARCH
PYVERSION=python2.5
## Compiler flags.
##
CC="gcc"
CXX="g++"
CFLAGS="$CFLAGS -m64 -fPIC"
CXXFLAGS="$CXXFLAGS -m64 -fPIC -I/opt/apps/intel10_1/mvapich/1.0.1/include"
MPI_LIBS="-Wl,-rpath,/opt/apps/intel10_1/mvapich/1.0.1/lib/shared -i-dynamic -Wl,-rpath,/opt/apps/intel/10.1/fc/lib -Wl,-rpath,/opt/apps/intel/10.1/cc/lib -i-dynamic -Wl,-rpath-link -Wl,/opt/apps/intel10_1/mvapich/1.0.1/lib/shared -L/opt/apps/intel10_1/mvapich/1.0.1/lib/shared -L/opt/apps/intel10_1/mvapich/1.0.1/lib -Wl,-rpath,/opt/apps/intel10_1/mvapich/1.0.1/lib/shared -i-dynamic -Wl,-rpath,/opt/apps/intel/10.1/fc/lib -Wl,-rpath,/opt/apps/intel/10.1/cc/lib -i-dynamic -lpmpich++ -lmpich -L/opt/ofed//lib64/ -libverbs -libumad -lpthread -lpthread -lrt "
##
## Database reader plugin support libraries
##
##############################################################
##
## Boxlib
##
##
## CFITSIO
##
##
## CGNS
##
##
## Exodus
##
##
## GDAL
##
##
## H5Part
##
##
## FastBit
##
##
## HDF4
##
##
## HDF5
##
DEFAULT_HDF5_LIBLOC=$VISITHOME/hdf5/1.8.1/$VISITARCH
##
## Mili
##
##
## NetCDF
##
##
## SZIP
##
##
## CCMIO
##
## Silo
##
DEFAULT_SILO_LIBLOC=$VISITHOME/silo/4.7/$VISITARCH
DEFAULT_SILO_LIBDEP=-L$DEFAULT_HDF5_LIBLOC/lib,-lhdf5,$DEFAULT_HDF5_LIBDEP
##
## Ice-T
##
DEFAULT_ICET_INCLUDE=$VISITHOME/icet/0.5.4/$VISITARCH/include
DEFAULT_ICET_LIB=$VISITHOME/icet/0.5.4/$VISITARCH/lib
ICET_ENABLE="yes"
##
......@@ -239,8 +239,8 @@ QvisHostProfileWindow::~QvisHostProfileWindow()
// Brad Whitlock, Tue Apr 8 09:27:26 PDT 2008
// Support for internationalization.
//
// Cyrus Harrison, Tue Jun 24 11:15:28 PDT 2008
// Initial Qt4 Port.
// Cyrus Harrison, Tue Jun 24 11:15:28 PDT 2008
// Initial Qt4 Port.
//
// ****************************************************************************
......@@ -455,6 +455,9 @@ QvisHostProfileWindow::CreateSelectedTab(QWidget *parent)
// Eric Brugger, Mon Aug 18 10:39:11 PDT 2008
// Added support for just "msub" as a parallel launch method.
//
// Hank Childs, Sat Apr 25 13:51:17 PDT 2009
// Added support for ibrun & qsub/ibrun.
//
// ****************************************************************************
QWidget *
......@@ -475,6 +478,7 @@ QvisHostProfileWindow::CreateParallelTab(QWidget *parent)
launchMethod->addItem(tr("(default)"));
launchMethod->addItem("bsub");
launchMethod->addItem("dmpirun");
launchMethod->addItem("ibrun");
launchMethod->addItem("mpirun");
launchMethod->addItem("msub");
launchMethod->addItem("poe");
......@@ -487,6 +491,7 @@ QvisHostProfileWindow::CreateParallelTab(QWidget *parent)
launchMethod->addItem("psub/poe");
launchMethod->addItem("psub/srun");
launchMethod->addItem("qsub/aprun");
launchMethod->addItem("qsub/ibrun");
launchMethod->addItem("qsub/mpiexec");
launchMethod->addItem("qsub/mpirun");
launchMethod->addItem("qsub/srun");
......
......@@ -380,12 +380,13 @@
# Added minimum possible logic for dbio-only distros. Many commands fail
# in this mode. But, those failures are harmless and the script should
# continue on to complete the creation of a binary distro.
# Kathleen Bonnell, Wed Apr 22 16:46:53 PDT 2009
# Add ultrawapper files, pyparsing files.
#
# Kathleen Bonnell, Wed Apr 22 16:46:53 PDT 2009
# Add ultrawapper files, pyparsing files.
#
# Hank Childs, Sat May 2 10:59:41 CDT 2009
# Added configs for TACC. Also change incorrect "fi" to be an "endif".
#
#------------------------------------------------------------------------------
set DataFiles = "TRUE"
......@@ -1013,7 +1014,7 @@ cp $VisItDir/exe/time_annotation $bindir
cp $VisItDir/exe/visitconvert_ser $bindir
if(-e $VisItDir/exe/visitconvert_ser_lite) then
cp $VisItDir/exe/visitconvert_ser_lite $bindir
fi
endif
cp $VisItDir/exe/visit_composite $bindir
cp $VisItDir/exe/visit_transition $bindir
if(-e $VisItDir/exe/visitconvert_par) then
......@@ -1531,13 +1532,15 @@ cp $VisItDir/ultrawrapper/*.py $ultradir/
# Copy the configuration files.
#
mkdir $verdir/.visit
cp $VisItDir/svn_bin/visit-config-closed $verdir/.visit
cp $VisItDir/svn_bin/visit-config-llnl_closed $verdir/.visit
cp $VisItDir/svn_bin/visit-config-nersc $verdir/.visit
cp $VisItDir/svn_bin/visit-config-open $verdir/.visit
cp $VisItDir/svn_bin/visit-config-llnl_open $verdir/.visit
cp $VisItDir/svn_bin/visit-config-ornl $verdir/.visit
cp $VisItDir/svn_bin/visit-config-anag $verdir/.visit
cp $VisItDir/svn_bin/visit-config-anl $verdir/.visit
cp $VisItDir/svn_bin/visit-config-princeton $verdir/.visit
cp $VisItDir/svn_bin/visit-config-tacc $verdir/.visit
cp $VisItDir/svn_bin/visit-config-tacc_internal $verdir/.visit
if (-e $verdir/.visit/visit-config-$Configuration) then
ln -s visit-config-$Configuration $verdir/.visit/config
endif
......
<?xml version="1.0"?>
<Object name="VisIt">
<Field name="Version" type="string">2.0.0</Field>
<Object name="VIEWER">
<Object name="DEFAULT_VALUES">
<Object name="HostProfileList">
<Object name="HostProfile">
<Field name="profileName" type="string">ranger serial</Field>
<Field name="host" type="string">ranger.tacc.utexas.edu</Field>
<Field name="arguments" type="stringVector">"-dir" "/share/apps/vis/visit" </Field>
<Field name="tunnelSSH" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">ranger normal</Field>
<Field name="host" type="string">ranger.tacc.utexas.edu</Field>
<Field name="numProcessors" type="int">32</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">2</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">normal</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">SET BANK HERE</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">60</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">qsub/ibrun</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/share/apps/vis/visit" </Field>
<Field name="parallel" type="bool">true</Field>
<Field name="launchArgsSet" type="bool">true</Field>
<Field name="launchArgs" type="string">-V -cwd -N visit -o SGE_out.visit -e SGE_err.visit</Field>
<Field name="tunnelSSH" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">ranger dev</Field>
<Field name="host" type="string">ranger.tacc.utexas.edu</Field>
<Field name="numProcessors" type="int">32</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">2</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">development</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">SET BANK HERE</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">60</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">qsub/ibrun</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/share/apps/vis/visit" </Field>
<Field name="parallel" type="bool">true</Field>
<Field name="launchArgsSet" type="bool">true</Field>
<Field name="launchArgs" type="string">-V -cwd -N visit -o SGE_out.visit -e SGE_err.visit</Field>
<Field name="tunnelSSH" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">spur serial</Field>
<Field name="host" type="string">spur.tacc.utexas.edu</Field>
<Field name="arguments" type="stringVector">"-dir" "/share/apps/vis/visit" </Field>
<Field name="tunnelSSH" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">spur parallel</Field>
<Field name="host" type="string">spur.tacc.utexas.edu</Field>
<Field name="numProcessors" type="int">32</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">2</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">vis</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">SET BANK HERE</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">60</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">qsub/ibrun</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/share/apps/vis/visit" </Field>
<Field name="parallel" type="bool">true</Field>
<Field name="launchArgsSet" type="bool">true</Field>
<Field name="launchArgs" type="string">-V -cwd -N visit -o SGE_out.visit -e SGE_err.visit</Field>
<Field name="tunnelSSH" type="bool">true</Field>
</Object>
<Field name="activeProfile" type="int">1</Field>
</Object>
</Object>
</Object>
</Object>
<?xml version="1.0"?>
<Object name="VisIt">
<Field name="Version" type="string">2.0.0</Field>
<Object name="VIEWER">
<Object name="DEFAULT_VALUES">
<Object name="HostProfileList">
<Object name="HostProfile">
<Field name="profileName" type="string">ranger serial</Field>
<Field name="host" type="string">ranger.tacc.utexas.edu</Field>
<Field name="arguments" type="stringVector">"-dir" "/share/apps/vis/visit" </Field>
<Field name="tunnelSSH" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">ranger normal</Field>
<Field name="host" type="string">ranger.tacc.utexas.edu</Field>
<Field name="numProcessors" type="int">32</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">2</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">normal</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">SET BANK HERE</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">60</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">qsub/ibrun</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/share/apps/vis/visit" </Field>
<Field name="parallel" type="bool">true</Field>
<Field name="launchArgsSet" type="bool">true</Field>
<Field name="launchArgs" type="string">-V -cwd -N visit -o SGE_out.visit -e SGE_err.visit</Field>
<Field name="tunnelSSH" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">ranger dev</Field>
<Field name="host" type="string">ranger.tacc.utexas.edu</Field>
<Field name="numProcessors" type="int">32</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">2</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">development</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">SET BANK HERE</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">60</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">qsub/ibrun</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/share/apps/vis/visit" </Field>
<Field name="parallel" type="bool">true</Field>
<Field name="launchArgsSet" type="bool">true</Field>
<Field name="launchArgs" type="string">-V -cwd -N visit -o SGE_out.visit -e SGE_err.visit</Field>
<Field name="tunnelSSH" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">spur serial</Field>
<Field name="host" type="string">spur.tacc.utexas.edu</Field>
<Field name="arguments" type="stringVector">"-dir" "/share/apps/vis/visit" </Field>
<Field name="tunnelSSH" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">spur parallel</Field>
<Field name="host" type="string">spur.tacc.utexas.edu</Field>
<Field name="numProcessors" type="int">32</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">2</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">vis</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">SET BANK HERE</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">60</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">qsub/ibrun</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/share/apps/vis/visit" </Field>
<Field name="parallel" type="bool">true</Field>
<Field name="launchArgsSet" type="bool">true</Field>
<Field name="launchArgs" type="string">-V -cwd -N visit -o SGE_out.visit -e SGE_err.visit</Field>
<Field name="tunnelSSH" type="bool">true</Field>
</Object>
<Field name="activeProfile" type="int">1</Field>
</Object>
</Object>
</Object>
</Object>
<?xml version="1.0"?>
<Object name="VisIt">
<Field name="Version" type="string">2.0.0</Field>
<Object name="VIEWER">
<Object name="DEFAULT_VALUES">
<Object name="HostProfileList">
<Object name="HostProfile">
<Field name="profileName" type="string">ranger</Field>
<Field name="host" type="string">ranger.tacc.utexas.edu</Field>
<Field name="hostAliases" type="string">login#.ranger.tacc.utexas.edu</Field>
<Field name="arguments" type="stringVector">"-dir" "/share/apps/vis/visit" </Field>
<Field name="parallel" type="bool">true</Field>
<Field name="numProcessors" type="int">8</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">ibrun</Field>
<Field name="active" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">spur</Field>
<Field name="host" type="string">spur.tacc.utexas.edu</Field>
<Field name="arguments" type="stringVector">"-dir" "/share/apps/vis/visit" </Field>
<Field name="numProcessors" type="int">8</Field>
<Field name="parallel" type="bool">true</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">ibrun</Field>
<Field name="active" type="bool">true</Field>
</Object>
<Field name="activeProfile" type="int">1</Field>
</Object>
</Object>
</Object>
</Object>
......@@ -8,7 +8,7 @@
# Date: October 26, 1996
#
# Usage
# visit-install [-c open | closed | ornl | nersc | anl | princeton] [-g group] [-gw] [-l] [-dmg]
# visit-install [-c anl | llnl_open | llnl_closed | nersc | ornl | princeton | tacc] [-g group] [-gw] [-l] [-dmg]
# [-beta | -private] version platform directory
#
# The default is to install this version as the current version.
......@@ -167,6 +167,9 @@
# Hank Childs, Tue Jan 20 14:58:07 PST 2009
# Added princeton site option.
#
# Hank Childs, Sun Apr 26 09:26:43 CDT 2009
# Added TACC option. Renamed open and closed to llnl_open and llnl_closed.
#
#-----------------------------------------------------------------------
set Compress = COMPRESS
......@@ -234,7 +237,7 @@ while ($option_found == true)
end
if ($#argv != 3) then
echo "Usage: visit-install [-c open | closed | ornl | nersc | anl | princeton] [-g group] [-b bank] [-gw] [-l] [-dmg]"
echo "Usage: visit-install [-c anl | llnl_open | llnl_closed | nersc | ornl | princeton | tacc] [-g group] [-b bank] [-gw] [-l] [-dmg]"
echo " [-beta | -private] version platform directory"
echo ""
echo " This will install all of its files and subdirectories"
......@@ -343,12 +346,13 @@ while ($config == prompt)
echo "remote computers."
echo ""
echo " 1) No system configuration"
echo " 2) LLNL open network"
echo " 3) LLNL closed network"
echo " 4) NERSC network"
echo " 5) ORNL network"
echo " 6) ANL network"
echo " 2) ANL network"
echo " 3) LLNL open network"
echo " 4) LLNL closed network"
echo " 5) NERSC network"
echo " 6) ORNL network"
echo " 7) Princeton network"
echo " 8) TACC network"
echo ""
echo "(1,2,3,4,5,6,7):"
......@@ -358,31 +362,34 @@ while ($config == prompt)
set config = none
breaksw
case 2:
set config = open
set config = anl
breaksw
case 3:
set config = closed
set config = llnl_open
breaksw
case 4:
set config = nersc
set config = llnl_closed
breaksw
case 5:
set config = ornl
set config = nersc
breaksw
case 6:
set config = anl
set config = ornl
breaksw
case 7:
set config = princeton
breaksw
case 8:
set config = tacc
breaksw
default:
set config = prompt
breaksw
endsw
end
if ($config != none && $config != open && $config != closed && $config != nersc && $config != ornl && $config != anl && $config != princeton) then
echo "Illegal configuration option, choices are none, open, closed, ornl, nersc, anl, and princeton."
if ($config != none && $config != llnl_open && $config != llnl_closed && $config != nersc && $config != ornl && $config != anl && $config != princeton && $config != tacc) then
echo "Illegal configuration option, choices are none, open, closed, ornl, nersc, anl, princeton, and tacc."
exit (1)
endif
......@@ -519,18 +526,20 @@ echo "1;$config;$bank;$platform" > "$dir"/$version+/$platformDir/.installinfo
# Use the appropriate configuration file, setting the bank to the right value.
#
rm -f "$dir"/$version+/.visit/config
if ($config == closed) then
ln -s visit-config-closed "$dir"/$version+/.visit/config_template
if ($config == anl) then
ln -s visit-config-anl "$dir"/$version+/.visit/config_template
else if ($config == llnl_closed) then
ln -s visit-config-llnl_closed "$dir"/$version+/.visit/config_template
else if ($config == llnl_open) then
ln -s visit-config-llnl_open "$dir"/$version+/.visit/config_template
else if ($config == nersc) then
ln -s visit-config-nersc "$dir"/$version+/.visit/config_template
else if ($config == open) then
ln -s visit-config-open "$dir"/$version+/.visit/config_template
else if ($config == ornl) then
ln -s visit-config-ornl "$dir"/$version+/.visit/config_template
else if ($config == anl) then
ln -s visit-config-anl "$dir"/$version+/.visit/config_template
else if ($config == princeton) then
ln -s visit-config-princeton "$dir"/$version+/.visit/config_template
else if ($config == tacc) then
ln -s visit-config-tacc "$dir"/$version+/.visit/config_template
endif
if (-e "$dir"/$version+/.visit/config_template) then
sed -e "s/bdivp/$bank/" "$dir"/$version+/.visit/config_template > "$dir"/$version+/.visit/config
......
......@@ -17,6 +17,9 @@
# Eric Brugger, Mon Apr 7 13:52:50 PDT 2008
# Removed sc install.
#
# Hank Childs, Sat May 2 13:26:51 CDT 2009
# Renamed config file to llnl_closed.
#
#-----------------------------------------------------------------------
test=no
......@@ -104,7 +107,7 @@ ver=`echo $ver2 | tr "_" "."`
rm -f crier
cat <<EOF > crier
#!/bin/sh
./visit-install -private -c closed -g visit -b bdivp -gw -l $ver linux_rhel3 /usr/gapps/visit > installlog 2>&1
./visit-install -private -c llnl_closed -g visit -b bdivp -gw -l $ver linux_rhel3 /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo "" > resultlog 2>&1
echo " install of visit on crier" >> resultlog 2>&1
......@@ -141,8 +144,8 @@ fi
rm -f purple
cat <<EOF > purple
#!/bin/sh
./visit-install -private -c closed -g visit -b bdivp -gw -l $ver aix /usr/gapps/visit > installlog 2>&1
./visit-install -private -c closed -g visit -b bdivp -gw -l $ver aix64 /usr/gapps/visit > installlog 2>&1
./visit-install -private -c llnl_closed -g visit -b bdivp -gw -l $ver aix /usr/gapps/visit > installlog 2>&1
./visit-install -private -c llnl_closed -g visit -b bdivp -gw -l $ver aix64 /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo "" > resultlog 2>&1
echo " install of visit on purple" >> resultlog 2>&1
......@@ -194,7 +197,7 @@ fi
rm -f hopi
cat <<EOF > hopi
#!/bin/sh
./visit-install -private -c closed -g visit -b bdivp -gw -l $ver linux-x86_64 /usr/gapps/visit > installlog 2>&1
./visit-install -private -c llnl_closed -g visit -b bdivp -gw -l $ver linux-x86_64 /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo "" > resultlog 2>&1
echo " install of visit on hopi" >> resultlog 2>&1
......