Commit 2251be9c authored by hrchilds's avatar hrchilds

Update from June 23, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@267 18c085ea-50e0-402c-830e-de6fd14e8384
parent 93ff45a6
......@@ -203,7 +203,7 @@ cd VTK
# Ideally this would be done by editing CMakeCache.txt, adding "-fno-rtti"
# to the CMAKE_CXX_FLAGS string and running cmake, but alas, this doesn't
# work. The work around is to do the following:
# env CXXFLAGS="-fno-rtti" ../cmake-1.8.1/bin/cmake
# env CXXFLAGS="-fno-rtti" ../cmake-1.8.1/bin/cmake .
#
# This indirectly turns off rtti, because VTK_NO_ANSI_STRING_STREAM is set
# to 1. This causes vtkOStrStreamWrapper.cxx to use <strstream> instead
......@@ -456,9 +456,9 @@ env command for configure.
#
# Build and install it in the visit directory.
#
gunzip visit040517.tar.gz
tar xf visit040517.tar
cd visit040517/config-site
gunzip visit040628.tar.gz
tar xf visit040628.tar
cd visit040628/config-site
echo VISITHOME=`cat ../../visitpath` > `hostname`.conf
cat Template.conf >> `hostname`.conf
cd ..
......@@ -467,11 +467,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.3.1 aix `cat ../visitpath`
clearcase_bin/visit-install 1.3.1 irix6 `cat ../visitpath`
clearcase_bin/visit-install 1.3.1 linux `cat ../visitpath`
clearcase_bin/visit-install 1.3.1 osf1 `cat ../visitpath`
clearcase_bin/visit-install 1.3.1 sunos5 `cat ../visitpath`
clearcase_bin/visit-install 1.3.2 aix `cat ../visitpath`
clearcase_bin/visit-install 1.3.2 irix6 `cat ../visitpath`
clearcase_bin/visit-install 1.3.2 linux `cat ../visitpath`
clearcase_bin/visit-install 1.3.2 osf1 `cat ../visitpath`
clearcase_bin/visit-install 1.3.2 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 and Mac OS X:
where
"version" will be 1.3.1 for the current distribution.
"version" will be 1.3.2 for the current distribution.
"platform" will be one of the following: aix, darwin, irix6, linux,
osf1, or sunos5 depending on the machine. The one you use should
......@@ -28,17 +28,17 @@ Unix and Mac OS X:
For example
visit-install 1.3.1 irix6 /usr/local/visit
visit-install 1.3.2 irix6 /usr/local/visit
will install the irix6, 1.3.1 version of visit in the directory
will install the irix6, 1.3.2 version of visit in the directory
"/usr/local/visit". Note that you will need to have the file
"visit1_3_1.irix6.tar.gz" present in the current directory for this
"visit1_3_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.3.1 linux /usr/local/visit
visit-install 1.3.2 linux /usr/local/visit
to add a linux, 1.3.1 version of visit to the same directory.
to add a linux, 1.3.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.
......@@ -76,8 +76,8 @@ Unix and Mac OS X:
Windows:
1. Copy the file visit1.3.1.exe to your desktop.
1. Copy the file visit1.3.2.exe to your desktop.
2. Double click on the visit1.3.1.exe icon to run the installer.
2. Double click on the visit1.3.2.exe icon to run the installer.
3. Follow the directions provided by the installer.
......@@ -35,6 +35,10 @@ using std::vector;
// Hank Childs, Mon Apr 7 18:16:07 PDT 2003
// Do not read in the meta-data during the constructor.
//
// Hank Childs, Wed Jun 23 09:10:11 PDT 2004
// Declare the number of domains as 0, so it will definitely match up with
// the size of the read_domain vector.
//
// ****************************************************************************
avtSpheralFileFormat::avtSpheralFileFormat(const char *fname)
......@@ -42,7 +46,7 @@ avtSpheralFileFormat::avtSpheralFileFormat(const char *fname)
{
rootfile = fname;
current_file = rootfile;
ndomains = 1;
ndomains = 0;
cycle = 0;
gotCycle = false;
dtime = 0.;
......@@ -104,6 +108,11 @@ avtSpheralFileFormat::~avtSpheralFileFormat()
// Programmer: Hank Childs
// Creation: March 14, 2003
//
// Modifications:
//
// Hank Childs, Wed Jun 23 09:34:43 PDT 2004
// Avoid dangling pointers.
//
// ****************************************************************************
void
......@@ -117,6 +126,7 @@ avtSpheralFileFormat::FreeUpResources(void)
if (cache[i].meshes[j] != NULL)
{
cache[i].meshes[j]->Delete();
cache[i].meshes[j] = NULL;
}
for (k = 0 ; k < fields.size() ; k++)
......@@ -124,6 +134,7 @@ avtSpheralFileFormat::FreeUpResources(void)
if (cache[i].fields[j][k] != NULL)
{
cache[i].fields[j][k]->Delete();
cache[i].fields[j][k] = NULL;
}
}
}
......@@ -143,6 +154,12 @@ avtSpheralFileFormat::FreeUpResources(void)
// Programmer: Hank Childs
// Creation: March 14, 2003
//
// Modifications:
//
// Hank Childs, Wed Jun 23 07:32:20 PDT 2004
// Make sure we have read in the meta-data, so we can get field indices
// properly ['5109].
//
// ****************************************************************************
void
......@@ -151,6 +168,11 @@ avtSpheralFileFormat::RegisterVariableList(const char *primVar,
{
int i, j;
if (!readInMetaData)
{
ReadInMetaData();
}
//
// We want every node list (-> mat) unless we have reason not to include
// it.
......
......@@ -215,6 +215,10 @@ HelpMLFile::Open(const char *filename)
// Brad Whitlock, Mon Jun 21 16:43:16 PST 2004
// Added debugging output (commented out).
//
// Eric Brugger, Wed Jun 23 09:09:47 PDT 2004
// Modified the usages of strings to use the c_str method when adding its
// contents to an iostream.
//
// ****************************************************************************
bool
......@@ -227,8 +231,8 @@ HelpMLFile::AddPage(const string &topic, const string &doc,
if(allowAdds)
{
// cout << "Adding HTML page: " << topic << endl;
// cout << "\tdoc=" << doc << endl;
// cout << "Adding HTML page: " << topic.c_str() << endl;
// cout << "\tdoc=" << doc.c_str() << endl;
// cout << "\tpage.size()=" << page.size() << endl;
// cout << "\tindentLevel=" << indentLevel << endl;
......@@ -237,8 +241,8 @@ HelpMLFile::AddPage(const string &topic, const string &doc,
}
else
{
// cerr << "Not allowing addition of HTML page: " << topic << endl;
// cerr << "\tdoc=" << doc << endl;
// cerr << "Not allowing addition of HTML page: " << topic.c_str() << endl;
// cerr << "\tdoc=" << doc.c_str() << endl;
// cerr << "\tpage.size()=" << page.size() << endl;
// cerr << "\tindentLevel=" << indentLevel << endl;
}
......@@ -1058,6 +1062,10 @@ MIF_To_HTML::WriteHTMLString(const char *str)
// I totally changed how we add to paragraphs and I added support for
// subscript and tables.
//
// Eric Brugger, Wed Jun 23 09:09:47 PDT 2004
// Modified the usages of strings to use the c_str method when adding its
// contents to an iostream.
//
// ****************************************************************************
void
......@@ -1139,7 +1147,7 @@ MIF_To_HTML::EndTag(int state, const string &token)
}
// else
// {
// cout << "<!-- PGFTAG = \"" << pFormat << "\" -->" << endl;
// cout << "<!-- PGFTAG = \"" << pFormat.c_str() << "\" -->" << endl;
// }
}
}
......@@ -1174,7 +1182,7 @@ MIF_To_HTML::EndTag(int state, const string &token)
paragraphString += "<b>";
}
// else
// cout << "<!-- FTAG = \"" << token << "\" -->" << endl;
// cout << "<!-- FTAG = \"" << token.c_str() << "\" -->" << endl;
}
else if(state == READ_FANGLE)
{
......@@ -1252,11 +1260,11 @@ MIF_To_HTML::EndTag(int state, const string &token)
if(index != -1)
{
// Add the contents of the table to the file.
//cout << "Adding table " << tables[index]->name << endl;
//cout << "Adding table " << tables[index]->name.c_str() << endl;
appendTables.push_back(tables[index]);
}
else
cerr << "Could not find table id=" << token << endl;
cerr << "Could not find table id=" << token.c_str() << endl;
}
else if(state == READ_TEXTFLOW)
{
......
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