From 1281fe8287ee5f352ab9ad6ff7de1be3d8c54ed2 Mon Sep 17 00:00:00 2001 From: akl Date: Wed, 7 Aug 2013 07:18:48 +0000 Subject: [PATCH] Fix of 0022075: [CEA 753] make test de PARAVIS echoue. 'PARAVIS_TEST_OUTPUT_DIR' cmake cache variable was removed. Path of temp directory for 'make test' pictures can be defined by user or will be built at start of test. --- CMakeLists.txt | 1 - test/VisuPrs/2D_viewer/CMakeLists.txt | 2 +- test/VisuPrs/3D_viewer/A1.py | 2 +- test/VisuPrs/3D_viewer/A2.py | 2 +- test/VisuPrs/3D_viewer/A3.py | 2 +- test/VisuPrs/3D_viewer/A4.py | 2 +- test/VisuPrs/3D_viewer/A5.py | 2 +- test/VisuPrs/3D_viewer/A6.py | 2 +- test/VisuPrs/3D_viewer/A7.py | 2 +- test/VisuPrs/3D_viewer/A8.py | 2 +- test/VisuPrs/3D_viewer/A9.py | 2 +- test/VisuPrs/3D_viewer/B0.py | 2 +- test/VisuPrs/3D_viewer/B2.py | 2 +- test/VisuPrs/3D_viewer/CMakeLists.txt | 2 +- test/VisuPrs/Animation/A0.py | 2 +- test/VisuPrs/Animation/A2.py | 2 +- test/VisuPrs/Animation/A4.py | 2 +- test/VisuPrs/Animation/A7.py | 2 +- test/VisuPrs/Animation/A8.py | 2 +- test/VisuPrs/Animation/B2.py | 2 +- test/VisuPrs/Animation/B5.py | 2 +- test/VisuPrs/Animation/B6.py | 2 +- test/VisuPrs/Animation/C0.py | 2 +- test/VisuPrs/Animation/C1.py | 2 +- test/VisuPrs/Animation/C3.py | 2 +- test/VisuPrs/Animation/C8.py | 2 +- test/VisuPrs/Animation/CMakeLists.txt | 2 +- test/VisuPrs/Animation/D1.py | 2 +- test/VisuPrs/Animation/D2.py | 2 +- test/VisuPrs/Animation/D6.py | 2 +- test/VisuPrs/Animation/D9.py | 2 +- test/VisuPrs/Animation/E0.py | 2 +- test/VisuPrs/Animation/E4.py | 2 +- test/VisuPrs/Animation/E7.py | 2 +- test/VisuPrs/Animation/E8.py | 2 +- test/VisuPrs/Animation/F2.py | 2 +- test/VisuPrs/Animation/F5.py | 2 +- test/VisuPrs/Animation/F6.py | 2 +- test/VisuPrs/Animation/G0.py | 2 +- test/VisuPrs/Animation/G3.py | 2 +- test/VisuPrs/Animation/G4.py | 2 +- test/VisuPrs/Animation/G8.py | 2 +- test/VisuPrs/Animation/H1.py | 2 +- test/VisuPrs/Animation/H2.py | 2 +- test/VisuPrs/CutLines/A0.py | 2 +- test/VisuPrs/CutLines/A1.py | 2 +- test/VisuPrs/CutLines/A2.py | 2 +- test/VisuPrs/CutLines/A3.py | 2 +- test/VisuPrs/CutLines/A4.py | 2 +- test/VisuPrs/CutLines/A5.py | 2 +- test/VisuPrs/CutLines/A6.py | 2 +- test/VisuPrs/CutLines/A7.py | 2 +- test/VisuPrs/CutLines/A8.py | 2 +- test/VisuPrs/CutLines/A9.py | 2 +- test/VisuPrs/CutLines/B0.py | 2 +- test/VisuPrs/CutLines/B1.py | 2 +- test/VisuPrs/CutLines/B2.py | 2 +- test/VisuPrs/CutLines/CMakeLists.txt | 2 +- test/VisuPrs/CutLines/E0.py | 2 +- test/VisuPrs/CutLines/E1.py | 2 +- test/VisuPrs/CutLines/E2.py | 2 +- test/VisuPrs/CutLines/E3.py | 2 +- test/VisuPrs/CutLines/E4.py | 2 +- test/VisuPrs/CutLines/E5.py | 2 +- test/VisuPrs/CutLines/E6.py | 2 +- test/VisuPrs/CutLines/E7.py | 2 +- test/VisuPrs/CutLines/E8.py | 2 +- test/VisuPrs/CutLines/E9.py | 2 +- test/VisuPrs/CutLines/F1.py | 2 +- test/VisuPrs/CutLines/F2.py | 2 +- test/VisuPrs/CutLines/F3.py | 2 +- test/VisuPrs/CutLines/F4.py | 2 +- test/VisuPrs/CutLines/F5.py | 2 +- test/VisuPrs/CutLines/F6.py | 2 +- test/VisuPrs/CutLines/F7.py | 2 +- test/VisuPrs/CutLines/F8.py | 2 +- test/VisuPrs/CutLines/F9.py | 2 +- test/VisuPrs/CutLines/G0.py | 2 +- test/VisuPrs/CutLines/G1.py | 2 +- test/VisuPrs/CutLines/G2.py | 2 +- test/VisuPrs/CutPlanes/A0.py | 2 +- test/VisuPrs/CutPlanes/A1.py | 2 +- test/VisuPrs/CutPlanes/A2.py | 2 +- test/VisuPrs/CutPlanes/A3.py | 2 +- test/VisuPrs/CutPlanes/A4.py | 2 +- test/VisuPrs/CutPlanes/A5.py | 2 +- test/VisuPrs/CutPlanes/A6.py | 2 +- test/VisuPrs/CutPlanes/A7.py | 2 +- test/VisuPrs/CutPlanes/A8.py | 2 +- test/VisuPrs/CutPlanes/A9.py | 2 +- test/VisuPrs/CutPlanes/B0.py | 2 +- test/VisuPrs/CutPlanes/B1.py | 2 +- test/VisuPrs/CutPlanes/B2.py | 2 +- test/VisuPrs/CutPlanes/CMakeLists.txt | 2 +- test/VisuPrs/CutPlanes/E0.py | 2 +- test/VisuPrs/CutPlanes/E1.py | 2 +- test/VisuPrs/CutPlanes/E2.py | 2 +- test/VisuPrs/CutPlanes/E3.py | 2 +- test/VisuPrs/CutPlanes/E4.py | 2 +- test/VisuPrs/CutPlanes/E5.py | 2 +- test/VisuPrs/CutPlanes/E6.py | 2 +- test/VisuPrs/CutPlanes/E7.py | 2 +- test/VisuPrs/CutPlanes/E8.py | 2 +- test/VisuPrs/CutPlanes/E9.py | 2 +- test/VisuPrs/CutPlanes/F1.py | 2 +- test/VisuPrs/CutPlanes/F2.py | 2 +- test/VisuPrs/CutPlanes/F3.py | 2 +- test/VisuPrs/CutPlanes/F4.py | 2 +- test/VisuPrs/CutPlanes/F5.py | 2 +- test/VisuPrs/CutPlanes/F6.py | 2 +- test/VisuPrs/CutPlanes/F7.py | 2 +- test/VisuPrs/CutPlanes/F8.py | 2 +- test/VisuPrs/CutPlanes/F9.py | 2 +- test/VisuPrs/CutPlanes/G0.py | 2 +- test/VisuPrs/CutPlanes/G1.py | 2 +- test/VisuPrs/CutPlanes/G2.py | 2 +- test/VisuPrs/DeformedShape/A0.py | 2 +- test/VisuPrs/DeformedShape/A1.py | 2 +- test/VisuPrs/DeformedShape/A2.py | 2 +- test/VisuPrs/DeformedShape/A3.py | 2 +- test/VisuPrs/DeformedShape/A4.py | 2 +- test/VisuPrs/DeformedShape/A5.py | 2 +- test/VisuPrs/DeformedShape/A6.py | 2 +- test/VisuPrs/DeformedShape/A7.py | 2 +- test/VisuPrs/DeformedShape/A8.py | 2 +- test/VisuPrs/DeformedShape/A9.py | 2 +- test/VisuPrs/DeformedShape/B0.py | 2 +- test/VisuPrs/DeformedShape/B1.py | 2 +- test/VisuPrs/DeformedShape/B2.py | 2 +- test/VisuPrs/DeformedShape/CMakeLists.txt | 2 +- test/VisuPrs/DeformedShape/E0.py | 2 +- test/VisuPrs/DeformedShape/E1.py | 2 +- test/VisuPrs/DeformedShape/E2.py | 2 +- test/VisuPrs/DeformedShape/E3.py | 2 +- test/VisuPrs/DeformedShape/E4.py | 2 +- test/VisuPrs/DeformedShape/E5.py | 2 +- test/VisuPrs/DeformedShape/E6.py | 2 +- test/VisuPrs/DeformedShape/E7.py | 2 +- test/VisuPrs/DeformedShape/E8.py | 2 +- test/VisuPrs/DeformedShape/E9.py | 2 +- test/VisuPrs/DeformedShape/F1.py | 2 +- test/VisuPrs/DeformedShape/F2.py | 2 +- test/VisuPrs/DeformedShape/F3.py | 2 +- test/VisuPrs/DeformedShape/F4.py | 2 +- test/VisuPrs/DeformedShape/F5.py | 2 +- test/VisuPrs/DeformedShape/F6.py | 2 +- test/VisuPrs/DeformedShape/F7.py | 2 +- test/VisuPrs/DeformedShape/F8.py | 2 +- test/VisuPrs/DeformedShape/F9.py | 2 +- test/VisuPrs/GaussPoints/A0.py | 2 +- test/VisuPrs/GaussPoints/A1.py | 2 +- test/VisuPrs/GaussPoints/A2.py | 2 +- test/VisuPrs/GaussPoints/A3.py | 2 +- test/VisuPrs/GaussPoints/A4.py | 2 +- test/VisuPrs/GaussPoints/A5.py | 2 +- test/VisuPrs/GaussPoints/A6.py | 2 +- test/VisuPrs/GaussPoints/A7.py | 2 +- test/VisuPrs/GaussPoints/A9.py | 2 +- test/VisuPrs/GaussPoints/B0.py | 2 +- test/VisuPrs/GaussPoints/B1.py | 2 +- test/VisuPrs/GaussPoints/B2.py | 2 +- test/VisuPrs/GaussPoints/B3.py | 2 +- test/VisuPrs/GaussPoints/B4.py | 2 +- test/VisuPrs/GaussPoints/B5.py | 2 +- test/VisuPrs/GaussPoints/B6.py | 2 +- test/VisuPrs/GaussPoints/B7.py | 2 +- test/VisuPrs/GaussPoints/B8.py | 2 +- test/VisuPrs/GaussPoints/B9.py | 2 +- test/VisuPrs/GaussPoints/C0.py | 2 +- test/VisuPrs/GaussPoints/C1.py | 2 +- test/VisuPrs/GaussPoints/C2.py | 2 +- test/VisuPrs/GaussPoints/C3.py | 2 +- test/VisuPrs/GaussPoints/C4.py | 2 +- test/VisuPrs/GaussPoints/C5.py | 2 +- test/VisuPrs/GaussPoints/C6.py | 2 +- test/VisuPrs/GaussPoints/C7.py | 2 +- test/VisuPrs/GaussPoints/CMakeLists.txt | 2 +- test/VisuPrs/IsoSurfaces/A0.py | 2 +- test/VisuPrs/IsoSurfaces/A1.py | 2 +- test/VisuPrs/IsoSurfaces/A2.py | 2 +- test/VisuPrs/IsoSurfaces/A3.py | 2 +- test/VisuPrs/IsoSurfaces/A4.py | 2 +- test/VisuPrs/IsoSurfaces/A5.py | 2 +- test/VisuPrs/IsoSurfaces/A6.py | 2 +- test/VisuPrs/IsoSurfaces/A7.py | 2 +- test/VisuPrs/IsoSurfaces/A8.py | 2 +- test/VisuPrs/IsoSurfaces/A9.py | 2 +- test/VisuPrs/IsoSurfaces/B0.py | 2 +- test/VisuPrs/IsoSurfaces/B1.py | 2 +- test/VisuPrs/IsoSurfaces/B2.py | 2 +- test/VisuPrs/IsoSurfaces/CMakeLists.txt | 2 +- test/VisuPrs/IsoSurfaces/E0.py | 2 +- test/VisuPrs/IsoSurfaces/E1.py | 2 +- test/VisuPrs/IsoSurfaces/E2.py | 2 +- test/VisuPrs/IsoSurfaces/E3.py | 2 +- test/VisuPrs/IsoSurfaces/E4.py | 2 +- test/VisuPrs/IsoSurfaces/E5.py | 2 +- test/VisuPrs/IsoSurfaces/E6.py | 2 +- test/VisuPrs/IsoSurfaces/E7.py | 2 +- test/VisuPrs/IsoSurfaces/E8.py | 2 +- test/VisuPrs/IsoSurfaces/E9.py | 2 +- test/VisuPrs/IsoSurfaces/F1.py | 2 +- test/VisuPrs/IsoSurfaces/F2.py | 2 +- test/VisuPrs/IsoSurfaces/F3.py | 2 +- test/VisuPrs/IsoSurfaces/F4.py | 2 +- test/VisuPrs/IsoSurfaces/F5.py | 2 +- test/VisuPrs/IsoSurfaces/F6.py | 2 +- test/VisuPrs/IsoSurfaces/F7.py | 2 +- test/VisuPrs/IsoSurfaces/F8.py | 2 +- test/VisuPrs/IsoSurfaces/F9.py | 2 +- test/VisuPrs/IsoSurfaces/G0.py | 2 +- test/VisuPrs/IsoSurfaces/G1.py | 2 +- test/VisuPrs/IsoSurfaces/G2.py | 2 +- test/VisuPrs/MeshPresentation/A0.py | 2 +- test/VisuPrs/MeshPresentation/A1.py | 2 +- test/VisuPrs/MeshPresentation/A2.py | 2 +- test/VisuPrs/MeshPresentation/A3.py | 2 +- test/VisuPrs/MeshPresentation/A4.py | 2 +- test/VisuPrs/MeshPresentation/A5.py | 2 +- test/VisuPrs/MeshPresentation/A6.py | 2 +- test/VisuPrs/MeshPresentation/A7.py | 2 +- test/VisuPrs/MeshPresentation/A8.py | 2 +- test/VisuPrs/MeshPresentation/A9.py | 2 +- test/VisuPrs/MeshPresentation/B0.py | 2 +- test/VisuPrs/MeshPresentation/B1.py | 2 +- test/VisuPrs/MeshPresentation/B2.py | 2 +- test/VisuPrs/MeshPresentation/CMakeLists.txt | 2 +- test/VisuPrs/MeshPresentation/E0.py | 2 +- test/VisuPrs/MeshPresentation/E1.py | 2 +- test/VisuPrs/MeshPresentation/E2.py | 2 +- test/VisuPrs/MeshPresentation/E3.py | 2 +- test/VisuPrs/MeshPresentation/E4.py | 2 +- test/VisuPrs/MeshPresentation/E5.py | 2 +- test/VisuPrs/MeshPresentation/E6.py | 2 +- test/VisuPrs/MeshPresentation/E7.py | 2 +- test/VisuPrs/MeshPresentation/E8.py | 2 +- test/VisuPrs/MeshPresentation/E9.py | 2 +- test/VisuPrs/MeshPresentation/F0.py | 2 +- test/VisuPrs/MeshPresentation/F1.py | 2 +- test/VisuPrs/MeshPresentation/F2.py | 2 +- test/VisuPrs/MeshPresentation/F3.py | 2 +- test/VisuPrs/MeshPresentation/F4.py | 2 +- test/VisuPrs/MeshPresentation/F5.py | 2 +- test/VisuPrs/MeshPresentation/F6.py | 2 +- test/VisuPrs/MeshPresentation/F7.py | 2 +- test/VisuPrs/MeshPresentation/F8.py | 2 +- test/VisuPrs/MeshPresentation/F9.py | 2 +- test/VisuPrs/MeshPresentation/G0.py | 2 +- test/VisuPrs/MeshPresentation/G1.py | 2 +- test/VisuPrs/MeshPresentation/G3.py | 2 +- test/VisuPrs/MeshPresentation/G4.py | 2 +- test/VisuPrs/MeshPresentation/G5.py | 2 +- test/VisuPrs/MeshPresentation/G6.py | 2 +- test/VisuPrs/MeshPresentation/G7.py | 2 +- test/VisuPrs/MeshPresentation/G8.py | 2 +- test/VisuPrs/MeshPresentation/G9.py | 2 +- test/VisuPrs/MeshPresentation/H0.py | 2 +- test/VisuPrs/MeshPresentation/H1.py | 2 +- test/VisuPrs/MeshPresentation/H2.py | 2 +- test/VisuPrs/MeshPresentation/H3.py | 2 +- test/VisuPrs/MeshPresentation/H4.py | 2 +- test/VisuPrs/MeshPresentation/H5.py | 2 +- test/VisuPrs/MeshPresentation/H6.py | 2 +- test/VisuPrs/MeshPresentation/H7.py | 2 +- test/VisuPrs/MeshPresentation/H8.py | 2 +- test/VisuPrs/MeshPresentation/H9.py | 2 +- test/VisuPrs/MeshPresentation/I0.py | 2 +- test/VisuPrs/MeshPresentation/I1.py | 2 +- test/VisuPrs/MeshPresentation/I2.py | 2 +- test/VisuPrs/MeshPresentation/I3.py | 2 +- test/VisuPrs/MeshPresentation/I4.py | 2 +- test/VisuPrs/MeshPresentation/I5.py | 2 +- test/VisuPrs/MeshPresentation/I6.py | 2 +- test/VisuPrs/MeshPresentation/I7.py | 2 +- test/VisuPrs/MeshPresentation/I8.py | 2 +- test/VisuPrs/MeshPresentation/I9.py | 2 +- test/VisuPrs/MeshPresentation/J0.py | 2 +- test/VisuPrs/MeshPresentation/J1.py | 2 +- test/VisuPrs/MeshPresentation/J2.py | 2 +- test/VisuPrs/MeshPresentation/J3.py | 2 +- test/VisuPrs/MeshPresentation/J4.py | 2 +- test/VisuPrs/MeshPresentation/J5.py | 2 +- test/VisuPrs/MeshPresentation/J6.py | 2 +- test/VisuPrs/MeshPresentation/J7.py | 2 +- test/VisuPrs/MeshPresentation/J8.py | 2 +- test/VisuPrs/MeshPresentation/J9.py | 2 +- test/VisuPrs/MeshPresentation/K0.py | 2 +- test/VisuPrs/MeshPresentation/K1.py | 2 +- test/VisuPrs/MeshPresentation/K2.py | 2 +- test/VisuPrs/MeshPresentation/K3.py | 2 +- test/VisuPrs/MeshPresentation/K4.py | 2 +- test/VisuPrs/MeshPresentation/K5.py | 2 +- test/VisuPrs/MeshPresentation/K6.py | 2 +- test/VisuPrs/MeshPresentation/K7.py | 2 +- test/VisuPrs/MeshPresentation/K8.py | 2 +- test/VisuPrs/MeshPresentation/K9.py | 2 +- test/VisuPrs/MeshPresentation/L0.py | 2 +- test/VisuPrs/MeshPresentation/L1.py | 2 +- test/VisuPrs/Plot3D/A0.py | 2 +- test/VisuPrs/Plot3D/A1.py | 2 +- test/VisuPrs/Plot3D/A2.py | 2 +- test/VisuPrs/Plot3D/A3.py | 2 +- test/VisuPrs/Plot3D/A4.py | 2 +- test/VisuPrs/Plot3D/A5.py | 2 +- test/VisuPrs/Plot3D/A6.py | 2 +- test/VisuPrs/Plot3D/A7.py | 2 +- test/VisuPrs/Plot3D/A8.py | 2 +- test/VisuPrs/Plot3D/A9.py | 2 +- test/VisuPrs/Plot3D/B0.py | 2 +- test/VisuPrs/Plot3D/B1.py | 2 +- test/VisuPrs/Plot3D/B2.py | 2 +- test/VisuPrs/Plot3D/CMakeLists.txt | 2 +- test/VisuPrs/Plot3D/E0.py | 2 +- test/VisuPrs/Plot3D/E1.py | 2 +- test/VisuPrs/Plot3D/E2.py | 2 +- test/VisuPrs/Plot3D/E3.py | 2 +- test/VisuPrs/Plot3D/E4.py | 2 +- test/VisuPrs/Plot3D/E5.py | 2 +- test/VisuPrs/Plot3D/E6.py | 2 +- test/VisuPrs/Plot3D/E7.py | 2 +- test/VisuPrs/Plot3D/E8.py | 2 +- test/VisuPrs/Plot3D/E9.py | 2 +- test/VisuPrs/Plot3D/F1.py | 2 +- test/VisuPrs/Plot3D/F2.py | 2 +- test/VisuPrs/Plot3D/F3.py | 2 +- test/VisuPrs/Plot3D/F4.py | 2 +- test/VisuPrs/Plot3D/F5.py | 2 +- test/VisuPrs/Plot3D/F6.py | 2 +- test/VisuPrs/Plot3D/F7.py | 2 +- test/VisuPrs/Plot3D/F8.py | 2 +- test/VisuPrs/Plot3D/F9.py | 2 +- test/VisuPrs/Plot3D/G0.py | 2 +- test/VisuPrs/Plot3D/G1.py | 2 +- test/VisuPrs/Plot3D/G2.py | 2 +- test/VisuPrs/SWIG_scripts/C7.py | 2 +- test/VisuPrs/SWIG_scripts/CMakeLists.txt | 2 +- test/VisuPrs/ScalarMap/A0.py | 2 +- test/VisuPrs/ScalarMap/A1.py | 2 +- test/VisuPrs/ScalarMap/A2.py | 2 +- test/VisuPrs/ScalarMap/A3.py | 2 +- test/VisuPrs/ScalarMap/A4.py | 2 +- test/VisuPrs/ScalarMap/A5.py | 2 +- test/VisuPrs/ScalarMap/A6.py | 2 +- test/VisuPrs/ScalarMap/A7.py | 2 +- test/VisuPrs/ScalarMap/A8.py | 2 +- test/VisuPrs/ScalarMap/A9.py | 2 +- test/VisuPrs/ScalarMap/B0.py | 2 +- test/VisuPrs/ScalarMap/B1.py | 2 +- test/VisuPrs/ScalarMap/B2.py | 2 +- test/VisuPrs/ScalarMap/CMakeLists.txt | 2 +- test/VisuPrs/ScalarMap/E0.py | 2 +- test/VisuPrs/ScalarMap/E1.py | 2 +- test/VisuPrs/ScalarMap/E2.py | 2 +- test/VisuPrs/ScalarMap/E3.py | 2 +- test/VisuPrs/ScalarMap/E4.py | 2 +- test/VisuPrs/ScalarMap/E5.py | 2 +- test/VisuPrs/ScalarMap/E6.py | 2 +- test/VisuPrs/ScalarMap/E7.py | 2 +- test/VisuPrs/ScalarMap/E8.py | 2 +- test/VisuPrs/ScalarMap/E9.py | 2 +- test/VisuPrs/ScalarMap/F1.py | 2 +- test/VisuPrs/ScalarMap/F2.py | 2 +- test/VisuPrs/ScalarMap/F3.py | 2 +- test/VisuPrs/ScalarMap/F4.py | 2 +- test/VisuPrs/ScalarMap/F5.py | 2 +- test/VisuPrs/ScalarMap/F6.py | 2 +- test/VisuPrs/ScalarMap/F7.py | 2 +- test/VisuPrs/ScalarMap/F8.py | 2 +- test/VisuPrs/ScalarMap/F9.py | 2 +- test/VisuPrs/ScalarMap/G0.py | 2 +- test/VisuPrs/ScalarMap/G1.py | 2 +- test/VisuPrs/ScalarMap/G2.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/A0.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/A1.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/A2.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/A3.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/A4.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/A5.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/A6.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/A7.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/A8.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/A9.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/B0.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/B1.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/B2.py | 2 +- .../ScalarMap_On_DeformedShape/CMakeLists.txt | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/E0.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/E1.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/E2.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/E3.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/E4.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/E5.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/E6.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/E7.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/E8.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/E9.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/F1.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/F2.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/F3.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/F4.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/F5.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/F6.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/F7.py | 2 +- test/VisuPrs/ScalarMap_On_DeformedShape/F8.py | 2 +- test/VisuPrs/StreamLines/A0.py | 2 +- test/VisuPrs/StreamLines/A1.py | 2 +- test/VisuPrs/StreamLines/A2.py | 2 +- test/VisuPrs/StreamLines/A3.py | 2 +- test/VisuPrs/StreamLines/A4.py | 2 +- test/VisuPrs/StreamLines/A5.py | 2 +- test/VisuPrs/StreamLines/A6.py | 2 +- test/VisuPrs/StreamLines/A7.py | 2 +- test/VisuPrs/StreamLines/A8.py | 2 +- test/VisuPrs/StreamLines/A9.py | 2 +- test/VisuPrs/StreamLines/B0.py | 2 +- test/VisuPrs/StreamLines/B1.py | 2 +- test/VisuPrs/StreamLines/B2.py | 2 +- test/VisuPrs/StreamLines/CMakeLists.txt | 2 +- test/VisuPrs/StreamLines/E0.py | 2 +- test/VisuPrs/StreamLines/E1.py | 2 +- test/VisuPrs/StreamLines/E2.py | 2 +- test/VisuPrs/StreamLines/E3.py | 2 +- test/VisuPrs/StreamLines/E4.py | 2 +- test/VisuPrs/StreamLines/E5.py | 2 +- test/VisuPrs/StreamLines/E6.py | 2 +- test/VisuPrs/StreamLines/E7.py | 2 +- test/VisuPrs/StreamLines/E8.py | 2 +- test/VisuPrs/StreamLines/E9.py | 2 +- test/VisuPrs/StreamLines/F1.py | 2 +- test/VisuPrs/StreamLines/F2.py | 2 +- test/VisuPrs/StreamLines/F3.py | 2 +- test/VisuPrs/StreamLines/F4.py | 2 +- test/VisuPrs/StreamLines/F5.py | 2 +- test/VisuPrs/StreamLines/F6.py | 2 +- test/VisuPrs/StreamLines/F7.py | 2 +- test/VisuPrs/StreamLines/F8.py | 2 +- test/VisuPrs/StreamLines/F9.py | 2 +- test/VisuPrs/Tables/A0.py | 2 +- test/VisuPrs/Tables/A2.py | 2 +- test/VisuPrs/Tables/CMakeLists.txt | 2 +- test/VisuPrs/Util/paravistest.py | 19 ++++++++++++------- test/VisuPrs/Vectors/A0.py | 2 +- test/VisuPrs/Vectors/A1.py | 2 +- test/VisuPrs/Vectors/A2.py | 2 +- test/VisuPrs/Vectors/A3.py | 2 +- test/VisuPrs/Vectors/A4.py | 2 +- test/VisuPrs/Vectors/A5.py | 2 +- test/VisuPrs/Vectors/A6.py | 2 +- test/VisuPrs/Vectors/A7.py | 2 +- test/VisuPrs/Vectors/A8.py | 2 +- test/VisuPrs/Vectors/A9.py | 2 +- test/VisuPrs/Vectors/B0.py | 2 +- test/VisuPrs/Vectors/B1.py | 2 +- test/VisuPrs/Vectors/B2.py | 2 +- test/VisuPrs/Vectors/CMakeLists.txt | 2 +- test/VisuPrs/Vectors/E0.py | 2 +- test/VisuPrs/Vectors/E1.py | 2 +- test/VisuPrs/Vectors/E2.py | 2 +- test/VisuPrs/Vectors/E3.py | 2 +- test/VisuPrs/Vectors/E4.py | 2 +- test/VisuPrs/Vectors/E5.py | 2 +- test/VisuPrs/Vectors/E6.py | 2 +- test/VisuPrs/Vectors/E7.py | 2 +- test/VisuPrs/Vectors/E8.py | 2 +- test/VisuPrs/Vectors/E9.py | 2 +- test/VisuPrs/Vectors/F1.py | 2 +- test/VisuPrs/Vectors/F2.py | 2 +- test/VisuPrs/Vectors/F3.py | 2 +- test/VisuPrs/Vectors/F4.py | 2 +- test/VisuPrs/Vectors/F5.py | 2 +- test/VisuPrs/Vectors/F6.py | 2 +- test/VisuPrs/Vectors/F7.py | 2 +- test/VisuPrs/Vectors/F8.py | 2 +- test/VisuPrs/Vectors/F9.py | 2 +- 474 files changed, 484 insertions(+), 480 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46bcb049..34c9699b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -150,7 +150,6 @@ ENDIF(CMAKE_BUILD_TYPE) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/PARAVIS_version.h DESTINATION include/salome) # Configure Testing -SET(PARAVIS_TEST_OUTPUT_DIR /tmp/pic CACHE PATH "Directory for saving test pictures.") OPTION(BUILD_TESTING "Build ParaVis Testing" ON) IF(BUILD_TESTING) SET(PARAVIS_TEST_DIR ${ParaVis_BINARY_DIR}/Test/Temporary) diff --git a/test/VisuPrs/2D_viewer/CMakeLists.txt b/test/VisuPrs/2D_viewer/CMakeLists.txt index d5372e2d..0863a480 100644 --- a/test/VisuPrs/2D_viewer/CMakeLists.txt +++ b/test/VisuPrs/2D_viewer/CMakeLists.txt @@ -23,7 +23,7 @@ IF (PYTHON_EXECUTABLE) A1 ) SET(TIMEOUT 10000) - ADD_TEST(2DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(2DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(2DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/3D_viewer/A1.py b/test/VisuPrs/3D_viewer/A1.py index a0e64f75..fe15dc5d 100644 --- a/test/VisuPrs/3D_viewer/A1.py +++ b/test/VisuPrs/3D_viewer/A1.py @@ -28,7 +28,7 @@ import paravis import time # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "3D_viewer/A1") +picturedir = get_picture_dir("3D_viewer/A1") # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): diff --git a/test/VisuPrs/3D_viewer/A2.py b/test/VisuPrs/3D_viewer/A2.py index 8611392c..6fb1a752 100644 --- a/test/VisuPrs/3D_viewer/A2.py +++ b/test/VisuPrs/3D_viewer/A2.py @@ -28,7 +28,7 @@ import paravis import time # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "3D_viewer/A2") +picturedir = get_picture_dir("3D_viewer/A2") # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): diff --git a/test/VisuPrs/3D_viewer/A3.py b/test/VisuPrs/3D_viewer/A3.py index 69fbd244..8a3bfb4f 100644 --- a/test/VisuPrs/3D_viewer/A3.py +++ b/test/VisuPrs/3D_viewer/A3.py @@ -28,7 +28,7 @@ import paravis import time # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "3D_viewer/A3") +picturedir = get_picture_dir("3D_viewer/A3") # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): diff --git a/test/VisuPrs/3D_viewer/A4.py b/test/VisuPrs/3D_viewer/A4.py index 0189e987..d464806c 100644 --- a/test/VisuPrs/3D_viewer/A4.py +++ b/test/VisuPrs/3D_viewer/A4.py @@ -28,7 +28,7 @@ import paravis import time # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "3D_viewer/A4") +picturedir = get_picture_dir("3D_viewer/A4") # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): diff --git a/test/VisuPrs/3D_viewer/A5.py b/test/VisuPrs/3D_viewer/A5.py index 7a25d162..286418b7 100644 --- a/test/VisuPrs/3D_viewer/A5.py +++ b/test/VisuPrs/3D_viewer/A5.py @@ -28,7 +28,7 @@ import paravis import time # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "3D_viewer/A5") +picturedir = get_picture_dir("3D_viewer/A5") # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): diff --git a/test/VisuPrs/3D_viewer/A6.py b/test/VisuPrs/3D_viewer/A6.py index e73b309c..1aec3631 100644 --- a/test/VisuPrs/3D_viewer/A6.py +++ b/test/VisuPrs/3D_viewer/A6.py @@ -29,7 +29,7 @@ import paravis import time # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "3D_viewer/A6") +picturedir = get_picture_dir("3D_viewer/A6") # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): diff --git a/test/VisuPrs/3D_viewer/A7.py b/test/VisuPrs/3D_viewer/A7.py index 89c7b1e6..e916b807 100644 --- a/test/VisuPrs/3D_viewer/A7.py +++ b/test/VisuPrs/3D_viewer/A7.py @@ -28,7 +28,7 @@ import paravis import time # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "3D_viewer/A7") +picturedir = get_picture_dir("3D_viewer/A7") # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): diff --git a/test/VisuPrs/3D_viewer/A8.py b/test/VisuPrs/3D_viewer/A8.py index beff49b9..c24d2b84 100644 --- a/test/VisuPrs/3D_viewer/A8.py +++ b/test/VisuPrs/3D_viewer/A8.py @@ -28,7 +28,7 @@ import paravis import time # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "3D_viewer/A8") +picturedir = get_picture_dir("3D_viewer/A8") # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): diff --git a/test/VisuPrs/3D_viewer/A9.py b/test/VisuPrs/3D_viewer/A9.py index 2f88624d..3a090f18 100644 --- a/test/VisuPrs/3D_viewer/A9.py +++ b/test/VisuPrs/3D_viewer/A9.py @@ -54,7 +54,7 @@ def check_all_params(prs, pres_type, shad, opac, lwid): return err # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "3D_viewer/A9") +picturedir = get_picture_dir("3D_viewer/A9") # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): diff --git a/test/VisuPrs/3D_viewer/B0.py b/test/VisuPrs/3D_viewer/B0.py index 6aca6741..ccedd880 100644 --- a/test/VisuPrs/3D_viewer/B0.py +++ b/test/VisuPrs/3D_viewer/B0.py @@ -28,7 +28,7 @@ import paravis import time # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "3D_viewer/B0") +picturedir = get_picture_dir("3D_viewer/B0") # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): diff --git a/test/VisuPrs/3D_viewer/B2.py b/test/VisuPrs/3D_viewer/B2.py index 927f07aa..98bd02ff 100644 --- a/test/VisuPrs/3D_viewer/B2.py +++ b/test/VisuPrs/3D_viewer/B2.py @@ -30,7 +30,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "3D_viewer/B2") +picturedir = get_picture_dir("3D_viewer/B2") # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): diff --git a/test/VisuPrs/3D_viewer/CMakeLists.txt b/test/VisuPrs/3D_viewer/CMakeLists.txt index 973d356b..bad44ac0 100755 --- a/test/VisuPrs/3D_viewer/CMakeLists.txt +++ b/test/VisuPrs/3D_viewer/CMakeLists.txt @@ -32,7 +32,7 @@ IF (PYTHON_EXECUTABLE) B2 ) SET(TIMEOUT 10000) - ADD_TEST(3DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(3DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(3DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/Animation/A0.py b/test/VisuPrs/Animation/A0.py index ccb51128..3e8aab60 100755 --- a/test/VisuPrs/Animation/A0.py +++ b/test/VisuPrs/Animation/A0.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/A0") +picturedir = get_picture_dir("Animation/A0") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/A2.py b/test/VisuPrs/Animation/A2.py index c3bda9b4..cc0ec9bd 100755 --- a/test/VisuPrs/Animation/A2.py +++ b/test/VisuPrs/Animation/A2.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/A2") +picturedir = get_picture_dir("Animation/A2") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/A4.py b/test/VisuPrs/Animation/A4.py index 3c067493..cbf6b677 100644 --- a/test/VisuPrs/Animation/A4.py +++ b/test/VisuPrs/Animation/A4.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/A4") +picturedir = get_picture_dir("Animation/A4") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/A7.py b/test/VisuPrs/Animation/A7.py index 2d65bdff..0bdbac0f 100644 --- a/test/VisuPrs/Animation/A7.py +++ b/test/VisuPrs/Animation/A7.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/A7") +picturedir = get_picture_dir("Animation/A7") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/A8.py b/test/VisuPrs/Animation/A8.py index 3d51ccbd..4cf32b0c 100644 --- a/test/VisuPrs/Animation/A8.py +++ b/test/VisuPrs/Animation/A8.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/A8") +picturedir = get_picture_dir("Animation/A8") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/B2.py b/test/VisuPrs/Animation/B2.py index 212d71df..13544de8 100644 --- a/test/VisuPrs/Animation/B2.py +++ b/test/VisuPrs/Animation/B2.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/B2") +picturedir = get_picture_dir("Animation/B2") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/B5.py b/test/VisuPrs/Animation/B5.py index ea4ee4e9..5256fd64 100644 --- a/test/VisuPrs/Animation/B5.py +++ b/test/VisuPrs/Animation/B5.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/B5") +picturedir = get_picture_dir("Animation/B5") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/B6.py b/test/VisuPrs/Animation/B6.py index 22764cf1..d5d9f394 100644 --- a/test/VisuPrs/Animation/B6.py +++ b/test/VisuPrs/Animation/B6.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/B6") +picturedir = get_picture_dir("Animation/B6") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/C0.py b/test/VisuPrs/Animation/C0.py index 021b3d21..08319fd8 100644 --- a/test/VisuPrs/Animation/C0.py +++ b/test/VisuPrs/Animation/C0.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/C0") +picturedir = get_picture_dir("Animation/C0") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/C1.py b/test/VisuPrs/Animation/C1.py index bdbb49b9..d4924798 100644 --- a/test/VisuPrs/Animation/C1.py +++ b/test/VisuPrs/Animation/C1.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/C1") +picturedir = get_picture_dir("Animation/C1") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/C3.py b/test/VisuPrs/Animation/C3.py index 0cdd32e3..2cf5b1d5 100644 --- a/test/VisuPrs/Animation/C3.py +++ b/test/VisuPrs/Animation/C3.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/C3") +picturedir = get_picture_dir("Animation/C3") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/C8.py b/test/VisuPrs/Animation/C8.py index 3bf7e9ed..f3952134 100644 --- a/test/VisuPrs/Animation/C8.py +++ b/test/VisuPrs/Animation/C8.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/C8") +picturedir = get_picture_dir("Animation/C8") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/CMakeLists.txt b/test/VisuPrs/Animation/CMakeLists.txt index 3a4e12ab..1f08bea6 100755 --- a/test/VisuPrs/Animation/CMakeLists.txt +++ b/test/VisuPrs/Animation/CMakeLists.txt @@ -50,7 +50,7 @@ IF (PYTHON_EXECUTABLE) H2 ) SET(TIMEOUT 10000) - ADD_TEST(ANIMATION_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(ANIMATION_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(ANIMATION_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/Animation/D1.py b/test/VisuPrs/Animation/D1.py index 9557f008..13b4455a 100644 --- a/test/VisuPrs/Animation/D1.py +++ b/test/VisuPrs/Animation/D1.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/D1") +picturedir = get_picture_dir("Animation/D1") theFileName = datadir + "TimeStamps.med" diff --git a/test/VisuPrs/Animation/D2.py b/test/VisuPrs/Animation/D2.py index 31040a5d..a9e569f6 100644 --- a/test/VisuPrs/Animation/D2.py +++ b/test/VisuPrs/Animation/D2.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/D2") +picturedir = get_picture_dir("Animation/D2") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/D6.py b/test/VisuPrs/Animation/D6.py index da19fd1b..21530cec 100644 --- a/test/VisuPrs/Animation/D6.py +++ b/test/VisuPrs/Animation/D6.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/D6") +picturedir = get_picture_dir("Animation/D6") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/D9.py b/test/VisuPrs/Animation/D9.py index 130dbc57..bb697b52 100644 --- a/test/VisuPrs/Animation/D9.py +++ b/test/VisuPrs/Animation/D9.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/D9") +picturedir = get_picture_dir("Animation/D9") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/E0.py b/test/VisuPrs/Animation/E0.py index 024a69f3..10e04ae0 100644 --- a/test/VisuPrs/Animation/E0.py +++ b/test/VisuPrs/Animation/E0.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/E0") +picturedir = get_picture_dir("Animation/E0") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/E4.py b/test/VisuPrs/Animation/E4.py index 6af05ea8..183bfbb2 100644 --- a/test/VisuPrs/Animation/E4.py +++ b/test/VisuPrs/Animation/E4.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/E4") +picturedir = get_picture_dir("Animation/E4") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/E7.py b/test/VisuPrs/Animation/E7.py index c95132b4..6b8aa289 100644 --- a/test/VisuPrs/Animation/E7.py +++ b/test/VisuPrs/Animation/E7.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/E7") +picturedir = get_picture_dir("Animation/E7") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/E8.py b/test/VisuPrs/Animation/E8.py index c0224342..8c81f06d 100644 --- a/test/VisuPrs/Animation/E8.py +++ b/test/VisuPrs/Animation/E8.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/E8") +picturedir = get_picture_dir("Animation/E8") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/F2.py b/test/VisuPrs/Animation/F2.py index 8daabd29..5c3d72cb 100644 --- a/test/VisuPrs/Animation/F2.py +++ b/test/VisuPrs/Animation/F2.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/F2") +picturedir = get_picture_dir("Animation/F2") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/F5.py b/test/VisuPrs/Animation/F5.py index 6ead2c43..bc006324 100644 --- a/test/VisuPrs/Animation/F5.py +++ b/test/VisuPrs/Animation/F5.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/F5") +picturedir = get_picture_dir("Animation/F5") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/F6.py b/test/VisuPrs/Animation/F6.py index 741e1277..95c5c8e8 100644 --- a/test/VisuPrs/Animation/F6.py +++ b/test/VisuPrs/Animation/F6.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/F6") +picturedir = get_picture_dir("Animation/F6") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/G0.py b/test/VisuPrs/Animation/G0.py index b11c3702..e880c69c 100644 --- a/test/VisuPrs/Animation/G0.py +++ b/test/VisuPrs/Animation/G0.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/G0") +picturedir = get_picture_dir("Animation/G0") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/G3.py b/test/VisuPrs/Animation/G3.py index b28fff7f..df5db2e6 100644 --- a/test/VisuPrs/Animation/G3.py +++ b/test/VisuPrs/Animation/G3.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/G3") +picturedir = get_picture_dir("Animation/G3") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/G4.py b/test/VisuPrs/Animation/G4.py index be461791..1041c75e 100644 --- a/test/VisuPrs/Animation/G4.py +++ b/test/VisuPrs/Animation/G4.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/G3") +picturedir = get_picture_dir("Animation/G3") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/G8.py b/test/VisuPrs/Animation/G8.py index c5086b18..3314fbeb 100644 --- a/test/VisuPrs/Animation/G8.py +++ b/test/VisuPrs/Animation/G8.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/G8") +picturedir = get_picture_dir("Animation/G8") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/H1.py b/test/VisuPrs/Animation/H1.py index 8c7f4625..cda57079 100644 --- a/test/VisuPrs/Animation/H1.py +++ b/test/VisuPrs/Animation/H1.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/H1") +picturedir = get_picture_dir("Animation/H1") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/Animation/H2.py b/test/VisuPrs/Animation/H2.py index 5a215358..42174cea 100644 --- a/test/VisuPrs/Animation/H2.py +++ b/test/VisuPrs/Animation/H2.py @@ -31,7 +31,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Animation/H2") +picturedir = get_picture_dir("Animation/H2") theFileName = datadir + "TimeStamps.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/A0.py b/test/VisuPrs/CutLines/A0.py index e270297e..c0876e9c 100644 --- a/test/VisuPrs/CutLines/A0.py +++ b/test/VisuPrs/CutLines/A0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/A0") +picturedir = get_picture_dir("CutLines/A0") file = datadir + "fra.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/A1.py b/test/VisuPrs/CutLines/A1.py index 92b2839f..6114fd38 100644 --- a/test/VisuPrs/CutLines/A1.py +++ b/test/VisuPrs/CutLines/A1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/A1") +picturedir = get_picture_dir("CutLines/A1") file = datadir + "hexa_28320_ELEM.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/A2.py b/test/VisuPrs/CutLines/A2.py index 9683c453..0e01da2d 100755 --- a/test/VisuPrs/CutLines/A2.py +++ b/test/VisuPrs/CutLines/A2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/A2") +picturedir = get_picture_dir("CutLines/A2") file = datadir + "pointe.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/A3.py b/test/VisuPrs/CutLines/A3.py index 2c40a1ef..b98a73a4 100755 --- a/test/VisuPrs/CutLines/A3.py +++ b/test/VisuPrs/CutLines/A3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/A3") +picturedir = get_picture_dir("CutLines/A3") file = datadir + "Fields_group3D.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/A4.py b/test/VisuPrs/CutLines/A4.py index 3e274fc8..85ff3bea 100644 --- a/test/VisuPrs/CutLines/A4.py +++ b/test/VisuPrs/CutLines/A4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/A4") +picturedir = get_picture_dir("CutLines/A4") file = datadir + "Hexa8.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/A5.py b/test/VisuPrs/CutLines/A5.py index 8c23c0ad..f03a9d4f 100644 --- a/test/VisuPrs/CutLines/A5.py +++ b/test/VisuPrs/CutLines/A5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/A5") +picturedir = get_picture_dir("CutLines/A5") file = datadir + "Penta6.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/A6.py b/test/VisuPrs/CutLines/A6.py index 0c75b8ad..50f52c09 100644 --- a/test/VisuPrs/CutLines/A6.py +++ b/test/VisuPrs/CutLines/A6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/A6") +picturedir = get_picture_dir("CutLines/A6") file = datadir + "clo.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/A7.py b/test/VisuPrs/CutLines/A7.py index d3836278..00a6f0fa 100644 --- a/test/VisuPrs/CutLines/A7.py +++ b/test/VisuPrs/CutLines/A7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/A7") +picturedir = get_picture_dir("CutLines/A7") file = datadir + "Tetra4.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/A8.py b/test/VisuPrs/CutLines/A8.py index 09196f0d..c9e5afd2 100644 --- a/test/VisuPrs/CutLines/A8.py +++ b/test/VisuPrs/CutLines/A8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/A8") +picturedir = get_picture_dir("CutLines/A8") file = datadir + "Tria3.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/A9.py b/test/VisuPrs/CutLines/A9.py index 364a0bb3..1c84cb62 100644 --- a/test/VisuPrs/CutLines/A9.py +++ b/test/VisuPrs/CutLines/A9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/A9") +picturedir = get_picture_dir("CutLines/A9") file = datadir + "Quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/B0.py b/test/VisuPrs/CutLines/B0.py index e0b41483..8f76e9a4 100644 --- a/test/VisuPrs/CutLines/B0.py +++ b/test/VisuPrs/CutLines/B0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/B0") +picturedir = get_picture_dir("CutLines/B0") file = datadir + "carre_en_quad4_seg2.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/B1.py b/test/VisuPrs/CutLines/B1.py index a27055f1..22609f3b 100644 --- a/test/VisuPrs/CutLines/B1.py +++ b/test/VisuPrs/CutLines/B1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/B1") +picturedir = get_picture_dir("CutLines/B1") file = datadir + "carre_en_quad4_seg2_fields.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/B2.py b/test/VisuPrs/CutLines/B2.py index 82d6c0b3..ee4ddf24 100644 --- a/test/VisuPrs/CutLines/B2.py +++ b/test/VisuPrs/CutLines/B2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/B2") +picturedir = get_picture_dir("CutLines/B2") file = datadir + "cube_hexa8_quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/CMakeLists.txt b/test/VisuPrs/CutLines/CMakeLists.txt index ad8dd3da..36f05ff2 100644 --- a/test/VisuPrs/CutLines/CMakeLists.txt +++ b/test/VisuPrs/CutLines/CMakeLists.txt @@ -57,7 +57,7 @@ IF (PYTHON_EXECUTABLE) G2 ) SET(TIMEOUT 10000) - ADD_TEST(CUTLINES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(CUTLINES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(CUTLINES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/CutLines/E0.py b/test/VisuPrs/CutLines/E0.py index b1306853..78c448fd 100644 --- a/test/VisuPrs/CutLines/E0.py +++ b/test/VisuPrs/CutLines/E0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/E0") +picturedir = get_picture_dir("CutLines/E0") file = datadir + "test_55_solid_concentr_dom.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/E1.py b/test/VisuPrs/CutLines/E1.py index a32e62b9..080ec270 100644 --- a/test/VisuPrs/CutLines/E1.py +++ b/test/VisuPrs/CutLines/E1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/E1") +picturedir = get_picture_dir("CutLines/E1") file = datadir + "H_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/E2.py b/test/VisuPrs/CutLines/E2.py index 9e077fe4..f206b8c7 100644 --- a/test/VisuPrs/CutLines/E2.py +++ b/test/VisuPrs/CutLines/E2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/E2") +picturedir = get_picture_dir("CutLines/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/E3.py b/test/VisuPrs/CutLines/E3.py index 446ce57b..626465e0 100644 --- a/test/VisuPrs/CutLines/E3.py +++ b/test/VisuPrs/CutLines/E3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/E3") +picturedir = get_picture_dir("CutLines/E3") file = datadir + "hydro_d10.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/E4.py b/test/VisuPrs/CutLines/E4.py index 7658bbd7..da5e4db9 100644 --- a/test/VisuPrs/CutLines/E4.py +++ b/test/VisuPrs/CutLines/E4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/E4") +picturedir = get_picture_dir("CutLines/E4") file = datadir + "champc.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/E5.py b/test/VisuPrs/CutLines/E5.py index d062fb1b..57cd0a7b 100644 --- a/test/VisuPrs/CutLines/E5.py +++ b/test/VisuPrs/CutLines/E5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/E5") +picturedir = get_picture_dir("CutLines/E5") file = datadir + "hydro_sea_alv.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/E6.py b/test/VisuPrs/CutLines/E6.py index 827542ab..0d3f3336 100644 --- a/test/VisuPrs/CutLines/E6.py +++ b/test/VisuPrs/CutLines/E6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/E6") +picturedir = get_picture_dir("CutLines/E6") file = datadir + "toto.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/E7.py b/test/VisuPrs/CutLines/E7.py index 0306393d..c4a8eb36 100644 --- a/test/VisuPrs/CutLines/E7.py +++ b/test/VisuPrs/CutLines/E7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/E7") +picturedir = get_picture_dir("CutLines/E7") file = datadir + "couplex_alain.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/E8.py b/test/VisuPrs/CutLines/E8.py index 48aaa474..7a6fd809 100644 --- a/test/VisuPrs/CutLines/E8.py +++ b/test/VisuPrs/CutLines/E8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/E8") +picturedir = get_picture_dir("CutLines/E8") file = datadir + "KCOUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/E9.py b/test/VisuPrs/CutLines/E9.py index 9ce8de2f..718be889 100644 --- a/test/VisuPrs/CutLines/E9.py +++ b/test/VisuPrs/CutLines/E9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/E9") +picturedir = get_picture_dir("CutLines/E9") file = datadir + "test_hydro.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/F1.py b/test/VisuPrs/CutLines/F1.py index b5c59546..c4f618a4 100644 --- a/test/VisuPrs/CutLines/F1.py +++ b/test/VisuPrs/CutLines/F1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/F1") +picturedir = get_picture_dir("CutLines/F1") file = datadir + "ml.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/F2.py b/test/VisuPrs/CutLines/F2.py index edca8db7..7f481fc4 100644 --- a/test/VisuPrs/CutLines/F2.py +++ b/test/VisuPrs/CutLines/F2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/F2") +picturedir = get_picture_dir("CutLines/F2") file = datadir + "T_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/F3.py b/test/VisuPrs/CutLines/F3.py index 6d4f6eec..b4781233 100644 --- a/test/VisuPrs/CutLines/F3.py +++ b/test/VisuPrs/CutLines/F3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/F3") +picturedir = get_picture_dir("CutLines/F3") file = datadir + "test_hydro_darcy4_out.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/F4.py b/test/VisuPrs/CutLines/F4.py index d2a8906d..9316a29f 100644 --- a/test/VisuPrs/CutLines/F4.py +++ b/test/VisuPrs/CutLines/F4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/F4") +picturedir = get_picture_dir("CutLines/F4") file = datadir + "UO2_250ans.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/F5.py b/test/VisuPrs/CutLines/F5.py index a3eb1026..e69ba788 100644 --- a/test/VisuPrs/CutLines/F5.py +++ b/test/VisuPrs/CutLines/F5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/F5") +picturedir = get_picture_dir("CutLines/F5") file = datadir + "maill.1.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/F6.py b/test/VisuPrs/CutLines/F6.py index 61e25573..406322e7 100644 --- a/test/VisuPrs/CutLines/F6.py +++ b/test/VisuPrs/CutLines/F6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/F6") +picturedir = get_picture_dir("CutLines/F6") file = datadir + "maill.0.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/F7.py b/test/VisuPrs/CutLines/F7.py index 37e0acfa..423a5bc6 100644 --- a/test/VisuPrs/CutLines/F7.py +++ b/test/VisuPrs/CutLines/F7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/F7") +picturedir = get_picture_dir("CutLines/F7") file = datadir + "occ4050.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/F8.py b/test/VisuPrs/CutLines/F8.py index 35f09501..4f7d3e59 100755 --- a/test/VisuPrs/CutLines/F8.py +++ b/test/VisuPrs/CutLines/F8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/F8") +picturedir = get_picture_dir("CutLines/F8") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.1.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/F9.py b/test/VisuPrs/CutLines/F9.py index c9d6bbdd..b659679b 100644 --- a/test/VisuPrs/CutLines/F9.py +++ b/test/VisuPrs/CutLines/F9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/F9") +picturedir = get_picture_dir("CutLines/F9") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.2.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/G0.py b/test/VisuPrs/CutLines/G0.py index f87754c5..914e6d61 100644 --- a/test/VisuPrs/CutLines/G0.py +++ b/test/VisuPrs/CutLines/G0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/G0") +picturedir = get_picture_dir("CutLines/G0") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.3.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/G1.py b/test/VisuPrs/CutLines/G1.py index 4dfadb5a..8b4ab4f1 100644 --- a/test/VisuPrs/CutLines/G1.py +++ b/test/VisuPrs/CutLines/G1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutLines/G1") +picturedir = get_picture_dir("CutLines/G1") file = datadir + "maill.2.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutLines/G2.py b/test/VisuPrs/CutLines/G2.py index e4c1d2f7..ebcff0e1 100644 --- a/test/VisuPrs/CutLines/G2.py +++ b/test/VisuPrs/CutLines/G2.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "CutLines/G2") +picturedir = get_picture_dir("CutLines/G2") theFileName = datadir + "Bug829_resu_mode.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/A0.py b/test/VisuPrs/CutPlanes/A0.py index 999e6212..f9620c71 100644 --- a/test/VisuPrs/CutPlanes/A0.py +++ b/test/VisuPrs/CutPlanes/A0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/A0") +picturedir = get_picture_dir("CutPlanes/A0") file = datadir + "fra.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/A1.py b/test/VisuPrs/CutPlanes/A1.py index ba28840c..26530eea 100644 --- a/test/VisuPrs/CutPlanes/A1.py +++ b/test/VisuPrs/CutPlanes/A1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/A1") +picturedir = get_picture_dir("CutPlanes/A1") file = datadir + "hexa_28320_ELEM.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/A2.py b/test/VisuPrs/CutPlanes/A2.py index 0125b678..f0ce6cd0 100755 --- a/test/VisuPrs/CutPlanes/A2.py +++ b/test/VisuPrs/CutPlanes/A2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/A2") +picturedir = get_picture_dir("CutPlanes/A2") file = datadir + "pointe.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/A3.py b/test/VisuPrs/CutPlanes/A3.py index d5568112..18ec53d3 100755 --- a/test/VisuPrs/CutPlanes/A3.py +++ b/test/VisuPrs/CutPlanes/A3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/A3") +picturedir = get_picture_dir("CutPlanes/A3") file = datadir + "Fields_group3D.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/A4.py b/test/VisuPrs/CutPlanes/A4.py index 0dc33759..a801d34a 100644 --- a/test/VisuPrs/CutPlanes/A4.py +++ b/test/VisuPrs/CutPlanes/A4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/A4") +picturedir = get_picture_dir("CutPlanes/A4") file = datadir + "Hexa8.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/A5.py b/test/VisuPrs/CutPlanes/A5.py index d1aa08af..584e487a 100644 --- a/test/VisuPrs/CutPlanes/A5.py +++ b/test/VisuPrs/CutPlanes/A5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/A5") +picturedir = get_picture_dir("CutPlanes/A5") file = datadir + "Penta6.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/A6.py b/test/VisuPrs/CutPlanes/A6.py index 96d93f52..01227f2e 100644 --- a/test/VisuPrs/CutPlanes/A6.py +++ b/test/VisuPrs/CutPlanes/A6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/A6") +picturedir = get_picture_dir("CutPlanes/A6") file = datadir + "clo.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/A7.py b/test/VisuPrs/CutPlanes/A7.py index 9dbb02df..87cc8f23 100644 --- a/test/VisuPrs/CutPlanes/A7.py +++ b/test/VisuPrs/CutPlanes/A7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/A7") +picturedir = get_picture_dir("CutPlanes/A7") file = datadir + "Tetra4.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/A8.py b/test/VisuPrs/CutPlanes/A8.py index ba058aa9..60651843 100644 --- a/test/VisuPrs/CutPlanes/A8.py +++ b/test/VisuPrs/CutPlanes/A8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/A8") +picturedir = get_picture_dir("CutPlanes/A8") file = datadir + "Tria3.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/A9.py b/test/VisuPrs/CutPlanes/A9.py index c247495d..9620851f 100644 --- a/test/VisuPrs/CutPlanes/A9.py +++ b/test/VisuPrs/CutPlanes/A9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/A9") +picturedir = get_picture_dir("CutPlanes/A9") file = datadir + "Quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/B0.py b/test/VisuPrs/CutPlanes/B0.py index 2a3afa0b..4cf9200a 100644 --- a/test/VisuPrs/CutPlanes/B0.py +++ b/test/VisuPrs/CutPlanes/B0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/B0") +picturedir = get_picture_dir("CutPlanes/B0") file = datadir + "carre_en_quad4_seg2.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/B1.py b/test/VisuPrs/CutPlanes/B1.py index faa40139..47f02cfc 100644 --- a/test/VisuPrs/CutPlanes/B1.py +++ b/test/VisuPrs/CutPlanes/B1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/B1") +picturedir = get_picture_dir("CutPlanes/B1") file = datadir + "carre_en_quad4_seg2_fields.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/B2.py b/test/VisuPrs/CutPlanes/B2.py index 6546d2d5..6c99ad49 100644 --- a/test/VisuPrs/CutPlanes/B2.py +++ b/test/VisuPrs/CutPlanes/B2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/B2") +picturedir = get_picture_dir("CutPlanes/B2") file = datadir + "cube_hexa8_quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/CMakeLists.txt b/test/VisuPrs/CutPlanes/CMakeLists.txt index f48e2a8a..9ee393f1 100644 --- a/test/VisuPrs/CutPlanes/CMakeLists.txt +++ b/test/VisuPrs/CutPlanes/CMakeLists.txt @@ -57,7 +57,7 @@ IF (PYTHON_EXECUTABLE) G2 ) SET(TIMEOUT 10000) - ADD_TEST(CUTPLANES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(CUTPLANES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(CUTPLANES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/CutPlanes/E0.py b/test/VisuPrs/CutPlanes/E0.py index 24fe36b7..6ce6a8f5 100644 --- a/test/VisuPrs/CutPlanes/E0.py +++ b/test/VisuPrs/CutPlanes/E0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/E0") +picturedir = get_picture_dir("CutPlanes/E0") file = datadir + "test_55_solid_concentr_dom.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/E1.py b/test/VisuPrs/CutPlanes/E1.py index ca2a8084..f95fcbc6 100644 --- a/test/VisuPrs/CutPlanes/E1.py +++ b/test/VisuPrs/CutPlanes/E1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/E1") +picturedir = get_picture_dir("CutPlanes/E1") file = datadir + "H_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/E2.py b/test/VisuPrs/CutPlanes/E2.py index e63550df..5286539c 100644 --- a/test/VisuPrs/CutPlanes/E2.py +++ b/test/VisuPrs/CutPlanes/E2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/E2") +picturedir = get_picture_dir("CutPlanes/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/E3.py b/test/VisuPrs/CutPlanes/E3.py index f927e6d5..a26354ce 100644 --- a/test/VisuPrs/CutPlanes/E3.py +++ b/test/VisuPrs/CutPlanes/E3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/E3") +picturedir = get_picture_dir("CutPlanes/E3") file = datadir + "hydro_d10.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/E4.py b/test/VisuPrs/CutPlanes/E4.py index e859123a..30ebc149 100644 --- a/test/VisuPrs/CutPlanes/E4.py +++ b/test/VisuPrs/CutPlanes/E4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/E4") +picturedir = get_picture_dir("CutPlanes/E4") file = datadir + "champc.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/E5.py b/test/VisuPrs/CutPlanes/E5.py index de760dfe..03b43a96 100644 --- a/test/VisuPrs/CutPlanes/E5.py +++ b/test/VisuPrs/CutPlanes/E5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/E5") +picturedir = get_picture_dir("CutPlanes/E5") file = datadir + "hydro_sea_alv.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/E6.py b/test/VisuPrs/CutPlanes/E6.py index d6a16308..ace0da25 100644 --- a/test/VisuPrs/CutPlanes/E6.py +++ b/test/VisuPrs/CutPlanes/E6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/E6") +picturedir = get_picture_dir("CutPlanes/E6") file = datadir + "toto.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/E7.py b/test/VisuPrs/CutPlanes/E7.py index 98565e1c..411c4188 100644 --- a/test/VisuPrs/CutPlanes/E7.py +++ b/test/VisuPrs/CutPlanes/E7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/E7") +picturedir = get_picture_dir("CutPlanes/E7") file = datadir + "couplex_alain.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/E8.py b/test/VisuPrs/CutPlanes/E8.py index f86feb3f..4b779945 100644 --- a/test/VisuPrs/CutPlanes/E8.py +++ b/test/VisuPrs/CutPlanes/E8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/E8") +picturedir = get_picture_dir("CutPlanes/E8") file = datadir + "KCOUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/E9.py b/test/VisuPrs/CutPlanes/E9.py index d91587fc..77bafa6a 100644 --- a/test/VisuPrs/CutPlanes/E9.py +++ b/test/VisuPrs/CutPlanes/E9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/E9") +picturedir = get_picture_dir("CutPlanes/E9") file = datadir + "test_hydro.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/F1.py b/test/VisuPrs/CutPlanes/F1.py index bd4dcb1b..0ad4bb04 100644 --- a/test/VisuPrs/CutPlanes/F1.py +++ b/test/VisuPrs/CutPlanes/F1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/F1") +picturedir = get_picture_dir("CutPlanes/F1") file = datadir + "ml.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/F2.py b/test/VisuPrs/CutPlanes/F2.py index 1b92be66..098df678 100644 --- a/test/VisuPrs/CutPlanes/F2.py +++ b/test/VisuPrs/CutPlanes/F2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/F2") +picturedir = get_picture_dir("CutPlanes/F2") file = datadir + "T_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/F3.py b/test/VisuPrs/CutPlanes/F3.py index 7dac26d3..41422e66 100644 --- a/test/VisuPrs/CutPlanes/F3.py +++ b/test/VisuPrs/CutPlanes/F3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/F3") +picturedir = get_picture_dir("CutPlanes/F3") file = datadir + "test_hydro_darcy4_out.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/F4.py b/test/VisuPrs/CutPlanes/F4.py index 440ab261..210fda94 100644 --- a/test/VisuPrs/CutPlanes/F4.py +++ b/test/VisuPrs/CutPlanes/F4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/F4") +picturedir = get_picture_dir("CutPlanes/F4") file = datadir + "UO2_250ans.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/F5.py b/test/VisuPrs/CutPlanes/F5.py index 1594497a..50cafa7a 100644 --- a/test/VisuPrs/CutPlanes/F5.py +++ b/test/VisuPrs/CutPlanes/F5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/F5") +picturedir = get_picture_dir("CutPlanes/F5") file = datadir + "maill.1.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/F6.py b/test/VisuPrs/CutPlanes/F6.py index 45163bd9..deca6757 100644 --- a/test/VisuPrs/CutPlanes/F6.py +++ b/test/VisuPrs/CutPlanes/F6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/F6") +picturedir = get_picture_dir("CutPlanes/F6") file = datadir + "maill.0.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/F7.py b/test/VisuPrs/CutPlanes/F7.py index 292d764e..6225afad 100755 --- a/test/VisuPrs/CutPlanes/F7.py +++ b/test/VisuPrs/CutPlanes/F7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/F7") +picturedir = get_picture_dir("CutPlanes/F7") file = datadir + "occ4050.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/F8.py b/test/VisuPrs/CutPlanes/F8.py index 27198e6f..264fe7bc 100644 --- a/test/VisuPrs/CutPlanes/F8.py +++ b/test/VisuPrs/CutPlanes/F8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/F8") +picturedir = get_picture_dir("CutPlanes/F8") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.1.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/F9.py b/test/VisuPrs/CutPlanes/F9.py index ad6daf1e..3fd58d01 100644 --- a/test/VisuPrs/CutPlanes/F9.py +++ b/test/VisuPrs/CutPlanes/F9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/F9") +picturedir = get_picture_dir("CutPlanes/F9") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.2.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/G0.py b/test/VisuPrs/CutPlanes/G0.py index f5955b69..a3e601ff 100644 --- a/test/VisuPrs/CutPlanes/G0.py +++ b/test/VisuPrs/CutPlanes/G0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/G0") +picturedir = get_picture_dir("CutPlanes/G0") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.3.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/G1.py b/test/VisuPrs/CutPlanes/G1.py index 60433f9b..a9fb53fb 100644 --- a/test/VisuPrs/CutPlanes/G1.py +++ b/test/VisuPrs/CutPlanes/G1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"CutPlanes/G1") +picturedir = get_picture_dir("CutPlanes/G1") file = datadir + "maill.2.med" print " --------------------------------- " diff --git a/test/VisuPrs/CutPlanes/G2.py b/test/VisuPrs/CutPlanes/G2.py index df5b05ad..cda53032 100644 --- a/test/VisuPrs/CutPlanes/G2.py +++ b/test/VisuPrs/CutPlanes/G2.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "CutPlanes/G2") +picturedir = get_picture_dir("CutPlanes/G2") theFileName = datadir + "Bug829_resu_mode.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/A0.py b/test/VisuPrs/DeformedShape/A0.py index 3e7b286b..785a49e3 100644 --- a/test/VisuPrs/DeformedShape/A0.py +++ b/test/VisuPrs/DeformedShape/A0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/A0") +picturedir = get_picture_dir("DeformedShape/A0") file = datadir + "fra.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/A1.py b/test/VisuPrs/DeformedShape/A1.py index bcaa846a..074e0fee 100644 --- a/test/VisuPrs/DeformedShape/A1.py +++ b/test/VisuPrs/DeformedShape/A1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/A1") +picturedir = get_picture_dir("DeformedShape/A1") file = datadir + "hexa_28320_ELEM.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/A2.py b/test/VisuPrs/DeformedShape/A2.py index ec3df2a9..7ff2007a 100755 --- a/test/VisuPrs/DeformedShape/A2.py +++ b/test/VisuPrs/DeformedShape/A2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/A2") +picturedir = get_picture_dir("DeformedShape/A2") file = datadir + "pointe.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/A3.py b/test/VisuPrs/DeformedShape/A3.py index f4adcd4c..1364acdf 100755 --- a/test/VisuPrs/DeformedShape/A3.py +++ b/test/VisuPrs/DeformedShape/A3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/A3") +picturedir = get_picture_dir("DeformedShape/A3") file = datadir + "Fields_group3D.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/A4.py b/test/VisuPrs/DeformedShape/A4.py index 3ba7de0b..04399aad 100755 --- a/test/VisuPrs/DeformedShape/A4.py +++ b/test/VisuPrs/DeformedShape/A4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/A4") +picturedir = get_picture_dir("DeformedShape/A4") file = datadir + "Hexa8.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/A5.py b/test/VisuPrs/DeformedShape/A5.py index 59f14ddd..0c12e452 100644 --- a/test/VisuPrs/DeformedShape/A5.py +++ b/test/VisuPrs/DeformedShape/A5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/A5") +picturedir = get_picture_dir("DeformedShape/A5") file = datadir + "Penta6.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/A6.py b/test/VisuPrs/DeformedShape/A6.py index 8a42d941..599158ba 100755 --- a/test/VisuPrs/DeformedShape/A6.py +++ b/test/VisuPrs/DeformedShape/A6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/A6") +picturedir = get_picture_dir("DeformedShape/A6") file = datadir + "clo.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/A7.py b/test/VisuPrs/DeformedShape/A7.py index b55c0c48..4227bf41 100644 --- a/test/VisuPrs/DeformedShape/A7.py +++ b/test/VisuPrs/DeformedShape/A7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/A7") +picturedir = get_picture_dir("DeformedShape/A7") file = datadir + "Tetra4.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/A8.py b/test/VisuPrs/DeformedShape/A8.py index b726d78a..989d8630 100644 --- a/test/VisuPrs/DeformedShape/A8.py +++ b/test/VisuPrs/DeformedShape/A8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/A8") +picturedir = get_picture_dir("DeformedShape/A8") file = datadir + "Tria3.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/A9.py b/test/VisuPrs/DeformedShape/A9.py index 1d380fbf..18fab4ac 100644 --- a/test/VisuPrs/DeformedShape/A9.py +++ b/test/VisuPrs/DeformedShape/A9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/A9") +picturedir = get_picture_dir("DeformedShape/A9") file = datadir + "Quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/B0.py b/test/VisuPrs/DeformedShape/B0.py index 743ad55b..4a531979 100644 --- a/test/VisuPrs/DeformedShape/B0.py +++ b/test/VisuPrs/DeformedShape/B0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/B0") +picturedir = get_picture_dir("DeformedShape/B0") file = datadir + "carre_en_quad4_seg2.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/B1.py b/test/VisuPrs/DeformedShape/B1.py index b724d4ea..85f54282 100644 --- a/test/VisuPrs/DeformedShape/B1.py +++ b/test/VisuPrs/DeformedShape/B1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/B1") +picturedir = get_picture_dir("DeformedShape/B1") file = datadir + "carre_en_quad4_seg2_fields.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/B2.py b/test/VisuPrs/DeformedShape/B2.py index 26c26a8a..d3fefb53 100644 --- a/test/VisuPrs/DeformedShape/B2.py +++ b/test/VisuPrs/DeformedShape/B2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/B2") +picturedir = get_picture_dir("DeformedShape/B2") file = datadir + "cube_hexa8_quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/CMakeLists.txt b/test/VisuPrs/DeformedShape/CMakeLists.txt index cbff4753..372b17b7 100644 --- a/test/VisuPrs/DeformedShape/CMakeLists.txt +++ b/test/VisuPrs/DeformedShape/CMakeLists.txt @@ -55,7 +55,7 @@ IF (PYTHON_EXECUTABLE) F9 ) SET(TIMEOUT 10000) - ADD_TEST(DEFORMEDSHAPE_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(DEFORMEDSHAPE_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(DEFORMEDSHAPE_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/DeformedShape/E0.py b/test/VisuPrs/DeformedShape/E0.py index 96979675..2f4236c0 100644 --- a/test/VisuPrs/DeformedShape/E0.py +++ b/test/VisuPrs/DeformedShape/E0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/E0") +picturedir = get_picture_dir("DeformedShape/E0") file = datadir + "test_55_solid_concentr_dom.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/E1.py b/test/VisuPrs/DeformedShape/E1.py index 8b800e9b..273e1544 100644 --- a/test/VisuPrs/DeformedShape/E1.py +++ b/test/VisuPrs/DeformedShape/E1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/E1") +picturedir = get_picture_dir("DeformedShape/E1") file = datadir + "H_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/E2.py b/test/VisuPrs/DeformedShape/E2.py index 8132d6dc..a04352ec 100644 --- a/test/VisuPrs/DeformedShape/E2.py +++ b/test/VisuPrs/DeformedShape/E2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/E2") +picturedir = get_picture_dir("DeformedShape/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/E3.py b/test/VisuPrs/DeformedShape/E3.py index c667e1bb..9e8dfe51 100755 --- a/test/VisuPrs/DeformedShape/E3.py +++ b/test/VisuPrs/DeformedShape/E3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/E3") +picturedir = get_picture_dir("DeformedShape/E3") file = datadir + "hydro_d10.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/E4.py b/test/VisuPrs/DeformedShape/E4.py index 46ffea1b..08d02f14 100644 --- a/test/VisuPrs/DeformedShape/E4.py +++ b/test/VisuPrs/DeformedShape/E4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/E4") +picturedir = get_picture_dir("DeformedShape/E4") file = datadir + "champc.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/E5.py b/test/VisuPrs/DeformedShape/E5.py index b697da62..05f8e996 100644 --- a/test/VisuPrs/DeformedShape/E5.py +++ b/test/VisuPrs/DeformedShape/E5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/E5") +picturedir = get_picture_dir("DeformedShape/E5") file = datadir + "hydro_sea_alv.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/E6.py b/test/VisuPrs/DeformedShape/E6.py index 89b6aff6..db752267 100644 --- a/test/VisuPrs/DeformedShape/E6.py +++ b/test/VisuPrs/DeformedShape/E6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/E6") +picturedir = get_picture_dir("DeformedShape/E6") file = datadir + "toto.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/E7.py b/test/VisuPrs/DeformedShape/E7.py index d4c64bac..87c46c6b 100644 --- a/test/VisuPrs/DeformedShape/E7.py +++ b/test/VisuPrs/DeformedShape/E7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/E7") +picturedir = get_picture_dir("DeformedShape/E7") file = datadir + "couplex_alain.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/E8.py b/test/VisuPrs/DeformedShape/E8.py index 1a703397..93a6b7cb 100644 --- a/test/VisuPrs/DeformedShape/E8.py +++ b/test/VisuPrs/DeformedShape/E8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/E8") +picturedir = get_picture_dir("DeformedShape/E8") file = datadir + "KCOUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/E9.py b/test/VisuPrs/DeformedShape/E9.py index 0d99f5ff..b004f3e6 100644 --- a/test/VisuPrs/DeformedShape/E9.py +++ b/test/VisuPrs/DeformedShape/E9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/E9") +picturedir = get_picture_dir("DeformedShape/E9") file = datadir + "test_hydro.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/F1.py b/test/VisuPrs/DeformedShape/F1.py index ee0e5819..bf249b33 100644 --- a/test/VisuPrs/DeformedShape/F1.py +++ b/test/VisuPrs/DeformedShape/F1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/F1") +picturedir = get_picture_dir("DeformedShape/F1") file = datadir + "ml.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/F2.py b/test/VisuPrs/DeformedShape/F2.py index 41839081..25412e36 100644 --- a/test/VisuPrs/DeformedShape/F2.py +++ b/test/VisuPrs/DeformedShape/F2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/F2") +picturedir = get_picture_dir("DeformedShape/F2") file = datadir + "T_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/F3.py b/test/VisuPrs/DeformedShape/F3.py index 0fe6f860..3e1c9cbb 100644 --- a/test/VisuPrs/DeformedShape/F3.py +++ b/test/VisuPrs/DeformedShape/F3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/F3") +picturedir = get_picture_dir("DeformedShape/F3") file = datadir + "test_hydro_darcy4_out.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/F4.py b/test/VisuPrs/DeformedShape/F4.py index 000e7c13..ebe2f17a 100644 --- a/test/VisuPrs/DeformedShape/F4.py +++ b/test/VisuPrs/DeformedShape/F4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/F4") +picturedir = get_picture_dir("DeformedShape/F4") file = datadir + "UO2_250ans.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/F5.py b/test/VisuPrs/DeformedShape/F5.py index 4b221e85..15792f38 100644 --- a/test/VisuPrs/DeformedShape/F5.py +++ b/test/VisuPrs/DeformedShape/F5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/F5") +picturedir = get_picture_dir("DeformedShape/F5") file = datadir + "maill.1.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/F6.py b/test/VisuPrs/DeformedShape/F6.py index 2c438539..65c0a9ed 100644 --- a/test/VisuPrs/DeformedShape/F6.py +++ b/test/VisuPrs/DeformedShape/F6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/F6") +picturedir = get_picture_dir("DeformedShape/F6") file = datadir + "maill.0.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/F7.py b/test/VisuPrs/DeformedShape/F7.py index 611cef19..371b6964 100755 --- a/test/VisuPrs/DeformedShape/F7.py +++ b/test/VisuPrs/DeformedShape/F7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/F7") +picturedir = get_picture_dir("DeformedShape/F7") file = datadir + "occ4050.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/F8.py b/test/VisuPrs/DeformedShape/F8.py index 58078d97..6e1bd123 100644 --- a/test/VisuPrs/DeformedShape/F8.py +++ b/test/VisuPrs/DeformedShape/F8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"DeformedShape/F8") +picturedir = get_picture_dir("DeformedShape/F8") file = datadir + "maill.2.med" print " --------------------------------- " diff --git a/test/VisuPrs/DeformedShape/F9.py b/test/VisuPrs/DeformedShape/F9.py index e6f0d1eb..923ec3a7 100644 --- a/test/VisuPrs/DeformedShape/F9.py +++ b/test/VisuPrs/DeformedShape/F9.py @@ -29,7 +29,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "DeformedShape/F9") +picturedir = get_picture_dir("DeformedShape/F9") theFileName = datadir + "Bug829_resu_mode.med" print " --------------------------------- " diff --git a/test/VisuPrs/GaussPoints/A0.py b/test/VisuPrs/GaussPoints/A0.py index c398b293..904adb31 100644 --- a/test/VisuPrs/GaussPoints/A0.py +++ b/test/VisuPrs/GaussPoints/A0.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/A0") +picturedir = get_picture_dir("GaussPoints/A0") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/A1.py b/test/VisuPrs/GaussPoints/A1.py index 515b28cd..e7a2c4c0 100644 --- a/test/VisuPrs/GaussPoints/A1.py +++ b/test/VisuPrs/GaussPoints/A1.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/A1") +picturedir = get_picture_dir("GaussPoints/A1") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/A2.py b/test/VisuPrs/GaussPoints/A2.py index 3acd6cc6..22d4c214 100644 --- a/test/VisuPrs/GaussPoints/A2.py +++ b/test/VisuPrs/GaussPoints/A2.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/A2") +picturedir = get_picture_dir("GaussPoints/A2") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/A3.py b/test/VisuPrs/GaussPoints/A3.py index b3ca7158..bef3d322 100644 --- a/test/VisuPrs/GaussPoints/A3.py +++ b/test/VisuPrs/GaussPoints/A3.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/A3") +picturedir = get_picture_dir("GaussPoints/A3") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/A4.py b/test/VisuPrs/GaussPoints/A4.py index f9ae61c0..27ce8f7b 100644 --- a/test/VisuPrs/GaussPoints/A4.py +++ b/test/VisuPrs/GaussPoints/A4.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/A4") +picturedir = get_picture_dir("GaussPoints/A4") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/A5.py b/test/VisuPrs/GaussPoints/A5.py index 20db5ad2..fe34ed17 100644 --- a/test/VisuPrs/GaussPoints/A5.py +++ b/test/VisuPrs/GaussPoints/A5.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/A5") +picturedir = get_picture_dir("GaussPoints/A5") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/A6.py b/test/VisuPrs/GaussPoints/A6.py index 2299ea09..30c51c7e 100644 --- a/test/VisuPrs/GaussPoints/A6.py +++ b/test/VisuPrs/GaussPoints/A6.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/A6") +picturedir = get_picture_dir("GaussPoints/A6") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/A7.py b/test/VisuPrs/GaussPoints/A7.py index 684d994e..a55ea80f 100644 --- a/test/VisuPrs/GaussPoints/A7.py +++ b/test/VisuPrs/GaussPoints/A7.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/A7") +picturedir = get_picture_dir("GaussPoints/A7") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/A9.py b/test/VisuPrs/GaussPoints/A9.py index 3ecd6987..5c438a4f 100644 --- a/test/VisuPrs/GaussPoints/A9.py +++ b/test/VisuPrs/GaussPoints/A9.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/A9") +picturedir = get_picture_dir("GaussPoints/A9") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/B0.py b/test/VisuPrs/GaussPoints/B0.py index 79677f8e..7ad89f77 100644 --- a/test/VisuPrs/GaussPoints/B0.py +++ b/test/VisuPrs/GaussPoints/B0.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/B0") +picturedir = get_picture_dir("GaussPoints/B0") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/B1.py b/test/VisuPrs/GaussPoints/B1.py index 4f2c0024..aa6cc3ea 100644 --- a/test/VisuPrs/GaussPoints/B1.py +++ b/test/VisuPrs/GaussPoints/B1.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/B1") +picturedir = get_picture_dir("GaussPoints/B1") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/B2.py b/test/VisuPrs/GaussPoints/B2.py index 2b353df4..48185d5c 100644 --- a/test/VisuPrs/GaussPoints/B2.py +++ b/test/VisuPrs/GaussPoints/B2.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/B2") +picturedir = get_picture_dir("GaussPoints/B2") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/B3.py b/test/VisuPrs/GaussPoints/B3.py index b5c3c433..0bbb799d 100644 --- a/test/VisuPrs/GaussPoints/B3.py +++ b/test/VisuPrs/GaussPoints/B3.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/B3") +picturedir = get_picture_dir("GaussPoints/B3") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/B4.py b/test/VisuPrs/GaussPoints/B4.py index af7ed7a7..15e6971e 100644 --- a/test/VisuPrs/GaussPoints/B4.py +++ b/test/VisuPrs/GaussPoints/B4.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/B4") +picturedir = get_picture_dir("GaussPoints/B4") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/B5.py b/test/VisuPrs/GaussPoints/B5.py index 86f6d966..774e269d 100644 --- a/test/VisuPrs/GaussPoints/B5.py +++ b/test/VisuPrs/GaussPoints/B5.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/B5") +picturedir = get_picture_dir("GaussPoints/B5") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/B6.py b/test/VisuPrs/GaussPoints/B6.py index 56d0aa4c..60fcb2f9 100644 --- a/test/VisuPrs/GaussPoints/B6.py +++ b/test/VisuPrs/GaussPoints/B6.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/B6") +picturedir = get_picture_dir("GaussPoints/B6") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/B7.py b/test/VisuPrs/GaussPoints/B7.py index 420557f6..ab4737d6 100644 --- a/test/VisuPrs/GaussPoints/B7.py +++ b/test/VisuPrs/GaussPoints/B7.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/B7") +picturedir = get_picture_dir("GaussPoints/B7") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/B8.py b/test/VisuPrs/GaussPoints/B8.py index 0e43559f..25720004 100644 --- a/test/VisuPrs/GaussPoints/B8.py +++ b/test/VisuPrs/GaussPoints/B8.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/B8") +picturedir = get_picture_dir("GaussPoints/B8") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/B9.py b/test/VisuPrs/GaussPoints/B9.py index c28300b2..2085d27a 100644 --- a/test/VisuPrs/GaussPoints/B9.py +++ b/test/VisuPrs/GaussPoints/B9.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/B9") +picturedir = get_picture_dir("GaussPoints/B9") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/C0.py b/test/VisuPrs/GaussPoints/C0.py index 13fa9b31..1f127f5c 100644 --- a/test/VisuPrs/GaussPoints/C0.py +++ b/test/VisuPrs/GaussPoints/C0.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/C0") +picturedir = get_picture_dir("GaussPoints/C0") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/C1.py b/test/VisuPrs/GaussPoints/C1.py index 7e3488fc..04581e05 100644 --- a/test/VisuPrs/GaussPoints/C1.py +++ b/test/VisuPrs/GaussPoints/C1.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/C1") +picturedir = get_picture_dir("GaussPoints/C1") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/C2.py b/test/VisuPrs/GaussPoints/C2.py index 784f9b9f..4326d4a6 100644 --- a/test/VisuPrs/GaussPoints/C2.py +++ b/test/VisuPrs/GaussPoints/C2.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/C2") +picturedir = get_picture_dir("GaussPoints/C2") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/C3.py b/test/VisuPrs/GaussPoints/C3.py index 34e507cb..a8c2348f 100644 --- a/test/VisuPrs/GaussPoints/C3.py +++ b/test/VisuPrs/GaussPoints/C3.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/C3") +picturedir = get_picture_dir("GaussPoints/C3") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/C4.py b/test/VisuPrs/GaussPoints/C4.py index 6590a4d1..bfe47bee 100644 --- a/test/VisuPrs/GaussPoints/C4.py +++ b/test/VisuPrs/GaussPoints/C4.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/C4") +picturedir = get_picture_dir("GaussPoints/C4") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/C5.py b/test/VisuPrs/GaussPoints/C5.py index b600192b..6ca4a080 100644 --- a/test/VisuPrs/GaussPoints/C5.py +++ b/test/VisuPrs/GaussPoints/C5.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/C5") +picturedir = get_picture_dir("GaussPoints/C5") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/C6.py b/test/VisuPrs/GaussPoints/C6.py index 2a2243c3..1490e2b5 100644 --- a/test/VisuPrs/GaussPoints/C6.py +++ b/test/VisuPrs/GaussPoints/C6.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/C6") +picturedir = get_picture_dir("GaussPoints/C6") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/C7.py b/test/VisuPrs/GaussPoints/C7.py index bd364255..c8ecec6e 100644 --- a/test/VisuPrs/GaussPoints/C7.py +++ b/test/VisuPrs/GaussPoints/C7.py @@ -30,7 +30,7 @@ import pvsimple # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "GaussPoints/C7") +picturedir = get_picture_dir("GaussPoints/C7") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/GaussPoints/CMakeLists.txt b/test/VisuPrs/GaussPoints/CMakeLists.txt index 19a1bf82..d1a3a233 100644 --- a/test/VisuPrs/GaussPoints/CMakeLists.txt +++ b/test/VisuPrs/GaussPoints/CMakeLists.txt @@ -48,7 +48,7 @@ IF (PYTHON_EXECUTABLE) C7 ) SET(TIMEOUT 10000) - ADD_TEST(GAUSSPOINTS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(GAUSSPOINTS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(GAUSSPOINTS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/IsoSurfaces/A0.py b/test/VisuPrs/IsoSurfaces/A0.py index 3b7fda7b..94e758fc 100644 --- a/test/VisuPrs/IsoSurfaces/A0.py +++ b/test/VisuPrs/IsoSurfaces/A0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/A0") +picturedir = get_picture_dir("IsoSurfaces/A0") file = datadir + "fra.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/A1.py b/test/VisuPrs/IsoSurfaces/A1.py index 094e6018..3c5fd1a5 100755 --- a/test/VisuPrs/IsoSurfaces/A1.py +++ b/test/VisuPrs/IsoSurfaces/A1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/A1") +picturedir = get_picture_dir("IsoSurfaces/A1") file = datadir + "hexa_28320_ELEM.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/A2.py b/test/VisuPrs/IsoSurfaces/A2.py index b061551d..9a1560a1 100755 --- a/test/VisuPrs/IsoSurfaces/A2.py +++ b/test/VisuPrs/IsoSurfaces/A2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/A2") +picturedir = get_picture_dir("IsoSurfaces/A2") file = datadir + "pointe.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/A3.py b/test/VisuPrs/IsoSurfaces/A3.py index d9405460..5d031588 100755 --- a/test/VisuPrs/IsoSurfaces/A3.py +++ b/test/VisuPrs/IsoSurfaces/A3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/A3") +picturedir = get_picture_dir("IsoSurfaces/A3") file = datadir + "Fields_group3D.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/A4.py b/test/VisuPrs/IsoSurfaces/A4.py index 6a731d50..ed45f878 100755 --- a/test/VisuPrs/IsoSurfaces/A4.py +++ b/test/VisuPrs/IsoSurfaces/A4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/A4") +picturedir = get_picture_dir("IsoSurfaces/A4") file = datadir + "Hexa8.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/A5.py b/test/VisuPrs/IsoSurfaces/A5.py index 6cd8014c..7732177e 100755 --- a/test/VisuPrs/IsoSurfaces/A5.py +++ b/test/VisuPrs/IsoSurfaces/A5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/A5") +picturedir = get_picture_dir("IsoSurfaces/A5") file = datadir + "Penta6.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/A6.py b/test/VisuPrs/IsoSurfaces/A6.py index 6aaa219d..8ee1d2dc 100644 --- a/test/VisuPrs/IsoSurfaces/A6.py +++ b/test/VisuPrs/IsoSurfaces/A6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/A6") +picturedir = get_picture_dir("IsoSurfaces/A6") file = datadir + "clo.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/A7.py b/test/VisuPrs/IsoSurfaces/A7.py index 9da01d6f..dda4fd27 100755 --- a/test/VisuPrs/IsoSurfaces/A7.py +++ b/test/VisuPrs/IsoSurfaces/A7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/A7") +picturedir = get_picture_dir("IsoSurfaces/A7") file = datadir + "Tetra4.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/A8.py b/test/VisuPrs/IsoSurfaces/A8.py index c7bbb03a..0813c6fd 100755 --- a/test/VisuPrs/IsoSurfaces/A8.py +++ b/test/VisuPrs/IsoSurfaces/A8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/A8") +picturedir = get_picture_dir("IsoSurfaces/A8") file = datadir + "Tria3.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/A9.py b/test/VisuPrs/IsoSurfaces/A9.py index f7fc7323..85fdb443 100755 --- a/test/VisuPrs/IsoSurfaces/A9.py +++ b/test/VisuPrs/IsoSurfaces/A9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/A9") +picturedir = get_picture_dir("IsoSurfaces/A9") file = datadir + "Quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/B0.py b/test/VisuPrs/IsoSurfaces/B0.py index 93f6eefc..5fd40cc3 100755 --- a/test/VisuPrs/IsoSurfaces/B0.py +++ b/test/VisuPrs/IsoSurfaces/B0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/B0") +picturedir = get_picture_dir("IsoSurfaces/B0") file = datadir + "carre_en_quad4_seg2.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/B1.py b/test/VisuPrs/IsoSurfaces/B1.py index 8fc3a75f..befb8938 100644 --- a/test/VisuPrs/IsoSurfaces/B1.py +++ b/test/VisuPrs/IsoSurfaces/B1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/B1") +picturedir = get_picture_dir("IsoSurfaces/B1") file = datadir + "carre_en_quad4_seg2_fields.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/B2.py b/test/VisuPrs/IsoSurfaces/B2.py index f3b427ab..3efb3649 100755 --- a/test/VisuPrs/IsoSurfaces/B2.py +++ b/test/VisuPrs/IsoSurfaces/B2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/B2") +picturedir = get_picture_dir("IsoSurfaces/B2") file = datadir + "cube_hexa8_quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/CMakeLists.txt b/test/VisuPrs/IsoSurfaces/CMakeLists.txt index 6b891f0c..7928b98d 100755 --- a/test/VisuPrs/IsoSurfaces/CMakeLists.txt +++ b/test/VisuPrs/IsoSurfaces/CMakeLists.txt @@ -56,7 +56,7 @@ IF (PYTHON_EXECUTABLE) G2 ) SET(TIMEOUT 10000) - ADD_TEST(ISOSURFACES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(ISOSURFACES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(ISOSURFACES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/IsoSurfaces/E0.py b/test/VisuPrs/IsoSurfaces/E0.py index c098efc6..055c78d0 100755 --- a/test/VisuPrs/IsoSurfaces/E0.py +++ b/test/VisuPrs/IsoSurfaces/E0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/E0") +picturedir = get_picture_dir("IsoSurfaces/E0") file = datadir + "test_55_solid_concentr_dom.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/E1.py b/test/VisuPrs/IsoSurfaces/E1.py index e25e63e3..b22e5522 100755 --- a/test/VisuPrs/IsoSurfaces/E1.py +++ b/test/VisuPrs/IsoSurfaces/E1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/E1") +picturedir = get_picture_dir("IsoSurfaces/E1") file = datadir + "H_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/E2.py b/test/VisuPrs/IsoSurfaces/E2.py index 2ffb54b5..8324ae68 100755 --- a/test/VisuPrs/IsoSurfaces/E2.py +++ b/test/VisuPrs/IsoSurfaces/E2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/E2") +picturedir = get_picture_dir("IsoSurfaces/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/E3.py b/test/VisuPrs/IsoSurfaces/E3.py index 27f24831..4d6773a7 100644 --- a/test/VisuPrs/IsoSurfaces/E3.py +++ b/test/VisuPrs/IsoSurfaces/E3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/E3") +picturedir = get_picture_dir("IsoSurfaces/E3") file = datadir + "hydro_d10.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/E4.py b/test/VisuPrs/IsoSurfaces/E4.py index 7d88b358..8a303c4c 100755 --- a/test/VisuPrs/IsoSurfaces/E4.py +++ b/test/VisuPrs/IsoSurfaces/E4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/E4") +picturedir = get_picture_dir("IsoSurfaces/E4") file = datadir + "champc.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/E5.py b/test/VisuPrs/IsoSurfaces/E5.py index 3dd97ac0..7a4d8eb7 100755 --- a/test/VisuPrs/IsoSurfaces/E5.py +++ b/test/VisuPrs/IsoSurfaces/E5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/E5") +picturedir = get_picture_dir("IsoSurfaces/E5") file = datadir + "hydro_sea_alv.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/E6.py b/test/VisuPrs/IsoSurfaces/E6.py index 30d231a6..5f0c1d0f 100755 --- a/test/VisuPrs/IsoSurfaces/E6.py +++ b/test/VisuPrs/IsoSurfaces/E6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/E6") +picturedir = get_picture_dir("IsoSurfaces/E6") file = datadir + "toto.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/E7.py b/test/VisuPrs/IsoSurfaces/E7.py index 32a942e5..0e946a42 100755 --- a/test/VisuPrs/IsoSurfaces/E7.py +++ b/test/VisuPrs/IsoSurfaces/E7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/E7") +picturedir = get_picture_dir("IsoSurfaces/E7") file = datadir + "couplex_alain.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/E8.py b/test/VisuPrs/IsoSurfaces/E8.py index 12063e15..255b0c3e 100755 --- a/test/VisuPrs/IsoSurfaces/E8.py +++ b/test/VisuPrs/IsoSurfaces/E8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/E8") +picturedir = get_picture_dir("IsoSurfaces/E8") file = datadir + "KCOUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/E9.py b/test/VisuPrs/IsoSurfaces/E9.py index 1140f2e6..033abf0f 100644 --- a/test/VisuPrs/IsoSurfaces/E9.py +++ b/test/VisuPrs/IsoSurfaces/E9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/E9") +picturedir = get_picture_dir("IsoSurfaces/E9") file = datadir + "test_hydro.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/F1.py b/test/VisuPrs/IsoSurfaces/F1.py index e6a065a6..c4b6b8ee 100755 --- a/test/VisuPrs/IsoSurfaces/F1.py +++ b/test/VisuPrs/IsoSurfaces/F1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/F1") +picturedir = get_picture_dir("IsoSurfaces/F1") file = datadir + "ml.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/F2.py b/test/VisuPrs/IsoSurfaces/F2.py index 3b7c29af..da9daff3 100755 --- a/test/VisuPrs/IsoSurfaces/F2.py +++ b/test/VisuPrs/IsoSurfaces/F2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/F2") +picturedir = get_picture_dir("IsoSurfaces/F2") file = datadir + "T_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/F3.py b/test/VisuPrs/IsoSurfaces/F3.py index 68bc0286..49ff234a 100755 --- a/test/VisuPrs/IsoSurfaces/F3.py +++ b/test/VisuPrs/IsoSurfaces/F3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/F3") +picturedir = get_picture_dir("IsoSurfaces/F3") file = datadir + "test_hydro_darcy4_out.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/F4.py b/test/VisuPrs/IsoSurfaces/F4.py index 6794c3e6..8ff4e3b5 100755 --- a/test/VisuPrs/IsoSurfaces/F4.py +++ b/test/VisuPrs/IsoSurfaces/F4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/F4") +picturedir = get_picture_dir("IsoSurfaces/F4") file = datadir + "UO2_250ans.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/F5.py b/test/VisuPrs/IsoSurfaces/F5.py index b7419239..2f2e8115 100755 --- a/test/VisuPrs/IsoSurfaces/F5.py +++ b/test/VisuPrs/IsoSurfaces/F5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/F5") +picturedir = get_picture_dir("IsoSurfaces/F5") file = datadir + "maill.1.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/F6.py b/test/VisuPrs/IsoSurfaces/F6.py index ffc744fd..c0ee37e5 100755 --- a/test/VisuPrs/IsoSurfaces/F6.py +++ b/test/VisuPrs/IsoSurfaces/F6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/F6") +picturedir = get_picture_dir("IsoSurfaces/F6") file = datadir + "maill.0.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/F7.py b/test/VisuPrs/IsoSurfaces/F7.py index afda2fae..74f5ee56 100644 --- a/test/VisuPrs/IsoSurfaces/F7.py +++ b/test/VisuPrs/IsoSurfaces/F7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/F7") +picturedir = get_picture_dir("IsoSurfaces/F7") file = datadir + "occ4050.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/F8.py b/test/VisuPrs/IsoSurfaces/F8.py index db36a3ef..d02e6eef 100755 --- a/test/VisuPrs/IsoSurfaces/F8.py +++ b/test/VisuPrs/IsoSurfaces/F8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/F8") +picturedir = get_picture_dir("IsoSurfaces/F8") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.1.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/F9.py b/test/VisuPrs/IsoSurfaces/F9.py index 21a1c83c..a1a00cdf 100644 --- a/test/VisuPrs/IsoSurfaces/F9.py +++ b/test/VisuPrs/IsoSurfaces/F9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/F9") +picturedir = get_picture_dir("IsoSurfaces/F9") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.2.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/G0.py b/test/VisuPrs/IsoSurfaces/G0.py index 38ff3874..1aec0086 100644 --- a/test/VisuPrs/IsoSurfaces/G0.py +++ b/test/VisuPrs/IsoSurfaces/G0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/G0") +picturedir = get_picture_dir("IsoSurfaces/G0") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.3.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/G1.py b/test/VisuPrs/IsoSurfaces/G1.py index 3aaafc63..20c020bb 100755 --- a/test/VisuPrs/IsoSurfaces/G1.py +++ b/test/VisuPrs/IsoSurfaces/G1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"IsoSurfaces/G1") +picturedir = get_picture_dir("IsoSurfaces/G1") file = datadir + "maill.2.med" print " --------------------------------- " diff --git a/test/VisuPrs/IsoSurfaces/G2.py b/test/VisuPrs/IsoSurfaces/G2.py index 3b459bdf..6f932351 100644 --- a/test/VisuPrs/IsoSurfaces/G2.py +++ b/test/VisuPrs/IsoSurfaces/G2.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "IsoSurfaces/G2") +picturedir = get_picture_dir("IsoSurfaces/G2") theFileName = datadir + "Bug829_resu_mode.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/A0.py b/test/VisuPrs/MeshPresentation/A0.py index 29ae2e13..cbfaeb3c 100644 --- a/test/VisuPrs/MeshPresentation/A0.py +++ b/test/VisuPrs/MeshPresentation/A0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/A0") +picturedir = get_picture_dir("MeshPresentation/A0") file = datadir + "fra.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/A1.py b/test/VisuPrs/MeshPresentation/A1.py index 93c71f58..5ed16b18 100644 --- a/test/VisuPrs/MeshPresentation/A1.py +++ b/test/VisuPrs/MeshPresentation/A1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/A1") +picturedir = get_picture_dir("MeshPresentation/A1") file = datadir + "hexa_28320_ELEM.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/A2.py b/test/VisuPrs/MeshPresentation/A2.py index bf5fe704..d1dbaae9 100644 --- a/test/VisuPrs/MeshPresentation/A2.py +++ b/test/VisuPrs/MeshPresentation/A2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/A2") +picturedir = get_picture_dir("MeshPresentation/A2") file = datadir + "pointe.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/A3.py b/test/VisuPrs/MeshPresentation/A3.py index 8095032f..4a519c95 100644 --- a/test/VisuPrs/MeshPresentation/A3.py +++ b/test/VisuPrs/MeshPresentation/A3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/A3") +picturedir = get_picture_dir("MeshPresentation/A3") file = datadir + "Fields_group3D.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/A4.py b/test/VisuPrs/MeshPresentation/A4.py index dac1e81c..1b1aacdd 100644 --- a/test/VisuPrs/MeshPresentation/A4.py +++ b/test/VisuPrs/MeshPresentation/A4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/A4") +picturedir = get_picture_dir("MeshPresentation/A4") file = datadir + "Hexa8.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/A5.py b/test/VisuPrs/MeshPresentation/A5.py index 9df17896..e716fad4 100644 --- a/test/VisuPrs/MeshPresentation/A5.py +++ b/test/VisuPrs/MeshPresentation/A5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/A5") +picturedir = get_picture_dir("MeshPresentation/A5") file = datadir + "Penta6.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/A6.py b/test/VisuPrs/MeshPresentation/A6.py index 0a6e6939..45d4d5f3 100644 --- a/test/VisuPrs/MeshPresentation/A6.py +++ b/test/VisuPrs/MeshPresentation/A6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/A6") +picturedir = get_picture_dir("MeshPresentation/A6") file = datadir + "clo.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/A7.py b/test/VisuPrs/MeshPresentation/A7.py index e5b3469a..0ad3ec55 100644 --- a/test/VisuPrs/MeshPresentation/A7.py +++ b/test/VisuPrs/MeshPresentation/A7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/A7") +picturedir = get_picture_dir("MeshPresentation/A7") file = datadir + "Tetra4.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/A8.py b/test/VisuPrs/MeshPresentation/A8.py index 5f72a49f..20565acf 100644 --- a/test/VisuPrs/MeshPresentation/A8.py +++ b/test/VisuPrs/MeshPresentation/A8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/A8") +picturedir = get_picture_dir("MeshPresentation/A8") file = datadir + "Tria3.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/A9.py b/test/VisuPrs/MeshPresentation/A9.py index 7917549d..f865230c 100644 --- a/test/VisuPrs/MeshPresentation/A9.py +++ b/test/VisuPrs/MeshPresentation/A9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/A9") +picturedir = get_picture_dir("MeshPresentation/A9") file = datadir + "Quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/B0.py b/test/VisuPrs/MeshPresentation/B0.py index 6f2bbbf0..553698c1 100644 --- a/test/VisuPrs/MeshPresentation/B0.py +++ b/test/VisuPrs/MeshPresentation/B0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/B0") +picturedir = get_picture_dir("MeshPresentation/B0") file = datadir + "carre_en_quad4_seg2.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/B1.py b/test/VisuPrs/MeshPresentation/B1.py index 2a016992..1e08af5f 100644 --- a/test/VisuPrs/MeshPresentation/B1.py +++ b/test/VisuPrs/MeshPresentation/B1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/B1") +picturedir = get_picture_dir("MeshPresentation/B1") file = datadir + "carre_en_quad4_seg2_fields.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/B2.py b/test/VisuPrs/MeshPresentation/B2.py index bf7499dd..584fada2 100644 --- a/test/VisuPrs/MeshPresentation/B2.py +++ b/test/VisuPrs/MeshPresentation/B2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/B2") +picturedir = get_picture_dir("MeshPresentation/B2") file = datadir + "cube_hexa8_quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/CMakeLists.txt b/test/VisuPrs/MeshPresentation/CMakeLists.txt index 4add8454..ee345647 100644 --- a/test/VisuPrs/MeshPresentation/CMakeLists.txt +++ b/test/VisuPrs/MeshPresentation/CMakeLists.txt @@ -104,7 +104,7 @@ IF (PYTHON_EXECUTABLE) L1 ) SET(TIMEOUT 10000) - ADD_TEST(MESH_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(MESH_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(MESH_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/MeshPresentation/E0.py b/test/VisuPrs/MeshPresentation/E0.py index f4775227..3eaa732c 100644 --- a/test/VisuPrs/MeshPresentation/E0.py +++ b/test/VisuPrs/MeshPresentation/E0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/E0") +picturedir = get_picture_dir("MeshPresentation/E0") file = datadir + "test_55_solid_concentr_dom.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/E1.py b/test/VisuPrs/MeshPresentation/E1.py index 1902c6d1..1afbdc98 100644 --- a/test/VisuPrs/MeshPresentation/E1.py +++ b/test/VisuPrs/MeshPresentation/E1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/E1") +picturedir = get_picture_dir("MeshPresentation/E1") file = datadir + "H_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/E2.py b/test/VisuPrs/MeshPresentation/E2.py index e89bb1d7..59e72842 100644 --- a/test/VisuPrs/MeshPresentation/E2.py +++ b/test/VisuPrs/MeshPresentation/E2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/E2") +picturedir = get_picture_dir("MeshPresentation/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/E3.py b/test/VisuPrs/MeshPresentation/E3.py index 89aee6c5..8e3feb06 100644 --- a/test/VisuPrs/MeshPresentation/E3.py +++ b/test/VisuPrs/MeshPresentation/E3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/E3") +picturedir = get_picture_dir("MeshPresentation/E3") file = datadir + "hydro_d10.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/E4.py b/test/VisuPrs/MeshPresentation/E4.py index 4f83c5d1..76a6d0af 100644 --- a/test/VisuPrs/MeshPresentation/E4.py +++ b/test/VisuPrs/MeshPresentation/E4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/E4") +picturedir = get_picture_dir("MeshPresentation/E4") file = datadir + "champc.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/E5.py b/test/VisuPrs/MeshPresentation/E5.py index 14fa9a33..9d9aa314 100644 --- a/test/VisuPrs/MeshPresentation/E5.py +++ b/test/VisuPrs/MeshPresentation/E5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/E5") +picturedir = get_picture_dir("MeshPresentation/E5") file = datadir + "hydro_sea_alv.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/E6.py b/test/VisuPrs/MeshPresentation/E6.py index b00eca10..d7024020 100644 --- a/test/VisuPrs/MeshPresentation/E6.py +++ b/test/VisuPrs/MeshPresentation/E6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/E6") +picturedir = get_picture_dir("MeshPresentation/E6") file = datadir + "toto.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/E7.py b/test/VisuPrs/MeshPresentation/E7.py index dac957b2..9646d215 100644 --- a/test/VisuPrs/MeshPresentation/E7.py +++ b/test/VisuPrs/MeshPresentation/E7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/E7") +picturedir = get_picture_dir("MeshPresentation/E7") file = datadir + "couplex_alain.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/E8.py b/test/VisuPrs/MeshPresentation/E8.py index 68a6e3ff..b41089fd 100644 --- a/test/VisuPrs/MeshPresentation/E8.py +++ b/test/VisuPrs/MeshPresentation/E8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/E8") +picturedir = get_picture_dir("MeshPresentation/E8") file = datadir + "KCOUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/E9.py b/test/VisuPrs/MeshPresentation/E9.py index 19df0b30..cc4e3151 100644 --- a/test/VisuPrs/MeshPresentation/E9.py +++ b/test/VisuPrs/MeshPresentation/E9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/E9") +picturedir = get_picture_dir("MeshPresentation/E9") file = datadir + "test_hydro.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/F0.py b/test/VisuPrs/MeshPresentation/F0.py index 8f44a0f9..c6e0a867 100644 --- a/test/VisuPrs/MeshPresentation/F0.py +++ b/test/VisuPrs/MeshPresentation/F0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/F0") +picturedir = get_picture_dir("MeshPresentation/F0") file = datadir + "gro5couches.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/F1.py b/test/VisuPrs/MeshPresentation/F1.py index eee9d43e..50bf2b82 100644 --- a/test/VisuPrs/MeshPresentation/F1.py +++ b/test/VisuPrs/MeshPresentation/F1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/F1") +picturedir = get_picture_dir("MeshPresentation/F1") file = datadir + "ml.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/F2.py b/test/VisuPrs/MeshPresentation/F2.py index b488ba78..f0206a72 100644 --- a/test/VisuPrs/MeshPresentation/F2.py +++ b/test/VisuPrs/MeshPresentation/F2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/F2") +picturedir = get_picture_dir("MeshPresentation/F2") file = datadir + "T_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/F3.py b/test/VisuPrs/MeshPresentation/F3.py index ced0fb73..50453a42 100644 --- a/test/VisuPrs/MeshPresentation/F3.py +++ b/test/VisuPrs/MeshPresentation/F3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/F3") +picturedir = get_picture_dir("MeshPresentation/F3") file = datadir + "test_hydro_darcy4_out.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/F4.py b/test/VisuPrs/MeshPresentation/F4.py index 1284f90d..f861239a 100644 --- a/test/VisuPrs/MeshPresentation/F4.py +++ b/test/VisuPrs/MeshPresentation/F4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/F4") +picturedir = get_picture_dir("MeshPresentation/F4") file = datadir + "UO2_250ans.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/F5.py b/test/VisuPrs/MeshPresentation/F5.py index c27f67ff..cb3ec393 100644 --- a/test/VisuPrs/MeshPresentation/F5.py +++ b/test/VisuPrs/MeshPresentation/F5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/F5") +picturedir = get_picture_dir("MeshPresentation/F5") file = datadir + "maill.1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/F6.py b/test/VisuPrs/MeshPresentation/F6.py index 27954fe2..7e137417 100644 --- a/test/VisuPrs/MeshPresentation/F6.py +++ b/test/VisuPrs/MeshPresentation/F6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/F6") +picturedir = get_picture_dir("MeshPresentation/F6") file = datadir + "maill.0.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/F7.py b/test/VisuPrs/MeshPresentation/F7.py index 159186b8..2e847f6b 100644 --- a/test/VisuPrs/MeshPresentation/F7.py +++ b/test/VisuPrs/MeshPresentation/F7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/F7") +picturedir = get_picture_dir("MeshPresentation/F7") file = datadir + "occ4050.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/F8.py b/test/VisuPrs/MeshPresentation/F8.py index fe8c5030..f9e77532 100644 --- a/test/VisuPrs/MeshPresentation/F8.py +++ b/test/VisuPrs/MeshPresentation/F8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/F8") +picturedir = get_picture_dir("MeshPresentation/F8") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/F9.py b/test/VisuPrs/MeshPresentation/F9.py index 03b7d9e5..de1b0b22 100644 --- a/test/VisuPrs/MeshPresentation/F9.py +++ b/test/VisuPrs/MeshPresentation/F9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/F9") +picturedir = get_picture_dir("MeshPresentation/F9") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.2.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/G0.py b/test/VisuPrs/MeshPresentation/G0.py index 90303693..f76a7aed 100644 --- a/test/VisuPrs/MeshPresentation/G0.py +++ b/test/VisuPrs/MeshPresentation/G0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/G0") +picturedir = get_picture_dir("MeshPresentation/G0") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.3.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/G1.py b/test/VisuPrs/MeshPresentation/G1.py index 1987fbcb..383d1a42 100644 --- a/test/VisuPrs/MeshPresentation/G1.py +++ b/test/VisuPrs/MeshPresentation/G1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"MeshPresentation/G1") +picturedir = get_picture_dir("MeshPresentation/G1") file = datadir + "maill.2.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/G3.py b/test/VisuPrs/MeshPresentation/G3.py index eb5c83e2..6a0d9994 100644 --- a/test/VisuPrs/MeshPresentation/G3.py +++ b/test/VisuPrs/MeshPresentation/G3.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/G3") +picturedir = get_picture_dir("MeshPresentation/G3") theFileName = datadir + "Box1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/G4.py b/test/VisuPrs/MeshPresentation/G4.py index fa68ca3b..a75b8a21 100644 --- a/test/VisuPrs/MeshPresentation/G4.py +++ b/test/VisuPrs/MeshPresentation/G4.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/G4") +picturedir = get_picture_dir("MeshPresentation/G4") theFileName = datadir + "Box1Moderate.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/G5.py b/test/VisuPrs/MeshPresentation/G5.py index 48599e9c..64443ece 100644 --- a/test/VisuPrs/MeshPresentation/G5.py +++ b/test/VisuPrs/MeshPresentation/G5.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/G5") +picturedir = get_picture_dir("MeshPresentation/G5") theFileName = datadir + "Box2.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/G6.py b/test/VisuPrs/MeshPresentation/G6.py index 0a36b969..8c77d7b7 100644 --- a/test/VisuPrs/MeshPresentation/G6.py +++ b/test/VisuPrs/MeshPresentation/G6.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/G6") +picturedir = get_picture_dir("MeshPresentation/G6") theFileName = datadir + "Box2Moderate.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/G7.py b/test/VisuPrs/MeshPresentation/G7.py index 31d06bc1..1e99910f 100644 --- a/test/VisuPrs/MeshPresentation/G7.py +++ b/test/VisuPrs/MeshPresentation/G7.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/G7") +picturedir = get_picture_dir("MeshPresentation/G7") theFileName = datadir + "Box3.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/G8.py b/test/VisuPrs/MeshPresentation/G8.py index 600a84f8..91f21d9f 100644 --- a/test/VisuPrs/MeshPresentation/G8.py +++ b/test/VisuPrs/MeshPresentation/G8.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/G8") +picturedir = get_picture_dir("MeshPresentation/G8") theFileName = datadir + "BoxEvenSmaller1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/G9.py b/test/VisuPrs/MeshPresentation/G9.py index 27b9a786..25e7889c 100644 --- a/test/VisuPrs/MeshPresentation/G9.py +++ b/test/VisuPrs/MeshPresentation/G9.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/G9") +picturedir = get_picture_dir("MeshPresentation/G9") theFileName = datadir + "BoxHexa1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/H0.py b/test/VisuPrs/MeshPresentation/H0.py index 3a728894..b9eb8660 100644 --- a/test/VisuPrs/MeshPresentation/H0.py +++ b/test/VisuPrs/MeshPresentation/H0.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/H0") +picturedir = get_picture_dir("MeshPresentation/H0") theFileName = datadir + "BoxHexa2.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/H1.py b/test/VisuPrs/MeshPresentation/H1.py index 60565213..0c580962 100644 --- a/test/VisuPrs/MeshPresentation/H1.py +++ b/test/VisuPrs/MeshPresentation/H1.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/H1") +picturedir = get_picture_dir("MeshPresentation/H1") theFileName = datadir + "BoxModSmall1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/H2.py b/test/VisuPrs/MeshPresentation/H2.py index eb9246f5..e48d57c1 100644 --- a/test/VisuPrs/MeshPresentation/H2.py +++ b/test/VisuPrs/MeshPresentation/H2.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/H2") +picturedir = get_picture_dir("MeshPresentation/H2") theFileName = datadir + "BoxModSmall2.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/H3.py b/test/VisuPrs/MeshPresentation/H3.py index bc210f1f..7fac6beb 100644 --- a/test/VisuPrs/MeshPresentation/H3.py +++ b/test/VisuPrs/MeshPresentation/H3.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/H3") +picturedir = get_picture_dir("MeshPresentation/H3") theFileName = datadir + "BoxTetra2.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/H4.py b/test/VisuPrs/MeshPresentation/H4.py index 77223fd6..c3847839 100644 --- a/test/VisuPrs/MeshPresentation/H4.py +++ b/test/VisuPrs/MeshPresentation/H4.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/H4") +picturedir = get_picture_dir("MeshPresentation/H4") theFileName = datadir + "ComplexIncludedTetra.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/H5.py b/test/VisuPrs/MeshPresentation/H5.py index 64287084..1445954d 100644 --- a/test/VisuPrs/MeshPresentation/H5.py +++ b/test/VisuPrs/MeshPresentation/H5.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/H5") +picturedir = get_picture_dir("MeshPresentation/H5") theFileName = datadir + "ComplexIncludingTetra.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/H6.py b/test/VisuPrs/MeshPresentation/H6.py index 49b65026..a28b878d 100644 --- a/test/VisuPrs/MeshPresentation/H6.py +++ b/test/VisuPrs/MeshPresentation/H6.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/H6") +picturedir = get_picture_dir("MeshPresentation/H6") theFileName = datadir + "CornerTetra.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/H7.py b/test/VisuPrs/MeshPresentation/H7.py index cc140830..e329019a 100644 --- a/test/VisuPrs/MeshPresentation/H7.py +++ b/test/VisuPrs/MeshPresentation/H7.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/H7") +picturedir = get_picture_dir("MeshPresentation/H7") theFileName = datadir + "DegenEdgeXY.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/H8.py b/test/VisuPrs/MeshPresentation/H8.py index b10b624c..0f568072 100644 --- a/test/VisuPrs/MeshPresentation/H8.py +++ b/test/VisuPrs/MeshPresentation/H8.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/H8") +picturedir = get_picture_dir("MeshPresentation/H8") theFileName = datadir + "DegenFaceXYZ.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/H9.py b/test/VisuPrs/MeshPresentation/H9.py index b731d829..d0443303 100644 --- a/test/VisuPrs/MeshPresentation/H9.py +++ b/test/VisuPrs/MeshPresentation/H9.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/H9") +picturedir = get_picture_dir("MeshPresentation/H9") theFileName = datadir + "DegenTranslatedInPlane.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/I0.py b/test/VisuPrs/MeshPresentation/I0.py index cdac8ff3..c5001983 100644 --- a/test/VisuPrs/MeshPresentation/I0.py +++ b/test/VisuPrs/MeshPresentation/I0.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/I0") +picturedir = get_picture_dir("MeshPresentation/I0") theFileName = datadir + "TinyBox.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/I1.py b/test/VisuPrs/MeshPresentation/I1.py index 71ec61e9..80836e35 100644 --- a/test/VisuPrs/MeshPresentation/I1.py +++ b/test/VisuPrs/MeshPresentation/I1.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/I1") +picturedir = get_picture_dir("MeshPresentation/I1") theFileName = datadir + "TrickyTetra1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/I2.py b/test/VisuPrs/MeshPresentation/I2.py index 28398cd0..e0d3b3da 100644 --- a/test/VisuPrs/MeshPresentation/I2.py +++ b/test/VisuPrs/MeshPresentation/I2.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/I2") +picturedir = get_picture_dir("MeshPresentation/I2") theFileName = datadir + "UnitTetra.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/I3.py b/test/VisuPrs/MeshPresentation/I3.py index 437e8483..36cc99e8 100644 --- a/test/VisuPrs/MeshPresentation/I3.py +++ b/test/VisuPrs/MeshPresentation/I3.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/I3") +picturedir = get_picture_dir("MeshPresentation/I3") theFileName = datadir + "UnitTetraDegenT.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/I4.py b/test/VisuPrs/MeshPresentation/I4.py index 47218ccd..16a3d822 100644 --- a/test/VisuPrs/MeshPresentation/I4.py +++ b/test/VisuPrs/MeshPresentation/I4.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/I4") +picturedir = get_picture_dir("MeshPresentation/I4") theFileName = datadir + "square1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/I5.py b/test/VisuPrs/MeshPresentation/I5.py index 1a3b87cd..65ef104f 100644 --- a/test/VisuPrs/MeshPresentation/I5.py +++ b/test/VisuPrs/MeshPresentation/I5.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/I5") +picturedir = get_picture_dir("MeshPresentation/I5") theFileName = datadir + "square1_split1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/I6.py b/test/VisuPrs/MeshPresentation/I6.py index 02d21e3d..7554dc80 100644 --- a/test/VisuPrs/MeshPresentation/I6.py +++ b/test/VisuPrs/MeshPresentation/I6.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/I6") +picturedir = get_picture_dir("MeshPresentation/I6") theFileName = datadir + "square1_split2.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/I7.py b/test/VisuPrs/MeshPresentation/I7.py index 2bfea39f..4fae7e51 100644 --- a/test/VisuPrs/MeshPresentation/I7.py +++ b/test/VisuPrs/MeshPresentation/I7.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/I7") +picturedir = get_picture_dir("MeshPresentation/I7") theFileName = datadir + "square1_split3.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/I8.py b/test/VisuPrs/MeshPresentation/I8.py index babe3f0a..3deec400 100644 --- a/test/VisuPrs/MeshPresentation/I8.py +++ b/test/VisuPrs/MeshPresentation/I8.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/I8") +picturedir = get_picture_dir("MeshPresentation/I8") theFileName = datadir + "square2.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/I9.py b/test/VisuPrs/MeshPresentation/I9.py index 530007bd..c703abaf 100644 --- a/test/VisuPrs/MeshPresentation/I9.py +++ b/test/VisuPrs/MeshPresentation/I9.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/I9") +picturedir = get_picture_dir("MeshPresentation/I9") theFileName = datadir + "square2_split1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/J0.py b/test/VisuPrs/MeshPresentation/J0.py index 156860e3..52dbd66f 100644 --- a/test/VisuPrs/MeshPresentation/J0.py +++ b/test/VisuPrs/MeshPresentation/J0.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/J0") +picturedir = get_picture_dir("MeshPresentation/J0") theFileName = datadir + "DividedGenTetra1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/J1.py b/test/VisuPrs/MeshPresentation/J1.py index ce33dc3f..2300afcf 100644 --- a/test/VisuPrs/MeshPresentation/J1.py +++ b/test/VisuPrs/MeshPresentation/J1.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/J1") +picturedir = get_picture_dir("MeshPresentation/J1") theFileName = datadir + "DividedGenTetra2.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/J2.py b/test/VisuPrs/MeshPresentation/J2.py index a6209e95..b24f4b87 100644 --- a/test/VisuPrs/MeshPresentation/J2.py +++ b/test/VisuPrs/MeshPresentation/J2.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/J2") +picturedir = get_picture_dir("MeshPresentation/J2") theFileName = datadir + "DividedUnitTetra.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/J3.py b/test/VisuPrs/MeshPresentation/J3.py index e02d08f4..47f1c7ff 100644 --- a/test/VisuPrs/MeshPresentation/J3.py +++ b/test/VisuPrs/MeshPresentation/J3.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/J3") +picturedir = get_picture_dir("MeshPresentation/J3") theFileName = datadir + "DividedUnitTetraSimpler.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/J4.py b/test/VisuPrs/MeshPresentation/J4.py index 422d99df..4da0f972 100644 --- a/test/VisuPrs/MeshPresentation/J4.py +++ b/test/VisuPrs/MeshPresentation/J4.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/J4") +picturedir = get_picture_dir("MeshPresentation/J4") theFileName = datadir + "GenTetra1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/J5.py b/test/VisuPrs/MeshPresentation/J5.py index 7cba420a..f05cac54 100644 --- a/test/VisuPrs/MeshPresentation/J5.py +++ b/test/VisuPrs/MeshPresentation/J5.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/J5") +picturedir = get_picture_dir("MeshPresentation/J5") theFileName = datadir + "GenTetra2.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/J6.py b/test/VisuPrs/MeshPresentation/J6.py index 757b0a25..de515cfe 100644 --- a/test/VisuPrs/MeshPresentation/J6.py +++ b/test/VisuPrs/MeshPresentation/J6.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/J6") +picturedir = get_picture_dir("MeshPresentation/J6") theFileName = datadir + "GeneralTetra.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/J7.py b/test/VisuPrs/MeshPresentation/J7.py index 405c890a..72c1e92c 100644 --- a/test/VisuPrs/MeshPresentation/J7.py +++ b/test/VisuPrs/MeshPresentation/J7.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/J7") +picturedir = get_picture_dir("MeshPresentation/J7") theFileName = datadir + "HalfstripOnly.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/J8.py b/test/VisuPrs/MeshPresentation/J8.py index 69ba5583..e8d77936 100644 --- a/test/VisuPrs/MeshPresentation/J8.py +++ b/test/VisuPrs/MeshPresentation/J8.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/J8") +picturedir = get_picture_dir("MeshPresentation/J8") theFileName = datadir + "HalfstripOnly2.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/J9.py b/test/VisuPrs/MeshPresentation/J9.py index 081323f4..c32ed474 100644 --- a/test/VisuPrs/MeshPresentation/J9.py +++ b/test/VisuPrs/MeshPresentation/J9.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/J9") +picturedir = get_picture_dir("MeshPresentation/J9") theFileName = datadir + "LargeInconsistentTetra.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/K0.py b/test/VisuPrs/MeshPresentation/K0.py index 960f6538..c18c906d 100644 --- a/test/VisuPrs/MeshPresentation/K0.py +++ b/test/VisuPrs/MeshPresentation/K0.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/K0") +picturedir = get_picture_dir("MeshPresentation/K0") theFileName = datadir + "LargeUnitTetra.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/K1.py b/test/VisuPrs/MeshPresentation/K1.py index 8c86aadb..710259ab 100644 --- a/test/VisuPrs/MeshPresentation/K1.py +++ b/test/VisuPrs/MeshPresentation/K1.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/K1") +picturedir = get_picture_dir("MeshPresentation/K1") theFileName = datadir + "MovedHexaBox1.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/K2.py b/test/VisuPrs/MeshPresentation/K2.py index eda0fac7..8b7755c9 100644 --- a/test/VisuPrs/MeshPresentation/K2.py +++ b/test/VisuPrs/MeshPresentation/K2.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/K2") +picturedir = get_picture_dir("MeshPresentation/K2") theFileName = datadir + "MovedHexaBox2.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/K3.py b/test/VisuPrs/MeshPresentation/K3.py index f4350ac7..58fc4763 100644 --- a/test/VisuPrs/MeshPresentation/K3.py +++ b/test/VisuPrs/MeshPresentation/K3.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/K3") +picturedir = get_picture_dir("MeshPresentation/K3") theFileName = datadir + "NudgedDividedUnitTetra.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/K4.py b/test/VisuPrs/MeshPresentation/K4.py index fe200080..8bbca1ae 100644 --- a/test/VisuPrs/MeshPresentation/K4.py +++ b/test/VisuPrs/MeshPresentation/K4.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/K4") +picturedir = get_picture_dir("MeshPresentation/K4") theFileName = datadir + "NudgedDividedUnitTetraSimpler.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/K5.py b/test/VisuPrs/MeshPresentation/K5.py index 4c069cbd..1621be3a 100644 --- a/test/VisuPrs/MeshPresentation/K5.py +++ b/test/VisuPrs/MeshPresentation/K5.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/K5") +picturedir = get_picture_dir("MeshPresentation/K5") theFileName = datadir + "NudgedSimpler.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/K6.py b/test/VisuPrs/MeshPresentation/K6.py index dea79764..c059ace3 100644 --- a/test/VisuPrs/MeshPresentation/K6.py +++ b/test/VisuPrs/MeshPresentation/K6.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/K6") +picturedir = get_picture_dir("MeshPresentation/K6") theFileName = datadir + "NudgedTetra.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/K7.py b/test/VisuPrs/MeshPresentation/K7.py index 767f2bfc..4bc9f67f 100644 --- a/test/VisuPrs/MeshPresentation/K7.py +++ b/test/VisuPrs/MeshPresentation/K7.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/K7") +picturedir = get_picture_dir("MeshPresentation/K7") theFileName = datadir + "SimpleHalfstripOnly.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/K8.py b/test/VisuPrs/MeshPresentation/K8.py index 830b853b..49776a96 100644 --- a/test/VisuPrs/MeshPresentation/K8.py +++ b/test/VisuPrs/MeshPresentation/K8.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/K8") +picturedir = get_picture_dir("MeshPresentation/K8") theFileName = datadir + "SimpleIncludedTetra.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/K9.py b/test/VisuPrs/MeshPresentation/K9.py index 19f5ae45..05791965 100644 --- a/test/VisuPrs/MeshPresentation/K9.py +++ b/test/VisuPrs/MeshPresentation/K9.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/K9") +picturedir = get_picture_dir("MeshPresentation/K9") theFileName = datadir + "SimpleIncludingTetra.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/L0.py b/test/VisuPrs/MeshPresentation/L0.py index 23da31a7..3d4e2076 100644 --- a/test/VisuPrs/MeshPresentation/L0.py +++ b/test/VisuPrs/MeshPresentation/L0.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/L0") +picturedir = get_picture_dir("MeshPresentation/L0") theFileName = datadir + "square2_split2.med" print " --------------------------------- " diff --git a/test/VisuPrs/MeshPresentation/L1.py b/test/VisuPrs/MeshPresentation/L1.py index ff5df49e..31e1c87b 100644 --- a/test/VisuPrs/MeshPresentation/L1.py +++ b/test/VisuPrs/MeshPresentation/L1.py @@ -28,7 +28,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "MeshPresentation/L1") +picturedir = get_picture_dir("MeshPresentation/L1") theFileName = datadir + "Bug829_resu_mode.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/A0.py b/test/VisuPrs/Plot3D/A0.py index 86b99b43..d49762bf 100644 --- a/test/VisuPrs/Plot3D/A0.py +++ b/test/VisuPrs/Plot3D/A0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/A0") +picturedir = get_picture_dir("Plot3D/A0") file = datadir + "fra.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/A1.py b/test/VisuPrs/Plot3D/A1.py index d9b57ee5..a836c9b3 100755 --- a/test/VisuPrs/Plot3D/A1.py +++ b/test/VisuPrs/Plot3D/A1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/A1") +picturedir = get_picture_dir("Plot3D/A1") file = datadir + "hexa_28320_ELEM.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/A2.py b/test/VisuPrs/Plot3D/A2.py index 2c5f17e3..812ab2b4 100755 --- a/test/VisuPrs/Plot3D/A2.py +++ b/test/VisuPrs/Plot3D/A2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/A2") +picturedir = get_picture_dir("Plot3D/A2") file = datadir + "pointe.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/A3.py b/test/VisuPrs/Plot3D/A3.py index 53769bf1..811c798c 100755 --- a/test/VisuPrs/Plot3D/A3.py +++ b/test/VisuPrs/Plot3D/A3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/A3") +picturedir = get_picture_dir("Plot3D/A3") file = datadir + "Fields_group3D.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/A4.py b/test/VisuPrs/Plot3D/A4.py index 2343f75b..5b23a7b5 100755 --- a/test/VisuPrs/Plot3D/A4.py +++ b/test/VisuPrs/Plot3D/A4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/A4") +picturedir = get_picture_dir("Plot3D/A4") file = datadir + "Hexa8.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/A5.py b/test/VisuPrs/Plot3D/A5.py index 5c67f2eb..6154b274 100755 --- a/test/VisuPrs/Plot3D/A5.py +++ b/test/VisuPrs/Plot3D/A5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/A5") +picturedir = get_picture_dir("Plot3D/A5") file = datadir + "Penta6.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/A6.py b/test/VisuPrs/Plot3D/A6.py index eca9632e..6e78faf9 100644 --- a/test/VisuPrs/Plot3D/A6.py +++ b/test/VisuPrs/Plot3D/A6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/A6") +picturedir = get_picture_dir("Plot3D/A6") file = datadir + "clo.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/A7.py b/test/VisuPrs/Plot3D/A7.py index 329a8173..bf8a1a95 100755 --- a/test/VisuPrs/Plot3D/A7.py +++ b/test/VisuPrs/Plot3D/A7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/A7") +picturedir = get_picture_dir("Plot3D/A7") file = datadir + "Tetra4.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/A8.py b/test/VisuPrs/Plot3D/A8.py index 4e825343..e45fdc10 100755 --- a/test/VisuPrs/Plot3D/A8.py +++ b/test/VisuPrs/Plot3D/A8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/A8") +picturedir = get_picture_dir("Plot3D/A8") file = datadir + "Tria3.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/A9.py b/test/VisuPrs/Plot3D/A9.py index 5551a1b2..ec2afa14 100755 --- a/test/VisuPrs/Plot3D/A9.py +++ b/test/VisuPrs/Plot3D/A9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/A9") +picturedir = get_picture_dir("Plot3D/A9") file = datadir + "Quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/B0.py b/test/VisuPrs/Plot3D/B0.py index 577fa182..39c478e8 100755 --- a/test/VisuPrs/Plot3D/B0.py +++ b/test/VisuPrs/Plot3D/B0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/B0") +picturedir = get_picture_dir("Plot3D/B0") file = datadir + "carre_en_quad4_seg2.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/B1.py b/test/VisuPrs/Plot3D/B1.py index 9d35ebeb..1bdc86fd 100755 --- a/test/VisuPrs/Plot3D/B1.py +++ b/test/VisuPrs/Plot3D/B1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/B1") +picturedir = get_picture_dir("Plot3D/B1") file = datadir + "carre_en_quad4_seg2_fields.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/B2.py b/test/VisuPrs/Plot3D/B2.py index 008300fb..ffd09042 100755 --- a/test/VisuPrs/Plot3D/B2.py +++ b/test/VisuPrs/Plot3D/B2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/B2") +picturedir = get_picture_dir("Plot3D/B2") file = datadir + "cube_hexa8_quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/CMakeLists.txt b/test/VisuPrs/Plot3D/CMakeLists.txt index eb53d51f..b75e8749 100755 --- a/test/VisuPrs/Plot3D/CMakeLists.txt +++ b/test/VisuPrs/Plot3D/CMakeLists.txt @@ -56,7 +56,7 @@ IF (PYTHON_EXECUTABLE) G2 ) SET(TIMEOUT 10000) - ADD_TEST(PLOT3D_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(PLOT3D_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(PLOT3D_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/Plot3D/E0.py b/test/VisuPrs/Plot3D/E0.py index 5f965009..4fe38fcb 100755 --- a/test/VisuPrs/Plot3D/E0.py +++ b/test/VisuPrs/Plot3D/E0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/E0") +picturedir = get_picture_dir("Plot3D/E0") file = datadir + "test_55_solid_concentr_dom.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/E1.py b/test/VisuPrs/Plot3D/E1.py index bf7e6366..18e7a79c 100755 --- a/test/VisuPrs/Plot3D/E1.py +++ b/test/VisuPrs/Plot3D/E1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/E1") +picturedir = get_picture_dir("Plot3D/E1") file = datadir + "H_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/E2.py b/test/VisuPrs/Plot3D/E2.py index cc27fb64..31e05184 100755 --- a/test/VisuPrs/Plot3D/E2.py +++ b/test/VisuPrs/Plot3D/E2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/E2") +picturedir = get_picture_dir("Plot3D/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/E3.py b/test/VisuPrs/Plot3D/E3.py index e32311f5..6f45db0e 100644 --- a/test/VisuPrs/Plot3D/E3.py +++ b/test/VisuPrs/Plot3D/E3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/E3") +picturedir = get_picture_dir("Plot3D/E3") file = datadir + "hydro_d10.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/E4.py b/test/VisuPrs/Plot3D/E4.py index 87e0e3da..ec17ccf7 100755 --- a/test/VisuPrs/Plot3D/E4.py +++ b/test/VisuPrs/Plot3D/E4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/E4") +picturedir = get_picture_dir("Plot3D/E4") file = datadir + "champc.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/E5.py b/test/VisuPrs/Plot3D/E5.py index cc8d9b1c..ae39233f 100755 --- a/test/VisuPrs/Plot3D/E5.py +++ b/test/VisuPrs/Plot3D/E5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/E5") +picturedir = get_picture_dir("Plot3D/E5") file = datadir + "hydro_sea_alv.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/E6.py b/test/VisuPrs/Plot3D/E6.py index e61f9cd9..8a77950c 100755 --- a/test/VisuPrs/Plot3D/E6.py +++ b/test/VisuPrs/Plot3D/E6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/E6") +picturedir = get_picture_dir("Plot3D/E6") file = datadir + "toto.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/E7.py b/test/VisuPrs/Plot3D/E7.py index a1bb8800..113b8a5d 100755 --- a/test/VisuPrs/Plot3D/E7.py +++ b/test/VisuPrs/Plot3D/E7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/E7") +picturedir = get_picture_dir("Plot3D/E7") file = datadir + "couplex_alain.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/E8.py b/test/VisuPrs/Plot3D/E8.py index edcd594d..0cbaadb4 100755 --- a/test/VisuPrs/Plot3D/E8.py +++ b/test/VisuPrs/Plot3D/E8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/E8") +picturedir = get_picture_dir("Plot3D/E8") file = datadir + "KCOUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/E9.py b/test/VisuPrs/Plot3D/E9.py index 19471c3f..8a302e16 100755 --- a/test/VisuPrs/Plot3D/E9.py +++ b/test/VisuPrs/Plot3D/E9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/E9") +picturedir = get_picture_dir("Plot3D/E9") file = datadir + "test_hydro.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/F1.py b/test/VisuPrs/Plot3D/F1.py index 1a885375..7c747698 100755 --- a/test/VisuPrs/Plot3D/F1.py +++ b/test/VisuPrs/Plot3D/F1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/F1") +picturedir = get_picture_dir("Plot3D/F1") file = datadir + "ml.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/F2.py b/test/VisuPrs/Plot3D/F2.py index 75de5b4a..a8978ae5 100755 --- a/test/VisuPrs/Plot3D/F2.py +++ b/test/VisuPrs/Plot3D/F2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/F2") +picturedir = get_picture_dir("Plot3D/F2") file = datadir + "T_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/F3.py b/test/VisuPrs/Plot3D/F3.py index 1a4d4c34..0fa3d1c4 100755 --- a/test/VisuPrs/Plot3D/F3.py +++ b/test/VisuPrs/Plot3D/F3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/F3") +picturedir = get_picture_dir("Plot3D/F3") file = datadir + "test_hydro_darcy4_out.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/F4.py b/test/VisuPrs/Plot3D/F4.py index dd5f15ae..fb5f6ce8 100755 --- a/test/VisuPrs/Plot3D/F4.py +++ b/test/VisuPrs/Plot3D/F4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/F4") +picturedir = get_picture_dir("Plot3D/F4") file = datadir + "UO2_250ans.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/F5.py b/test/VisuPrs/Plot3D/F5.py index 0f2550d4..2f8f3a9e 100755 --- a/test/VisuPrs/Plot3D/F5.py +++ b/test/VisuPrs/Plot3D/F5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/F5") +picturedir = get_picture_dir("Plot3D/F5") file = datadir + "maill.1.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/F6.py b/test/VisuPrs/Plot3D/F6.py index a08e532c..d7895ff4 100755 --- a/test/VisuPrs/Plot3D/F6.py +++ b/test/VisuPrs/Plot3D/F6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/F6") +picturedir = get_picture_dir("Plot3D/F6") file = datadir + "maill.0.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/F7.py b/test/VisuPrs/Plot3D/F7.py index b11459df..54c364e4 100644 --- a/test/VisuPrs/Plot3D/F7.py +++ b/test/VisuPrs/Plot3D/F7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/F7") +picturedir = get_picture_dir("Plot3D/F7") file = datadir + "occ4050.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/F8.py b/test/VisuPrs/Plot3D/F8.py index be6c5c79..ea4fcb35 100755 --- a/test/VisuPrs/Plot3D/F8.py +++ b/test/VisuPrs/Plot3D/F8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/F8") +picturedir = get_picture_dir("Plot3D/F8") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.1.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/F9.py b/test/VisuPrs/Plot3D/F9.py index b43a61ae..acc125ef 100644 --- a/test/VisuPrs/Plot3D/F9.py +++ b/test/VisuPrs/Plot3D/F9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/F9") +picturedir = get_picture_dir("Plot3D/F9") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.2.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/G0.py b/test/VisuPrs/Plot3D/G0.py index 89745bfb..008147cf 100644 --- a/test/VisuPrs/Plot3D/G0.py +++ b/test/VisuPrs/Plot3D/G0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/G0") +picturedir = get_picture_dir("Plot3D/G0") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.3.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/G1.py b/test/VisuPrs/Plot3D/G1.py index 40d1cc6f..3827f525 100755 --- a/test/VisuPrs/Plot3D/G1.py +++ b/test/VisuPrs/Plot3D/G1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Plot3D/G1") +picturedir = get_picture_dir("Plot3D/G1") file = datadir + "maill.2.med" print " --------------------------------- " diff --git a/test/VisuPrs/Plot3D/G2.py b/test/VisuPrs/Plot3D/G2.py index e7c0ae84..691dc9fb 100755 --- a/test/VisuPrs/Plot3D/G2.py +++ b/test/VisuPrs/Plot3D/G2.py @@ -29,7 +29,7 @@ import paravis # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "Plot3D/G2") +picturedir = get_picture_dir("Plot3D/G2") theFileName = datadir + "Bug829_resu_mode.med" print " --------------------------------- " diff --git a/test/VisuPrs/SWIG_scripts/C7.py b/test/VisuPrs/SWIG_scripts/C7.py index 89f95bd9..58a8da9e 100755 --- a/test/VisuPrs/SWIG_scripts/C7.py +++ b/test/VisuPrs/SWIG_scripts/C7.py @@ -112,7 +112,7 @@ reset_view(view=view) # Write image # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "SWIG_scripts/C7") +picturedir = get_picture_dir("SWIG_scripts/C7") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/SWIG_scripts/CMakeLists.txt b/test/VisuPrs/SWIG_scripts/CMakeLists.txt index 67fef0b3..e6b44824 100644 --- a/test/VisuPrs/SWIG_scripts/CMakeLists.txt +++ b/test/VisuPrs/SWIG_scripts/CMakeLists.txt @@ -38,7 +38,7 @@ IF (PYTHON_EXECUTABLE) C7 ) SET(TIMEOUT 10000) - ADD_TEST(SWIGSCRIPTS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(SWIGSCRIPTS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(SWIGSCRIPTS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/ScalarMap/A0.py b/test/VisuPrs/ScalarMap/A0.py index 9ea631dc..00f97bd9 100755 --- a/test/VisuPrs/ScalarMap/A0.py +++ b/test/VisuPrs/ScalarMap/A0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/A0") +picturedir = get_picture_dir("ScalarMap/A0") file = datadir + "fra.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/A1.py b/test/VisuPrs/ScalarMap/A1.py index fce950bd..d5f1d328 100644 --- a/test/VisuPrs/ScalarMap/A1.py +++ b/test/VisuPrs/ScalarMap/A1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/A1") +picturedir = get_picture_dir("ScalarMap/A1") file = datadir + "hexa_28320_ELEM.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/A2.py b/test/VisuPrs/ScalarMap/A2.py index e2685750..336083e9 100755 --- a/test/VisuPrs/ScalarMap/A2.py +++ b/test/VisuPrs/ScalarMap/A2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/A2") +picturedir = get_picture_dir("ScalarMap/A2") file = datadir + "pointe.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/A3.py b/test/VisuPrs/ScalarMap/A3.py index 058c53de..4c2a51cc 100755 --- a/test/VisuPrs/ScalarMap/A3.py +++ b/test/VisuPrs/ScalarMap/A3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/A3") +picturedir = get_picture_dir("ScalarMap/A3") file = datadir + "Fields_group3D.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/A4.py b/test/VisuPrs/ScalarMap/A4.py index 433e5639..6668c59b 100755 --- a/test/VisuPrs/ScalarMap/A4.py +++ b/test/VisuPrs/ScalarMap/A4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/A4") +picturedir = get_picture_dir("ScalarMap/A4") file = datadir + "Hexa8.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/A5.py b/test/VisuPrs/ScalarMap/A5.py index 261bfe51..78b55e98 100644 --- a/test/VisuPrs/ScalarMap/A5.py +++ b/test/VisuPrs/ScalarMap/A5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/A5") +picturedir = get_picture_dir("ScalarMap/A5") file = datadir + "Penta6.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/A6.py b/test/VisuPrs/ScalarMap/A6.py index 274746a0..19c2a191 100755 --- a/test/VisuPrs/ScalarMap/A6.py +++ b/test/VisuPrs/ScalarMap/A6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/A6") +picturedir = get_picture_dir("ScalarMap/A6") file = datadir + "clo.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/A7.py b/test/VisuPrs/ScalarMap/A7.py index 4bcd9398..6a088f82 100644 --- a/test/VisuPrs/ScalarMap/A7.py +++ b/test/VisuPrs/ScalarMap/A7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/A7") +picturedir = get_picture_dir("ScalarMap/A7") file = datadir + "Tetra4.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/A8.py b/test/VisuPrs/ScalarMap/A8.py index c19e9200..4fc766f6 100644 --- a/test/VisuPrs/ScalarMap/A8.py +++ b/test/VisuPrs/ScalarMap/A8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/A8") +picturedir = get_picture_dir("ScalarMap/A8") file = datadir + "Tria3.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/A9.py b/test/VisuPrs/ScalarMap/A9.py index c39f55b0..2cc91b79 100644 --- a/test/VisuPrs/ScalarMap/A9.py +++ b/test/VisuPrs/ScalarMap/A9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/A9") +picturedir = get_picture_dir("ScalarMap/A9") file = datadir + "Quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/B0.py b/test/VisuPrs/ScalarMap/B0.py index b211f28d..7c347a71 100644 --- a/test/VisuPrs/ScalarMap/B0.py +++ b/test/VisuPrs/ScalarMap/B0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/B0") +picturedir = get_picture_dir("ScalarMap/B0") file = datadir + "carre_en_quad4_seg2.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/B1.py b/test/VisuPrs/ScalarMap/B1.py index 953aced4..54d7b11b 100644 --- a/test/VisuPrs/ScalarMap/B1.py +++ b/test/VisuPrs/ScalarMap/B1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/B1") +picturedir = get_picture_dir("ScalarMap/B1") file = datadir + "carre_en_quad4_seg2_fields.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/B2.py b/test/VisuPrs/ScalarMap/B2.py index cd960029..6620dd67 100644 --- a/test/VisuPrs/ScalarMap/B2.py +++ b/test/VisuPrs/ScalarMap/B2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/B2") +picturedir = get_picture_dir("ScalarMap/B2") file = datadir + "cube_hexa8_quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/CMakeLists.txt b/test/VisuPrs/ScalarMap/CMakeLists.txt index 7cdc4ba4..2771ac98 100644 --- a/test/VisuPrs/ScalarMap/CMakeLists.txt +++ b/test/VisuPrs/ScalarMap/CMakeLists.txt @@ -56,7 +56,7 @@ IF (PYTHON_EXECUTABLE) G2 ) SET(TIMEOUT 10000) - ADD_TEST(SCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(SCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(SCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/ScalarMap/E0.py b/test/VisuPrs/ScalarMap/E0.py index 94c7b920..39ffe464 100644 --- a/test/VisuPrs/ScalarMap/E0.py +++ b/test/VisuPrs/ScalarMap/E0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/E0") +picturedir = get_picture_dir("ScalarMap/E0") file = datadir + "test_55_solid_concentr_dom.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/E1.py b/test/VisuPrs/ScalarMap/E1.py index b3b85750..597c276d 100644 --- a/test/VisuPrs/ScalarMap/E1.py +++ b/test/VisuPrs/ScalarMap/E1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/E1") +picturedir = get_picture_dir("ScalarMap/E1") file = datadir + "H_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/E2.py b/test/VisuPrs/ScalarMap/E2.py index 55b14e4c..8bcfec8a 100644 --- a/test/VisuPrs/ScalarMap/E2.py +++ b/test/VisuPrs/ScalarMap/E2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/E2") +picturedir = get_picture_dir("ScalarMap/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/E3.py b/test/VisuPrs/ScalarMap/E3.py index 5e980f79..e8262bd6 100755 --- a/test/VisuPrs/ScalarMap/E3.py +++ b/test/VisuPrs/ScalarMap/E3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/E3") +picturedir = get_picture_dir("ScalarMap/E3") file = datadir + "hydro_d10.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/E4.py b/test/VisuPrs/ScalarMap/E4.py index ab237231..c128c952 100644 --- a/test/VisuPrs/ScalarMap/E4.py +++ b/test/VisuPrs/ScalarMap/E4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/E4") +picturedir = get_picture_dir("ScalarMap/E4") file = datadir + "champc.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/E5.py b/test/VisuPrs/ScalarMap/E5.py index 822409b7..299f9372 100644 --- a/test/VisuPrs/ScalarMap/E5.py +++ b/test/VisuPrs/ScalarMap/E5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/E5") +picturedir = get_picture_dir("ScalarMap/E5") file = datadir + "hydro_sea_alv.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/E6.py b/test/VisuPrs/ScalarMap/E6.py index 3eac994b..b68d4750 100644 --- a/test/VisuPrs/ScalarMap/E6.py +++ b/test/VisuPrs/ScalarMap/E6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/E6") +picturedir = get_picture_dir("ScalarMap/E6") file = datadir + "toto.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/E7.py b/test/VisuPrs/ScalarMap/E7.py index 6b74522f..7bbadc11 100644 --- a/test/VisuPrs/ScalarMap/E7.py +++ b/test/VisuPrs/ScalarMap/E7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/E7") +picturedir = get_picture_dir("ScalarMap/E7") file = datadir + "couplex_alain.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/E8.py b/test/VisuPrs/ScalarMap/E8.py index b7b86fbe..ac61e43c 100644 --- a/test/VisuPrs/ScalarMap/E8.py +++ b/test/VisuPrs/ScalarMap/E8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/E8") +picturedir = get_picture_dir("ScalarMap/E8") file = datadir + "KCOUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/E9.py b/test/VisuPrs/ScalarMap/E9.py index 0e9fd053..0d5d0835 100644 --- a/test/VisuPrs/ScalarMap/E9.py +++ b/test/VisuPrs/ScalarMap/E9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/E9") +picturedir = get_picture_dir("ScalarMap/E9") file = datadir + "test_hydro.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/F1.py b/test/VisuPrs/ScalarMap/F1.py index 3bae8e68..62c8bb08 100644 --- a/test/VisuPrs/ScalarMap/F1.py +++ b/test/VisuPrs/ScalarMap/F1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/F1") +picturedir = get_picture_dir("ScalarMap/F1") file = datadir + "ml.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/F2.py b/test/VisuPrs/ScalarMap/F2.py index f6722fc1..b21c34dd 100644 --- a/test/VisuPrs/ScalarMap/F2.py +++ b/test/VisuPrs/ScalarMap/F2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/F2") +picturedir = get_picture_dir("ScalarMap/F2") file = datadir + "T_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/F3.py b/test/VisuPrs/ScalarMap/F3.py index 0a5d1ad2..e2586ac8 100644 --- a/test/VisuPrs/ScalarMap/F3.py +++ b/test/VisuPrs/ScalarMap/F3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/F3") +picturedir = get_picture_dir("ScalarMap/F3") file = datadir + "test_hydro_darcy4_out.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/F4.py b/test/VisuPrs/ScalarMap/F4.py index 65794bf9..bd5f07d1 100644 --- a/test/VisuPrs/ScalarMap/F4.py +++ b/test/VisuPrs/ScalarMap/F4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/F4") +picturedir = get_picture_dir("ScalarMap/F4") file = datadir + "UO2_250ans.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/F5.py b/test/VisuPrs/ScalarMap/F5.py index 6e9d9373..109a0a9f 100644 --- a/test/VisuPrs/ScalarMap/F5.py +++ b/test/VisuPrs/ScalarMap/F5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/F5") +picturedir = get_picture_dir("ScalarMap/F5") file = datadir + "maill.1.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/F6.py b/test/VisuPrs/ScalarMap/F6.py index 123685c3..6a7ef159 100644 --- a/test/VisuPrs/ScalarMap/F6.py +++ b/test/VisuPrs/ScalarMap/F6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/F6") +picturedir = get_picture_dir("ScalarMap/F6") file = datadir + "maill.0.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/F7.py b/test/VisuPrs/ScalarMap/F7.py index b1234f5e..ab61fa15 100644 --- a/test/VisuPrs/ScalarMap/F7.py +++ b/test/VisuPrs/ScalarMap/F7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/F7") +picturedir = get_picture_dir("ScalarMap/F7") file = datadir + "occ4050.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/F8.py b/test/VisuPrs/ScalarMap/F8.py index 26a15a43..dd9f2790 100644 --- a/test/VisuPrs/ScalarMap/F8.py +++ b/test/VisuPrs/ScalarMap/F8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/F8") +picturedir = get_picture_dir("ScalarMap/F8") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.1.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/F9.py b/test/VisuPrs/ScalarMap/F9.py index 54fbb865..daaf5f71 100644 --- a/test/VisuPrs/ScalarMap/F9.py +++ b/test/VisuPrs/ScalarMap/F9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/F9") +picturedir = get_picture_dir("ScalarMap/F9") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.2.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/G0.py b/test/VisuPrs/ScalarMap/G0.py index a5a0d35c..01d0219a 100644 --- a/test/VisuPrs/ScalarMap/G0.py +++ b/test/VisuPrs/ScalarMap/G0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/G0") +picturedir = get_picture_dir("ScalarMap/G0") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.3.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/G1.py b/test/VisuPrs/ScalarMap/G1.py index 74ead1e4..aabd7cb1 100644 --- a/test/VisuPrs/ScalarMap/G1.py +++ b/test/VisuPrs/ScalarMap/G1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap/G1") +picturedir = get_picture_dir("ScalarMap/G1") file = datadir + "maill.2.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap/G2.py b/test/VisuPrs/ScalarMap/G2.py index 8522e483..fbceb5df 100644 --- a/test/VisuPrs/ScalarMap/G2.py +++ b/test/VisuPrs/ScalarMap/G2.py @@ -31,7 +31,7 @@ from presentations import ScalarMapOnField, hide_all, EntityType, PrsTypeEnum,re # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "ScalarMap/G2") +picturedir = get_picture_dir("ScalarMap/G2") theFileName = datadir + "Bug829_resu_mode.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A0.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A0.py index 273eeaaa..9aba530f 100644 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A0.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/A0") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A0") file = datadir + "fra.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A1.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A1.py index 9f8dfa9c..813d628a 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A1.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/A1") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A1") file = datadir + "hexa_28320_ELEM.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A2.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A2.py index d97e276c..9eeb459e 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A2.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/A2") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A2") file = datadir + "pointe.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A3.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A3.py index d8a65d13..90caf147 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A3.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/A3") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A3") file = datadir + "Fields_group3D.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A4.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A4.py index 7314faa5..dd54d148 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A4.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/A4") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A4") file = datadir + "Hexa8.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A5.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A5.py index a3dcb968..8db3f7f1 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A5.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/A5") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A5") file = datadir + "Penta6.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A6.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A6.py index 8eb683ae..3256d091 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A6.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/A6") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A6") file = datadir + "clo.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A7.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A7.py index b793d69d..6ef8a4bd 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A7.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/A7") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A7") file = datadir + "Tetra4.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A8.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A8.py index e3eb5455..240288b5 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A8.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/A8") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A8") file = datadir + "Tria3.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A9.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A9.py index 5ad6190e..9b300312 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A9.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/A9") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A9") file = datadir + "Quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/B0.py b/test/VisuPrs/ScalarMap_On_DeformedShape/B0.py index e9912c87..9f9d1b32 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/B0.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/B0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/B0") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/B0") file = datadir + "carre_en_quad4_seg2.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/B1.py b/test/VisuPrs/ScalarMap_On_DeformedShape/B1.py index 323fb3b6..3d1afacd 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/B1.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/B1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/B1") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/B1") file = datadir + "carre_en_quad4_seg2_fields.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/B2.py b/test/VisuPrs/ScalarMap_On_DeformedShape/B2.py index e53eab5b..e329c603 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/B2.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/B2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/B2") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/B2") file = datadir + "cube_hexa8_quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt index 40981a9a..e6c320bf 100644 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt @@ -53,7 +53,7 @@ IF (PYTHON_EXECUTABLE) F8 ) SET(TIMEOUT 10000) - ADD_TEST(DEFORMEDSHAPESCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(DEFORMEDSHAPESCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(DEFORMEDSHAPESCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E0.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E0.py index c170d3bf..b435e731 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E0.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/E0") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E0") file = datadir + "test_55_solid_concentr_dom.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E1.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E1.py index 7e6a0689..4a169577 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E1.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/E1") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E1") file = datadir + "H_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E2.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E2.py index 738109ed..3fa587b9 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E2.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/E2") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E3.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E3.py index 5ce83705..1d937486 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E3.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/E3") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E3") file = datadir + "hydro_d10.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E4.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E4.py index 47cb31e8..489141e7 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E4.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/E4") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E4") file = datadir + "champc.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E5.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E5.py index 35e65cb6..1c6c1674 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E5.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/E5") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E5") file = datadir + "hydro_sea_alv.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E6.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E6.py index b032cc75..76b9c70d 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E6.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/E6") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E6") file = datadir + "toto.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E7.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E7.py index 2b3138bf..3f7cb9c6 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E7.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/E7") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E7") file = datadir + "couplex_alain.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E8.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E8.py index 2dc23361..92415bb3 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E8.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/E8") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E8") file = datadir + "KCOUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E9.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E9.py index 1a4cacf2..83e0a8f5 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E9.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/E9") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E9") file = datadir + "test_hydro.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F1.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F1.py index db74f0bb..6cfbce5b 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/F1.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/F1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/F1") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/F1") file = datadir + "ml.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F2.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F2.py index 39b3fe27..6adf4610 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/F2.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/F2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/F2") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/F2") file = datadir + "T_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F3.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F3.py index df9a0ed6..1a996590 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/F3.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/F3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/F3") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/F3") file = datadir + "test_hydro_darcy4_out.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F4.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F4.py index 1f8165a7..83cafe30 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/F4.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/F4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/F4") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/F4") file = datadir + "UO2_250ans.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F5.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F5.py index 17a9bdb7..4d42808f 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/F5.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/F5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/F5") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/F5") file = datadir + "maill.1.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F6.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F6.py index 6da6418f..8c7ba040 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/F6.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/F6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/F6") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/F6") file = datadir + "maill.0.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F7.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F7.py index b87354a0..e6157757 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/F7.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/F7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/F7") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/F7") file = datadir + "occ4050.med" print " --------------------------------- " diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F8.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F8.py index c4842683..a8816b2a 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/F8.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/F8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"ScalarMap_On_DeformedShape/F8") +picturedir = get_picture_dir("ScalarMap_On_DeformedShape/F8") file = datadir + "maill.2.med" print " --------------------------------- " diff --git a/test/VisuPrs/StreamLines/A0.py b/test/VisuPrs/StreamLines/A0.py index 13986ecf..90241486 100644 --- a/test/VisuPrs/StreamLines/A0.py +++ b/test/VisuPrs/StreamLines/A0.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/A0") +picturedir = get_picture_dir("StreamLines/A0") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/A1.py b/test/VisuPrs/StreamLines/A1.py index 17611147..ef67cfae 100644 --- a/test/VisuPrs/StreamLines/A1.py +++ b/test/VisuPrs/StreamLines/A1.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/A1") +picturedir = get_picture_dir("StreamLines/A1") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/A2.py b/test/VisuPrs/StreamLines/A2.py index e1937ae5..9b49871d 100644 --- a/test/VisuPrs/StreamLines/A2.py +++ b/test/VisuPrs/StreamLines/A2.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/A2") +picturedir = get_picture_dir("StreamLines/A2") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/A3.py b/test/VisuPrs/StreamLines/A3.py index 9708e8bf..791b9ea6 100644 --- a/test/VisuPrs/StreamLines/A3.py +++ b/test/VisuPrs/StreamLines/A3.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/A3") +picturedir = get_picture_dir("StreamLines/A3") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/A4.py b/test/VisuPrs/StreamLines/A4.py index cdcbaf98..b28310f0 100644 --- a/test/VisuPrs/StreamLines/A4.py +++ b/test/VisuPrs/StreamLines/A4.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/A4") +picturedir = get_picture_dir("StreamLines/A4") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/A5.py b/test/VisuPrs/StreamLines/A5.py index a36a1260..e832fd33 100644 --- a/test/VisuPrs/StreamLines/A5.py +++ b/test/VisuPrs/StreamLines/A5.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/A5") +picturedir = get_picture_dir("StreamLines/A5") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/A6.py b/test/VisuPrs/StreamLines/A6.py index 14797ad0..cd7f2de1 100644 --- a/test/VisuPrs/StreamLines/A6.py +++ b/test/VisuPrs/StreamLines/A6.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/A6") +picturedir = get_picture_dir("StreamLines/A6") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/A7.py b/test/VisuPrs/StreamLines/A7.py index e317ed15..95cb04eb 100644 --- a/test/VisuPrs/StreamLines/A7.py +++ b/test/VisuPrs/StreamLines/A7.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/A7") +picturedir = get_picture_dir("StreamLines/A7") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/A8.py b/test/VisuPrs/StreamLines/A8.py index 185e7e19..64a2734a 100644 --- a/test/VisuPrs/StreamLines/A8.py +++ b/test/VisuPrs/StreamLines/A8.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/A8") +picturedir = get_picture_dir("StreamLines/A8") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/A9.py b/test/VisuPrs/StreamLines/A9.py index 01c67be4..5c1a4bb4 100644 --- a/test/VisuPrs/StreamLines/A9.py +++ b/test/VisuPrs/StreamLines/A9.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/A9") +picturedir = get_picture_dir("StreamLines/A9") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/B0.py b/test/VisuPrs/StreamLines/B0.py index 81a13ca5..85f28e51 100644 --- a/test/VisuPrs/StreamLines/B0.py +++ b/test/VisuPrs/StreamLines/B0.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/B0") +picturedir = get_picture_dir("StreamLines/B0") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/B1.py b/test/VisuPrs/StreamLines/B1.py index 84ea4980..6250cf5f 100644 --- a/test/VisuPrs/StreamLines/B1.py +++ b/test/VisuPrs/StreamLines/B1.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/B1") +picturedir = get_picture_dir("StreamLines/B1") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/B2.py b/test/VisuPrs/StreamLines/B2.py index 6ea7c988..c54e991f 100644 --- a/test/VisuPrs/StreamLines/B2.py +++ b/test/VisuPrs/StreamLines/B2.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/B2") +picturedir = get_picture_dir("StreamLines/B2") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/CMakeLists.txt b/test/VisuPrs/StreamLines/CMakeLists.txt index 26665bd1..6aac5b9a 100644 --- a/test/VisuPrs/StreamLines/CMakeLists.txt +++ b/test/VisuPrs/StreamLines/CMakeLists.txt @@ -53,7 +53,7 @@ IF (PYTHON_EXECUTABLE) F9 ) SET(TIMEOUT 10000) - ADD_TEST(STREAMLINES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(STREAMLINES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(STREAMLINES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/StreamLines/E0.py b/test/VisuPrs/StreamLines/E0.py index 6aa86eae..1193922a 100644 --- a/test/VisuPrs/StreamLines/E0.py +++ b/test/VisuPrs/StreamLines/E0.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/E0") +picturedir = get_picture_dir("StreamLines/E0") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/E1.py b/test/VisuPrs/StreamLines/E1.py index ca4a9c77..ed03d801 100644 --- a/test/VisuPrs/StreamLines/E1.py +++ b/test/VisuPrs/StreamLines/E1.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/E1") +picturedir = get_picture_dir("StreamLines/E1") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/E2.py b/test/VisuPrs/StreamLines/E2.py index f8386437..3e8225d5 100644 --- a/test/VisuPrs/StreamLines/E2.py +++ b/test/VisuPrs/StreamLines/E2.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/E2") +picturedir = get_picture_dir("StreamLines/E2") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/E3.py b/test/VisuPrs/StreamLines/E3.py index 68ae0083..d9fd1362 100644 --- a/test/VisuPrs/StreamLines/E3.py +++ b/test/VisuPrs/StreamLines/E3.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/E3") +picturedir = get_picture_dir("StreamLines/E3") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/E4.py b/test/VisuPrs/StreamLines/E4.py index 8feb8f7d..75a18171 100644 --- a/test/VisuPrs/StreamLines/E4.py +++ b/test/VisuPrs/StreamLines/E4.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/E4") +picturedir = get_picture_dir("StreamLines/E4") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/E5.py b/test/VisuPrs/StreamLines/E5.py index 59bd0cd1..bae9b361 100644 --- a/test/VisuPrs/StreamLines/E5.py +++ b/test/VisuPrs/StreamLines/E5.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/E5") +picturedir = get_picture_dir("StreamLines/E5") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/E6.py b/test/VisuPrs/StreamLines/E6.py index 3fc50044..0ea39fac 100644 --- a/test/VisuPrs/StreamLines/E6.py +++ b/test/VisuPrs/StreamLines/E6.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/E6") +picturedir = get_picture_dir("StreamLines/E6") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/E7.py b/test/VisuPrs/StreamLines/E7.py index 5906d6ec..aa4b32ed 100644 --- a/test/VisuPrs/StreamLines/E7.py +++ b/test/VisuPrs/StreamLines/E7.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/E7") +picturedir = get_picture_dir("StreamLines/E7") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/E8.py b/test/VisuPrs/StreamLines/E8.py index d3917201..fa2fda90 100644 --- a/test/VisuPrs/StreamLines/E8.py +++ b/test/VisuPrs/StreamLines/E8.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/E8") +picturedir = get_picture_dir("StreamLines/E8") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/E9.py b/test/VisuPrs/StreamLines/E9.py index 160a1cd8..42568b56 100644 --- a/test/VisuPrs/StreamLines/E9.py +++ b/test/VisuPrs/StreamLines/E9.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/E9") +picturedir = get_picture_dir("StreamLines/E9") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/F1.py b/test/VisuPrs/StreamLines/F1.py index c2b0b5bc..e5a0a64e 100644 --- a/test/VisuPrs/StreamLines/F1.py +++ b/test/VisuPrs/StreamLines/F1.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/F1") +picturedir = get_picture_dir("StreamLines/F1") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/F2.py b/test/VisuPrs/StreamLines/F2.py index a46b5668..860e5739 100644 --- a/test/VisuPrs/StreamLines/F2.py +++ b/test/VisuPrs/StreamLines/F2.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/F2") +picturedir = get_picture_dir("StreamLines/F2") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/F3.py b/test/VisuPrs/StreamLines/F3.py index 87e462e5..360eb1ac 100644 --- a/test/VisuPrs/StreamLines/F3.py +++ b/test/VisuPrs/StreamLines/F3.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/F3") +picturedir = get_picture_dir("StreamLines/F3") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/F4.py b/test/VisuPrs/StreamLines/F4.py index e225f5f2..529abfd9 100644 --- a/test/VisuPrs/StreamLines/F4.py +++ b/test/VisuPrs/StreamLines/F4.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/F4") +picturedir = get_picture_dir("StreamLines/F4") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/F5.py b/test/VisuPrs/StreamLines/F5.py index 5352d159..4e8b3aa6 100644 --- a/test/VisuPrs/StreamLines/F5.py +++ b/test/VisuPrs/StreamLines/F5.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/F5") +picturedir = get_picture_dir("StreamLines/F5") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/F6.py b/test/VisuPrs/StreamLines/F6.py index 91696a3f..f3ac0ae0 100644 --- a/test/VisuPrs/StreamLines/F6.py +++ b/test/VisuPrs/StreamLines/F6.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/F6") +picturedir = get_picture_dir("StreamLines/F6") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/F7.py b/test/VisuPrs/StreamLines/F7.py index bbb5858e..edbeaf0a 100644 --- a/test/VisuPrs/StreamLines/F7.py +++ b/test/VisuPrs/StreamLines/F7.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/F7") +picturedir = get_picture_dir("StreamLines/F7") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/F8.py b/test/VisuPrs/StreamLines/F8.py index c5dcaa7c..5dae62b9 100644 --- a/test/VisuPrs/StreamLines/F8.py +++ b/test/VisuPrs/StreamLines/F8.py @@ -28,7 +28,7 @@ import paravis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/F8") +picturedir = get_picture_dir("StreamLines/F8") # Create presentations myParavis = paravis.myParavis diff --git a/test/VisuPrs/StreamLines/F9.py b/test/VisuPrs/StreamLines/F9.py index 6827462b..48309eaa 100644 --- a/test/VisuPrs/StreamLines/F9.py +++ b/test/VisuPrs/StreamLines/F9.py @@ -31,7 +31,7 @@ import pvsimple my_paravis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "StreamLines/F9") +picturedir = get_picture_dir("StreamLines/F9") # Import of the "Bug829_resu_mode.med" file file_path = datadir + "Bug829_resu_mode.med" diff --git a/test/VisuPrs/Tables/A0.py b/test/VisuPrs/Tables/A0.py index 33bef1fd..42b575d4 100755 --- a/test/VisuPrs/Tables/A0.py +++ b/test/VisuPrs/Tables/A0.py @@ -68,7 +68,7 @@ pvsimple.Render(xy_view) # Write image # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Tables/A0") +picturedir = get_picture_dir("Tables/A0") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/Tables/A2.py b/test/VisuPrs/Tables/A2.py index ac62469e..8cdd106a 100755 --- a/test/VisuPrs/Tables/A2.py +++ b/test/VisuPrs/Tables/A2.py @@ -66,7 +66,7 @@ pvsimple.Render(xy_view) # Write image # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1], "Tables/A2") +picturedir = get_picture_dir("Tables/A2") if not picturedir.endswith(os.sep): picturedir += os.sep diff --git a/test/VisuPrs/Tables/CMakeLists.txt b/test/VisuPrs/Tables/CMakeLists.txt index 7d6b9419..f1be315f 100644 --- a/test/VisuPrs/Tables/CMakeLists.txt +++ b/test/VisuPrs/Tables/CMakeLists.txt @@ -23,7 +23,7 @@ IF (PYTHON_EXECUTABLE) A2 ) SET(TIMEOUT 10000) - ADD_TEST(TABLES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(TABLES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(TABLES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/Util/paravistest.py b/test/VisuPrs/Util/paravistest.py index 82733ff0..1665c2f2 100755 --- a/test/VisuPrs/Util/paravistest.py +++ b/test/VisuPrs/Util/paravistest.py @@ -25,6 +25,8 @@ This module provides auxiliary classes, functions and variables for testing. from math import fabs import os +import tempfile +import getpass from datetime import date import salome @@ -129,14 +131,17 @@ def test_values(value, et_value, check_error=0): return error -def get_picture_dir(pic_dir, subdir): - res_dir = pic_dir +def get_picture_dir(subdir): + res_dir = os.getenv("PARAVIS_TEST_PICS") if not res_dir: - res_dir = "/tmp/pic" - - # Add current date and subdirectory for the case to the directory path - cur_date = date.today().strftime("%d%m%Y") - res_dir += "/test_" + cur_date + "/" + subdir + # Add username and current date to unify the directory + cur_user = getpass.getuser() + cur_date = date.today().strftime("%Y%m%d") + res_dir = tempfile.gettempdir() + \ + "/pic_" + cur_user + \ + "/test_" + cur_date + # Add subdirectory for the case to the directory path + res_dir += "/" + subdir # Create the directory if doesn't exist res_dir = os.path.normpath(res_dir) if not os.path.exists(res_dir): diff --git a/test/VisuPrs/Vectors/A0.py b/test/VisuPrs/Vectors/A0.py index febcc72a..1213fdd1 100644 --- a/test/VisuPrs/Vectors/A0.py +++ b/test/VisuPrs/Vectors/A0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/A0") +picturedir = get_picture_dir("Vectors/A0") file = datadir + "fra.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/A1.py b/test/VisuPrs/Vectors/A1.py index 476c68ae..d90be553 100755 --- a/test/VisuPrs/Vectors/A1.py +++ b/test/VisuPrs/Vectors/A1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/A1") +picturedir = get_picture_dir("Vectors/A1") file = datadir + "hexa_28320_ELEM.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/A2.py b/test/VisuPrs/Vectors/A2.py index 6ee52413..66264f37 100644 --- a/test/VisuPrs/Vectors/A2.py +++ b/test/VisuPrs/Vectors/A2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/A2") +picturedir = get_picture_dir("Vectors/A2") file = datadir + "pointe.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/A3.py b/test/VisuPrs/Vectors/A3.py index 10e195be..ab992b78 100755 --- a/test/VisuPrs/Vectors/A3.py +++ b/test/VisuPrs/Vectors/A3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/A3") +picturedir = get_picture_dir("Vectors/A3") file = datadir + "Fields_group3D.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/A4.py b/test/VisuPrs/Vectors/A4.py index 83a97e27..01d105bb 100755 --- a/test/VisuPrs/Vectors/A4.py +++ b/test/VisuPrs/Vectors/A4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/A4") +picturedir = get_picture_dir("Vectors/A4") file = datadir + "Hexa8.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/A5.py b/test/VisuPrs/Vectors/A5.py index aae3dd01..66a9729c 100755 --- a/test/VisuPrs/Vectors/A5.py +++ b/test/VisuPrs/Vectors/A5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/A5") +picturedir = get_picture_dir("Vectors/A5") file = datadir + "Penta6.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/A6.py b/test/VisuPrs/Vectors/A6.py index f18ba6d2..d5b35780 100644 --- a/test/VisuPrs/Vectors/A6.py +++ b/test/VisuPrs/Vectors/A6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/A6") +picturedir = get_picture_dir("Vectors/A6") file = datadir + "clo.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/A7.py b/test/VisuPrs/Vectors/A7.py index b6ec85c5..5b09f791 100755 --- a/test/VisuPrs/Vectors/A7.py +++ b/test/VisuPrs/Vectors/A7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/A7") +picturedir = get_picture_dir("Vectors/A7") file = datadir + "Tetra4.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/A8.py b/test/VisuPrs/Vectors/A8.py index 0d9bddde..224529af 100755 --- a/test/VisuPrs/Vectors/A8.py +++ b/test/VisuPrs/Vectors/A8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/A8") +picturedir = get_picture_dir("Vectors/A8") file = datadir + "Tria3.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/A9.py b/test/VisuPrs/Vectors/A9.py index 82d2d6d5..8e661b00 100755 --- a/test/VisuPrs/Vectors/A9.py +++ b/test/VisuPrs/Vectors/A9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/A9") +picturedir = get_picture_dir("Vectors/A9") file = datadir + "Quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/B0.py b/test/VisuPrs/Vectors/B0.py index d85b5352..dbbc496e 100755 --- a/test/VisuPrs/Vectors/B0.py +++ b/test/VisuPrs/Vectors/B0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/B0") +picturedir = get_picture_dir("Vectors/B0") file = datadir + "carre_en_quad4_seg2.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/B1.py b/test/VisuPrs/Vectors/B1.py index 98ba0c03..3a9cd049 100755 --- a/test/VisuPrs/Vectors/B1.py +++ b/test/VisuPrs/Vectors/B1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/B1") +picturedir = get_picture_dir("Vectors/B1") file = datadir + "carre_en_quad4_seg2_fields.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/B2.py b/test/VisuPrs/Vectors/B2.py index f8ff8658..7f38d5cc 100755 --- a/test/VisuPrs/Vectors/B2.py +++ b/test/VisuPrs/Vectors/B2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/B2") +picturedir = get_picture_dir("Vectors/B2") file = datadir + "cube_hexa8_quad4.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/CMakeLists.txt b/test/VisuPrs/Vectors/CMakeLists.txt index 48fc6ef1..e08cbb7c 100644 --- a/test/VisuPrs/Vectors/CMakeLists.txt +++ b/test/VisuPrs/Vectors/CMakeLists.txt @@ -54,7 +54,7 @@ IF (PYTHON_EXECUTABLE) F9 ) SET(TIMEOUT 10000) - ADD_TEST(VECTORS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(VECTORS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py) SET_TESTS_PROPERTIES(VECTORS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/Vectors/E0.py b/test/VisuPrs/Vectors/E0.py index 942f2c6d..949a065b 100755 --- a/test/VisuPrs/Vectors/E0.py +++ b/test/VisuPrs/Vectors/E0.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/E0") +picturedir = get_picture_dir("Vectors/E0") file = datadir + "test_55_solid_concentr_dom.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/E1.py b/test/VisuPrs/Vectors/E1.py index aa31586b..1e2de050 100755 --- a/test/VisuPrs/Vectors/E1.py +++ b/test/VisuPrs/Vectors/E1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/E1") +picturedir = get_picture_dir("Vectors/E1") file = datadir + "H_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/E2.py b/test/VisuPrs/Vectors/E2.py index 8cc27a01..b10956c7 100755 --- a/test/VisuPrs/Vectors/E2.py +++ b/test/VisuPrs/Vectors/E2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/E2") +picturedir = get_picture_dir("Vectors/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/E3.py b/test/VisuPrs/Vectors/E3.py index f8f14ee0..c6475596 100644 --- a/test/VisuPrs/Vectors/E3.py +++ b/test/VisuPrs/Vectors/E3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/E3") +picturedir = get_picture_dir("Vectors/E3") file = datadir + "hydro_d10.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/E4.py b/test/VisuPrs/Vectors/E4.py index 87738c2e..0854f037 100755 --- a/test/VisuPrs/Vectors/E4.py +++ b/test/VisuPrs/Vectors/E4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/E4") +picturedir = get_picture_dir("Vectors/E4") file = datadir + "champc.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/E5.py b/test/VisuPrs/Vectors/E5.py index 9ebacdf4..de5504e2 100755 --- a/test/VisuPrs/Vectors/E5.py +++ b/test/VisuPrs/Vectors/E5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/E5") +picturedir = get_picture_dir("Vectors/E5") file = datadir + "hydro_sea_alv.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/E6.py b/test/VisuPrs/Vectors/E6.py index 4bad203b..5d0bf5f5 100755 --- a/test/VisuPrs/Vectors/E6.py +++ b/test/VisuPrs/Vectors/E6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/E6") +picturedir = get_picture_dir("Vectors/E6") file = datadir + "toto.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/E7.py b/test/VisuPrs/Vectors/E7.py index eab2254a..1c04ea34 100755 --- a/test/VisuPrs/Vectors/E7.py +++ b/test/VisuPrs/Vectors/E7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/E7") +picturedir = get_picture_dir("Vectors/E7") file = datadir + "couplex_alain.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/E8.py b/test/VisuPrs/Vectors/E8.py index 8e7bcbb3..2f2f3538 100755 --- a/test/VisuPrs/Vectors/E8.py +++ b/test/VisuPrs/Vectors/E8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/E8") +picturedir = get_picture_dir("Vectors/E8") file = datadir + "KCOUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/E9.py b/test/VisuPrs/Vectors/E9.py index 4540b087..7389a609 100755 --- a/test/VisuPrs/Vectors/E9.py +++ b/test/VisuPrs/Vectors/E9.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/E9") +picturedir = get_picture_dir("Vectors/E9") file = datadir + "test_hydro.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/F1.py b/test/VisuPrs/Vectors/F1.py index 9a87c5fc..32f7ec56 100755 --- a/test/VisuPrs/Vectors/F1.py +++ b/test/VisuPrs/Vectors/F1.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/F1") +picturedir = get_picture_dir("Vectors/F1") file = datadir + "ml.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/F2.py b/test/VisuPrs/Vectors/F2.py index e33fc02c..c0080cc0 100755 --- a/test/VisuPrs/Vectors/F2.py +++ b/test/VisuPrs/Vectors/F2.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/F2") +picturedir = get_picture_dir("Vectors/F2") file = datadir + "T_COUPLEX1.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/F3.py b/test/VisuPrs/Vectors/F3.py index a0a319db..196a83c8 100755 --- a/test/VisuPrs/Vectors/F3.py +++ b/test/VisuPrs/Vectors/F3.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/F3") +picturedir = get_picture_dir("Vectors/F3") file = datadir + "test_hydro_darcy4_out.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/F4.py b/test/VisuPrs/Vectors/F4.py index 57c41f08..5e012864 100755 --- a/test/VisuPrs/Vectors/F4.py +++ b/test/VisuPrs/Vectors/F4.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/F4") +picturedir = get_picture_dir("Vectors/F4") file = datadir + "UO2_250ans.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/F5.py b/test/VisuPrs/Vectors/F5.py index a4a5df7c..aa0e8221 100755 --- a/test/VisuPrs/Vectors/F5.py +++ b/test/VisuPrs/Vectors/F5.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/F5") +picturedir = get_picture_dir("Vectors/F5") file = datadir + "maill.1.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/F6.py b/test/VisuPrs/Vectors/F6.py index 8583e5fe..3131ec41 100755 --- a/test/VisuPrs/Vectors/F6.py +++ b/test/VisuPrs/Vectors/F6.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/F6") +picturedir = get_picture_dir("Vectors/F6") file = datadir + "maill.0.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/F7.py b/test/VisuPrs/Vectors/F7.py index 971839c4..aa0623b1 100644 --- a/test/VisuPrs/Vectors/F7.py +++ b/test/VisuPrs/Vectors/F7.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/F7") +picturedir = get_picture_dir("Vectors/F7") file = datadir + "occ4050.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/F8.py b/test/VisuPrs/Vectors/F8.py index 4c39a70e..51cb6d56 100755 --- a/test/VisuPrs/Vectors/F8.py +++ b/test/VisuPrs/Vectors/F8.py @@ -29,7 +29,7 @@ import paravis myParavis = paravis.myParavis # Directory for saving snapshots -picturedir = get_picture_dir(sys.argv[1],"Vectors/F8") +picturedir = get_picture_dir("Vectors/F8") file = datadir + "maill.2.med" print " --------------------------------- " diff --git a/test/VisuPrs/Vectors/F9.py b/test/VisuPrs/Vectors/F9.py index e451280b..57634ffe 100644 --- a/test/VisuPrs/Vectors/F9.py +++ b/test/VisuPrs/Vectors/F9.py @@ -29,7 +29,7 @@ from presentations import VectorsOnField, hide_all,EntityType,PrsTypeEnum,reset_ # Create presentations myParavis = paravis.myParavis -picturedir = get_picture_dir(sys.argv[1], "Vectors/F9") +picturedir = get_picture_dir("Vectors/F9") theFileName = datadir + "Bug829_resu_mode.med" print " --------------------------------- " -- 2.39.2