mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-10-05 01:49:02 +00:00
Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into add_visit_file_reader
This commit is contained in:
commit
3efa8bb744
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3a24175a16a60f3e917170907546a52de15e703bd06017fecd9c6238db9d2726
|
||||
size 103177
|
||||
oid sha256:3f9bdb6825e859500308217228970c406b8f75c0ab16d0c2c8d704dfa9ae2e10
|
||||
size 116102
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7a569aff0c6872611ef75a4dcb597e1320cb966b80f840a0dbd76a29b2760dbb
|
||||
size 50335052
|
||||
oid sha256:347b03839fde1734ce4bd7bbf660524d039246ca3a7fd54c356a5fd7d1ffccf8
|
||||
size 50335089
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:671345bdb045aeadc8e9fa1060de51e53286c74929c6c8c60a529b318f02bbfc
|
||||
size 3795
|
||||
oid sha256:9ab17ce444d6df1ab28f24ea997adaf2a406ca6b5035da6b17867f742380fbf4
|
||||
size 3832
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8c23821f7436bce6d71593698e3cb0047752b4dd671513f8c4e961d4489f199f
|
||||
size 12110311
|
3
data/data/third_party/README.md
vendored
Normal file
3
data/data/third_party/README.md
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:362e59e70e65fd365bc64221decdea1096ac9fe4346e23126ec2d35836215832
|
||||
size 456
|
3
data/data/third_party/ecl_cc/README
vendored
3
data/data/third_party/ecl_cc/README
vendored
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6f5e6e3dc559fefc7990daaec071fcd620f620e5ab8652dddaa6b43ca4ba08e7
|
||||
size 222
|
3
data/data/third_party/ecl_cc/README.md
vendored
Normal file
3
data/data/third_party/ecl_cc/README.md
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:55f8b9b11031d8a200145763989dedb787efee60b24f39e0c20b139899570d96
|
||||
size 2197
|
3
data/data/third_party/visit/README.md
vendored
Normal file
3
data/data/third_party/visit/README.md
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:279231652c3bc23c31a8c7a6bf2e71f56afd11b6e09b5c05dca5dc48380ee0fb
|
||||
size 1934
|
3
data/data/third_party/visit/example.vtk
vendored
Normal file
3
data/data/third_party/visit/example.vtk
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ce56bb831ac66983f9689c2a73ec0dd7a7a91294f822ad19bf1caa093a8fba25
|
||||
size 11295710
|
3
data/data/third_party/visit/example_temp.bov
vendored
Normal file
3
data/data/third_party/visit/example_temp.bov
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:724a6dce8f6f5d6478891a915c76c57c5881467240bb055c6001725631f7833a
|
||||
size 350
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2071da4365341303e401d20dc6e8bb35ebeccc24b801cc81ab87e75e3a4ef654
|
||||
size 339
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d68d7acc1199af1de37ff581c6e39309e99dc0bae977fc9a0abf054d80aeb52a
|
||||
size 2004559
|
||||
oid sha256:553468d1130df26b48823fa5dc0f58196920056106b9bf0d312d651c66e423c5
|
||||
size 2004653
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9a178b29073f2aa0d15375b07d0bdd28369422a352b5dcb5155cf67aebe54bbc
|
||||
size 286099
|
44
docs/changelog/data-license.md
Normal file
44
docs/changelog/data-license.md
Normal file
@ -0,0 +1,44 @@
|
||||
# Clarified license of test data
|
||||
|
||||
The VTK-m source comes distributed with several data files used for
|
||||
regression testing. Some of these are generated specifically by VTK-m
|
||||
developers and are released as part of the VTK-m license, but some come
|
||||
from external sources. For those that come from external sources, we have
|
||||
clarified the license and attribution of those files. In particular, the
|
||||
following files originate from external sources.
|
||||
|
||||
* **internet.egr**: Distributed as part of a graph data set paper. The
|
||||
license of this data is compatible with VTK-m's license. The file is
|
||||
placed in the third-party data directory and the information has been
|
||||
updated to clearly document the correct license for this data.
|
||||
* **example.vtk** and **example_temp.bov**: Distributed as part of the
|
||||
VisIt tutorials. This data is provided under the VisIt license (per Eric
|
||||
Brugger), which is compatible with VTK-m's license. The files are moved
|
||||
to the third-party data directory and the license and attribution is
|
||||
clarified. (These files were previously named "noise" but were changed to
|
||||
match the VisIt tutorial files they came from.)
|
||||
* **vanc.vtk** Data derived from a digital elevation map of Vancouver that
|
||||
comes from GTOPO30. This data is in the public domain, so it is valid for
|
||||
us to use, modify, and redistribute the data under our license.
|
||||
|
||||
The fishtank and fusion/magField datasets were removed. These are standard
|
||||
flow testing data sets that are commonly distributed. However, we could not
|
||||
track down the original source and license, so to be cautious these data
|
||||
sets have been removed and replaced with some generated in house.
|
||||
|
||||
For some of the other data sets, we have traced down the original author
|
||||
and verified that they propery contribute the data to VTK-m and agree to
|
||||
allow it to be distributed under VTK-m's license. Not counting the most
|
||||
trivial examples, here are the originators of the non-trivial data
|
||||
examples.
|
||||
|
||||
* **5x6_&_MC*.ctm** and **8x9test_HierarchicalAugmentedTree*.dat**: Hamish
|
||||
Carr
|
||||
* **warpXfields.vtk** and **warpXparticles.vtk**: Axel Huebl
|
||||
* **amr_wind_flowfield.vtk**: James Kress
|
||||
* **DoubleGyre*.vtk**: James Kress
|
||||
* **venn250.vtk**: Abhishek Yenpure
|
||||
* **wedge_cells.vtk**: Chris Laganella
|
||||
* **kitchen.vtk**: Copyright owned by Kitware, Inc. (who shares the
|
||||
copyright of VTK-m)
|
||||
|
@ -24,9 +24,9 @@ int main(int argc, char* argv[])
|
||||
if ((argc < 4) || (argc > 5))
|
||||
{
|
||||
std::cerr << "Usage: " << argv[0] << " in_data.vtk field_name clip_value [out_data.vtk]\n\n";
|
||||
std::cerr << "For example, you could use the ucd3d.vtk that comes with the VTK-m source:\n\n";
|
||||
std::cerr << "For example, you could use the example.vtk that comes with the VTK-m source:\n\n";
|
||||
std::cerr << " " << argv[0]
|
||||
<< " <path-to-vtkm-source>/data/data/unstructured/ucd3d.vtk v 0.3\n";
|
||||
<< " <path-to-vtkm-source>/data/data/third_party/visit/example.vtk temp 3.5\n";
|
||||
return 1;
|
||||
}
|
||||
std::string infilename = argv[1];
|
||||
|
@ -24,8 +24,9 @@ int main(int argc, char* argv[])
|
||||
if ((argc < 2) || (argc > 3))
|
||||
{
|
||||
std::cerr << "Usage: " << argv[0] << " in_data.vtk [out_data.vtk]\n\n";
|
||||
std::cerr << "For example, you could use the ucd3d.vtk that comes with the VTK-m source:\n\n";
|
||||
std::cerr << " " << argv[0] << " <path-to-vtkm-source>/data/data/unstructured/ucd3d.vtk\n";
|
||||
std::cerr << "For example, you could use the example.vtk that comes with the VTK-m source:\n\n";
|
||||
std::cerr << " " << argv[0]
|
||||
<< " <path-to-vtkm-source>/data/data/third_party/visit/example.vtk\n";
|
||||
return 1;
|
||||
}
|
||||
std::string infilename = argv[1];
|
||||
|
@ -41,7 +41,8 @@ inline vtkm::cont::DataSet readBOVDataSet(const char* fname)
|
||||
|
||||
void TestReadingBOVDataSet()
|
||||
{
|
||||
std::string bovFile = vtkm::cont::testing::Testing::DataPath("uniform/noise.bov");
|
||||
std::string bovFile =
|
||||
vtkm::cont::testing::Testing::DataPath("third_party/visit/example_temp.bov");
|
||||
|
||||
auto const& ds = readBOVDataSet(bovFile.data());
|
||||
|
||||
|
@ -26,8 +26,10 @@ namespace
|
||||
void RenderTests()
|
||||
{
|
||||
vtkm::cont::ColorTable colorTable = vtkm::cont::ColorTable::Preset::Inferno;
|
||||
colorTable.AddPointAlpha(0.0, .01f);
|
||||
colorTable.AddPointAlpha(1.0, .01f);
|
||||
colorTable.AddPointAlpha(0.0, 0.01f);
|
||||
colorTable.AddPointAlpha(0.4, 0.01f);
|
||||
colorTable.AddPointAlpha(0.7, 0.2f);
|
||||
colorTable.AddPointAlpha(1.0, 0.5f);
|
||||
|
||||
vtkm::rendering::testing::RenderTestOptions options;
|
||||
options.Mapper = vtkm::rendering::testing::MapperType::Volume;
|
||||
@ -35,7 +37,7 @@ void RenderTests()
|
||||
options.ColorTable = colorTable;
|
||||
|
||||
vtkm::cont::DataSet rectDS, unsDS;
|
||||
std::string rectfname = vtkm::cont::testing::Testing::DataPath("rectilinear/noise.vtk");
|
||||
std::string rectfname = vtkm::cont::testing::Testing::DataPath("third_party/visit/example.vtk");
|
||||
vtkm::io::VTKDataSetReader rectReader(rectfname);
|
||||
|
||||
try
|
||||
@ -53,7 +55,7 @@ void RenderTests()
|
||||
}
|
||||
|
||||
vtkm::rendering::testing::RenderTest(
|
||||
rectDS, "hardyglobal", "rendering/volume/rectilinear3D.png", options);
|
||||
rectDS, "temp", "rendering/volume/rectilinear3D.png", options);
|
||||
}
|
||||
|
||||
} //namespace
|
||||
|
Loading…
Reference in New Issue
Block a user