Commit 7c96a9d0 authored by David C. Lonie's avatar David C. Lonie Committed by Code Review
Browse files

Merge topic 'chemistry-warnings' into master

41ddc334 Fix set-but-not-used warnings in Domains/Chemistry tests.
parents ddfcd0f4 41ddc334
......@@ -47,19 +47,19 @@ int TestBallAndStick(int, char *[])
vtkAtom H5 = mol->AppendAtom(1, 2.3344947615, 1.8381683043, 0.9310726537);
vtkAtom H6 = mol->AppendAtom(1, -2.1991803919, 3.3206134015, 0.9413825084);
vtkBond B1 = mol->AppendBond( C1, C5, 1);
vtkBond B2 = mol->AppendBond( C1, C2, 2);
vtkBond B3 = mol->AppendBond( C2, C3, 1);
vtkBond B4 = mol->AppendBond( C3, C4, 3);
vtkBond B5 = mol->AppendBond( C4, C6, 1);
vtkBond B6 = mol->AppendBond( C5, O2, 2);
vtkBond B7 = mol->AppendBond( C6, O1, 1);
vtkBond B8 = mol->AppendBond( C5, H6, 1);
vtkBond B9 = mol->AppendBond( C1, H1, 1);
vtkBond B10 = mol->AppendBond( C2, H2, 1);
vtkBond B11 = mol->AppendBond( C6, H3, 1);
vtkBond B12 = mol->AppendBond( C6, H4, 1);
vtkBond B13 = mol->AppendBond( O1, H5, 1);
mol->AppendBond( C1, C5, 1);
mol->AppendBond( C1, C2, 2);
mol->AppendBond( C2, C3, 1);
mol->AppendBond( C3, C4, 3);
mol->AppendBond( C4, C6, 1);
mol->AppendBond( C5, O2, 2);
mol->AppendBond( C6, O1, 1);
mol->AppendBond( C5, H6, 1);
mol->AppendBond( C1, H1, 1);
mol->AppendBond( C2, H2, 1);
mol->AppendBond( C6, H3, 1);
mol->AppendBond( C6, H4, 1);
mol->AppendBond( O1, H5, 1);
vtkNew<vtkMoleculeMapper> molmapper;
molmapper->SetInputData(mol.GetPointer());
......
......@@ -45,19 +45,19 @@ int TestBondColorModeDiscreteByAtom(int, char *[])
vtkAtom H5 = mol->AppendAtom(1, 2.3344947615, 1.8381683043, 0.9310726537);
vtkAtom H6 = mol->AppendAtom(1, -2.1991803919, 3.3206134015, 0.9413825084);
vtkBond B1 = mol->AppendBond( C1, C5, 1);
vtkBond B2 = mol->AppendBond( C1, C2, 2);
vtkBond B3 = mol->AppendBond( C2, C3, 1);
vtkBond B4 = mol->AppendBond( C3, C4, 3);
vtkBond B5 = mol->AppendBond( C4, C6, 1);
vtkBond B6 = mol->AppendBond( C5, O2, 2);
vtkBond B7 = mol->AppendBond( C6, O1, 1);
vtkBond B8 = mol->AppendBond( C5, H6, 1);
vtkBond B9 = mol->AppendBond( C1, H1, 1);
vtkBond B10 = mol->AppendBond( C2, H2, 1);
vtkBond B11 = mol->AppendBond( C6, H3, 1);
vtkBond B12 = mol->AppendBond( C6, H4, 1);
vtkBond B13 = mol->AppendBond( O1, H5, 1);
mol->AppendBond( C1, C5, 1);
mol->AppendBond( C1, C2, 2);
mol->AppendBond( C2, C3, 1);
mol->AppendBond( C3, C4, 3);
mol->AppendBond( C4, C6, 1);
mol->AppendBond( C5, O2, 2);
mol->AppendBond( C6, O1, 1);
mol->AppendBond( C5, H6, 1);
mol->AppendBond( C1, H1, 1);
mol->AppendBond( C2, H2, 1);
mol->AppendBond( C6, H3, 1);
mol->AppendBond( C6, H4, 1);
mol->AppendBond( O1, H5, 1);
vtkNew<vtkMoleculeMapper> molmapper;
molmapper->SetInputData(mol.GetPointer());
......
......@@ -45,19 +45,19 @@ int TestBondColorModeSingleColor(int, char *[])
vtkAtom H5 = mol->AppendAtom(1, 2.3344947615, 1.8381683043, 0.9310726537);
vtkAtom H6 = mol->AppendAtom(1, -2.1991803919, 3.3206134015, 0.9413825084);
vtkBond B1 = mol->AppendBond( C1, C5, 1);
vtkBond B2 = mol->AppendBond( C1, C2, 2);
vtkBond B3 = mol->AppendBond( C2, C3, 1);
vtkBond B4 = mol->AppendBond( C3, C4, 3);
vtkBond B5 = mol->AppendBond( C4, C6, 1);
vtkBond B6 = mol->AppendBond( C5, O2, 2);
vtkBond B7 = mol->AppendBond( C6, O1, 1);
vtkBond B8 = mol->AppendBond( C5, H6, 1);
vtkBond B9 = mol->AppendBond( C1, H1, 1);
vtkBond B10 = mol->AppendBond( C2, H2, 1);
vtkBond B11 = mol->AppendBond( C6, H3, 1);
vtkBond B12 = mol->AppendBond( C6, H4, 1);
vtkBond B13 = mol->AppendBond( O1, H5, 1);
mol->AppendBond( C1, C5, 1);
mol->AppendBond( C1, C2, 2);
mol->AppendBond( C2, C3, 1);
mol->AppendBond( C3, C4, 3);
mol->AppendBond( C4, C6, 1);
mol->AppendBond( C5, O2, 2);
mol->AppendBond( C6, O1, 1);
mol->AppendBond( C5, H6, 1);
mol->AppendBond( C1, H1, 1);
mol->AppendBond( C2, H2, 1);
mol->AppendBond( C6, H3, 1);
mol->AppendBond( C6, H4, 1);
mol->AppendBond( O1, H5, 1);
vtkNew<vtkMoleculeMapper> molmapper;
molmapper->SetInputData(mol.GetPointer());
......
......@@ -44,19 +44,19 @@ int TestCompositeRender(int, char *[])
vtkAtom H5 = mol->AppendAtom(1, 2.3344947615, 1.8381683043, 0.9310726537);
vtkAtom H6 = mol->AppendAtom(1, -2.1991803919, 3.3206134015, 0.9413825084);
vtkBond B1 = mol->AppendBond( C1, C5, 1);
vtkBond B2 = mol->AppendBond( C1, C2, 2);
vtkBond B3 = mol->AppendBond( C2, C3, 1);
vtkBond B4 = mol->AppendBond( C3, C4, 3);
vtkBond B5 = mol->AppendBond( C4, C6, 1);
vtkBond B6 = mol->AppendBond( C5, O2, 2);
vtkBond B7 = mol->AppendBond( C6, O1, 1);
vtkBond B8 = mol->AppendBond( C5, H6, 1);
vtkBond B9 = mol->AppendBond( C1, H1, 1);
vtkBond B10 = mol->AppendBond( C2, H2, 1);
vtkBond B11 = mol->AppendBond( C6, H3, 1);
vtkBond B12 = mol->AppendBond( C6, H4, 1);
vtkBond B13 = mol->AppendBond( O1, H5, 1);
mol->AppendBond( C1, C5, 1);
mol->AppendBond( C1, C2, 2);
mol->AppendBond( C2, C3, 1);
mol->AppendBond( C3, C4, 3);
mol->AppendBond( C4, C6, 1);
mol->AppendBond( C5, O2, 2);
mol->AppendBond( C6, O1, 1);
mol->AppendBond( C5, H6, 1);
mol->AppendBond( C1, H1, 1);
mol->AppendBond( C2, H2, 1);
mol->AppendBond( C6, H3, 1);
mol->AppendBond( C6, H4, 1);
mol->AppendBond( O1, H5, 1);
// Opaque balls and sticks
vtkNew<vtkMoleculeMapper> bsMapper;
......
......@@ -45,19 +45,19 @@ int TestFastRender(int, char *[])
vtkAtom H5 = mol->AppendAtom(1, 2.3344947615, 1.8381683043, 0.9310726537);
vtkAtom H6 = mol->AppendAtom(1, -2.1991803919, 3.3206134015, 0.9413825084);
vtkBond B1 = mol->AppendBond( C1, C5, 1);
vtkBond B2 = mol->AppendBond( C1, C2, 2);
vtkBond B3 = mol->AppendBond( C2, C3, 1);
vtkBond B4 = mol->AppendBond( C3, C4, 3);
vtkBond B5 = mol->AppendBond( C4, C6, 1);
vtkBond B6 = mol->AppendBond( C5, O2, 2);
vtkBond B7 = mol->AppendBond( C6, O1, 1);
vtkBond B8 = mol->AppendBond( C5, H6, 1);
vtkBond B9 = mol->AppendBond( C1, H1, 1);
vtkBond B10 = mol->AppendBond( C2, H2, 1);
vtkBond B11 = mol->AppendBond( C6, H3, 1);
vtkBond B12 = mol->AppendBond( C6, H4, 1);
vtkBond B13 = mol->AppendBond( O1, H5, 1);
mol->AppendBond( C1, C5, 1);
mol->AppendBond( C1, C2, 2);
mol->AppendBond( C2, C3, 1);
mol->AppendBond( C3, C4, 3);
mol->AppendBond( C4, C6, 1);
mol->AppendBond( C5, O2, 2);
mol->AppendBond( C6, O1, 1);
mol->AppendBond( C5, H6, 1);
mol->AppendBond( C1, H1, 1);
mol->AppendBond( C2, H2, 1);
mol->AppendBond( C6, H3, 1);
mol->AppendBond( C6, H4, 1);
mol->AppendBond( O1, H5, 1);
vtkNew<vtkMoleculeMapper> molmapper;
molmapper->SetInputData(mol.GetPointer());
......
......@@ -45,19 +45,19 @@ int TestLiquoriceSticks(int, char *[])
vtkAtom H5 = mol->AppendAtom(1, 2.3344947615, 1.8381683043, 0.9310726537);
vtkAtom H6 = mol->AppendAtom(1, -2.1991803919, 3.3206134015, 0.9413825084);
vtkBond B1 = mol->AppendBond( C1, C5, 1);
vtkBond B2 = mol->AppendBond( C1, C2, 2);
vtkBond B3 = mol->AppendBond( C2, C3, 1);
vtkBond B4 = mol->AppendBond( C3, C4, 3);
vtkBond B5 = mol->AppendBond( C4, C6, 1);
vtkBond B6 = mol->AppendBond( C5, O2, 2);
vtkBond B7 = mol->AppendBond( C6, O1, 1);
vtkBond B8 = mol->AppendBond( C5, H6, 1);
vtkBond B9 = mol->AppendBond( C1, H1, 1);
vtkBond B10 = mol->AppendBond( C2, H2, 1);
vtkBond B11 = mol->AppendBond( C6, H3, 1);
vtkBond B12 = mol->AppendBond( C6, H4, 1);
vtkBond B13 = mol->AppendBond( O1, H5, 1);
mol->AppendBond( C1, C5, 1);
mol->AppendBond( C1, C2, 2);
mol->AppendBond( C2, C3, 1);
mol->AppendBond( C3, C4, 3);
mol->AppendBond( C4, C6, 1);
mol->AppendBond( C5, O2, 2);
mol->AppendBond( C6, O1, 1);
mol->AppendBond( C5, H6, 1);
mol->AppendBond( C1, H1, 1);
mol->AppendBond( C2, H2, 1);
mol->AppendBond( C6, H3, 1);
mol->AppendBond( C6, H4, 1);
mol->AppendBond( O1, H5, 1);
vtkNew<vtkMoleculeMapper> molmapper;
molmapper->SetInputData(mol.GetPointer());
......
......@@ -47,19 +47,19 @@ int TestMoleculeMapperPropertyUpdate(int, char *[])
vtkAtom H5 = mol->AppendAtom(1, 2.3344947615, 1.8381683043, 0.9310726537);
vtkAtom H6 = mol->AppendAtom(1, -2.1991803919, 3.3206134015, 0.9413825084);
vtkBond B1 = mol->AppendBond( C1, C5, 1);
vtkBond B2 = mol->AppendBond( C1, C2, 2);
vtkBond B3 = mol->AppendBond( C2, C3, 1);
vtkBond B4 = mol->AppendBond( C3, C4, 3);
vtkBond B5 = mol->AppendBond( C4, C6, 1);
vtkBond B6 = mol->AppendBond( C5, O2, 2);
vtkBond B7 = mol->AppendBond( C6, O1, 1);
vtkBond B8 = mol->AppendBond( C5, H6, 1);
vtkBond B9 = mol->AppendBond( C1, H1, 1);
vtkBond B10 = mol->AppendBond( C2, H2, 1);
vtkBond B11 = mol->AppendBond( C6, H3, 1);
vtkBond B12 = mol->AppendBond( C6, H4, 1);
vtkBond B13 = mol->AppendBond( O1, H5, 1);
mol->AppendBond( C1, C5, 1);
mol->AppendBond( C1, C2, 2);
mol->AppendBond( C2, C3, 1);
mol->AppendBond( C3, C4, 3);
mol->AppendBond( C4, C6, 1);
mol->AppendBond( C5, O2, 2);
mol->AppendBond( C6, O1, 1);
mol->AppendBond( C5, H6, 1);
mol->AppendBond( C1, H1, 1);
mol->AppendBond( C2, H2, 1);
mol->AppendBond( C6, H3, 1);
mol->AppendBond( C6, H4, 1);
mol->AppendBond( O1, H5, 1);
vtkNew<vtkMoleculeMapper> molmapper;
molmapper->SetInputData(mol.GetPointer());
......
......@@ -166,30 +166,30 @@ int TestMoleculeSelection(int argc, char *argv[])
vtkAtom a16 = mol->AppendAtom(16, 3.0, 3.0, 0.0);
// Add bonds along the grid
vtkBond b1 = mol->AppendBond( a1, a2, 1);
vtkBond b2 = mol->AppendBond( a2, a3, 1);
vtkBond b3 = mol->AppendBond( a3, a4, 1);
vtkBond b4 = mol->AppendBond( a5, a6, 1);
vtkBond b5 = mol->AppendBond( a6, a7, 1);
vtkBond b6 = mol->AppendBond( a7, a8, 1);
vtkBond b7 = mol->AppendBond( a9, a10, 1);
vtkBond b8 = mol->AppendBond(a10, a11, 1);
vtkBond b9 = mol->AppendBond(a11, a12, 1);
vtkBond b10 = mol->AppendBond(a13, a14, 1);
vtkBond b11 = mol->AppendBond(a14, a15, 1);
vtkBond b12 = mol->AppendBond(a15, a16, 1);
vtkBond b13 = mol->AppendBond( a1, a5, 1);
vtkBond b14 = mol->AppendBond( a2, a6, 1);
vtkBond b15 = mol->AppendBond( a3, a7, 1);
vtkBond b16 = mol->AppendBond( a4, a8, 1);
vtkBond b17 = mol->AppendBond( a5, a9, 1);
vtkBond b18 = mol->AppendBond( a6, a10, 1);
vtkBond b19 = mol->AppendBond( a7, a11, 1);
vtkBond b20 = mol->AppendBond( a8, a12, 1);
vtkBond b21 = mol->AppendBond( a9, a13, 1);
vtkBond b22 = mol->AppendBond(a10, a14, 1);
vtkBond b23 = mol->AppendBond(a11, a15, 1);
vtkBond b24 = mol->AppendBond(a12, a16, 1);
mol->AppendBond( a1, a2, 1);
mol->AppendBond( a2, a3, 1);
mol->AppendBond( a3, a4, 1);
mol->AppendBond( a5, a6, 1);
mol->AppendBond( a6, a7, 1);
mol->AppendBond( a7, a8, 1);
mol->AppendBond( a9, a10, 1);
mol->AppendBond(a10, a11, 1);
mol->AppendBond(a11, a12, 1);
mol->AppendBond(a13, a14, 1);
mol->AppendBond(a14, a15, 1);
mol->AppendBond(a15, a16, 1);
mol->AppendBond( a1, a5, 1);
mol->AppendBond( a2, a6, 1);
mol->AppendBond( a3, a7, 1);
mol->AppendBond( a4, a8, 1);
mol->AppendBond( a5, a9, 1);
mol->AppendBond( a6, a10, 1);
mol->AppendBond( a7, a11, 1);
mol->AppendBond( a8, a12, 1);
mol->AppendBond( a9, a13, 1);
mol->AppendBond(a10, a14, 1);
mol->AppendBond(a11, a15, 1);
mol->AppendBond(a12, a16, 1);
// Set up render engine
vtkNew<vtkMoleculeMapper> molmapper;
......
......@@ -45,19 +45,19 @@ int TestMultiCylinderOff(int, char *[])
vtkAtom H5 = mol->AppendAtom(1, 2.3344947615, 1.8381683043, 0.9310726537);
vtkAtom H6 = mol->AppendAtom(1, -2.1991803919, 3.3206134015, 0.9413825084);
vtkBond B1 = mol->AppendBond( C1, C5, 1);
vtkBond B2 = mol->AppendBond( C1, C2, 2);
vtkBond B3 = mol->AppendBond( C2, C3, 1);
vtkBond B4 = mol->AppendBond( C3, C4, 3);
vtkBond B5 = mol->AppendBond( C4, C6, 1);
vtkBond B6 = mol->AppendBond( C5, O2, 2);
vtkBond B7 = mol->AppendBond( C6, O1, 1);
vtkBond B8 = mol->AppendBond( C5, H6, 1);
vtkBond B9 = mol->AppendBond( C1, H1, 1);
vtkBond B10 = mol->AppendBond( C2, H2, 1);
vtkBond B11 = mol->AppendBond( C6, H3, 1);
vtkBond B12 = mol->AppendBond( C6, H4, 1);
vtkBond B13 = mol->AppendBond( O1, H5, 1);
mol->AppendBond( C1, C5, 1);
mol->AppendBond( C1, C2, 2);
mol->AppendBond( C2, C3, 1);
mol->AppendBond( C3, C4, 3);
mol->AppendBond( C4, C6, 1);
mol->AppendBond( C5, O2, 2);
mol->AppendBond( C6, O1, 1);
mol->AppendBond( C5, H6, 1);
mol->AppendBond( C1, H1, 1);
mol->AppendBond( C2, H2, 1);
mol->AppendBond( C6, H3, 1);
mol->AppendBond( C6, H4, 1);
mol->AppendBond( O1, H5, 1);
vtkNew<vtkMoleculeMapper> molmapper;
molmapper->SetInputData(mol.GetPointer());
......
......@@ -45,19 +45,19 @@ int TestMultiCylinderOn(int, char *[])
vtkAtom H5 = mol->AppendAtom(1, 2.3344947615, 1.8381683043, 0.9310726537);
vtkAtom H6 = mol->AppendAtom(1, -2.1991803919, 3.3206134015, 0.9413825084);
vtkBond B1 = mol->AppendBond( C1, C5, 1);
vtkBond B2 = mol->AppendBond( C1, C2, 2);
vtkBond B3 = mol->AppendBond( C2, C3, 1);
vtkBond B4 = mol->AppendBond( C3, C4, 3);
vtkBond B5 = mol->AppendBond( C4, C6, 1);
vtkBond B6 = mol->AppendBond( C5, O2, 2);
vtkBond B7 = mol->AppendBond( C6, O1, 1);
vtkBond B8 = mol->AppendBond( C5, H6, 1);
vtkBond B9 = mol->AppendBond( C1, H1, 1);
vtkBond B10 = mol->AppendBond( C2, H2, 1);
vtkBond B11 = mol->AppendBond( C6, H3, 1);
vtkBond B12 = mol->AppendBond( C6, H4, 1);
vtkBond B13 = mol->AppendBond( O1, H5, 1);
mol->AppendBond( C1, C5, 1);
mol->AppendBond( C1, C2, 2);
mol->AppendBond( C2, C3, 1);
mol->AppendBond( C3, C4, 3);
mol->AppendBond( C4, C6, 1);
mol->AppendBond( C5, O2, 2);
mol->AppendBond( C6, O1, 1);
mol->AppendBond( C5, H6, 1);
mol->AppendBond( C1, H1, 1);
mol->AppendBond( C2, H2, 1);
mol->AppendBond( C6, H3, 1);
mol->AppendBond( C6, H4, 1);
mol->AppendBond( O1, H5, 1);
vtkNew<vtkMoleculeMapper> molmapper;
molmapper->SetInputData(mol.GetPointer());
......
......@@ -45,19 +45,19 @@ int TestVDWSpheres(int, char *[])
vtkAtom H5 = mol->AppendAtom(1, 2.3344947615, 1.8381683043, 0.9310726537);
vtkAtom H6 = mol->AppendAtom(1, -2.1991803919, 3.3206134015, 0.9413825084);
vtkBond B1 = mol->AppendBond( C1, C5, 1);
vtkBond B2 = mol->AppendBond( C1, C2, 2);
vtkBond B3 = mol->AppendBond( C2, C3, 1);
vtkBond B4 = mol->AppendBond( C3, C4, 3);
vtkBond B5 = mol->AppendBond( C4, C6, 1);
vtkBond B6 = mol->AppendBond( C5, O2, 2);
vtkBond B7 = mol->AppendBond( C6, O1, 1);
vtkBond B8 = mol->AppendBond( C5, H6, 1);
vtkBond B9 = mol->AppendBond( C1, H1, 1);
vtkBond B10 = mol->AppendBond( C2, H2, 1);
vtkBond B11 = mol->AppendBond( C6, H3, 1);
vtkBond B12 = mol->AppendBond( C6, H4, 1);
vtkBond B13 = mol->AppendBond( O1, H5, 1);
mol->AppendBond( C1, C5, 1);
mol->AppendBond( C1, C2, 2);
mol->AppendBond( C2, C3, 1);
mol->AppendBond( C3, C4, 3);
mol->AppendBond( C4, C6, 1);
mol->AppendBond( C5, O2, 2);
mol->AppendBond( C6, O1, 1);
mol->AppendBond( C5, H6, 1);
mol->AppendBond( C1, H1, 1);
mol->AppendBond( C2, H2, 1);
mol->AppendBond( C6, H3, 1);
mol->AppendBond( C6, H4, 1);
mol->AppendBond( O1, H5, 1);
vtkNew<vtkMoleculeMapper> molmapper;
molmapper->SetInputData(mol.GetPointer());
......
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