Commit 3731ff2d authored by hrchilds's avatar hrchilds

Update from July 22, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@40 18c085ea-50e0-402c-830e-de6fd14e8384
parent a40ac18e
......@@ -422,7 +422,7 @@ cat Template.conf >> `hostname`.conf
cd ..
env CXXFLAGS=-O2 ./configure
make
clearcase_bin/visit-bin-dist -v 1.1.6
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.1.6 aix `cat ../visitpath`
......
......@@ -112,6 +112,9 @@
# Remove the version number option and make it determine the version
# number from the version file. Add a help option.
#
# Eric Brugger, Tue Jul 22 08:31:45 PDT 2003
# Add visit-config-open and visit-config-closed to the distribution.
#
#-----------------------------------------------------------------------
set DataFiles = "TRUE"
......@@ -603,6 +606,14 @@ if (-e $VisItDir/java/RunViewer.class) then
cp -R $VisItDir/java/RunViewer.class $javadir
endif
#
# Copy the configuration files.
#
mkdir $VisItDir/.visit
cp clearcase_bin/visit-config-closed $VisItDir/.visit
cp clearcase_bin/visit-config-open $VisItDir/.visit
ln -s visit-config-open $VisItDir/.visit/config
#
# Strip the executables and shared libraries.
#
......
......@@ -46,23 +46,27 @@
# I modified the script so that existing distributions would be
# consistent as much as possible while being updated.
#
# Eric Brugger, Mon Jul 21 17:53:22 PDT 2003
# I added the ability to install a configuration file.
#
#-----------------------------------------------------------------------
set Compress = COMPRESS
if ($#argv < 3) then
echo "Usage: visit-install [-a] [-beta | -private] [-g group] [-gw] version platform directory"
echo "Usage: visit-install [-a] [-beta | -private] [-c config] [-g group] [-gw] version platform directory"
exit (1)
endif
if ($#argv >= 9) then
echo "Usage: visit-install [-a] [-beta | -private] [-g group] [-gw] version platform directory"
echo "Usage: visit-install [-a] [-beta | -private] [-c config] [-g group] [-gw] version platform directory"
exit (1)
endif
set append = false
set beta = false
set private = false
set config = prompt
set group_ownership = none
set dir_permission = 755
set file_permission = 644
......@@ -92,6 +96,11 @@ while ($option_found == true)
set private = true
shift
breaksw
case -c:
set config = $2
shift
shift
breaksw
default:
set option_found = false
breaksw
......@@ -108,6 +117,41 @@ if ($beta == true && $private == true) then
exit (1)
endif
while ($config == prompt)
echo "Choose a system configuration file. A system configuration"
echo "file contains profiles that make it easy to access VisIt on"
echo "remote computers."
echo ""
echo " 1) No system configuration"
echo " 2) LLNL open network"
echo " 3) LLNL closed network"
echo ""
echo "(1,2,3):"
set config = $<
switch ($config)
case 1:
set config = none
breaksw
case 2:
set config = open
breaksw
case 3:
set config = closed
breaksw
default:
set config = prompt
breaksw
endsw
end
echo "config=$config"
exit (1)
if ($config != none && $config != open && $config != closed) then
echo "Illegal configuration option, choices are none, open and closed."
exit (1)
endif
set version = $1;
set base = `echo visit$version | tr "." "_"`
......@@ -189,6 +233,16 @@ cd ../../..
cp distribution/visit/data/* $dir/data
#
# Set the link for the configuration file.
#
rm -f $dir/.visit/config
if ($config == open) then
ln -s visit-config-open $dir/.visit/config
else if ($config == closed) then
ln -s visit-config-closed $dir/.visit/config
endif
#
# Set the permissions properly
#
......
......@@ -131,15 +131,6 @@ then
exit
fi
#
# Check that the visit open configuration file is present.
#
if [ ! -e visit-config-closed ]
then
echo "visit-config-closed is missing."
exit
fi
ver2=`echo $ver | tr "." "_"`
ver=`echo $ver2 | tr "_" "."`
......@@ -151,9 +142,9 @@ cat <<EOF > hitit
#!/bin/sh
if [ -d /usr/gapps/visit/$ver ]
then
./visit-install -private -a -g visit -gw $ver linux /usr/gapps/visit > installlog 2>&1
./visit-install -private -a -c closed -g visit -gw $ver linux /usr/gapps/visit > installlog 2>&1
else
./visit-install -private -g visit -gw $ver linux /usr/gapps/visit > installlog 2>&1
./visit-install -private -c closed -g visit -gw $ver linux /usr/gapps/visit > installlog 2>&1
fi
rm -f resultlog
echo " install of visit on hitit" > resultlog 2>&1
......@@ -184,16 +175,10 @@ cat <<EOF > warp
#!/bin/sh
if [ -d /usr/gapps/visit/$ver ]
then
./visit-install $verflag -a -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
./visit-install $verflag -a -c closed -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
else
./visit-install $verflag -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
./visit-install $verflag -c closed -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
fi
mkdir /usr/gapps/visit/$ver/.visit
chmod 775 /usr/gapps/visit/$ver/.visit
chgrp visit /usr/gapps/visit/$ver/.visit
cp visit-config-closed /usr/gapps/visit/$ver/.visit/config
chmod 664 /usr/gapps/visit/$ver/.visit/config
chgrp visit /usr/gapps/visit/$ver/.visit/config
rm -f resultlog
echo " install of visit on warp" > resultlog 2>&1
echo " --------------------------" >> resultlog 2>&1
......@@ -211,7 +196,6 @@ then
scp -P 22 visit$ver2.irix6.tar.gz warp:
scp -P 22 visit-install warp:
scp -P 22 warp warp:warp_install
scp -P 22 visit-config-closed warp:visit-config-closed
ssh -p 22 warp "chmod 750 warp_install;./warp_install"
fi
fi
......@@ -224,9 +208,9 @@ cat <<EOF > sc
#!/bin/sh
if [ -d /usr/gapps/visit/$ver ]
then
./visit-install -private -a -g visit -gw $ver osf1 /usr/gapps/visit > installlog 2>&1
./visit-install -private -a -c closed -g visit -gw $ver osf1 /usr/gapps/visit > installlog 2>&1
else
./visit-install -private -g visit -gw $ver osf1 /usr/gapps/visit > installlog 2>&1
./visit-install -private -c closed -g visit -gw $ver osf1 /usr/gapps/visit > installlog 2>&1
fi
rm -f resultlog
echo " install of visit on sc" > resultlog 2>&1
......@@ -257,9 +241,9 @@ cat <<EOF > tidalwave
#!/bin/sh
if [ -d /usr/gapps/visit/$ver ]
then
./visit-install -private -a -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
./visit-install -private -a -c closed -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
else
./visit-install -private -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
./visit-install -private -c closed -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
fi
rm -f resultlog
echo " install of visit on tidalwave" > resultlog 2>&1
......@@ -290,9 +274,9 @@ cat <<EOF > white
#!/bin/sh
if [ -d /usr/gapps/visit/$ver ]
then
./visit-install -private -a -g visit -gw $ver aix /usr/gapps/visit > installlog 2>&1
./visit-install -private -a -c closed -g visit -gw $ver aix /usr/gapps/visit > installlog 2>&1
else
./visit-install -private -g visit -gw $ver aix /usr/gapps/visit > installlog 2>&1
./visit-install -private -c closed -g visit -gw $ver aix /usr/gapps/visit > installlog 2>&1
fi
rm -f resultlog
echo " install of visit on white" > resultlog 2>&1
......@@ -323,16 +307,10 @@ cat <<EOF > emperor
#!/bin/sh
if [ -d /usr/gapps/visit/$ver ]
then
./visit-install $verflag -a -g visit -gw $ver linux /usr/gapps/visit > installlog 2>&1
./visit-install $verflag -a -c closed -g visit -gw $ver linux /usr/gapps/visit > installlog 2>&1
else
./visit-install $verflag -g visit -gw $ver linux /usr/gapps/visit > installlog 2>&1
./visit-install $verflag -c closed -g visit -gw $ver linux /usr/gapps/visit > installlog 2>&1
fi
mkdir /usr/gapps/visit/$ver/.visit
chmod 775 /usr/gapps/visit/$ver/.visit
chgrp visit /usr/gapps/visit/$ver/.visit
cp visit-config-closed /usr/gapps/visit/$ver/.visit/config
chmod 664 /usr/gapps/visit/$ver/.visit/config
chgrp visit /usr/gapps/visit/$ver/.visit/config
rm -f resultlog
echo " install of visit on emperor" > resultlog 2>&1
echo " -----------------------------" >> resultlog 2>&1
......@@ -350,7 +328,6 @@ then
scp visit$ver2.linux.tar.gz sc1:
scp visit-install sc1:
scp emperor sc1:emperor_install
scp visit-config-closed sc1:visit-config-closed
ssh sc1 "chmod 750 emperor_install;./emperor_install"
fi
fi
......
......@@ -172,15 +172,6 @@ then
exit
fi
#
# Check that the visit open configuration file is present.
#
if [ ! -e visit-config-open ]
then
echo "visit-config-open is missing."
exit
fi
ver2=`echo $ver | tr "." "_"`
ver=`echo $ver2 | tr "_" "."`
......@@ -190,7 +181,7 @@ ver=`echo $ver2 | tr "_" "."`
rm -f kickit
cat <<EOF > kickit
#!/bin/sh
./visit-install -private -g visit -gw $ver linux /usr/gapps/visit > installlog 2>&1
./visit-install -private -c open -g visit -gw $ver linux /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo " install of visit on kickit" > resultlog 2>&1
echo " ----------------------------" >> resultlog 2>&1
......@@ -221,9 +212,9 @@ cat <<EOF > sunspot
#!/bin/sh
if [ -d /usr/gapps/visit/$ver ]
then
./visit-install -private -a -g visit -gw $ver sunos5 /usr/gapps/visit > installlog 2>&1
./visit-install -private -a -c open -g visit -gw $ver sunos5 /usr/gapps/visit > installlog 2>&1
else
./visit-install -private -g visit -gw $ver sunos5 /usr/gapps/visit > installlog 2>&1
./visit-install -private -c open -g visit -gw $ver sunos5 /usr/gapps/visit > installlog 2>&1
fi
rm -f resultlog
echo " install of visit on sunspot" > resultlog 2>&1
......@@ -255,16 +246,10 @@ cat <<EOF > hyper
#!/bin/sh
if [ -d /usr/gapps/visit/$ver ]
then
./visit-install $verflag -a -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
./visit-install $verflag -a -c open -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
else
./visit-install $verflag -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
./visit-install $verflag -c open -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
fi
mkdir /usr/gapps/visit/$ver/.visit
chmod 775 /usr/gapps/visit/$ver/.visit
chgrp visit /usr/gapps/visit/$ver/.visit
cp visit-config-open /usr/gapps/visit/$ver/.visit/config
chmod 664 /usr/gapps/visit/$ver/.visit/config
chgrp visit /usr/gapps/visit/$ver/.visit/config
rm -f resultlog
echo " install of visit on hyper" > resultlog 2>&1
echo " ---------------------------" >> resultlog 2>&1
......@@ -283,7 +268,6 @@ then
scp visit$ver2.irix6.tar.gz kickit:
scp visit-install kickit:
scp hyper kickit:hyper_install
scp visit-config-open kickit:
ssh kickit "chmod 750 hyper_install;./hyper_install"
fi
fi
......@@ -294,7 +278,7 @@ fi
rm -f gps
cat <<EOF > gps
#!/bin/sh
./visit-install -private -g visit -gw $ver osf1 /usr/gapps/visit > installlog 2>&1
./visit-install -private -c open -g visit -gw $ver osf1 /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo " install of visit on gps" > resultlog 2>&1
echo " -------------------------" >> resultlog 2>&1
......@@ -325,9 +309,9 @@ cat <<EOF > riptide
#!/bin/sh
if [ -d /usr/gapps/visit/$ver ]
then
./visit-install -private -a -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
./visit-install -private -a -c open -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
else
./visit-install -private -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
./visit-install -private -c open -g visit -gw $ver irix6 /usr/gapps/visit > installlog 2>&1
fi
rm -f resultlog
echo " install of visit on riptide" > resultlog 2>&1
......@@ -359,9 +343,9 @@ cat <<EOF > frost
#!/bin/sh
if [ -d /usr/gapps/visit/$ver ]
then
./visit-install -private -a -g visit -gw $ver aix /usr/gapps/visit > installlog 2>&1
./visit-install -private -a -c open -g visit -gw $ver aix /usr/gapps/visit > installlog 2>&1
else
./visit-install -private -g visit -gw $ver aix /usr/gapps/visit > installlog 2>&1
./visit-install -private -c open -g visit -gw $ver aix /usr/gapps/visit > installlog 2>&1
fi
rm -f resultlog
echo " install of visit on frost" > resultlog 2>&1
......@@ -393,16 +377,10 @@ cat <<EOF > pengra
#!/bin/sh
if [ -d /usr/gapps/visit/$ver ]
then
./visit-install $verflag -a -g visit -gw $ver linux /usr/gapps/visit > installlog 2>&1
./visit-install $verflag -a -c open -g visit -gw $ver linux /usr/gapps/visit > installlog 2>&1
else
./visit-install $verflag -g visit -gw $ver linux /usr/gapps/visit > installlog 2>&1
./visit-install $verflag -c open -g visit -gw $ver linux /usr/gapps/visit > installlog 2>&1
fi
mkdir /usr/gapps/visit/$ver/.visit
chmod 775 /usr/gapps/visit/$ver/.visit
chgrp visit /usr/gapps/visit/$ver/.visit
cp visit-config-open /usr/gapps/visit/$ver/.visit/config
chmod 664 /usr/gapps/visit/$ver/.visit/config
chgrp visit /usr/gapps/visit/$ver/.visit/config
rm -f resultlog
echo " install of visit on pengra" > resultlog 2>&1
echo " ----------------------------" >> resultlog 2>&1
......@@ -420,7 +398,6 @@ then
scp visit$ver2.linux.tar.gz gps15:
scp visit-install gps15:
scp pengra gps15:pengra_install
scp visit-config-open gps15:
ssh gps15 "chmod 750 pengra_install;./pengra_install"
fi
fi
......
......@@ -1641,6 +1641,9 @@ avtGenericDatabase::AddOriginalNodesArray(vtkDataSet *ds, const int domain)
// Jeremy Meredith, Thu Jun 12 09:07:28 PDT 2003
// Added needBoundarySurfaces option.
//
// Hank Childs, Tue Jul 22 21:48:09 PDT 2003
// Added a flag for whether or not we communicated ghosts.
//
// ****************************************************************************
avtDataTree_p
......@@ -1651,7 +1654,7 @@ avtGenericDatabase::MaterialSelect(vtkDataSet *ds, avtMaterial *mat,
bool needBoundarySurfaces,
bool needValidConnectivity,
bool needSmoothMaterialInterfaces,
bool needCleanZonesOnly,
bool needCleanZonesOnly, bool didGhosts,
bool &subdivisionOccurred, bool &notAllCellsSubdivided,
bool reUseMIR)
{
......@@ -1676,7 +1679,7 @@ avtGenericDatabase::MaterialSelect(vtkDataSet *ds, avtMaterial *mat,
void_ref_ptr vr_mir = GetMIR(dom, var, ts, ds, mat, topoDim,
needValidConnectivity,
needSmoothMaterialInterfaces,
needCleanZonesOnly,
needCleanZonesOnly, didGhosts,
subdivisionOccurred,
notAllCellsSubdivided, reUseMIR);
MIR *mir = (MIR *) (*vr_mir);
......@@ -2123,6 +2126,9 @@ avtGenericDatabase::SpeciesSelect(avtDatasetCollection &dsc,
// Jeremy Meredith, Thu Oct 24 15:36:34 PDT 2002
// Added smoothing option and clean zones only option.
//
// Hank Childs, Tue Jul 22 21:48:09 PDT 2003
// Added a flag for whether or not we communicated ghosts.
//
// ****************************************************************************
void_ref_ptr
......@@ -2130,15 +2136,16 @@ avtGenericDatabase::GetMIR(int domain, const char *varname, int timestep,
vtkDataSet *ds, avtMaterial *mat, int topoDim,
bool needValidConnectivity,
bool needSmoothMaterialInterfaces,
bool needCleanZonesOnly,
bool needCleanZonesOnly, bool didGhosts,
bool &subdivisionOccurred,
bool &notAllCellsSubdivided, bool reUseMIR)
{
char cacheLbl[1000];
sprintf(cacheLbl, "MIR_%s_%s_%s",
sprintf(cacheLbl, "MIR_%s_%s_%s_%s",
needValidConnectivity ? "FullSubdiv" : "MinimalSubdiv",
needSmoothMaterialInterfaces ? "Smooth" : "NotSmooth",
needCleanZonesOnly ? "CleanOnly" : "SplitMixed");
needCleanZonesOnly ? "CleanOnly" : "SplitMixed",
didGhosts ? "DidGhosts" : "NoDidGhosts");
//
// See if we already have the data lying around.
......@@ -3142,6 +3149,9 @@ avtGenericDatabase::CommunicateGhosts(avtDatasetCollection &ds,
// Jeremy Meredith, Thu Jun 12 09:09:30 PDT 2003
// Added a flag for internal boundary surfaces.
//
// Hank Childs, Tue Jul 22 21:48:09 PDT 2003
// Send down information about whether or not we communicated ghost zones.
//
// ****************************************************************************
void
......@@ -3211,7 +3221,7 @@ avtGenericDatabase::MaterialSelect(avtDatasetCollection &ds,
spec->NeedBoundarySurfaces(),
spec->NeedValidFaceConnectivity(),
spec->NeedSmoothMaterialInterfaces(),
spec->NeedCleanZonesOnly(),
spec->NeedCleanZonesOnly(), didGhosts,
so, nacs, reUseMIR);
notAllCellsSubdivided = notAllCellsSubdivided || nacs ||
......
......@@ -207,10 +207,10 @@ class DATABASE_API avtGenericDatabase : public avtDatasetDatabase
std::vector<std::string> &,
std::vector<std::string> &,
bool, bool, bool, bool, bool,
bool&, bool&, bool);
bool, bool&, bool&, bool);
void_ref_ptr GetMIR(int, const char *, int, vtkDataSet*,
avtMaterial *, int, bool, bool, bool,
bool&, bool&, bool);
bool, bool&, bool&, bool);
avtMaterial *GetMaterial(int, const char *, int);
avtSpecies *GetSpecies(int, const char *, int);
void GetMaterialIndices(const char *,
......
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