Commit 82faf5f9 authored by hrchilds's avatar hrchilds
Browse files

Update from August 26, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@66 18c085ea-50e0-402c-830e-de6fd14e8384
parent 50b19f28
......@@ -427,9 +427,9 @@ More information about building VisIt follows after that.
#
# Build and install it in the visit directory.
#
gunzip visit030804.tar.gz
tar xf visit030804.tar
cd visit030804/config-site
gunzip visit030826.tar.gz
tar xf visit030826.tar
cd visit030826/config-site
echo VISITHOME=`cat ../../visitpath` > `hostname`.conf
cat Template.conf >> `hostname`.conf
cd ..
......@@ -438,11 +438,11 @@ make
clearcase_bin/visit-bin-dist
# Use the appropriate install command based on the operating system on
# which you built VisIt.
clearcase_bin/visit-install 1.2 aix `cat ../visitpath`
clearcase_bin/visit-install 1.2 irix6 `cat ../visitpath`
clearcase_bin/visit-install 1.2 linux `cat ../visitpath`
clearcase_bin/visit-install 1.2 osf1 `cat ../visitpath`
clearcase_bin/visit-install 1.2 sunos5 `cat ../visitpath`
clearcase_bin/visit-install 1.2.1 aix `cat ../visitpath`
clearcase_bin/visit-install 1.2.1 irix6 `cat ../visitpath`
clearcase_bin/visit-install 1.2.1 linux `cat ../visitpath`
clearcase_bin/visit-install 1.2.1 osf1 `cat ../visitpath`
clearcase_bin/visit-install 1.2.1 sunos5 `cat ../visitpath`
When running the configure script you can enable or disable certain dependent
packages. All the configure options are listed at the beginning of the
......
......@@ -17,7 +17,7 @@ Unix:
where
"version" will be 1.2 for the current distribution.
"version" will be 1.2.1 for the current distribution.
"platform" will be one of the following: aix, irix6, linux, osf1,
or sunos5 depending on the machine. The one you use should match
......@@ -28,17 +28,17 @@ Unix:
For example
visit-install 1.2 irix6 /usr/local/visit
visit-install 1.2.1 irix6 /usr/local/visit
will install the irix6, 1.2 version of visit in the directory
will install the irix6, 1.2.1 version of visit in the directory
"/usr/local/visit". Note that you will need to have the file
"visit1_2.irix6.tar.gz" present in the current directory for this
"visit1_2_1.irix6.tar.gz" present in the current directory for this
to function properly. You can install multiple binaries into the
same directory. For example, you could then execute
visit-install -a 1.2 linux /usr/local/visit
visit-install -a 1.2.1 linux /usr/local/visit
to add a linux, 1.2 version of visit to the same directory.
to add a linux, 1.2.1 version of visit to the same directory.
2. Add the bin directory below the installation directory
(/usr/local/visit/bin in our example) to each user's search path.
......@@ -76,15 +76,15 @@ Unix:
Windows:
1. Copy the file visit1.2.exe to your desktop.
1. Copy the file visit1.2.1.exe to your desktop.
2. Right click on the visit1.2.exe icon using your mouse and selecting
"Extract to folder C:\...\Desktop\visit1.2" from the popup menu. A
2. Right click on the visit1.2.1.exe icon using your mouse and selecting
"Extract to folder C:\...\Desktop\visit1.2.1" from the popup menu. A
window will popup as the file is extracted into the directory. Once
the process is complete a "visit1.2" directory icon should appear on
the process is complete a "visit1.2.1" directory icon should appear on
your desktop.
3. Double click on the "visit1.2" directory icon bringing up a file
3. Double click on the "visit1.2.1" directory icon bringing up a file
system browsing window.
4. Double click on the SETUP icon with the computer display icon to run
......
......@@ -251,6 +251,10 @@ $0 = shift @ARGV;
# I added back the splashscreen support so that the script would still
# work with previous versions.
#
# Eric Brugger, Mon Aug 25 16:47:04 PDT 2003
# I corrected a bug in the logic that decided if the vcl should be
# launched in the batch system. The fix was actually made by Jeremy.
#
###############################################################################
......@@ -561,7 +565,7 @@ if (($procs_set) and ($procs < 1))
if ((($parallel) or ($launchengine)) and
($exe_name ne "engine") and
($exe_name ne "vcl"))
(($exe_name ne "vcl") or (!$parlaunch_set)))
{
# If we're trying to run in parallel, or we've been explicitly
# told to launch an engine, add any parallel arguments back on
......
......@@ -124,6 +124,9 @@
# Brad Whitlock, Wed Jul 30 13:12:14 PST 2003
# Added mpeg_encode and makemovie.py to the distribution.
#
# Eric Brugger, Tue Aug 26 09:04:30 PDT 2003
# Added surfcomp to the distribution.
#
#-----------------------------------------------------------------------
set DataFiles = "TRUE"
......@@ -495,6 +498,8 @@ endif
# Copy the MPEG encoder and the makemovie script.
cp $VisItDir/bin/mpeg_encode $bindir
cp $VisItDir/bin/makemovie.py $bindir
# copy surfcomp
cp $VisItDir/bin/surfcomp $bindir
#
# Copy the VisIt libraries to the distribution.
......
......@@ -16,7 +16,7 @@
<Field name="id" type="stringVector">Streamline_1.0 </Field>
<Field name="enabled" type="intVector">0 </Field>
</Object>
<Object name="HostProfileList" childObjects="30">
<Object name="HostProfileList" childObjects="34">
<Object name="HostProfile" childObjects="0">
<Field name="shareOneBatchJob" type="bool">true</Field>
<Field name="profileName" type="string">Q-LANL parallel ldevq</Field>
......@@ -125,7 +125,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">adelie.llnl.gov</Field>
<Field name="hostAliases" type="string">adelie?.llnl.gov adelie??.llnl.gov adelie???.llnl.gov adelie? adelie?? adelie???</Field>
<Field name="hostAliases" type="string">adelie#.llnl.gov adelie##.llnl.gov adelie###.llnl.gov adelie# adelie## adelie###</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -147,7 +147,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pbatch</Field>
<Field name="host" type="string">adelie.llnl.gov</Field>
<Field name="hostAliases" type="string">adelie?.llnl.gov adelie??.llnl.gov adelie???.llnl.gov adelie? adelie?? adelie???</Field>
<Field name="hostAliases" type="string">adelie#.llnl.gov adelie##.llnl.gov adelie###.llnl.gov adelie# adelie## adelie###</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">4</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -211,7 +211,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">emperor.llnl.gov</Field>
<Field name="hostAliases" type="string">emperor?.llnl.gov emperor??.llnl.gov emperor???.llnl.gov emperor? emperor?? emperor???</Field>
<Field name="hostAliases" type="string">emperor#.llnl.gov emperor##.llnl.gov emperor###.llnl.gov emperor# emperor## emperor###</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -233,7 +233,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel interactive</Field>
<Field name="host" type="string">emperor.llnl.gov</Field>
<Field name="hostAliases" type="string">emperor?.llnl.gov emperor??.llnl.gov emperor???.llnl.gov emperor? emperor?? emperor???</Field>
<Field name="hostAliases" type="string">emperor#.llnl.gov emperor##.llnl.gov emperor###.llnl.gov emperor# emperor## emperor###</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">4</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -255,7 +255,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pbatch</Field>
<Field name="host" type="string">emperor.llnl.gov</Field>
<Field name="hostAliases" type="string">emperor?.llnl.gov emperor??.llnl.gov emperor???.llnl.gov emperor? emperor?? emperor???</Field>
<Field name="hostAliases" type="string">emperor#.llnl.gov emperor##.llnl.gov emperor###.llnl.gov emperor# emperor## emperor###</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">4</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -276,8 +276,8 @@
</Object>
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">ice.llnl.gov</Field>
<Field name="hostAliases" type="string">ice??.llnl.gov</Field>
<Field name="host" type="string">ice.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">ice##.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -298,8 +298,8 @@
</Object>
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pbatch</Field>
<Field name="host" type="string">ice.llnl.gov</Field>
<Field name="hostAliases" type="string">ice??.llnl.gov</Field>
<Field name="host" type="string">ice.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">ice##.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">16</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -319,15 +319,103 @@
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pdebug</Field>
<Field name="host" type="string">ice.llnl.gov</Field>
<Field name="hostAliases" type="string">ice??.llnl.gov</Field>
<Field name="profileName" type="string">parallel pdebug interactive</Field>
<Field name="host" type="string">ice.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">ice##.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">16</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">1</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">pdebug</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">30m</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">poe</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">-dir /usr/gapps/visit </Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">s.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">s###.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</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">true</Field>
<Field name="arguments" type="stringVector">-dir /usr/gapps/visit </Field>
<Field name="parallel" type="bool">false</Field>
</Object>
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pbatch</Field>
<Field name="host" type="string">s.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">s###.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">16</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">4</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">k,pbatch</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">30m</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">psub</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">-dir /usr/gapps/visit </Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">k.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">k###.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</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">true</Field>
<Field name="arguments" type="stringVector">-dir /usr/gapps/visit </Field>
<Field name="parallel" type="bool">false</Field>
</Object>
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pbatch</Field>
<Field name="host" type="string">k.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">k###.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">16</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">4</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">ice,pdebug</Field>
<Field name="partition" type="string">k,pbatch</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="timeLimitSet" type="bool">true</Field>
......@@ -342,8 +430,8 @@
</Object>
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">sky s.asci.llnl.gov k.asci.llnl.gov y.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">s???.asci.llnl.gov k???.asci.llnl.gov y???.asci.llnl.gov</Field>
<Field name="host" type="string">y.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">y###.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -364,8 +452,8 @@
</Object>
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pbatch</Field>
<Field name="host" type="string">sky s.asci.llnl.gov k.asci.llnl.gov y.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">s???.asci.llnl.gov k???.asci.llnl.gov y???.asci.llnl.gov</Field>
<Field name="host" type="string">y.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">y###.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">16</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -386,8 +474,8 @@
</Object>
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pdebug</Field>
<Field name="host" type="string">sky s.asci.llnl.gov k.asci.llnl.gov y.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">s???.asci.llnl.gov k???.asci.llnl.gov y???.asci.llnl.gov</Field>
<Field name="host" type="string">y.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">y###.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">4</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -409,7 +497,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">sc1.llnl.gov sc2.llnl.gov</Field>
<Field name="hostAliases" type="string">sc?.llnl.gov sc??.llnl.gov</Field>
<Field name="hostAliases" type="string">sc#.llnl.gov sc##.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -431,7 +519,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel</Field>
<Field name="host" type="string">sc1.llnl.gov sc2.llnl.gov</Field>
<Field name="hostAliases" type="string">sc?.llnl.gov sc??.llnl.gov</Field>
<Field name="hostAliases" type="string">sc#.llnl.gov sc##.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">2</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -495,7 +583,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">white.llnl.gov</Field>
<Field name="hostAliases" type="string">white???.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">white###.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -517,7 +605,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pbatch</Field>
<Field name="host" type="string">white.llnl.gov</Field>
<Field name="hostAliases" type="string">white???.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">white###.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">32</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -539,7 +627,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel views batch</Field>
<Field name="host" type="string">white.llnl.gov</Field>
<Field name="hostAliases" type="string">white???.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">white###.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">32</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -561,7 +649,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel views interactive</Field>
<Field name="host" type="string">white.llnl.gov</Field>
<Field name="hostAliases" type="string">white???.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">white###.asci.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">32</Field>
<Field name="numNodesSet" type="bool">true</Field>
......
......@@ -20,7 +20,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">blue.llnl.gov</Field>
<Field name="hostAliases" type="string">blue.pacific.llnl.gov blue???.pacific.llnl.gov</Field>
<Field name="hostAliases" type="string">blue.pacific.llnl.gov blue###.pacific.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -42,7 +42,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pdebug</Field>
<Field name="host" type="string">blue.llnl.gov</Field>
<Field name="hostAliases" type="string">blue.pacific.llnl.gov blue???.pacific.llnl.gov</Field>
<Field name="hostAliases" type="string">blue.pacific.llnl.gov blue###.pacific.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">4</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -64,7 +64,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pbatch</Field>
<Field name="host" type="string">blue.llnl.gov</Field>
<Field name="hostAliases" type="string">blue.pacific.llnl.gov blue???.pacific.llnl.gov</Field>
<Field name="hostAliases" type="string">blue.pacific.llnl.gov blue###.pacific.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">16</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -86,7 +86,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">frost.llnl.gov</Field>
<Field name="hostAliases" type="string">frost.pacific.llnl.gov frost???.pacific.llnl.gov</Field>
<Field name="hostAliases" type="string">frost.pacific.llnl.gov frost###.pacific.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -108,7 +108,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pdebug</Field>
<Field name="host" type="string">frost.llnl.gov</Field>
<Field name="hostAliases" type="string">frost.pacific.llnl.gov frost???.pacific.llnl.gov</Field>
<Field name="hostAliases" type="string">frost.pacific.llnl.gov frost###.pacific.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">16</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -130,7 +130,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pbatch</Field>
<Field name="host" type="string">frost.llnl.gov</Field>
<Field name="hostAliases" type="string">frost.pacific.llnl.gov frost???.pacific.llnl.gov</Field>
<Field name="hostAliases" type="string">frost.pacific.llnl.gov frost###.pacific.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">32</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -152,7 +152,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">gps15.llnl.gov gps16.llnl.gov</Field>
<Field name="hostAliases" type="string">gps??.llnl.gov</Field>
<Field name="hostAliases" type="string">gps##.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -174,7 +174,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel</Field>
<Field name="host" type="string">gps15.llnl.gov gps16.llnl.gov</Field>
<Field name="hostAliases" type="string">gps??.llnl.gov</Field>
<Field name="hostAliases" type="string">gps##.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">2</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -240,7 +240,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">snow.llnl.gov</Field>
<Field name="hostAliases" type="string">snow.llnl.gov snow??.llnl.gov</Field>
<Field name="hostAliases" type="string">snow.llnl.gov snow##.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -262,7 +262,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pbatch</Field>
<Field name="host" type="string">snow.llnl.gov</Field>
<Field name="hostAliases" type="string">snow.llnl.gov snow??.llnl.gov</Field>
<Field name="hostAliases" type="string">snow.llnl.gov snow##.llnl.gov</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">16</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -284,7 +284,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">pengra.llnl.gov</Field>
<Field name="hostAliases" type="string">pengra?.llnl.gov pengra??.llnl.gov pengra? pengra?? pengra???</Field>
<Field name="hostAliases" type="string">pengra#.llnl.gov pengra##.llnl.gov pengra# pengra## pengra###</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -306,7 +306,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel interactive pdebug</Field>
<Field name="host" type="string">pengra.llnl.gov</Field>
<Field name="hostAliases" type="string">pengra?.llnl.gov pengra??.llnl.gov pengra? pengra?? pengra???</Field>
<Field name="hostAliases" type="string">pengra#.llnl.gov pengra##.llnl.gov pengra# pengra## pengra###</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">2</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -328,7 +328,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel batch pbatch</Field>
<Field name="host" type="string">pengra.llnl.gov</Field>
<Field name="hostAliases" type="string">pengra?.llnl.gov pengra??.llnl.gov pengra? pengra?? pengra???</Field>
<Field name="hostAliases" type="string">pengra#.llnl.gov pengra##.llnl.gov pengra# pengra## pengra###</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">4</Field>
<Field name="numNodesSet" type="bool">true</Field>
......@@ -350,7 +350,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">pvc.llnl.gov</Field>
<Field name="hostAliases" type="string">pvc?.llnl.gov pvc??.llnl.gov pvc? pvc?? pvc???</Field>
<Field name="hostAliases" type="string">pvc#.llnl.gov pvc##.llnl.gov pvc# pvc## pvc###</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
......@@ -372,7 +372,7 @@
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pbatch</Field>
<Field name="host" type="string">pvc.llnl.gov</Field>
<Field name="hostAliases" type="string">pvc?.llnl.gov pvc??.llnl.gov pvc? pvc?? pvc???</Field>
<Field name="hostAliases" type="string">pvc#.llnl.gov pvc##.llnl.gov pvc# pvc## pvc###</Field>
<Field name="timeout" type="int">240</Field>
<Field name="numProcessors" type="int">4</Field>
<Field name="numNodesSet" type="bool">true</Field>
......
......@@ -470,3 +470,88 @@ ReadAndProcessDirectory(const std::string &directory,
return retval;
}
// ****************************************************************************
// Function: NumericStringCompare
//
// Purpose:
// Compares two strings but treats any numbers contained in the string as
// numbers so they compare differently than a staight text comparison.
//
// Arguments:
// str1 : The first string to compare.
// str2 : The second string to compare.
//
// Returns: true if str1<str2; false otherwise.
//
// Programmer: Sean Ahern
// Creation: Tue Aug 26 11:41:54 PDT 2003
//
// Modifications:
// Brad Whitlock, Tue Aug 26 11:42:12 PDT 2003
// I stole this function from MeshTV and adapted it to C++.
//
// ****************************************************************************
bool
NumericStringCompare(const std::string &str1, const std::string &str2)
{
const char *p1 = str1.c_str();
const char *p2 = str2.c_str();
// Compare the two strings, character by character.
while ((*p1 != '\0') && (*p2 != '\0'))
{
// If we're at some digits, we have to treat it differently.
if (isdigit(*p1) && isdigit(*p2))
{
/* We're in the digits. */
int num1 = (*p1) - '0';
int num2 = (*p2) - '0';
p1++;
p2++;
// Walk along until we're out of numbers in each string.
while ((*p1 != '\0') && isdigit(*p1))
{
num1 *= 10;
num1 += (*p1) - '0';
p1++;
}
while ((*p2 != '\0') && isdigit(*p2))
{
num2 *= 10;
num2 += (*p2) - '0';
p2++;
}
// Compare the numbers. If they're the same, keep going. If
// they're different, return the difference.
if (num1 != num2)
return ((num1 - num2) < 0);
}
else
{
// We're in some normal characters. Just compare them normally.
if (*p1 == *p2)
{
p1++;
p2++;
}
else
{
return ((*p1 - *p2) < 0);
}
}
}
//
// If we fall out here, the strings are the same up to the point. But
// one of the strings is shorter than the other.
//
if(*p1)
return true;
else