Skip to content
GitLab
Commit b53bd4e3 authored by hrchilds's avatar hrchilds
Browse files

Update from March 10, 2006 

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@634 18c085ea-50e0-402c-830e-de6fd14e8384
parent ca9ab949
Hide whitespace changes
Inline Side-by-side
BUILD_NOTES
View file @ b53bd4e3
......@@ -1099,9 +1099,9 @@ More information about building VisIt follows after that.
#
# Build and install it in the visit directory.
#
gunzip visit060206.tar.gz
tar xf visit060206.tar
cd visit060206/config-site
gunzip visit060327.tar.gz
tar xf visit060327.tar
cd visit060327/config-site
echo VISITHOME=$VISITDIR > `hostname`.conf
sed "s/ARCH/$VISITARCH/" Template.conf >> `hostname`.conf
cd ..
......@@ -1119,14 +1119,14 @@ 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.5.1 aix $VISITDIR
clearcase_bin/visit-install 1.5.1 darwin $VISITDIR
clearcase_bin/visit-install 1.5.1 irix6 $VISITDIR
clearcase_bin/visit-install 1.5.1 linux $VISITDIR
clearcase_bin/visit-install 1.5.1 linux-ia64 $VISITDIR
clearcase_bin/visit-install 1.5.1 linux-x86_64 $VISITDIR
clearcase_bin/visit-install 1.5.1 osf1 $VISITDIR
clearcase_bin/visit-install 1.5.1 sunos5 $VISITDIR
clearcase_bin/visit-install 1.5.2 aix $VISITDIR
clearcase_bin/visit-install 1.5.2 darwin $VISITDIR
clearcase_bin/visit-install 1.5.2 irix6 $VISITDIR
clearcase_bin/visit-install 1.5.2 linux $VISITDIR
clearcase_bin/visit-install 1.5.2 linux-ia64 $VISITDIR
clearcase_bin/visit-install 1.5.2 linux-x86_64 $VISITDIR
clearcase_bin/visit-install 1.5.2 osf1 $VISITDIR
clearcase_bin/visit-install 1.5.2 sunos5 $VISITDIR
When running the configure script you can enable or disable certain dependent
packages. All the configure options are listed at the beginning of the
......
BUILD_NOTES_MacOSX
View file @ b53bd4e3
......@@ -207,9 +207,9 @@ take this opportunity to unzip VisIt's source code distribution and set an
environment variable that will be used to identify VisIt's source code
directory.
gunzip visit060206.tar.gz
tar xf visit060206.tar
setenv VISITSOURCE `pwd`/visit060206
gunzip visit060327.tar.gz
tar xf visit060327.tar
setenv VISITSOURCE `pwd`/visit060327
# Make sure that you build a version of VisIt that can run on MacOS X 10.3
# and later.
......@@ -1054,9 +1054,9 @@ More information about building VisIt follows after that.
#
# Unzipping VisIt's source code distribution
#
gunzip visit060206.tar.gz
tar xf visit060206.tar
cd visit060206
gunzip visit060327.tar.gz
tar xf visit060327.tar
cd visit060327
#
# HDF5 and Silo
......
INSTALL_NOTES
View file @ b53bd4e3
......@@ -17,7 +17,7 @@ Unix and Mac OS X:
where
"version" will be 1.5.1 for the current distribution.
"version" will be 1.5.2 for the current distribution.
"platform" will be one of the following: aix, aix64-xlc, darwin,
irix6, linux-altix, linux-ia64, linux-x86_64, linux_chaos, linux_rhel3,
......@@ -29,17 +29,17 @@ Unix and Mac OS X:
For example
visit-install 1.5.1 irix6 /usr/local/visit
visit-install 1.5.2 irix6 /usr/local/visit
will install the irix6, 1.5.1 version of visit in the directory
will install the irix6, 1.5.2 version of visit in the directory
"/usr/local/visit". Note that you will need to have the file
"visit1_5_1.irix6.tar.gz" present in the current directory for this
"visit1_5_2.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 1.5.1 linux /usr/local/visit
visit-install 1.5.2 linux /usr/local/visit
to add a linux, 1.5.1 version of visit to the same directory.
to add a linux, 1.5.2 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.
......@@ -77,8 +77,8 @@ Unix and Mac OS X:
Windows:
1. Copy the file visit1.5.1.exe to your desktop.
1. Copy the file visit1.5.2.exe to your desktop.
2. Double click on the visit1.5.1.exe icon to run the installer.
2. Double click on the visit1.5.2.exe icon to run the installer.
3. Follow the directions provided by the installer.
bin/internallauncher
View file @ b53bd4e3
......@@ -527,6 +527,7 @@ if ($guesshost)
"environment variable to get a valid host name\n";
exit 1;
}
$remotehost =~ s/.*:([^:]*)/$1/;
}
# ----
......
clearcase_bin/visit-bin-dist
View file @ b53bd4e3
......@@ -228,6 +228,9 @@
# length restrictions on old Irix systems. Add links for libqt.a and
# libqui.a.
#
# Eric Brugger, Fri Mar 10 09:40:34 PST 2006
# I added visit-config-nersc and visit-config-ornl to the distrtibution.
#
#------------------------------------------------------------------------------
set DataFiles = "TRUE"
......@@ -961,7 +964,9 @@ endif
#
mkdir $verdir/.visit
cp $VisItDir/clearcase_bin/visit-config-closed $verdir/.visit
cp $VisItDir/clearcase_bin/visit-config-nersc $verdir/.visit
cp $VisItDir/clearcase_bin/visit-config-open $verdir/.visit
cp $VisItDir/clearcase_bin/visit-config-ornl $verdir/.visit
ln -s visit-config-open $verdir/.visit/config
#
......
clearcase_bin/visit-build-open
View file @ b53bd4e3
......@@ -360,7 +360,7 @@ cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1
env PARALLEL=4 make -P >> ../buildlog 2>&1
make >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.irix6.tar.gz ..
cd ..
......
clearcase_bin/visit-config-closed
View file @ b53bd4e3
<?xml version="1.0"?>
<Object name="VisIt">
<Field name="Version" type="string">1.5</Field>
<Field name="Version" type="string">1.5.2</Field>
<Object name="VIEWER">
<Object name="GlobalAttributes">
<Field name="cloneWindowOnFirstRef" type="bool">true</Field>
......
clearcase_bin/visit-config-closed.ini
View file @ b53bd4e3
<?xml version="1.0"?>
<Object name="VisIt">
<Field name="Version" type="string">1.5</Field>
<Field name="Version" type="string">1.5.2</Field>
<Object name="VIEWER">
<Object name="GlobalAttributes">
<Field name="cloneWindowOnFirstRef" type="bool">true</Field>
......
clearcase_bin/visit-config-nersc 0 → 100644
View file @ b53bd4e3
<?xml version="1.0"?>
<Object name="VisIt">
<Field name="Version" type="string">1.5.2</Field>
<Object name="VIEWER">
<Object name="HostProfileList">
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">davinci.nersc.gov</Field>
<Field name="hostAliases" type="string">davinci</Field>
<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">0</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"></Field>
<Field name="parallel" type="bool">false</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">parallel</Field>
<Field name="host" type="string">davinci.nersc.gov</Field>
<Field name="hostAliases" type="string">davinci</Field>
<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">0</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">true</Field>
</Object>
<Field name="activeProfile" type="int">1</Field>
</Object>
</Object>
</Object>
clearcase_bin/visit-config-nersc.ini 0 → 100644
View file @ b53bd4e3
<?xml version="1.0"?>
<Object name="VisIt">
<Field name="Version" type="string">1.5.2</Field>
<Object name="VIEWER">
<Object name="HostProfileList">
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">davinci.nersc.gov</Field>
<Field name="hostAliases" type="string">davinci</Field>
<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">0</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"></Field>
<Field name="parallel" type="bool">false</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">parallel</Field>
<Field name="host" type="string">davinci.nersc.gov</Field>
<Field name="hostAliases" type="string">davinci</Field>
<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">0</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">true</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Field name="activeProfile" type="int">1</Field>
</Object>
</Object>
</Object>
clearcase_bin/visit-config-open
View file @ b53bd4e3
<?xml version="1.0"?>
<Object name="VisIt">
<Field name="Version" type="string">1.5</Field>
<Field name="Version" type="string">1.5.2</Field>
<Object name="VIEWER">
<Object name="GlobalAttributes">
<Field name="cloneWindowOnFirstRef" type="bool">true</Field>
......@@ -123,50 +123,6 @@
<Field name="arguments" type="stringVector">"-dir" "/nfs/slac/g/ki/ki04/visit"</Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">davinci.nersc.gov</Field>
<Field name="hostAliases" type="string">davinci</Field>
<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">0</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"></Field>
<Field name="parallel" type="bool">false</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">parallel</Field>
<Field name="host" type="string">davinci.nersc.gov</Field>
<Field name="hostAliases" type="string">davinci</Field>
<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">0</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">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">gps15.llnl.gov gps16.llnl.gov</Field>
......
clearcase_bin/visit-config-open.ini
View file @ b53bd4e3
<?xml version="1.0"?>
<Object name="VisIt">
<Field name="Version" type="string">1.5</Field>
<Field name="Version" type="string">1.5.2</Field>
<Object name="VIEWER">
<Object name="GlobalAttributes">
<Field name="cloneWindowOnFirstRef" type="bool">true</Field>
......@@ -128,52 +128,6 @@
<Field name="parallel" type="bool">true</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">davinci.nersc.gov</Field>
<Field name="hostAliases" type="string">davinci</Field>
<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">0</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"></Field>
<Field name="parallel" type="bool">false</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">parallel</Field>
<Field name="host" type="string">davinci.nersc.gov</Field>
<Field name="hostAliases" type="string">davinci</Field>
<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">0</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">true</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">gps15.llnl.gov gps16.llnl.gov</Field>
......
clearcase_bin/visit-config-ornl 0 → 100644
View file @ b53bd4e3
<?xml version="1.0"?>
<Object name="VisIt">
<Field name="Version" type="string">1.5.2</Field>
<Object name="VIEWER">
<Object name="HostProfileList">
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">hawk.ccs.ornl.gov</Field>
<Field name="hostAliases" type="string">hawk#.ccs.ornl.gov hawk##.ccs.ornl.gov</Field>
<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">0</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">srun</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" "/apps/visit"</Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">parallel</Field>
<Field name="host" type="string">hawk.ccs.ornl.gov</Field>
<Field name="hostAliases" type="string">hawk#.ccs.ornl.gov hawk##.ccs.ornl.gov</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">2</Field>
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">0</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">srun</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" "/apps/visit"</Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Field name="activeProfile" type="int">1</Field>
</Object>
</Object>
</Object>
clearcase_bin/visit-config-ornl.ini 0 → 100644
View file @ b53bd4e3
<?xml version="1.0"?>
<Object name="VisIt">
<Field name="Version" type="string">1.5.2</Field>
<Object name="VIEWER">
<Object name="HostProfileList">
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">hawk.ccs.ornl.gov</Field>
<Field name="hostAliases" type="string">hawk#.ccs.ornl.gov hawk##.ccs.ornl.gov</Field>
<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">0</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">srun</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" "/apps/visit"</Field>
<Field name="parallel" type="bool">true</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">parallel</Field>
<Field name="host" type="string">hawk.ccs.ornl.gov</Field>
<Field name="hostAliases" type="string">hawk#.ccs.ornl.gov hawk##.ccs.ornl.gov</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">2</Field>
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">0</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">srun</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" "/apps/visit"</Field>
<Field name="parallel" type="bool">true</Field>
<Field name="clientHostDetermination" type="string">ParsedFromSSHCLIENT</Field>
</Object>
<Field name="activeProfile" type="int">1</Field>
</Object>
</Object>
</Object>
clearcase_bin/visit-install
View file @ b53bd4e3
......@@ -100,6 +100,10 @@
# Brad Whitlock, Tue Mar 7 13:47:00 PST 2006
# I added the ability to choose a bank other than bdivp.
#
# Eric Brugger, Fri Mar 10 09:55:15 PST 2006
# I added the ability to install a nersc or ornl config site file.
# I made a chgrp command conditional on the user having set a group.
#
#-----------------------------------------------------------------------
set Compress = COMPRESS
......@@ -183,8 +187,10 @@ while ($config == prompt)
echo " 1) No system configuration"
echo " 2) LLNL open network"
echo " 3) LLNL closed network"
echo " 4) NERSC network"
echo " 5) ORNL network"
echo ""
echo "(1,2,3):"
echo "(1,2,3,4,5):"
set config = $<
switch ($config)
......@@ -197,13 +203,19 @@ while ($config == prompt)
case 3:
set config = closed
breaksw
case 4:
set config = nersc
breaksw
case 5:
set config = ornl
breaksw
default:
set config = prompt
breaksw
endsw
end
if ($config != none && $config != open && $config != closed) then
if ($config != none && $config != open && $config != closed && $config != nersc && $config != ornl) then
echo "Illegal configuration option, choices are none, open and closed."
exit (1)
endif
......@@ -334,13 +346,19 @@ cp distribution/visit/data/* $dir/data
# Use the appropriate configuration file, setting the bank to the right value.
#
rm -f $dir/$version+/.visit/config
if ($config == open) then
ln -s visit-config-open $dir/$version+/.visit/config_template
else if ($config == closed) then
if ($config == closed) then
ln -s visit-config-closed $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
endif
sed -e "s/bdivp/$bank/" $dir/$version+/.visit/config_template > $dir/$version+/.visit/config
chgrp $group_ownership $dir/$version+/.visit/config
if ($group_ownership != none) then
chgrp $group_ownership $dir/$version+/.visit/config
endif
chmod 664 $dir/$version+/.visit/config
#
......
components/Expressions/CMFE/avtPosCMFEAlgorithm.C
View file @ b53bd4e3
......@@ -1449,6 +1449,11 @@ Boundary::AttemptSplit(Boundary *&b1, Boundary *&b2)
// Programmer: Hank Childs
// Creation: October 12, 2005
//
// Modification:
//
// Hank Childs, Fri Mar 10 14:35:32 PST 2006
// Add fix for parallel engines of 1 processor.
//
// ****************************************************************************
void
......@@ -1494,7 +1499,7 @@ avtPosCMFEAlgorithm::SpatialPartition::CreatePartition(DesiredPoints &dp,
b_list[0] = new Boundary(fbounds, nProcs, X_AXIS);
int listSize = 1;
int *bin_lookup = new int[2*nProcs];
bool keepGoing = true;
bool keepGoing = (nProcs > 1);
while (keepGoing)
{
// Figure out how many boundaries need to keep going.
......
gui/QvisExpressionsWindow.C
View file @ b53bd4e3
......@@ -935,6 +935,10 @@ QvisExpressionsWindow::displayAllVarsChanged()
// Hank Childs, Sun Jan 22 12:49:57 PST 2006
// Add special insertion code for complicated expressions.
//
// Hank Childs, Fri Mar 10 14:28:11 PST 2006
// Change ordering of arguments for pos_cmfe, since the first pass was
// incorrect.
//
// ****************************************************************************
void
......@@ -954,7 +958,7 @@ QvisExpressionsWindow::insertFunction(int id)
}
else if (str == "pos_cmfe")