Commit a405e06d authored by hrchilds's avatar hrchilds

Re-merge support for Argonne MCS machines to trunk. Was previously

added to RC and somehow trunk merge never happened.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@13570 18c085ea-50e0-402c-830e-de6fd14e8384
parent a2da7a11
......@@ -677,6 +677,9 @@ $0 = shift @ARGV;
# parallel on aztec and inca at LLNL. I removed some unnecessary hacks
# for launching on some LLNL machines.
#
# Hank Childs, Sun Oct 31 22:43:25 CDT 2010
# Add support for ANL MCS nodes.
#
# Eric Brugger, Wed Nov 17 12:42:30 PST 2010
# I added logic to redirect standard error and standard out to /dev/null
# for a msub or qsub job if the user does not have write permission in
......@@ -1912,7 +1915,14 @@ if ( ($parallel) and $exe_name eq "engine" and (($host =~ /login1/) and ($matche
}
else
{
$remotehost = "login1-mgmt.eureka";
if ( $domain eq "mcs.anl.gov" )
{
# Don't need to set remotehost.
}
else
{
$remotehost = "login1-mgmt.eureka";
}
}
}
......
#/homes/childs/visit/cmake/2.8.0/linux-Ubuntu_10.04-x86_64_gcc-4.4/bin/cmake
##
## ./build_visit generated host.cmake
## created: Wed Oct 20 09:42:32 CDT 2010
## system: Linux churn.mcs.anl.gov 2.6.32-25-generic #44-Ubuntu SMP Fri Sep 17 20:05:27 UTC 2010 x86_64 GNU/Linux
## by: childs
##
## Setup VISITHOME & VISITARCH variables.
##
SET(VISITHOME /homes/childs/visit)
SET(VISITARCH linux-Ubuntu_10.04-x86_64_gcc-4.4)
##
## Specify the location of the mesa.
##
VISIT_OPTION_DEFAULT(VISIT_MESA_DIR ${VISITHOME}/mesa/7.8.2/${VISITARCH})
##
## Specify the location of the vtk.
##
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/5.0.0g/${VISITARCH}/lib/vtk-5.0/)
##
## Specify the Qt4 binary dir.
## (qmake us used to locate & setup Qt4 dependencies)
##
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/qt/4.6.1/${VISITARCH}/bin)
##
## Specify the location of the python.
##
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.6.4/${VISITARCH})
##
## Compiler flags.
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -fvisibility=hidden")
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden")
##############################################################
##
## Database reader plugin support libraries
##
##############################################################
##
## HDF5
##
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.4/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP /usr/lib z)
##
## Silo
##
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo/4.7.2/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP})
......@@ -288,6 +288,7 @@ avtLinesFileFormat::ReadFile(void)
string lineName;
if (GetPoint(ifile, x, y, z, lineName))
{
cerr << "Got point " << x << ", " << y << ", " << z << endl;
if (headerName.find_first_not_of(" ") != string::npos)
{
lineNames.push_back(headerName);
......@@ -324,6 +325,7 @@ avtLinesFileFormat::ReadFile(void)
//
int start = 0;
cutoff.push_back(xl.size()); // Make logic easier.
cerr << "Cutoff = " << cutoff.size() << endl;
for (int i = 0 ; i < cutoff.size() ; i++)
{
if (start == cutoff[i])
......@@ -349,6 +351,7 @@ avtLinesFileFormat::ReadFile(void)
//
vtkCellArray *line = vtkCellArray::New();
pd->SetLines(line);
cerr << "Inserting lines for " << nPts << " points" << endl;
for (int k = 1 ; k < nPts ; k++)
{
line->InsertNextCell(2);
......
......@@ -80,6 +80,7 @@ SELinux-enabled systems.</LI>
<ul>
<li>The -o command line option, and OpenDatabase Python command, to open files with a specific database reader plugin no longer requires a plugin version. For example, <tt>visit -o myvtkfile,VTK</tt> now works as expected.</li>
<li>Host profiles were added for the new LLNL machines aztec, edge and inca.</li>
<li>Host profiles were added for Argonne's MCS machines.</li>
<li>Performance of vector plots with lots of zero-magnitude data has been improved.</li>
<li>VisIt's behavior for prompting about whether you want to exit all of VisIt or just the graphical interface has been improved.</li>
</ul>
......
<?xml version="1.0"?>
<Object name="MachineProfile">
<Field name="hostNickname" type="string">"MCS Login"</Field>
<Field name="host" type="string">"login1.mcs.anl.gov"</Field>
<Field name="userName" type="string">notset</Field>
<Field name="hostAliases" type="string">""</Field>
<Field name="directory" type="string">"/soft/apps/packages/visit"</Field>
<Field name="shareOneBatchJob" type="bool">false</Field>
<Field name="sshPortSpecified" type="bool">false</Field>
<Field name="sshPort" type="int">22</Field>
<Field name="clientHostDetermination" type="string">"MachineName"</Field>
<Field name="manualClientHostName" type="string">""</Field>
<Field name="tunnelSSH" type="bool">true</Field>
<Object name="LaunchProfile">
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">4</Field>
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">1</Field>
<Field name="partitionSet" type="bool">false</Field>
<Field name="partition" type="string">""</Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string">""</Field>
<Field name="timeLimitSet" type="bool">false</Field>
<Field name="timeLimit" type="string">""</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">"mpirun"</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector"></Field>
<Field name="parallel" type="bool">true</Field>
<Field name="launchArgsSet" type="bool">false</Field>
<Field name="launchArgs" type="string">""</Field>
<Field name="sublaunchArgsSet" type="bool">false</Field>
<Field name="sublaunchArgs" type="string">""</Field>
<Field name="sublaunchPreCmdSet" type="bool">false</Field>
<Field name="sublaunchPreCmd" type="string">""</Field>
<Field name="sublaunchPostCmdSet" type="bool">false</Field>
<Field name="sublaunchPostCmd" type="string">""</Field>
<Field name="machinefileSet" type="bool">false</Field>
<Field name="machinefile" type="string">""</Field>
<Field name="visitSetsUpEnv" type="bool">false</Field>
<Field name="canDoHWAccel" type="bool">false</Field>
<Field name="havePreCommand" type="bool">false</Field>
<Field name="hwAccelPreCommand" type="string">""</Field>
<Field name="havePostCommand" type="bool">false</Field>
<Field name="hwAccelPostCommand" type="string">""</Field>
<Field name="profileName" type="string">"parallel"</Field>
</Object>
<Object name="LaunchProfile">
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">1</Field>
<Field name="partitionSet" type="bool">false</Field>
<Field name="partition" type="string">""</Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string">""</Field>
<Field name="timeLimitSet" type="bool">false</Field>
<Field name="timeLimit" type="string">""</Field>
<Field name="launchMethodSet" type="bool">false</Field>
<Field name="launchMethod" type="string">""</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector"></Field>
<Field name="parallel" type="bool">false</Field>
<Field name="launchArgsSet" type="bool">false</Field>
<Field name="launchArgs" type="string">""</Field>
<Field name="sublaunchArgsSet" type="bool">false</Field>
<Field name="sublaunchArgs" type="string">""</Field>
<Field name="sublaunchPreCmdSet" type="bool">false</Field>
<Field name="sublaunchPreCmd" type="string">""</Field>
<Field name="sublaunchPostCmdSet" type="bool">false</Field>
<Field name="sublaunchPostCmd" type="string">""</Field>
<Field name="machinefileSet" type="bool">false</Field>
<Field name="machinefile" type="string">""</Field>
<Field name="visitSetsUpEnv" type="bool">false</Field>
<Field name="canDoHWAccel" type="bool">false</Field>
<Field name="havePreCommand" type="bool">false</Field>
<Field name="hwAccelPreCommand" type="string">""</Field>
<Field name="havePostCommand" type="bool">false</Field>
<Field name="hwAccelPostCommand" type="string">""</Field>
<Field name="profileName" type="string">"serial"</Field>
</Object>
<Field name="activeProfile" type="int">0</Field>
</Object>
......@@ -231,6 +231,9 @@
# Eric Brugger, Fri Oct 29 09:40:23 PDT 2010
# Added the profiles for aztec, edge and inca.
#
# Hank Childs, Sun Oct 31 20:48:23 PDT 2010
# Add ANL / MCS login profiles.
#
# Eric Brugger, Fri Nov 5 16:13:21 PDT 2010
# Deleted the profiles for hopi, purple, um, ilx, up and yana.
#
......@@ -621,6 +624,7 @@ if ($config == anl) then
cp "$dir"/$version+/.visit/allhosts/host_anl_cosmea.xml "$dir"/$version+/.visit/hosts/
cp "$dir"/$version+/.visit/allhosts/host_anl_eureka.xml "$dir"/$version+/.visit/hosts/
cp "$dir"/$version+/.visit/allhosts/host_anl_gadzooks.xml "$dir"/$version+/.visit/hosts/
cp "$dir"/$version+/.visit/allhosts/host_anl_mcs_login.xml "$dir"/$version+/.visit/hosts/
cp "$dir"/$version+/.visit/allhosts/host_anl_teragrid.xml "$dir"/$version+/.visit/hosts/
else if ($config == llnl_closed) then
ln -s visit-config-llnl_closed.ini "$dir"/$version+/.visit/config
......
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