Commit debfa518 authored by hrchilds's avatar hrchilds
Browse files

Update from April 12, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@218 18c085ea-50e0-402c-830e-de6fd14e8384
parent 67eca93a
......@@ -59,6 +59,10 @@
# Brad Whitlock, Wed Apr 7 17:21:25 PST 2004
# I removed keyframing tests from the skip list.
#
# Mark C. Miller, Mon Apr 12 17:11:22 PDT 2004
# I removed multi-format2.py, operators.py, and gradient.py tests
# from scalable,parallel skip
#
# ----------------------------------------------------------------------------
# list of users who want email every night with the log file
......@@ -189,10 +193,7 @@ modes="serial parallel scalable,parallel"
skipList="parallel:tests/databases/samrai.py \
parallel:tests/hybrid/sil.py \
parallel:tests/rendering/volume.py \
scalable,parallel:tests/databases/multi_format2.py \
scalable,parallel:tests/hybrid/gradient.py \
scalable,parallel:tests/hybrid/lineout.py \
scalable,parallel:tests/operators/operators.py \
scalable,parallel:tests/rendering/volume.py"
# run the test(s)
......
......@@ -1902,7 +1902,11 @@ avtSAMRAIFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
// re-format the material names for avt's API
vector<string> matnames;
for (i = 0; i < num_mats; i++)
matnames.push_back(mat_names[i]);
{
char tmpName[1024];
sprintf(tmpName, "%d %s", i, mat_names[i].c_str());
matnames.push_back(tmpName);
}
// add the material object
avtMaterialMetaData *mmd = new avtMaterialMetaData("materials", mesh_name,
......
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