From 843ca4ae5dbec936a7293a5b0a604f0c2b22eea7 Mon Sep 17 00:00:00 2001 From: Gilles DAVID Date: Fri, 31 Mar 2017 10:21:35 +0200 Subject: [PATCH] Porting to python3 2to3 -v -w -n --no-diffs -f all -f idioms -f buffer -f set_literal * --- examples/command_line/medviewer.py | 2 +- src/Macro/annotate_groups.py | 11 +- src/PVGUI/PVGUI_Module.cxx | 21 +- src/PV_SWIG/presentations.py | 70 +++--- src/PV_SWIG/pvsimple.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader0.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader10.py | 4 +- src/Plugins/MEDReader/Test/testMEDReader11.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader12.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader13.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader14.py | 8 +- src/Plugins/MEDReader/Test/testMEDReader15.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader16.py | 8 +- src/Plugins/MEDReader/Test/testMEDReader17.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader19.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader2.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader20.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader21.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader3.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader4.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader5.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader6.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader7.py | 2 +- src/Plugins/MEDReader/Test/testMEDReader8.py | 4 +- src/Plugins/SimpleMode/IO/CMakeLists.txt | 2 +- test/VisuPrs/2D_viewer/A0.py | 18 +- test/VisuPrs/2D_viewer/A1.py | 2 +- test/VisuPrs/3D_viewer/A1.py | 12 +- test/VisuPrs/3D_viewer/A2.py | 12 +- test/VisuPrs/3D_viewer/A3.py | 14 +- test/VisuPrs/3D_viewer/A4.py | 12 +- test/VisuPrs/3D_viewer/A5.py | 12 +- test/VisuPrs/3D_viewer/A6.py | 12 +- test/VisuPrs/3D_viewer/A7.py | 12 +- test/VisuPrs/3D_viewer/A8.py | 12 +- test/VisuPrs/3D_viewer/A9.py | 16 +- test/VisuPrs/3D_viewer/B0.py | 12 +- test/VisuPrs/Animation/A0.py | 24 +- test/VisuPrs/Animation/A1.py | 42 ++-- test/VisuPrs/Animation/A2.py | 24 +- test/VisuPrs/Animation/A4.py | 24 +- test/VisuPrs/Animation/A7.py | 24 +- test/VisuPrs/Animation/A8.py | 24 +- test/VisuPrs/Animation/B2.py | 24 +- test/VisuPrs/Animation/B5.py | 24 +- test/VisuPrs/Animation/B6.py | 24 +- test/VisuPrs/Animation/C0.py | 24 +- test/VisuPrs/Animation/C1.py | 24 +- test/VisuPrs/Animation/C3.py | 24 +- test/VisuPrs/Animation/C8.py | 24 +- test/VisuPrs/Animation/D1.py | 24 +- test/VisuPrs/Animation/D2.py | 24 +- test/VisuPrs/Animation/D6.py | 24 +- test/VisuPrs/Animation/D9.py | 24 +- test/VisuPrs/Animation/E0.py | 24 +- test/VisuPrs/Animation/E4.py | 24 +- test/VisuPrs/Animation/E7.py | 24 +- test/VisuPrs/Animation/E8.py | 24 +- test/VisuPrs/Animation/F2.py | 24 +- test/VisuPrs/Animation/F5.py | 24 +- test/VisuPrs/Animation/F6.py | 24 +- test/VisuPrs/Animation/G0.py | 26 +-- test/VisuPrs/Animation/G3.py | 24 +- test/VisuPrs/Animation/G4.py | 24 +- test/VisuPrs/Animation/G8.py | 24 +- test/VisuPrs/Animation/H1.py | 24 +- test/VisuPrs/Animation/H2.py | 24 +- test/VisuPrs/CutLines/A0.py | 8 +- test/VisuPrs/CutLines/A1.py | 8 +- test/VisuPrs/CutLines/A2.py | 8 +- test/VisuPrs/CutLines/A3.py | 8 +- test/VisuPrs/CutLines/A4.py | 8 +- test/VisuPrs/CutLines/A5.py | 8 +- test/VisuPrs/CutLines/A6.py | 8 +- test/VisuPrs/CutLines/A7.py | 8 +- test/VisuPrs/CutLines/A8.py | 8 +- test/VisuPrs/CutLines/A9.py | 8 +- test/VisuPrs/CutLines/B0.py | 8 +- test/VisuPrs/CutLines/B1.py | 8 +- test/VisuPrs/CutLines/B2.py | 8 +- test/VisuPrs/CutLines/E0.py | 8 +- test/VisuPrs/CutLines/E1.py | 8 +- test/VisuPrs/CutLines/E2.py | 8 +- test/VisuPrs/CutLines/E3.py | 8 +- test/VisuPrs/CutLines/E4.py | 8 +- test/VisuPrs/CutLines/E5.py | 8 +- test/VisuPrs/CutLines/E6.py | 8 +- test/VisuPrs/CutLines/E7.py | 8 +- test/VisuPrs/CutLines/E8.py | 8 +- test/VisuPrs/CutLines/E9.py | 8 +- test/VisuPrs/CutLines/F1.py | 8 +- test/VisuPrs/CutLines/F2.py | 8 +- test/VisuPrs/CutLines/F3.py | 8 +- test/VisuPrs/CutLines/F4.py | 8 +- test/VisuPrs/CutLines/F5.py | 8 +- test/VisuPrs/CutLines/F6.py | 8 +- test/VisuPrs/CutLines/F8.py | 8 +- test/VisuPrs/CutLines/F9.py | 8 +- test/VisuPrs/CutLines/G0.py | 8 +- test/VisuPrs/CutLines/G1.py | 8 +- test/VisuPrs/CutLines/G2.py | 12 +- test/VisuPrs/CutPlanes/A0.py | 8 +- test/VisuPrs/CutPlanes/A1.py | 8 +- test/VisuPrs/CutPlanes/A2.py | 8 +- test/VisuPrs/CutPlanes/A3.py | 8 +- test/VisuPrs/CutPlanes/A4.py | 8 +- test/VisuPrs/CutPlanes/A5.py | 8 +- test/VisuPrs/CutPlanes/A6.py | 8 +- test/VisuPrs/CutPlanes/A7.py | 8 +- test/VisuPrs/CutPlanes/A8.py | 8 +- test/VisuPrs/CutPlanes/A9.py | 8 +- test/VisuPrs/CutPlanes/B0.py | 8 +- test/VisuPrs/CutPlanes/B1.py | 8 +- test/VisuPrs/CutPlanes/B2.py | 8 +- test/VisuPrs/CutPlanes/B3.py | 16 +- test/VisuPrs/CutPlanes/E0.py | 8 +- test/VisuPrs/CutPlanes/E1.py | 8 +- test/VisuPrs/CutPlanes/E2.py | 8 +- test/VisuPrs/CutPlanes/E3.py | 8 +- test/VisuPrs/CutPlanes/E4.py | 8 +- test/VisuPrs/CutPlanes/E5.py | 8 +- test/VisuPrs/CutPlanes/E6.py | 8 +- test/VisuPrs/CutPlanes/E7.py | 8 +- test/VisuPrs/CutPlanes/E8.py | 8 +- test/VisuPrs/CutPlanes/E9.py | 8 +- test/VisuPrs/CutPlanes/F1.py | 8 +- test/VisuPrs/CutPlanes/F2.py | 8 +- test/VisuPrs/CutPlanes/F3.py | 8 +- test/VisuPrs/CutPlanes/F4.py | 8 +- test/VisuPrs/CutPlanes/F5.py | 8 +- test/VisuPrs/CutPlanes/F6.py | 8 +- test/VisuPrs/CutPlanes/F8.py | 8 +- test/VisuPrs/CutPlanes/F9.py | 8 +- test/VisuPrs/CutPlanes/G0.py | 8 +- test/VisuPrs/CutPlanes/G1.py | 8 +- test/VisuPrs/CutPlanes/G2.py | 12 +- test/VisuPrs/DeformedShape/A0.py | 8 +- test/VisuPrs/DeformedShape/A1.py | 8 +- test/VisuPrs/DeformedShape/A2.py | 8 +- test/VisuPrs/DeformedShape/A3.py | 8 +- test/VisuPrs/DeformedShape/A4.py | 8 +- test/VisuPrs/DeformedShape/A5.py | 8 +- test/VisuPrs/DeformedShape/A6.py | 8 +- test/VisuPrs/DeformedShape/A7.py | 8 +- test/VisuPrs/DeformedShape/A8.py | 8 +- test/VisuPrs/DeformedShape/A9.py | 8 +- test/VisuPrs/DeformedShape/B0.py | 8 +- test/VisuPrs/DeformedShape/B1.py | 8 +- test/VisuPrs/DeformedShape/B2.py | 8 +- test/VisuPrs/DeformedShape/B3.py | 50 ++-- test/VisuPrs/DeformedShape/B4.py | 40 ++-- test/VisuPrs/DeformedShape/E0.py | 8 +- test/VisuPrs/DeformedShape/E1.py | 8 +- test/VisuPrs/DeformedShape/E2.py | 8 +- test/VisuPrs/DeformedShape/E3.py | 8 +- test/VisuPrs/DeformedShape/E4.py | 8 +- test/VisuPrs/DeformedShape/E5.py | 8 +- test/VisuPrs/DeformedShape/E6.py | 8 +- test/VisuPrs/DeformedShape/E7.py | 8 +- test/VisuPrs/DeformedShape/E8.py | 8 +- test/VisuPrs/DeformedShape/E9.py | 8 +- test/VisuPrs/DeformedShape/F1.py | 8 +- test/VisuPrs/DeformedShape/F2.py | 8 +- test/VisuPrs/DeformedShape/F3.py | 8 +- test/VisuPrs/DeformedShape/F4.py | 8 +- test/VisuPrs/DeformedShape/F5.py | 8 +- test/VisuPrs/DeformedShape/F6.py | 8 +- test/VisuPrs/DeformedShape/F8.py | 8 +- test/VisuPrs/DeformedShape/F9.py | 12 +- 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/C6.py | 2 +- test/VisuPrs/GaussPoints/C7.py | 2 +- test/VisuPrs/GaussPoints/C8.py | 2 +- test/VisuPrs/GaussPoints/C9.py | 2 +- test/VisuPrs/ImportMedField/A1.py | 2 +- test/VisuPrs/ImportMedField/A2.py | 2 +- test/VisuPrs/ImportMedField/A3.py | 2 +- test/VisuPrs/ImportMedField/A4.py | 2 +- test/VisuPrs/ImportMedField/A5.py | 2 +- test/VisuPrs/ImportMedField/A6.py | 2 +- test/VisuPrs/ImportMedField/A7.py | 2 +- test/VisuPrs/ImportMedField/A8.py | 2 +- test/VisuPrs/ImportMedField/A9.py | 2 +- test/VisuPrs/ImportMedField/B0.py | 2 +- test/VisuPrs/ImportMedField/B1.py | 2 +- test/VisuPrs/ImportMedField/B2.py | 2 +- test/VisuPrs/ImportMedField/B4.py | 2 +- test/VisuPrs/ImportMedField/B5.py | 2 +- test/VisuPrs/ImportMedField/B8.py | 2 +- test/VisuPrs/IsoSurfaces/A0.py | 8 +- test/VisuPrs/IsoSurfaces/A1.py | 8 +- test/VisuPrs/IsoSurfaces/A2.py | 8 +- test/VisuPrs/IsoSurfaces/A3.py | 8 +- test/VisuPrs/IsoSurfaces/A4.py | 8 +- test/VisuPrs/IsoSurfaces/A5.py | 8 +- test/VisuPrs/IsoSurfaces/A6.py | 8 +- test/VisuPrs/IsoSurfaces/A7.py | 8 +- test/VisuPrs/IsoSurfaces/A8.py | 8 +- test/VisuPrs/IsoSurfaces/A9.py | 8 +- test/VisuPrs/IsoSurfaces/B0.py | 8 +- test/VisuPrs/IsoSurfaces/B1.py | 8 +- test/VisuPrs/IsoSurfaces/B2.py | 8 +- test/VisuPrs/IsoSurfaces/E0.py | 8 +- test/VisuPrs/IsoSurfaces/E1.py | 8 +- test/VisuPrs/IsoSurfaces/E2.py | 8 +- test/VisuPrs/IsoSurfaces/E3.py | 8 +- test/VisuPrs/IsoSurfaces/E4.py | 8 +- test/VisuPrs/IsoSurfaces/E5.py | 8 +- test/VisuPrs/IsoSurfaces/E6.py | 8 +- test/VisuPrs/IsoSurfaces/E7.py | 8 +- test/VisuPrs/IsoSurfaces/E8.py | 8 +- test/VisuPrs/IsoSurfaces/E9.py | 8 +- test/VisuPrs/IsoSurfaces/F1.py | 8 +- test/VisuPrs/IsoSurfaces/F2.py | 8 +- test/VisuPrs/IsoSurfaces/F3.py | 8 +- test/VisuPrs/IsoSurfaces/F4.py | 8 +- test/VisuPrs/IsoSurfaces/F5.py | 8 +- test/VisuPrs/IsoSurfaces/F6.py | 8 +- test/VisuPrs/IsoSurfaces/F8.py | 8 +- test/VisuPrs/IsoSurfaces/F9.py | 8 +- test/VisuPrs/IsoSurfaces/G0.py | 8 +- test/VisuPrs/IsoSurfaces/G1.py | 8 +- test/VisuPrs/IsoSurfaces/G2.py | 12 +- test/VisuPrs/MeshPresentation/A0.py | 8 +- test/VisuPrs/MeshPresentation/A1.py | 8 +- test/VisuPrs/MeshPresentation/A2.py | 8 +- test/VisuPrs/MeshPresentation/A3.py | 8 +- test/VisuPrs/MeshPresentation/A4.py | 8 +- test/VisuPrs/MeshPresentation/A5.py | 8 +- test/VisuPrs/MeshPresentation/A6.py | 8 +- test/VisuPrs/MeshPresentation/A7.py | 8 +- test/VisuPrs/MeshPresentation/A8.py | 8 +- test/VisuPrs/MeshPresentation/A9.py | 8 +- test/VisuPrs/MeshPresentation/B0.py | 8 +- test/VisuPrs/MeshPresentation/B1.py | 8 +- test/VisuPrs/MeshPresentation/B2.py | 8 +- test/VisuPrs/MeshPresentation/E0.py | 8 +- test/VisuPrs/MeshPresentation/E1.py | 8 +- test/VisuPrs/MeshPresentation/E2.py | 8 +- test/VisuPrs/MeshPresentation/E3.py | 8 +- test/VisuPrs/MeshPresentation/E4.py | 8 +- test/VisuPrs/MeshPresentation/E5.py | 8 +- test/VisuPrs/MeshPresentation/E6.py | 8 +- test/VisuPrs/MeshPresentation/E7.py | 8 +- test/VisuPrs/MeshPresentation/E8.py | 8 +- test/VisuPrs/MeshPresentation/E9.py | 8 +- test/VisuPrs/MeshPresentation/F0.py | 8 +- test/VisuPrs/MeshPresentation/F1.py | 8 +- test/VisuPrs/MeshPresentation/F2.py | 8 +- test/VisuPrs/MeshPresentation/F3.py | 8 +- test/VisuPrs/MeshPresentation/F4.py | 8 +- test/VisuPrs/MeshPresentation/F5.py | 8 +- test/VisuPrs/MeshPresentation/F6.py | 8 +- test/VisuPrs/MeshPresentation/F8.py | 8 +- test/VisuPrs/MeshPresentation/F9.py | 8 +- test/VisuPrs/MeshPresentation/G0.py | 8 +- test/VisuPrs/MeshPresentation/G1.py | 8 +- test/VisuPrs/MeshPresentation/G3.py | 12 +- test/VisuPrs/MeshPresentation/G4.py | 12 +- test/VisuPrs/MeshPresentation/G5.py | 12 +- test/VisuPrs/MeshPresentation/G6.py | 12 +- test/VisuPrs/MeshPresentation/G7.py | 12 +- test/VisuPrs/MeshPresentation/G8.py | 12 +- test/VisuPrs/MeshPresentation/G9.py | 12 +- test/VisuPrs/MeshPresentation/H0.py | 12 +- test/VisuPrs/MeshPresentation/H1.py | 12 +- test/VisuPrs/MeshPresentation/H2.py | 12 +- test/VisuPrs/MeshPresentation/H3.py | 12 +- test/VisuPrs/MeshPresentation/H4.py | 12 +- test/VisuPrs/MeshPresentation/H5.py | 12 +- test/VisuPrs/MeshPresentation/H6.py | 12 +- test/VisuPrs/MeshPresentation/H7.py | 12 +- test/VisuPrs/MeshPresentation/H8.py | 12 +- test/VisuPrs/MeshPresentation/H9.py | 12 +- test/VisuPrs/MeshPresentation/I0.py | 12 +- test/VisuPrs/MeshPresentation/I1.py | 12 +- test/VisuPrs/MeshPresentation/I2.py | 12 +- test/VisuPrs/MeshPresentation/I3.py | 12 +- test/VisuPrs/MeshPresentation/I4.py | 12 +- test/VisuPrs/MeshPresentation/I5.py | 12 +- test/VisuPrs/MeshPresentation/I6.py | 12 +- test/VisuPrs/MeshPresentation/I7.py | 12 +- test/VisuPrs/MeshPresentation/I8.py | 12 +- test/VisuPrs/MeshPresentation/I9.py | 12 +- test/VisuPrs/MeshPresentation/J0.py | 12 +- test/VisuPrs/MeshPresentation/J1.py | 12 +- test/VisuPrs/MeshPresentation/J2.py | 12 +- test/VisuPrs/MeshPresentation/J3.py | 12 +- test/VisuPrs/MeshPresentation/J4.py | 12 +- test/VisuPrs/MeshPresentation/J5.py | 12 +- test/VisuPrs/MeshPresentation/J6.py | 12 +- test/VisuPrs/MeshPresentation/J7.py | 12 +- test/VisuPrs/MeshPresentation/J8.py | 12 +- test/VisuPrs/MeshPresentation/J9.py | 12 +- test/VisuPrs/MeshPresentation/K0.py | 12 +- test/VisuPrs/MeshPresentation/K1.py | 12 +- test/VisuPrs/MeshPresentation/K2.py | 12 +- test/VisuPrs/MeshPresentation/K3.py | 12 +- test/VisuPrs/MeshPresentation/K4.py | 12 +- test/VisuPrs/MeshPresentation/K5.py | 12 +- test/VisuPrs/MeshPresentation/K6.py | 12 +- test/VisuPrs/MeshPresentation/K7.py | 12 +- test/VisuPrs/MeshPresentation/K8.py | 12 +- test/VisuPrs/MeshPresentation/K9.py | 12 +- test/VisuPrs/MeshPresentation/L0.py | 12 +- test/VisuPrs/MeshPresentation/L1.py | 12 +- test/VisuPrs/Plot3D/A0.py | 8 +- test/VisuPrs/Plot3D/A1.py | 8 +- test/VisuPrs/Plot3D/A2.py | 8 +- test/VisuPrs/Plot3D/A3.py | 8 +- test/VisuPrs/Plot3D/A4.py | 8 +- test/VisuPrs/Plot3D/A5.py | 8 +- test/VisuPrs/Plot3D/A6.py | 8 +- test/VisuPrs/Plot3D/A7.py | 8 +- test/VisuPrs/Plot3D/A8.py | 8 +- test/VisuPrs/Plot3D/A9.py | 8 +- test/VisuPrs/Plot3D/B0.py | 8 +- test/VisuPrs/Plot3D/B1.py | 8 +- test/VisuPrs/Plot3D/B2.py | 8 +- test/VisuPrs/Plot3D/E0.py | 8 +- test/VisuPrs/Plot3D/E1.py | 8 +- test/VisuPrs/Plot3D/E2.py | 8 +- test/VisuPrs/Plot3D/E3.py | 8 +- test/VisuPrs/Plot3D/E4.py | 8 +- test/VisuPrs/Plot3D/E5.py | 8 +- test/VisuPrs/Plot3D/E6.py | 8 +- test/VisuPrs/Plot3D/E7.py | 8 +- test/VisuPrs/Plot3D/E8.py | 8 +- test/VisuPrs/Plot3D/E9.py | 8 +- test/VisuPrs/Plot3D/F1.py | 8 +- test/VisuPrs/Plot3D/F2.py | 8 +- test/VisuPrs/Plot3D/F3.py | 8 +- test/VisuPrs/Plot3D/F4.py | 8 +- test/VisuPrs/Plot3D/F5.py | 8 +- test/VisuPrs/Plot3D/F6.py | 8 +- test/VisuPrs/Plot3D/F8.py | 8 +- test/VisuPrs/Plot3D/F9.py | 8 +- test/VisuPrs/Plot3D/G0.py | 8 +- test/VisuPrs/Plot3D/G1.py | 8 +- test/VisuPrs/Plot3D/G2.py | 12 +- test/VisuPrs/SWIG_scripts/A1.py | 104 ++++----- test/VisuPrs/SWIG_scripts/A3.py | 24 +- test/VisuPrs/SWIG_scripts/A4.py | 48 ++-- test/VisuPrs/SWIG_scripts/A7.py | 46 ++-- test/VisuPrs/SWIG_scripts/A9.py | 40 ++-- test/VisuPrs/SWIG_scripts/B1.py | 52 ++--- test/VisuPrs/SWIG_scripts/B4.py | 12 +- test/VisuPrs/SWIG_scripts/B5.py | 60 ++--- test/VisuPrs/SWIG_scripts/C6.py | 2 +- test/VisuPrs/SWIG_scripts/C7.py | 42 ++-- test/VisuPrs/ScalarMap/A0.py | 8 +- test/VisuPrs/ScalarMap/A1.py | 8 +- test/VisuPrs/ScalarMap/A2.py | 8 +- test/VisuPrs/ScalarMap/A3.py | 8 +- test/VisuPrs/ScalarMap/A4.py | 8 +- test/VisuPrs/ScalarMap/A5.py | 8 +- test/VisuPrs/ScalarMap/A6.py | 8 +- test/VisuPrs/ScalarMap/A7.py | 8 +- test/VisuPrs/ScalarMap/A8.py | 8 +- test/VisuPrs/ScalarMap/A9.py | 8 +- test/VisuPrs/ScalarMap/B0.py | 8 +- test/VisuPrs/ScalarMap/B1.py | 8 +- test/VisuPrs/ScalarMap/B2.py | 8 +- test/VisuPrs/ScalarMap/B3.py | 94 ++++---- test/VisuPrs/ScalarMap/E0.py | 8 +- test/VisuPrs/ScalarMap/E1.py | 8 +- test/VisuPrs/ScalarMap/E2.py | 8 +- test/VisuPrs/ScalarMap/E3.py | 8 +- test/VisuPrs/ScalarMap/E4.py | 8 +- test/VisuPrs/ScalarMap/E5.py | 8 +- test/VisuPrs/ScalarMap/E6.py | 8 +- test/VisuPrs/ScalarMap/E7.py | 8 +- test/VisuPrs/ScalarMap/E8.py | 8 +- test/VisuPrs/ScalarMap/E9.py | 8 +- test/VisuPrs/ScalarMap/F1.py | 8 +- test/VisuPrs/ScalarMap/F2.py | 8 +- test/VisuPrs/ScalarMap/F3.py | 8 +- test/VisuPrs/ScalarMap/F4.py | 8 +- test/VisuPrs/ScalarMap/F5.py | 8 +- test/VisuPrs/ScalarMap/F6.py | 8 +- test/VisuPrs/ScalarMap/F8.py | 8 +- test/VisuPrs/ScalarMap/F9.py | 8 +- test/VisuPrs/ScalarMap/G0.py | 8 +- test/VisuPrs/ScalarMap/G1.py | 8 +- test/VisuPrs/ScalarMap/G2.py | 12 +- test/VisuPrs/ScalarMap_On_DeformedShape/A0.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/A1.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/A2.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/A3.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/A4.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/A5.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/A6.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/A7.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/A8.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/A9.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/B0.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/B1.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/B2.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/B3.py | 122 +++++----- test/VisuPrs/ScalarMap_On_DeformedShape/E0.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/E1.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/E2.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/E3.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/E4.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/E5.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/E6.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/E7.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/E8.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/E9.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/F1.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/F2.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/F3.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/F4.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/F5.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/F6.py | 8 +- test/VisuPrs/ScalarMap_On_DeformedShape/F8.py | 8 +- test/VisuPrs/StreamLines/A0.py | 8 +- test/VisuPrs/StreamLines/A1.py | 8 +- test/VisuPrs/StreamLines/A2.py | 8 +- test/VisuPrs/StreamLines/A3.py | 8 +- test/VisuPrs/StreamLines/A4.py | 8 +- test/VisuPrs/StreamLines/A5.py | 8 +- test/VisuPrs/StreamLines/A6.py | 8 +- test/VisuPrs/StreamLines/A7.py | 8 +- test/VisuPrs/StreamLines/A8.py | 8 +- test/VisuPrs/StreamLines/A9.py | 8 +- test/VisuPrs/StreamLines/B0.py | 8 +- test/VisuPrs/StreamLines/B1.py | 8 +- test/VisuPrs/StreamLines/B2.py | 8 +- test/VisuPrs/StreamLines/B3.py | 8 +- test/VisuPrs/StreamLines/B4.py | 38 ++-- test/VisuPrs/StreamLines/E0.py | 8 +- test/VisuPrs/StreamLines/E1.py | 8 +- test/VisuPrs/StreamLines/E2.py | 8 +- test/VisuPrs/StreamLines/E3.py | 8 +- test/VisuPrs/StreamLines/E4.py | 8 +- test/VisuPrs/StreamLines/E5.py | 8 +- test/VisuPrs/StreamLines/E6.py | 8 +- test/VisuPrs/StreamLines/E7.py | 8 +- test/VisuPrs/StreamLines/E8.py | 8 +- test/VisuPrs/StreamLines/E9.py | 8 +- test/VisuPrs/StreamLines/F1.py | 8 +- test/VisuPrs/StreamLines/F2.py | 8 +- test/VisuPrs/StreamLines/F3.py | 8 +- test/VisuPrs/StreamLines/F4.py | 8 +- test/VisuPrs/StreamLines/F5.py | 8 +- test/VisuPrs/StreamLines/F6.py | 8 +- test/VisuPrs/StreamLines/F8.py | 8 +- test/VisuPrs/StreamLines/F9.py | 4 +- test/VisuPrs/StreamLines/G0.py | 4 +- test/VisuPrs/Tables/A0.py | 12 +- test/VisuPrs/Tables/A2.py | 12 +- test/VisuPrs/Util/paravistest.py | 56 ++--- test/VisuPrs/Vectors/A0.py | 8 +- test/VisuPrs/Vectors/A1.py | 8 +- test/VisuPrs/Vectors/A2.py | 8 +- test/VisuPrs/Vectors/A3.py | 8 +- test/VisuPrs/Vectors/A4.py | 8 +- test/VisuPrs/Vectors/A5.py | 8 +- test/VisuPrs/Vectors/A6.py | 8 +- test/VisuPrs/Vectors/A7.py | 8 +- test/VisuPrs/Vectors/A8.py | 8 +- test/VisuPrs/Vectors/A9.py | 8 +- test/VisuPrs/Vectors/B0.py | 8 +- test/VisuPrs/Vectors/B1.py | 8 +- test/VisuPrs/Vectors/B2.py | 8 +- test/VisuPrs/Vectors/B3.py | 46 ++-- test/VisuPrs/Vectors/E0.py | 8 +- test/VisuPrs/Vectors/E1.py | 8 +- test/VisuPrs/Vectors/E2.py | 8 +- test/VisuPrs/Vectors/E3.py | 8 +- test/VisuPrs/Vectors/E4.py | 8 +- test/VisuPrs/Vectors/E5.py | 8 +- test/VisuPrs/Vectors/E6.py | 8 +- test/VisuPrs/Vectors/E7.py | 8 +- test/VisuPrs/Vectors/E8.py | 8 +- test/VisuPrs/Vectors/E9.py | 8 +- test/VisuPrs/Vectors/F1.py | 8 +- test/VisuPrs/Vectors/F2.py | 8 +- test/VisuPrs/Vectors/F3.py | 8 +- test/VisuPrs/Vectors/F4.py | 8 +- test/VisuPrs/Vectors/F5.py | 8 +- test/VisuPrs/Vectors/F6.py | 8 +- test/VisuPrs/Vectors/F8.py | 8 +- test/VisuPrs/Vectors/F9.py | 12 +- test/VisuPrs/bugs/A0.py | 14 +- test/VisuPrs/bugs/A1.py | 2 +- test/VisuPrs/bugs/A2.py | 16 +- test/VisuPrs/bugs/A5.py | 4 +- test/VisuPrs/bugs/A6.py | 12 +- test/VisuPrs/bugs/A9.py | 76 +++---- test/VisuPrs/bugs/B1.py | 16 +- test/VisuPrs/bugs/C3.py | 16 +- test/VisuPrs/bugs/C5.py | 8 +- test/VisuPrs/bugs/C6.py | 12 +- test/VisuPrs/bugs/C8.py | 12 +- test/VisuPrs/bugs/C9.py | 6 +- test/VisuPrs/bugs/D1.py | 24 +- test/VisuPrs/bugs/D3.py | 10 +- test/VisuPrs/bugs/D5.py | 6 +- test/VisuPrs/bugs/D6.py | 8 +- test/VisuPrs/bugs/D7.py | 18 +- test/VisuPrs/bugs/E0.py | 42 ++-- test/VisuPrs/dump_study/A0.py | 32 +-- test/VisuPrs/dump_study/A1.py | 34 +-- test/VisuPrs/dump_study/A2.py | 36 +-- test/VisuPrs/dump_study/A3.py | 38 ++-- test/VisuPrs/dump_study/A4.py | 28 +-- test/VisuPrs/dump_study/A5.py | 40 ++-- test/VisuPrs/dump_study/A6.py | 38 ++-- test/VisuPrs/dump_study/A7.py | 34 +-- test/VisuPrs/dump_study/A8.py | 44 ++-- test/VisuPrs/dump_study/A9.py | 40 ++-- test/VisuPrs/dump_study/B0.py | 18 +- test/VisuPrs/dump_study/B1.py | 14 +- test/VisuPrs/dump_study/B3.py | 10 +- test/VisuPrs/dump_study/B4.py | 10 +- test/VisuPrs/dump_study/B5.py | 6 +- test/VisuPrs/imps/A1.py | 30 +-- test/VisuPrs/imps/A2.py | 12 +- test/VisuPrs/imps/A3.py | 8 +- test/VisuPrs/imps/A4.py | 10 +- test/VisuPrs/imps/A6.py | 6 +- test/VisuPrs/imps/B2.py | 18 +- test/VisuPrs/united/A1.py | 102 ++++----- test/VisuPrs/united/A2.py | 56 ++--- test/VisuPrs/united/A4.py | 214 +++++++++--------- test/VisuPrs/united/A5.py | 36 +-- test/VisuPrs/united/B0.py | 20 +- test/demo0.py | 14 +- test/demo1.py | 4 +- test/demo2.py | 12 +- test/demo3.py | 6 +- test/demo_14_med.py | 4 +- .../simple/Container_init_python.cxx | 9 +- .../simple/Container_init_python.hxx | 12 + 559 files changed, 3308 insertions(+), 3279 deletions(-) diff --git a/examples/command_line/medviewer.py b/examples/command_line/medviewer.py index d6c1ae9b..906cd4c8 100644 --- a/examples/command_line/medviewer.py +++ b/examples/command_line/medviewer.py @@ -49,7 +49,7 @@ class MEDViewer(): pvsimple.SetActiveSource(element) pvsimple.Render(view=self.renderView) if pause: - raw_input("Press Enter key to continue") + input("Press Enter key to continue") # def display_mesh(self, element, pause=False): diff --git a/src/Macro/annotate_groups.py b/src/Macro/annotate_groups.py index c1a4cf2d..b7eee570 100644 --- a/src/Macro/annotate_groups.py +++ b/src/Macro/annotate_groups.py @@ -154,9 +154,9 @@ def ExctractSILInformation(smProxy, mapFamilies, mapGroups, mapRelations): mapGroups[groupName] = familiesOnGroups # Establish the relations between families and groups - for family_name, family_id in mapFamilies.iteritems(): + for family_name, family_id in mapFamilies.items(): groupNames = [] - for group_name, family_name_on_group in mapGroups.iteritems(): + for group_name, family_name_on_group in mapGroups.items(): if family_name in family_name_on_group: groupNames.append(group_name) if len(groupNames) > 0: @@ -264,8 +264,7 @@ if not ExctractSILInformation(smproxy, mapFamilies, mapGroups, mapRelations): raise RuntimeError("Extraction SIL graph failed.") # Sort families array by ID -sortedArray = mapFamilies.values() -sortedArray.sort() +sortedArray = sorted(list(mapFamilies.values())) # Prepare 'Annotation' list for lookup-table numberValues = 0 @@ -287,9 +286,9 @@ for idFamily in sortedArray: numberValues += 1 # Iterate over all families to get group(s) by family name - for famName, famID in mapFamilies.iteritems(): + for famName, famID in mapFamilies.items(): if idFamily == famID: - if mapRelations.has_key(famName): + if famName in mapRelations: annotationList.append(str(', ').join(mapRelations.get(famName))) else: annotationList.append(str('No group')) diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx index 60a1635c..0190e0f2 100644 --- a/src/PVGUI/PVGUI_Module.cxx +++ b/src/PVGUI/PVGUI_Module.cxx @@ -125,6 +125,19 @@ #include #include +#if PY_VERSION_HEX < 0x03050000 +static char* +Py_EncodeLocale(const wchar_t *arg, size_t *size) +{ + return _Py_wchar2char(arg, size); +} +static wchar_t* +Py_DecodeLocale(const char *arg, size_t *size) +{ + return _Py_char2wchar(arg, size); +} +#endif + //---------------------------------------------------------------------------- PVGUI_Module* ParavisModule = 0; @@ -787,7 +800,7 @@ void PVGUI_Module::executeScript( const char* script ) // PyObject * elem = PyList_GetItem(lst, i); // if (PyString_Check(elem)) // { -// std::cout << "At pos:" << i << ", " << PyString_AsString(elem) << std::endl; +// std::cout << "At pos:" << i << ", " << Py_EncodeLocale(PyUnicode_AS_UNICODE(elem), NULL) << std::endl; // } // else // std::cout << "At pos:" << i << ", not a string!" << std::endl; @@ -834,12 +847,12 @@ QString PVGUI_Module::getTraceString() vtkSmartPyObject save_cam(PyObject_GetAttrString(trace_mod, const_cast("SaveCameras"))); vtkSmartPyObject camera_trace(PyObject_CallMethod(save_cam, const_cast("get_trace"), NULL)); // Convert to a single string - vtkSmartPyObject ret(PyString_FromString(end_line.toStdString().c_str())); + vtkSmartPyObject ret(PyUnicode_FromUnicode(Py_DecodeLocale(end_line.toStdString().c_str(), NULL), end_line.size())); vtkSmartPyObject final_string(PyObject_CallMethod(ret, const_cast("join"), const_cast("O"), (PyObject*)camera_trace)); - if (PyString_CheckExact(final_string)) + if (PyUnicode_CheckExact(final_string)) { - QString camera_qs(PyString_AsString(final_string)); // deep copy + QString camera_qs(Py_EncodeLocale(PyUnicode_AS_UNICODE(final_string.GetPointer()), NULL)); // deep copy traceString = traceString + end_line + end_line + QString("#### saving camera placements for all active views") + end_line + end_line + camera_qs + end_line; } diff --git a/src/PV_SWIG/presentations.py b/src/PV_SWIG/presentations.py index 11ea19c8..20456866 100644 --- a/src/PV_SWIG/presentations.py +++ b/src/PV_SWIG/presentations.py @@ -23,7 +23,7 @@ typical for Post-Pro module (Scalar Map, Deformed Shape, Vectors, etc.) """ -from __future__ import division + ##from __future__ import print_function import os @@ -236,7 +236,7 @@ def process_prs_for_test(prs, view, picture_name, show_bar=True): os.makedirs(pic_dir) # Save picture - print "Write image:", file_name + print("Write image:", file_name) pvs.WriteImage(file_name, view=view, Magnification=1) @@ -297,7 +297,7 @@ def set_visible_lines(xy_prs, lines): sv = xy_prs.GetProperty("SeriesVisibility").GetData() visible = '0' - for i in xrange(0, len(sv)): + for i in range(0, len(sv)): if i % 2 == 0: line_name = sv[i] if line_name in lines: @@ -375,7 +375,7 @@ def get_data_range(proxy, entity, field_name, vector_mode='Magnitude', entity_data_info = None field_data = proxy.GetFieldDataInformation() - if field_name in field_data.keys(): + if field_name in list(field_data.keys()): entity_data_info = field_data elif entity == EntityType.CELL: entity_data_info = proxy.GetCellDataInformation() @@ -384,7 +384,7 @@ def get_data_range(proxy, entity, field_name, vector_mode='Magnitude', data_range = [] - if field_name in entity_data_info.keys(): + if field_name in list(entity_data_info.keys()): vcomp = get_vector_component(vector_mode) data_range = entity_data_info[field_name].GetComponentRange(vcomp) else: @@ -448,7 +448,7 @@ def is_data_on_cells(proxy, field_name): """Check the existence of a field on cells with the given name.""" proxy.UpdatePipeline() cell_data_info = proxy.GetCellDataInformation() - return (field_name in cell_data_info.keys()) + return (field_name in list(cell_data_info.keys())) def is_empty(proxy): @@ -509,7 +509,7 @@ def multiply3x3(a, b): [0, 0, 0], [0, 0, 0]] - for i in xrange(3): + for i in range(3): c[0][i] = a[0][0] * b[0][i] + a[0][1] * b[1][i] + a[0][2] * b[2][i] c[1][i] = a[1][0] * b[0][i] + a[1][1] * b[1][i] + a[1][2] * b[2][i] c[2][i] = a[2][0] * b[0][i] + a[2][1] * b[1][i] + a[2][2] * b[2][i] @@ -575,7 +575,7 @@ def get_normal_by_orientation(orientation, ang1=0, ang2=0): rotation = multiply3x3(ry, rz) i_plane = 0 - for i in xrange(0, 3): + for i in range(0, 3): normal[i] = rotation[i][i_plane] return normal @@ -596,7 +596,7 @@ def get_bound_project(bound_box, dir): bound_prj[0] = dot_product(dir, bound_points[0]) bound_prj[1] = bound_prj[0] - for i in xrange(1, 8): + for i in range(1, 8): tmp = dot_product(dir, bound_points[i]) if bound_prj[1] < tmp: bound_prj[1] = tmp @@ -619,7 +619,7 @@ def get_positions(nb_planes, dir, bounds, displacement): step = bound_prj[2] / (nb_planes - 1) abs_displacement = step * displacement start_pos = bound_prj[0] - 0.5 * step + abs_displacement - for i in xrange(nb_planes): + for i in range(nb_planes): pos = start_pos + i * step positions.append(pos) else: @@ -632,7 +632,7 @@ def get_positions(nb_planes, dir, bounds, displacement): def get_contours(scalar_range, nb_contours): """Generate contour values.""" contours = [] - for i in xrange(nb_contours): + for i in range(nb_contours): pos = scalar_range[0] + i * ( scalar_range[1] - scalar_range[0]) / (nb_contours - 1) contours.append(pos) @@ -646,7 +646,7 @@ def get_nb_components(proxy, entity, field_name): entity_data_info = None field_data = proxy.GetFieldDataInformation() - if field_name in field_data.keys(): + if field_name in list(field_data.keys()): entity_data_info = field_data elif entity == EntityType.CELL: select_cells_with_data(proxy, on_cells=[field_name]) @@ -656,7 +656,7 @@ def get_nb_components(proxy, entity, field_name): entity_data_info = proxy.GetPointDataInformation() nb_comp = None - if field_name in entity_data_info.keys(): + if field_name in list(entity_data_info.keys()): nb_comp = entity_data_info[field_name].GetNumberOfComponents() else: pv_entity = EntityType.get_pvtype(entity) @@ -682,7 +682,7 @@ def get_scale_factor(proxy): volume = 1 vol = dim = 0 - for i in xrange(0, 6, 2): + for i in range(0, 6, 2): vol = abs(bounds[i + 1] - bounds[i]) if vol > 0: dim += 1 @@ -835,7 +835,7 @@ def select_cells_with_data(proxy, on_points=[], on_cells=[], on_gauss=[]): if not all_arrays: file_name = proxy.FileName.split(os.sep)[-1] - print "Warning: " + file_name + " doesn't contain any data array." + print("Warning: " + file_name + " doesn't contain any data array.") # List of cell types to be selected cell_types_on = [] @@ -845,8 +845,8 @@ def select_cells_with_data(proxy, on_points=[], on_cells=[], on_gauss=[]): proxy.Entity = [cell_type] proxy.UpdatePipeline() - cell_arrays = proxy.GetCellDataInformation().keys() - point_arrays = proxy.GetPointDataInformation().keys() + cell_arrays = list(proxy.GetCellDataInformation().keys()) + point_arrays = list(proxy.GetPointDataInformation().keys()) if on_points or on_cells: if on_points is None: @@ -998,7 +998,7 @@ def get_mesh_full_names(proxy): def get_group_names(extrGrps): """Return full names of all groups of the given 'ExtractGroup' filter object. """ - group_names = filter(lambda x:x[:4]=="GRP_",list(extrGrps.GetProperty("GroupsFlagsInfo")[::2])) + group_names = [x for x in list(extrGrps.GetProperty("GroupsFlagsInfo")[::2]) if x[:4]=="GRP_"] return group_names @@ -1014,7 +1014,7 @@ def get_time(proxy, timestamp_nb): timestamps = proxy.Input.TimestepValues.GetData() length = len(timestamps) - if (timestamp_nb > 0 and (timestamp_nb - 1) not in xrange(length) ) or (timestamp_nb < 0 and -timestamp_nb > length): + if (timestamp_nb > 0 and (timestamp_nb - 1) not in range(length) ) or (timestamp_nb < 0 and -timestamp_nb > length): raise ValueError("Timestamp number is out of range: " + str(timestamp_nb)) if not timestamps: @@ -2533,7 +2533,7 @@ def MeshOnEntity(proxy, mesh_name, entity): else: mesh_full_name = find_mesh_full_name(proxy, mesh_name) if not mesh_full_name: - raise RuntimeError, "The given mesh name was not found" + raise RuntimeError("The given mesh name was not found") # Select only the given mesh proxy.AllArrays = [mesh_full_name] proxy.UpdatePipeline() @@ -2603,17 +2603,17 @@ def CreatePrsForFile(file_name, prs_types, """ # Import MED file - print "Import " + file_name.split(os.sep)[-1] + "..." + print("Import " + file_name.split(os.sep)[-1] + "...") try: proxy = pvs.MEDReader(FileName=file_name) if proxy is None: - print "FAILED" + print("FAILED") else: #proxy.UpdatePipeline() - print "OK" + print("OK") except: - print "FAILED" + print("FAILED") else: # Get view view = pvs.GetRenderView() @@ -2653,13 +2653,13 @@ def CreatePrsForProxy(proxy, view, prs_types, picture_dir, picture_ext): mesh_names = get_mesh_full_names(proxy) for mesh_name in mesh_names: # Build mesh field presentation - print "Creating submesh for '" + get_field_short_name(mesh_name) + "' mesh... " + print("Creating submesh for '" + get_field_short_name(mesh_name) + "' mesh... ") prs = MeshOnEntity(proxy, mesh_name, None) if prs is None: - print "FAILED" + print("FAILED") continue else: - print "OK" + print("OK") # Construct image file name pic_name = picture_dir + get_field_short_name(mesh_name) + "." + picture_ext @@ -2671,13 +2671,13 @@ def CreatePrsForProxy(proxy, view, prs_types, picture_dir, picture_ext): extGrp.UpdatePipelineInformation() if if_possible(proxy, None, None, PrsTypeEnum.MESH, extGrp): for group in get_group_names(extGrp): - print "Creating submesh on group " + get_group_short_name(group) + "... " + print("Creating submesh on group " + get_group_short_name(group) + "... ") prs = MeshOnGroup(proxy, extGrp, group) if prs is None: - print "FAILED" + print("FAILED") continue else: - print "OK" + print("OK") # Construct image file name pic_name = picture_dir + get_group_short_name(group) + "." + picture_ext @@ -2714,7 +2714,7 @@ def CreatePrsForProxy(proxy, view, prs_types, picture_dir, picture_ext): # Presentation type for graphics file name f_prs_type = prs_name.replace(' ', '').upper() - for timestamp_nb in xrange(1, len(timestamps) + 1): + for timestamp_nb in range(1, len(timestamps) + 1): time = timestamps[timestamp_nb - 1] if (time == 0.0): scalar_range = get_data_range(proxy, field_entity, @@ -2722,7 +2722,7 @@ def CreatePrsForProxy(proxy, view, prs_types, picture_dir, picture_ext): # exclude time stamps with null lenght of scalar range if (scalar_range[0] == scalar_range[1]): continue - print "Creating " + prs_name + " on " + field_name + ", time = " + str(time) + "... " + print("Creating " + prs_name + " on " + field_name + ", time = " + str(time) + "... ") try: prs = create_prs(prs_type, proxy, field_entity, field_name, timestamp_nb) @@ -2733,13 +2733,13 @@ def CreatePrsForProxy(proxy, view, prs_types, picture_dir, picture_ext): MEDFileFieldRepresentationTree::activateTheFirst() and MEDFileFieldRepresentationTree::getTheSingleActivated(...) methods). """ - print "ValueError exception is catched" + print("ValueError exception is catched") continue if prs is None: - print "FAILED" + print("FAILED") continue else: - print "OK" + print("OK") # Construct image file name pic_name = picture_dir + field_name + "_" + str(time) + "_" + f_prs_type + "." + picture_ext diff --git a/src/PV_SWIG/pvsimple.py b/src/PV_SWIG/pvsimple.py index 219cc503..e6596603 100644 --- a/src/PV_SWIG/pvsimple.py +++ b/src/PV_SWIG/pvsimple.py @@ -27,7 +27,7 @@ __DEBUG = 0 # increase if you want more verbosity def __my_log(msg): if __DEBUG: - print "[PARAVIS] %s" % msg + print("[PARAVIS] %s" % msg) def __getFromGUI(): """ Identify if we are running inside SALOME's embedded interpreter. diff --git a/src/Plugins/MEDReader/Test/testMEDReader0.py b/src/Plugins/MEDReader/Test/testMEDReader0.py index d6c59d5b..cadecc42 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader0.py +++ b/src/Plugins/MEDReader/Test/testMEDReader0.py @@ -126,7 +126,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, "testMEDReader0.png") import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader10.py b/src/Plugins/MEDReader/Test/testMEDReader10.py index 30953c59..6462b91f 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader10.py +++ b/src/Plugins/MEDReader/Test/testMEDReader10.py @@ -80,7 +80,7 @@ DataRepresentation1.Representation = 'Wireframe' wbv=WarpByVector(Input=myMedReader) wbv.ScaleFactor=0.1 wbv.Vectors=['POINTS','f3NbComp4_Vector'] -assert(wbv.PointData.keys()==['f0NbComp1','f1NbComp2','f1NbComp2_Vector','f2NbComp3','f3NbComp4','f3NbComp4_Vector']) +assert(list(wbv.PointData.keys())==['f0NbComp1','f1NbComp2','f1NbComp2_Vector','f2NbComp3','f3NbComp4','f3NbComp4_Vector']) # DataRepresentation2 = Show() DataRepresentation2.EdgeColor = [0.0, 0.0, 0.5000076295109483] @@ -114,7 +114,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, "testMEDReader10.png") import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader11.py b/src/Plugins/MEDReader/Test/testMEDReader11.py index 8d3ce4d3..1ad24fbf 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader11.py +++ b/src/Plugins/MEDReader/Test/testMEDReader11.py @@ -201,7 +201,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, "testMEDReader11.png") import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader12.py b/src/Plugins/MEDReader/Test/testMEDReader12.py index 2649e132..37039e75 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader12.py +++ b/src/Plugins/MEDReader/Test/testMEDReader12.py @@ -98,7 +98,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, "testMEDReader12.png") import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader13.py b/src/Plugins/MEDReader/Test/testMEDReader13.py index d19a774d..40eb7031 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader13.py +++ b/src/Plugins/MEDReader/Test/testMEDReader13.py @@ -83,7 +83,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, "testMEDReader13.png") import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader14.py b/src/Plugins/MEDReader/Test/testMEDReader14.py index 6412f059..0f705055 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader14.py +++ b/src/Plugins/MEDReader/Test/testMEDReader14.py @@ -43,13 +43,13 @@ m1.allocateCells() for i in [[28,21],[21,14],[14,7],[7,0]]: m1.insertNextCell(i) pass -for i in xrange(6): +for i in range(6): m1.insertNextCell([i,i+1]) pass for i in [[6,13],[13,20],[20,27],[27,34]]: m1.insertNextCell(i) pass -for i in xrange(6,0,-1): +for i in range(6,0,-1): m1.insertNextCell([28+i,28+i-1]) pass # @@ -69,7 +69,7 @@ fieldName2="zeField2" fs0=MEDFileFieldMultiTS() fs1=MEDFileFieldMultiTS() fs2=MEDFileFieldMultiTS() -for i in xrange(5): +for i in range(5): f=MEDFileField1TS() zePfl0=DataArrayInt.Aggregate(DataArrayInt.Range(0,12,1),pfl3,0) ; zePfl0.setName("PFL") fNode=MEDCouplingFieldDouble(ON_GAUSS_PT) ; fNode.setTime(float(i),i,0) @@ -166,7 +166,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, "testMEDReader14.png") import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader15.py b/src/Plugins/MEDReader/Test/testMEDReader15.py index a68d7010..c61b11d8 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader15.py +++ b/src/Plugins/MEDReader/Test/testMEDReader15.py @@ -81,7 +81,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, "testMEDReader15.png") import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader16.py b/src/Plugins/MEDReader/Test/testMEDReader16.py index 0252cb99..3a07ef6a 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader16.py +++ b/src/Plugins/MEDReader/Test/testMEDReader16.py @@ -60,7 +60,7 @@ for elt in [ELNOMesh1,ELNOPoints1]: assert(vtkArrToTest.GetNumberOfComponents()==2) assert(vtkArrToTest.GetComponentName(0)==arr2.getInfoOnComponent(0)) assert(vtkArrToTest.GetComponentName(1)==arr2.getInfoOnComponent(1)) - vals=[vtkArrToTest.GetValue(i) for i in xrange(16)] + vals=[vtkArrToTest.GetValue(i) for i in range(16)] assert(arr2[8:].isEqualWithoutConsideringStr(DataArrayDouble(vals,8,2),1e-12)) pass # @@ -72,7 +72,7 @@ for elt in [ELNOMesh1,ELNOPoints1]: assert(vtkArrToTest.GetNumberOfComponents()==2) assert(vtkArrToTest.GetComponentName(0)==arr2.getInfoOnComponent(0)) assert(vtkArrToTest.GetComponentName(1)==arr2.getInfoOnComponent(1)) - vals=[vtkArrToTest.GetValue(i) for i in xrange(16)] + vals=[vtkArrToTest.GetValue(i) for i in range(16)] assert(arr2[4:12].isEqualWithoutConsideringStr(DataArrayDouble(vals,8,2),1e-12)) pass # important to check that if all the field is present that it is OK (check of the optimization) @@ -84,7 +84,7 @@ for elt in [ELNOMesh1,ELNOPoints1]: assert(vtkArrToTest.GetNumberOfComponents()==2) assert(vtkArrToTest.GetComponentName(0)==arr2.getInfoOnComponent(0)) assert(vtkArrToTest.GetComponentName(1)==arr2.getInfoOnComponent(1)) - vals=[vtkArrToTest.GetValue(i) for i in xrange(32)] + vals=[vtkArrToTest.GetValue(i) for i in range(32)] assert(arr2.isEqualWithoutConsideringStr(DataArrayDouble(vals,16,2),1e-12)) pass ELNOMesh1=ELNOMesh(Input=reader) @@ -97,6 +97,6 @@ for elt in [ELNOMesh1,ELNOPoints1]: assert(vtkArrToTest.GetNumberOfComponents()==2) assert(vtkArrToTest.GetComponentName(0)==arr2.getInfoOnComponent(0)) assert(vtkArrToTest.GetComponentName(1)==arr2.getInfoOnComponent(1)) - vals=[vtkArrToTest.GetValue(i) for i in xrange(32)] + vals=[vtkArrToTest.GetValue(i) for i in range(32)] assert(arr2.isEqualWithoutConsideringStr(DataArrayDouble(vals,16,2),1e-12)) pass diff --git a/src/Plugins/MEDReader/Test/testMEDReader17.py b/src/Plugins/MEDReader/Test/testMEDReader17.py index e1564ba5..eddef2ea 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader17.py +++ b/src/Plugins/MEDReader/Test/testMEDReader17.py @@ -64,5 +64,5 @@ assert(res.GetBlock(0).GetNumberOfCells()==8) vtkArrToTest=res.GetBlock(0).GetPointData().GetArray("MyField") assert(vtkArrToTest.GetNumberOfComponents()==2) assert(vtkArrToTest.GetNumberOfTuples()==8) -vals=[vtkArrToTest.GetValue(i) for i in xrange(16)] +vals=[vtkArrToTest.GetValue(i) for i in range(16)] assert(DataArrayDouble([(16.1,17.1),(18.1,19.1),(20.1,21.1),(22.1,23.1),(24.1,25.1),(26.1,27.1),(28.1,29.1),(30.1,31.1)]).isEqual(DataArrayDouble(vals,8,2),1e-12)) diff --git a/src/Plugins/MEDReader/Test/testMEDReader19.py b/src/Plugins/MEDReader/Test/testMEDReader19.py index df2925cd..25a8a802 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader19.py +++ b/src/Plugins/MEDReader/Test/testMEDReader19.py @@ -93,7 +93,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, imgName) import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader2.py b/src/Plugins/MEDReader/Test/testMEDReader2.py index da36c1c9..e65a9ebb 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader2.py +++ b/src/Plugins/MEDReader/Test/testMEDReader2.py @@ -111,7 +111,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, "testMEDReader2.png") import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader20.py b/src/Plugins/MEDReader/Test/testMEDReader20.py index 46ded62f..7425b9d8 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader20.py +++ b/src/Plugins/MEDReader/Test/testMEDReader20.py @@ -142,7 +142,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath,png) import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader21.py b/src/Plugins/MEDReader/Test/testMEDReader21.py index 1d9aa0b7..2f5c597a 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader21.py +++ b/src/Plugins/MEDReader/Test/testMEDReader21.py @@ -154,7 +154,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, imgName) import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader3.py b/src/Plugins/MEDReader/Test/testMEDReader3.py index f6fd880d..4c31665c 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader3.py +++ b/src/Plugins/MEDReader/Test/testMEDReader3.py @@ -133,7 +133,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, "testMEDReader3.png") import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader4.py b/src/Plugins/MEDReader/Test/testMEDReader4.py index a6cef30f..44c13925 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader4.py +++ b/src/Plugins/MEDReader/Test/testMEDReader4.py @@ -100,7 +100,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, "testMEDReader4.png") import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader5.py b/src/Plugins/MEDReader/Test/testMEDReader5.py index 0248a1c7..d5092899 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader5.py +++ b/src/Plugins/MEDReader/Test/testMEDReader5.py @@ -117,7 +117,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, "testMEDReader5.png") import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader6.py b/src/Plugins/MEDReader/Test/testMEDReader6.py index 9b73ce29..dc59fef6 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader6.py +++ b/src/Plugins/MEDReader/Test/testMEDReader6.py @@ -102,7 +102,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, "testMEDReader6.png") import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader7.py b/src/Plugins/MEDReader/Test/testMEDReader7.py index 423a3862..db52bf70 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader7.py +++ b/src/Plugins/MEDReader/Test/testMEDReader7.py @@ -102,7 +102,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, "testMEDReader7.png") import vtk.test.Testing diff --git a/src/Plugins/MEDReader/Test/testMEDReader8.py b/src/Plugins/MEDReader/Test/testMEDReader8.py index 0b552f67..2d50d14d 100644 --- a/src/Plugins/MEDReader/Test/testMEDReader8.py +++ b/src/Plugins/MEDReader/Test/testMEDReader8.py @@ -77,7 +77,7 @@ extractCT.AllGeoTypes=['TRI3'] extGrp=ExtractGroup(Input=extractCT) extGrp.UpdatePipelineInformation() -assert(filter(lambda x:x[:4]=="GRP_",list(extGrp.GetProperty("GroupsFlagsInfo")[::2]))==['GRP_grp0']) +assert([x for x in list(extGrp.GetProperty("GroupsFlagsInfo")[::2]) if x[:4]=="GRP_"]==['GRP_grp0']) extGrp.AllGroups="GRP_grp0" RenderView1 = GetRenderView() @@ -112,7 +112,7 @@ try: baselineIndex = sys.argv.index('-B')+1 baselinePath = sys.argv[baselineIndex] except: - print "Could not get baseline directory. Test failed." + print("Could not get baseline directory. Test failed.") exit(1) baseline_file = os.path.join(baselinePath, "testMEDReader8.png") import vtk.test.Testing diff --git a/src/Plugins/SimpleMode/IO/CMakeLists.txt b/src/Plugins/SimpleMode/IO/CMakeLists.txt index a33d5811..2bd884fe 100644 --- a/src/Plugins/SimpleMode/IO/CMakeLists.txt +++ b/src/Plugins/SimpleMode/IO/CMakeLists.txt @@ -19,5 +19,5 @@ # Author : Anthony Geay (EDF R&D) VTK_MODULE_LIBRARY(vtkSimpleMode vtkSimpleMode.cxx) -TARGET_LINK_LIBRARIES(vtkSimpleMode vtkPVVTKExtensionsRendering vtkFiltersGeneral vtkFiltersCore vtkRenderingOpenGL ${PARAVIEW_LIBRARIES}) +TARGET_LINK_LIBRARIES(vtkSimpleMode vtkPVVTKExtensionsRendering vtkFiltersGeneral vtkFiltersCore vtkRenderingOpenGL2 ${PARAVIEW_LIBRARIES}) INSTALL(TARGETS vtkSimpleMode RUNTIME DESTINATION lib/salome LIBRARY DESTINATION lib/salome ARCHIVE DESTINATION lib/salome) diff --git a/test/VisuPrs/2D_viewer/A0.py b/test/VisuPrs/2D_viewer/A0.py index aad739ba..85b12c13 100755 --- a/test/VisuPrs/2D_viewer/A0.py +++ b/test/VisuPrs/2D_viewer/A0.py @@ -28,9 +28,9 @@ aXYPlot = CreateXYPlotView() Render(aXYPlot) # Set title -print "Default chart title ...", aXYPlot.ChartTitle +print("Default chart title ...", aXYPlot.ChartTitle) aXYPlot.ChartTitle = 'title of XY plot' -print "New chart title ...", aXYPlot.ChartTitle +print("New chart title ...", aXYPlot.ChartTitle) # Apply custom axes range aXYPlot.LeftAxisUseCustomRange = 1 @@ -50,23 +50,23 @@ aXYPlot.BottomAxisRangeMinimum = aMinX aXYPlot.BottomAxisRangeMaximum = aMaxX # Set horizontal scaling for left and bottom axis -print "Default logarithmic scaling ... left = %s, bottom = %s" % ( aXYPlot.LeftAxisLogScale, aXYPlot.BottomAxisLogScale ) +print("Default logarithmic scaling ... left = %s, bottom = %s" % ( aXYPlot.LeftAxisLogScale, aXYPlot.BottomAxisLogScale )) # Set logarithmic scaling aXYPlot.LeftAxisLogScale = 1 aXYPlot.BottomAxisLogScale = 1 -print "Set logarithmic scaling ... left = %s, bottom = %s" % ( aXYPlot.LeftAxisLogScale, aXYPlot.BottomAxisLogScale ) +print("Set logarithmic scaling ... left = %s, bottom = %s" % ( aXYPlot.LeftAxisLogScale, aXYPlot.BottomAxisLogScale )) # Set linear scaling aXYPlot.LeftAxisLogScale = 0 aXYPlot.BottomAxisLogScale = 0 -print "Set linear scaling ... left = %s, bottom = %s" % ( aXYPlot.LeftAxisLogScale, aXYPlot.BottomAxisLogScale ) +print("Set linear scaling ... left = %s, bottom = %s" % ( aXYPlot.LeftAxisLogScale, aXYPlot.BottomAxisLogScale )) # Axis titles -print "Default title of the left axis ...", aXYPlot.LeftAxisTitle +print("Default title of the left axis ...", aXYPlot.LeftAxisTitle) aXYPlot.LeftAxisTitle = "Ytitle of XY plot" -print "New title of the left axis ...", aXYPlot.LeftAxisTitle -print "Default title of the bottom axis ...", aXYPlot.BottomAxisTitle +print("New title of the left axis ...", aXYPlot.LeftAxisTitle) +print("Default title of the bottom axis ...", aXYPlot.BottomAxisTitle) aXYPlot.BottomAxisTitle = "Xtitle of XY plot" -print "New title of the bottom axis ...", aXYPlot.BottomAxisTitle +print("New title of the bottom axis ...", aXYPlot.BottomAxisTitle) # Show/hide legend aXYPlot.ShowLegend = 1 diff --git a/test/VisuPrs/2D_viewer/A1.py b/test/VisuPrs/2D_viewer/A1.py index 42bc137b..ef9d9744 100755 --- a/test/VisuPrs/2D_viewer/A1.py +++ b/test/VisuPrs/2D_viewer/A1.py @@ -64,4 +64,4 @@ Ranges = aXYPlot.TopAxisRangeMinimum, aXYPlot.TopAxisRangeMaximum error = error + test_values(Ranges, Etvalue) if error > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/3D_viewer/A1.py b/test/VisuPrs/3D_viewer/A1.py index b9072293..61118bcd 100644 --- a/test/VisuPrs/3D_viewer/A1.py +++ b/test/VisuPrs/3D_viewer/A1.py @@ -39,16 +39,16 @@ reset_view(my_view) Render(my_view) file_name = datadir + "fra.med" -print " --------------------------------- " -print "file ", file_name -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", file_name) +print(" --------------------------------- ") OpenDataFile(file_name) proxy = GetActiveSource() if proxy is None: raise RuntimeError("Error: can't import file.") else: - print "OK" + print("OK") represents = [RepresentationType.POINTS, RepresentationType.WIREFRAME,\ RepresentationType.SURFACE, RepresentationType.VOLUME] @@ -63,7 +63,7 @@ field_name = 'VITESSE' # Get view my_view = GetRenderView() -print "\nCreating plot3d......." +print("\nCreating plot3d.......") plot3d = Plot3DOnField(proxy, EntityType.NODE, field_name, 1) if plot3d is None: raise RuntimeError("Error!!! Presentation wasn't created...") @@ -72,7 +72,7 @@ display_only(plot3d, my_view) reset_view(my_view) Render(my_view) -print "\nChange Presentation Parameters..." +print("\nChange Presentation Parameters...") for reprCode in represents: repr = RepresentationType.get_name(reprCode) diff --git a/test/VisuPrs/3D_viewer/A2.py b/test/VisuPrs/3D_viewer/A2.py index d22d4e8d..a1e310fb 100644 --- a/test/VisuPrs/3D_viewer/A2.py +++ b/test/VisuPrs/3D_viewer/A2.py @@ -39,16 +39,16 @@ reset_view(my_view) Render(my_view) file_name = datadir + "Penta6.med" -print " --------------------------------- " -print "file ", file_name -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", file_name) +print(" --------------------------------- ") OpenDataFile(file_name) proxy = GetActiveSource() if proxy is None: raise RuntimeError("Error: can't import file.") else: - print "OK" + print("OK") represents = [RepresentationType.POINTS, RepresentationType.WIREFRAME,\ RepresentationType.SURFACE, RepresentationType.VOLUME] @@ -60,7 +60,7 @@ compare_prec = 0.00001 field_name = 'vectoriel field' -print "\nCreating Vectors.......", +print("\nCreating Vectors.......", end=' ') vectors = VectorsOnField(proxy, EntityType.CELL, field_name, 1, is_colored=True, glyph_type="Cone") if vectors is None: @@ -70,7 +70,7 @@ display_only(vectors, my_view) reset_view(my_view) Render(my_view) -print "\nChange Presentation Parameters..." +print("\nChange Presentation Parameters...") for reprCode in represents: repr = RepresentationType.get_name(reprCode) diff --git a/test/VisuPrs/3D_viewer/A3.py b/test/VisuPrs/3D_viewer/A3.py index 2daf15a2..062e048b 100644 --- a/test/VisuPrs/3D_viewer/A3.py +++ b/test/VisuPrs/3D_viewer/A3.py @@ -39,9 +39,9 @@ reset_view(my_view) Render(my_view) file_name = datadir + "Penta6.med" -print " --------------------------------- " -print "file ", file_name -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", file_name) +print(" --------------------------------- ") OpenDataFile(file_name) #reader = OpenDataFile(file_name) @@ -59,7 +59,7 @@ proxy = GetActiveSource() if proxy is None: raise RuntimeError("Error: can't import file.") else: - print "OK" + print("OK") represents = [RepresentationType.POINTS, RepresentationType.WIREFRAME,\ RepresentationType.SURFACE, RepresentationType.VOLUME] @@ -72,11 +72,11 @@ compare_prec = 0.00001 field_name = 'vectoriel field' -print "\nCreating stream_lines......." +print("\nCreating stream_lines.......") stream_lines = StreamLinesOnField(proxy, EntityType.CELL, field_name, 1, is_colored=True) stream_tracer = stream_lines.Input -print "stream_tracer:", stream_tracer +print("stream_tracer:", stream_tracer) #stream_tracer.Input = None stream_tracer.InitialStepLength = 0.00940275 stream_tracer.MaximumStreamlineLength = 140.373 @@ -91,7 +91,7 @@ display_only(stream_lines, my_view) reset_view(my_view) Render(my_view) -print "\nChange Presentation Parameters..." +print("\nChange Presentation Parameters...") for reprCode in represents: repr = RepresentationType.get_name(reprCode) diff --git a/test/VisuPrs/3D_viewer/A4.py b/test/VisuPrs/3D_viewer/A4.py index 2ad3a648..9569fd78 100644 --- a/test/VisuPrs/3D_viewer/A4.py +++ b/test/VisuPrs/3D_viewer/A4.py @@ -39,16 +39,16 @@ reset_view(my_view) Render(my_view) file_name = datadir + "hydro_sea_alv.med" -print " --------------------------------- " -print "file ", file_name -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", file_name) +print(" --------------------------------- ") OpenDataFile(file_name) proxy = GetActiveSource() if proxy is None: raise RuntimeError("Error: can't import file.") else: - print "OK" + print("OK") represents = [RepresentationType.POINTS, RepresentationType.WIREFRAME,\ RepresentationType.SURFACE, RepresentationType.VOLUME] @@ -60,7 +60,7 @@ compare_prec = 0.00001 field_name = 'Head' -print "\nCreating iso surface.......", +print("\nCreating iso surface.......", end=' ') iso_surf = IsoSurfacesOnField(proxy, EntityType.CELL, field_name, 1) if iso_surf is None: raise RuntimeError("Error!!! Presentation wasn't created...") @@ -69,7 +69,7 @@ display_only(iso_surf, my_view) reset_view(my_view) Render(my_view) -print "\nChange Presentation Parameters..." +print("\nChange Presentation Parameters...") for reprCode in represents: repr = RepresentationType.get_name(reprCode) diff --git a/test/VisuPrs/3D_viewer/A5.py b/test/VisuPrs/3D_viewer/A5.py index da22a1c8..58ce594a 100644 --- a/test/VisuPrs/3D_viewer/A5.py +++ b/test/VisuPrs/3D_viewer/A5.py @@ -39,16 +39,16 @@ reset_view(my_view) Render(my_view) file_name = datadir + "cube_hexa8_quad4.med" -print " --------------------------------- " -print "file ", file_name -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", file_name) +print(" --------------------------------- ") OpenDataFile(file_name) proxy = GetActiveSource() if proxy is None: raise RuntimeError("Error: can't import file.") else: - print "OK" + print("OK") represents = [RepresentationType.POINTS, RepresentationType.WIREFRAME,\ RepresentationType.SURFACE, RepresentationType.VOLUME] @@ -62,7 +62,7 @@ shrinked_ds = None field_name = 'fieldcelldouble' -print "\nCreating deformed shape.......", +print("\nCreating deformed shape.......", end=' ') ds = DeformedShapeOnField(proxy, EntityType.CELL, field_name, 1, scale_factor=0.5, is_colored=True) if ds is None: @@ -72,7 +72,7 @@ display_only(ds, my_view) reset_view(my_view) Render(my_view) -print "\nChange Presentation Parameters..." +print("\nChange Presentation Parameters...") for reprCode in represents: diff --git a/test/VisuPrs/3D_viewer/A6.py b/test/VisuPrs/3D_viewer/A6.py index 30368586..d5bcacce 100644 --- a/test/VisuPrs/3D_viewer/A6.py +++ b/test/VisuPrs/3D_viewer/A6.py @@ -40,16 +40,16 @@ reset_view(my_view) Render(my_view) file_name = datadir + "cube_hexa8_quad4.med" -print " --------------------------------- " -print "file ", file_name -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", file_name) +print(" --------------------------------- ") OpenDataFile(file_name) proxy = GetActiveSource() if proxy is None: raise RuntimeError("Error: can't import file.") else: - print "OK" + print("OK") represents = [RepresentationType.POINTS, RepresentationType.WIREFRAME, RepresentationType.SURFACE, RepresentationType.VOLUME] @@ -63,7 +63,7 @@ shr_sm_on_ds = None field_name = 'fieldcelldouble' -print "\nCreating scalar map on deformed shape.......", +print("\nCreating scalar map on deformed shape.......", end=' ') sm_on_ds = DeformedShapeAndScalarMapOnField(proxy, EntityType.CELL, field_name, 1, scale_factor=0.2) if sm_on_ds is None: @@ -73,7 +73,7 @@ display_only(sm_on_ds, my_view) reset_view(my_view) Render(my_view) -print "\nChange Presentation Parameters..." +print("\nChange Presentation Parameters...") for reprCode in represents: diff --git a/test/VisuPrs/3D_viewer/A7.py b/test/VisuPrs/3D_viewer/A7.py index 03b895f5..68c93b30 100644 --- a/test/VisuPrs/3D_viewer/A7.py +++ b/test/VisuPrs/3D_viewer/A7.py @@ -39,16 +39,16 @@ reset_view(my_view) Render(my_view) file_name = datadir + "Tetra4.med" -print " --------------------------------- " -print "file ", file_name -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", file_name) +print(" --------------------------------- ") OpenDataFile(file_name) proxy = GetActiveSource() if proxy is None: raise RuntimeError("Error: can't import file.") else: - print "OK" + print("OK") represents = [RepresentationType.POINTS, RepresentationType.WIREFRAME,\ RepresentationType.SURFACE, RepresentationType.VOLUME] @@ -60,7 +60,7 @@ compare_prec = 0.00001 field_name = 'scalar field' -print "\nCreating cut planes.......", +print("\nCreating cut planes.......", end=' ') cut_planes = CutPlanesOnField(proxy, EntityType.CELL, field_name, 1, nb_planes=10, orientation=Orientation.YZ, displacement=0.5) if cut_planes is None: @@ -70,7 +70,7 @@ display_only(cut_planes, my_view) reset_view(my_view) Render(my_view) -print "\nChange Presentation Parameters..." +print("\nChange Presentation Parameters...") for reprCode in represents: repr = RepresentationType.get_name(reprCode) diff --git a/test/VisuPrs/3D_viewer/A8.py b/test/VisuPrs/3D_viewer/A8.py index 0aa0e72b..b5dcf306 100644 --- a/test/VisuPrs/3D_viewer/A8.py +++ b/test/VisuPrs/3D_viewer/A8.py @@ -39,16 +39,16 @@ reset_view(my_view) Render(my_view) file_name = datadir + "Tetra4.med" -print " --------------------------------- " -print "file ", file_name -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", file_name) +print(" --------------------------------- ") OpenDataFile(file_name) proxy = GetActiveSource() if proxy is None: raise RuntimeError("Error: can't import file.") else: - print "OK" + print("OK") represents = [RepresentationType.POINTS, RepresentationType.WIREFRAME,\ RepresentationType.SURFACE, RepresentationType.VOLUME] @@ -60,7 +60,7 @@ compare_prec = 0.00001 field_name = 'scalar field' -print "\nCreating cut lines.......", +print("\nCreating cut lines.......", end=' ') cut_lines = CutLinesOnField(proxy, EntityType.CELL, field_name, 1, nb_lines=10, orientation1=Orientation.ZX, @@ -73,7 +73,7 @@ display_only(cut_lines, my_view) reset_view(my_view) Render(my_view) -print "\nChange Presentation Parameters..." +print("\nChange Presentation Parameters...") for reprCode in represents: repr = RepresentationType.get_name(reprCode) diff --git a/test/VisuPrs/3D_viewer/A9.py b/test/VisuPrs/3D_viewer/A9.py index 47dd85ec..226112f3 100644 --- a/test/VisuPrs/3D_viewer/A9.py +++ b/test/VisuPrs/3D_viewer/A9.py @@ -64,20 +64,20 @@ reset_view(my_view) Render(my_view) theFileName = datadir + "cube_hexa8_quad4.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) proxy = GetActiveSource() if proxy is None: raise RuntimeError("Error: can't import file.") else: - print "OK" + print("OK") field_name = 'fieldcelldouble' -print "\nCreating scalar_map.......", +print("\nCreating scalar_map.......", end=' ') scalar_map = ScalarMapOnField(proxy, EntityType.CELL, field_name, 1) if scalar_map is None: raise RuntimeError("Error!!! Presentation wasn't created...") @@ -88,10 +88,10 @@ Render(my_view) compare_prec = 0.00001 -print "\nChange Presentation Parameters..." +print("\nChange Presentation Parameters...") # Group 1 (SHADED) -print "\nCheck in SURFACE:" +print("\nCheck in SURFACE:") call_and_check(scalar_map, "Representation", RepresentationType.get_name(RepresentationType.SURFACE)) @@ -192,7 +192,7 @@ call_and_check(shape_to_show, "LineWidth", 1.0, 1, compare_prec) # Group 2 (WIREFRAME) hide_all(my_view) -print "\nCheck in WIREFRAME:" +print("\nCheck in WIREFRAME:") scalar_map.Visibility = 1 call_and_check(scalar_map, "Representation", RepresentationType.get_name(RepresentationType.WIREFRAME), "Representation") diff --git a/test/VisuPrs/3D_viewer/B0.py b/test/VisuPrs/3D_viewer/B0.py index ead298bb..f5c3909a 100644 --- a/test/VisuPrs/3D_viewer/B0.py +++ b/test/VisuPrs/3D_viewer/B0.py @@ -39,16 +39,16 @@ reset_view(my_view) Render(my_view) theFileName = datadir + "fra.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) proxy = GetActiveSource() if proxy is None: raise RuntimeError("Error: can't import file.") else: - print "OK" + print("OK") represents = [RepresentationType.POINTS, RepresentationType.WIREFRAME,\ RepresentationType.SURFACE, RepresentationType.VOLUME] @@ -62,7 +62,7 @@ shrinked_sm = None field_name = 'VITESSE' -print "\nCreating scalar map.......", +print("\nCreating scalar map.......", end=' ') scalar_map = ScalarMapOnField(proxy, EntityType.NODE, field_name, 1) if scalar_map is None: raise RuntimeError("Error!!! Presentation wasn't created...") @@ -71,7 +71,7 @@ display_only(scalar_map, my_view) reset_view(my_view) Render(my_view) -print "\nChange Presentation Parameters..." +print("\nChange Presentation Parameters...") for reprCode in represents: diff --git a/test/VisuPrs/Animation/A0.py b/test/VisuPrs/Animation/A0.py index d6043782..b28dba3c 100644 --- a/test/VisuPrs/Animation/A0.py +++ b/test/VisuPrs/Animation/A0.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/A0") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Scalar Map creation prs= ScalarMapOnField(aProxy,EntityType.NODE,'vitesse' , 1) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "jpeg" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -82,5 +82,5 @@ scene.PlayMode = 1 # set RealTime mode for animation performance scene.Duration = 40 # correspond to set the speed of animation in VISU scene.GoToFirst() scene.Loop = 0 -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() diff --git a/test/VisuPrs/Animation/A1.py b/test/VisuPrs/Animation/A1.py index 888d0ffc..f5062e65 100644 --- a/test/VisuPrs/Animation/A1.py +++ b/test/VisuPrs/Animation/A1.py @@ -27,33 +27,33 @@ from presentations import * from pvsimple import * # 1. TimeStamps.med import -print 'Importing "TimeStamps.med"................', +print('Importing "TimeStamps.med"................', end=' ') file_path = datadir + "TimeStamps.med" OpenDataFile(file_path) med_reader = GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # 2. CutLines creation -print "Creating Cut Lines........................", +print("Creating Cut Lines........................", end=' ') med_field = "vitesse" cutlines = CutLinesOnField(med_reader, EntityType.NODE, med_field, 1, nb_lines = 20, orientation1=Orientation.XY, orientation2=Orientation.ZX) if cutlines is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # 3. Display CutLines -print "Getting a Viewer.........................", +print("Getting a Viewer.........................", end=' ') view = GetRenderView() if view is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") cutlines.Visibility = 1 Render(view=view) cutlines.Visibility = 0 @@ -62,27 +62,27 @@ display_only(cutlines, view=view) reset_view(view=view) # 4. Animation -print "Get Animation scene.....................", +print("Get Animation scene.....................", end=' ') scene = GetAnimationScene() if scene is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Duration default... ", scene.Duration +print("Duration default... ", scene.Duration) scene.Duration = -10 scene.Duration = 120 scene.Duration = 0 scene.Duration = 30 -print "Duration ... ", scene.Duration +print("Duration ... ", scene.Duration) -print "Loop ... ", scene.Loop +print("Loop ... ", scene.Loop) scene.Loop = 1 -print "Loop ... ", scene.Loop +print("Loop ... ", scene.Loop) scene.Loop = 0 -print "Loop ... ", scene.Loop +print("Loop ... ", scene.Loop) -print "AnimationTime ... ", scene.AnimationTime +print("AnimationTime ... ", scene.AnimationTime) scene.Play() @@ -90,19 +90,19 @@ scene.GoToFirst() scene.GoToNext() scene.GoToNext() -print "AnimationTime ... ", scene.AnimationTime +print("AnimationTime ... ", scene.AnimationTime) scene.GoToPrevious() scene.GoToLast() scene.Stop() -print "AnimationTime ... ", scene.AnimationTime +print("AnimationTime ... ", scene.AnimationTime) scene.AnimationTime = -1 scene.AnimationTime = scene.TimeKeeper.TimestepValues[1] scene.AnimationTime = scene.TimeKeeper.TimestepValues[0] nb_frames = scene.NumberOfFrames -print "NumberOfFrames ... ", nb_frames +print("NumberOfFrames ... ", nb_frames) diff --git a/test/VisuPrs/Animation/A2.py b/test/VisuPrs/Animation/A2.py index dfffd0b2..62d13baf 100644 --- a/test/VisuPrs/Animation/A2.py +++ b/test/VisuPrs/Animation/A2.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/A2") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Scalar Map creation prs= ScalarMapOnField(aProxy,EntityType.CELL,'pression' , 2) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "tiff" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/A4.py b/test/VisuPrs/Animation/A4.py index aa76df62..577828bd 100644 --- a/test/VisuPrs/Animation/A4.py +++ b/test/VisuPrs/Animation/A4.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/A4") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Cut Lines creation prs= CutLinesOnField(aProxy,EntityType.CELL,'pression' , 2) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "jpeg" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/A7.py b/test/VisuPrs/Animation/A7.py index 46322868..3b2a59a9 100644 --- a/test/VisuPrs/Animation/A7.py +++ b/test/VisuPrs/Animation/A7.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/A7") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Cut Lines creation prs= CutLinesOnField(aProxy,EntityType.CELL,'pression' , 2) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "png" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/A8.py b/test/VisuPrs/Animation/A8.py index 22fd2982..4f9a3081 100644 --- a/test/VisuPrs/Animation/A8.py +++ b/test/VisuPrs/Animation/A8.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/A8") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Cut Lines creation prs= CutLinesOnField(aProxy,EntityType.CELL,'pression' , 2) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "tiff" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/B2.py b/test/VisuPrs/Animation/B2.py index 98de770c..c0f6c732 100644 --- a/test/VisuPrs/Animation/B2.py +++ b/test/VisuPrs/Animation/B2.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/B2") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Cut Planes creation prs= CutPlanesOnField(aProxy,EntityType.CELL,'pression' , 2) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "jpeg" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/B5.py b/test/VisuPrs/Animation/B5.py index 62c56f4f..71e0fa9b 100644 --- a/test/VisuPrs/Animation/B5.py +++ b/test/VisuPrs/Animation/B5.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/B5") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Cut Planes creation prs= CutPlanesOnField(aProxy,EntityType.CELL,'pression' , 2) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "png" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/B6.py b/test/VisuPrs/Animation/B6.py index a8eef594..6fed70c9 100644 --- a/test/VisuPrs/Animation/B6.py +++ b/test/VisuPrs/Animation/B6.py @@ -30,17 +30,17 @@ from pvsimple import * picturedir = get_picture_dir("Animation/B6") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() time_value = get_time(aProxy, 0) aView.ViewTime = time_value @@ -48,16 +48,16 @@ UpdatePipeline(time=time_value, proxy=aProxy) reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Cut Planes creation prs= CutPlanesOnField(aProxy,EntityType.CELL,'pression' , 2) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "tiff" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -74,7 +74,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -84,6 +84,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/C0.py b/test/VisuPrs/Animation/C0.py index bf310c5c..2a95da59 100644 --- a/test/VisuPrs/Animation/C0.py +++ b/test/VisuPrs/Animation/C0.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/C0") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Deformed Shape creation prs= DeformedShapeOnField(aProxy,EntityType.NODE,'vitesse' , 1) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "jpeg" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/C1.py b/test/VisuPrs/Animation/C1.py index 23f65966..cc4588b4 100644 --- a/test/VisuPrs/Animation/C1.py +++ b/test/VisuPrs/Animation/C1.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/C1") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Deformed Shape creation prs= DeformedShapeOnField(aProxy,EntityType.NODE,'vitesse' , 1) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "tiff" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/C3.py b/test/VisuPrs/Animation/C3.py index d9d86790..cbc0b23c 100644 --- a/test/VisuPrs/Animation/C3.py +++ b/test/VisuPrs/Animation/C3.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/C3") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Deformed Shape creation prs= DeformedShapeOnField(aProxy,EntityType.NODE,'vitesse' , 1) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "png" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/C8.py b/test/VisuPrs/Animation/C8.py index 6d673c12..62bcf100 100644 --- a/test/VisuPrs/Animation/C8.py +++ b/test/VisuPrs/Animation/C8.py @@ -30,17 +30,17 @@ from pvsimple import * picturedir = get_picture_dir("Animation/C8") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() time_value = get_time(aProxy, 0) aView.ViewTime = time_value @@ -48,16 +48,16 @@ UpdatePipeline(time=time_value, proxy=aProxy) reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Gauss Points creation prs= GaussPointsOnField(aProxy,EntityType.CELL,'pression' , 1 , multiplier=0.01) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "jpeg" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -74,7 +74,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -84,6 +84,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/D1.py b/test/VisuPrs/Animation/D1.py index 8e4ddaa0..d310234a 100644 --- a/test/VisuPrs/Animation/D1.py +++ b/test/VisuPrs/Animation/D1.py @@ -31,17 +31,17 @@ picturedir = get_picture_dir("Animation/D1") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() time_value = get_time(aProxy, 0) aView.ViewTime = time_value @@ -49,16 +49,16 @@ UpdatePipeline(time=time_value, proxy=aProxy) reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Gauss Points creation prs= GaussPointsOnField(aProxy,EntityType.CELL,'pression' , 2, multiplier=0.01) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "png" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -75,7 +75,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -85,6 +85,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/D2.py b/test/VisuPrs/Animation/D2.py index 40668ce3..0dc53a6d 100644 --- a/test/VisuPrs/Animation/D2.py +++ b/test/VisuPrs/Animation/D2.py @@ -30,17 +30,17 @@ from pvsimple import * picturedir = get_picture_dir("Animation/D2") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() time_value = get_time(aProxy, 0) aView.ViewTime = time_value @@ -48,16 +48,16 @@ UpdatePipeline(time=time_value, proxy=aProxy) reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Gauss Points creation prs= GaussPointsOnField(aProxy,EntityType.CELL,'pression' , 2, multiplier=0.01) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "tiff" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -74,7 +74,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -84,6 +84,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/D6.py b/test/VisuPrs/Animation/D6.py index 66ae461b..f515ccda 100644 --- a/test/VisuPrs/Animation/D6.py +++ b/test/VisuPrs/Animation/D6.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/D6") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Iso Surfaces creation prs= IsoSurfacesOnField(aProxy,EntityType.CELL,'pression', 2) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "jpeg" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/D9.py b/test/VisuPrs/Animation/D9.py index bc57289e..c412146a 100644 --- a/test/VisuPrs/Animation/D9.py +++ b/test/VisuPrs/Animation/D9.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/D9") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Iso Surfaces creation prs= IsoSurfacesOnField(aProxy,EntityType.CELL,'pression', 2) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "png" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/E0.py b/test/VisuPrs/Animation/E0.py index dc0cc777..387d58f3 100644 --- a/test/VisuPrs/Animation/E0.py +++ b/test/VisuPrs/Animation/E0.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/E0") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Iso Surfaces creation prs= IsoSurfacesOnField(aProxy,EntityType.CELL,'pression', 2) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "tiff" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/E4.py b/test/VisuPrs/Animation/E4.py index 167c2e4f..15e7f556 100644 --- a/test/VisuPrs/Animation/E4.py +++ b/test/VisuPrs/Animation/E4.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/E4") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Plot 3D creation prs= Plot3DOnField(aProxy,EntityType.CELL,'pression' , 2) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "jpeg" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/E7.py b/test/VisuPrs/Animation/E7.py index 61c7b81f..776f812a 100644 --- a/test/VisuPrs/Animation/E7.py +++ b/test/VisuPrs/Animation/E7.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/E7") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Plot 3D creation prs= Plot3DOnField(aProxy,EntityType.CELL,'pression' , 2) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "png" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -66,7 +66,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -76,6 +76,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/E8.py b/test/VisuPrs/Animation/E8.py index 0224ccaf..a9acdc67 100644 --- a/test/VisuPrs/Animation/E8.py +++ b/test/VisuPrs/Animation/E8.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/E8") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Plot 3D creation prs= Plot3DOnField(aProxy,EntityType.CELL,'pression' , 2) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "tiff" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/F2.py b/test/VisuPrs/Animation/F2.py index f9cc61e0..5a938b54 100644 --- a/test/VisuPrs/Animation/F2.py +++ b/test/VisuPrs/Animation/F2.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/F2") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Scalar Map on Deformed Shape creation prs= DeformedShapeAndScalarMapOnField(aProxy,EntityType.NODE,'vitesse' , 1) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "jpeg" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/F5.py b/test/VisuPrs/Animation/F5.py index e9f7aa3d..f7fa78a9 100644 --- a/test/VisuPrs/Animation/F5.py +++ b/test/VisuPrs/Animation/F5.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/F5") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Scalar Map on Deformed Shape creation prs= DeformedShapeAndScalarMapOnField(aProxy,EntityType.NODE,'vitesse' , 1) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "png" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/F6.py b/test/VisuPrs/Animation/F6.py index 71fea4ac..114f34f1 100644 --- a/test/VisuPrs/Animation/F6.py +++ b/test/VisuPrs/Animation/F6.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/F6") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Scalar Map on Deformed Shape creation prs= DeformedShapeAndScalarMapOnField(aProxy,EntityType.NODE,'vitesse' , 1) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "tiff" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/G0.py b/test/VisuPrs/Animation/G0.py index 65f39ef2..3b95cc35 100644 --- a/test/VisuPrs/Animation/G0.py +++ b/test/VisuPrs/Animation/G0.py @@ -30,17 +30,17 @@ from pvsimple import * picturedir = get_picture_dir("Animation/G0") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() time_value = get_time(aProxy, 0) aView.ViewTime = time_value @@ -48,20 +48,20 @@ UpdatePipeline(time=time_value, proxy=aProxy) reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Stream Lines creation prs= StreamLinesOnField(aProxy,EntityType.NODE,'vitesse' , 1) if prs is None: # TODO: check why stream lines prs is empty - print "WARNING! StreamLines presentation wasn't created or is empty..." + print("WARNING! StreamLines presentation wasn't created or is empty...") else: prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "jpeg" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -78,7 +78,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -88,6 +88,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/G3.py b/test/VisuPrs/Animation/G3.py index e59b0f31..cea7c37c 100644 --- a/test/VisuPrs/Animation/G3.py +++ b/test/VisuPrs/Animation/G3.py @@ -30,18 +30,18 @@ from pvsimple import * picturedir = get_picture_dir("Animation/G3") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() time_value = get_time(aProxy, 0) aView.ViewTime = time_value @@ -49,16 +49,16 @@ UpdatePipeline(time=time_value, proxy=aProxy) reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Stream Lines creation prs= StreamLinesOnField(aProxy,EntityType.NODE,'vitesse' , 1) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "png" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -75,7 +75,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -85,6 +85,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/G4.py b/test/VisuPrs/Animation/G4.py index ad46ecd2..09aba97e 100644 --- a/test/VisuPrs/Animation/G4.py +++ b/test/VisuPrs/Animation/G4.py @@ -30,18 +30,18 @@ from pvsimple import * picturedir = get_picture_dir("Animation/G3") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() time_value = get_time(aProxy, 0) aView.ViewTime = time_value @@ -49,16 +49,16 @@ UpdatePipeline(time=time_value, proxy=aProxy) reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Stream Lines creation prs= StreamLinesOnField(aProxy,EntityType.NODE,'vitesse' , 1) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "tiff" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -75,7 +75,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -85,6 +85,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/G8.py b/test/VisuPrs/Animation/G8.py index 238d6b25..19e2c192 100644 --- a/test/VisuPrs/Animation/G8.py +++ b/test/VisuPrs/Animation/G8.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/G8") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Vectors creation prs= VectorsOnField(aProxy,EntityType.NODE,'vitesse' , 1) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "jpeg" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/H1.py b/test/VisuPrs/Animation/H1.py index 9fd8a25f..b91e9d75 100644 --- a/test/VisuPrs/Animation/H1.py +++ b/test/VisuPrs/Animation/H1.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/H1") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Vectors creation prs= VectorsOnField(aProxy,EntityType.NODE,'vitesse' , 1) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "png" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/Animation/H2.py b/test/VisuPrs/Animation/H2.py index 8e78544d..695213fd 100644 --- a/test/VisuPrs/Animation/H2.py +++ b/test/VisuPrs/Animation/H2.py @@ -30,31 +30,31 @@ from pvsimple import * picturedir = get_picture_dir("Animation/H2") theFileName = datadir + "TimeStamps.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") -print "Creating a Viewer.........................", +print("Creating a Viewer.........................", end=' ') aView = GetRenderView() reset_view(aView) Render(aView) -if aView is None : print "Error" -else : print "OK" +if aView is None : print("Error") +else : print("OK") # Vectors creation prs= VectorsOnField(aProxy,EntityType.NODE,'vitesse' , 1) prs.Visibility=1 aView.ResetCamera() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') my_format = "tiff" -print "Current format to save snapshots: ",my_format +print("Current format to save snapshots: ",my_format) # Add path separator to the end of picture path if necessery if not picturedir.endswith(os.sep): picturedir += os.sep @@ -71,7 +71,7 @@ nb_frames = len(scene.TimeKeeper.TimestepValues) pics = os.listdir(picturedir) if len(pics) != nb_frames: - print "FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames + print("FAILED!!! Number of made pictures is equal to ", len(pics), " instead of ", nb_frames) for pic in pics: os.remove(picturedir+pic) @@ -81,6 +81,6 @@ scene.PlayMode = 1 # set RealTime mode for animation performance # set period scene.Duration = 30 # correspond to set the speed of animation in VISU scene.GoToFirst() -print "Animation.................................", +print("Animation.................................", end=' ') scene.Play() scene.GoToFirst() diff --git a/test/VisuPrs/CutLines/A0.py b/test/VisuPrs/CutLines/A0.py index 331f714a..dcaba24a 100644 --- a/test/VisuPrs/CutLines/A0.py +++ b/test/VisuPrs/CutLines/A0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/A0") file = datadir + "fra.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/A1.py b/test/VisuPrs/CutLines/A1.py index e400e85b..2dc2b7bf 100644 --- a/test/VisuPrs/CutLines/A1.py +++ b/test/VisuPrs/CutLines/A1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/A1") file = datadir + "hexa_28320_ELEM.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/A2.py b/test/VisuPrs/CutLines/A2.py index f60859b9..507e0c6e 100755 --- a/test/VisuPrs/CutLines/A2.py +++ b/test/VisuPrs/CutLines/A2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/A2") file = datadir + "pointe.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/A3.py b/test/VisuPrs/CutLines/A3.py index 3a2ef371..27bf0897 100755 --- a/test/VisuPrs/CutLines/A3.py +++ b/test/VisuPrs/CutLines/A3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/A3") file = datadir + "Fields_group3D.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/A4.py b/test/VisuPrs/CutLines/A4.py index 33541b18..36183cde 100644 --- a/test/VisuPrs/CutLines/A4.py +++ b/test/VisuPrs/CutLines/A4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/A4") file = datadir + "Hexa8.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/A5.py b/test/VisuPrs/CutLines/A5.py index 7ecc4d78..2022e4f5 100644 --- a/test/VisuPrs/CutLines/A5.py +++ b/test/VisuPrs/CutLines/A5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/A5") file = datadir + "Penta6.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/A6.py b/test/VisuPrs/CutLines/A6.py index 2c8e8a0d..3ce47224 100644 --- a/test/VisuPrs/CutLines/A6.py +++ b/test/VisuPrs/CutLines/A6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/A6") file = datadir + "clo.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/A7.py b/test/VisuPrs/CutLines/A7.py index 9c271658..11ddde9b 100644 --- a/test/VisuPrs/CutLines/A7.py +++ b/test/VisuPrs/CutLines/A7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/A7") file = datadir + "Tetra4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/A8.py b/test/VisuPrs/CutLines/A8.py index ff941fb4..dfabbf77 100644 --- a/test/VisuPrs/CutLines/A8.py +++ b/test/VisuPrs/CutLines/A8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/A8") file = datadir + "Tria3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/A9.py b/test/VisuPrs/CutLines/A9.py index 32f4b39a..4b6afc92 100644 --- a/test/VisuPrs/CutLines/A9.py +++ b/test/VisuPrs/CutLines/A9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/A9") file = datadir + "Quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/B0.py b/test/VisuPrs/CutLines/B0.py index be0b492d..830e936e 100644 --- a/test/VisuPrs/CutLines/B0.py +++ b/test/VisuPrs/CutLines/B0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/B0") file = datadir + "carre_en_quad4_seg2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/B1.py b/test/VisuPrs/CutLines/B1.py index 4b7993f2..c94feb34 100644 --- a/test/VisuPrs/CutLines/B1.py +++ b/test/VisuPrs/CutLines/B1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/B1") file = datadir + "carre_en_quad4_seg2_fields.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/B2.py b/test/VisuPrs/CutLines/B2.py index 5a7fb889..4177380f 100644 --- a/test/VisuPrs/CutLines/B2.py +++ b/test/VisuPrs/CutLines/B2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/B2") file = datadir + "cube_hexa8_quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/E0.py b/test/VisuPrs/CutLines/E0.py index 3f5b3a3f..2cfaa838 100644 --- a/test/VisuPrs/CutLines/E0.py +++ b/test/VisuPrs/CutLines/E0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/E0") file = datadir + "test_55_solid_concentr_dom.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/E1.py b/test/VisuPrs/CutLines/E1.py index e95dacd5..fe23febe 100644 --- a/test/VisuPrs/CutLines/E1.py +++ b/test/VisuPrs/CutLines/E1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/E1") file = datadir + "H_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/E2.py b/test/VisuPrs/CutLines/E2.py index b12d4690..06bbb0ef 100644 --- a/test/VisuPrs/CutLines/E2.py +++ b/test/VisuPrs/CutLines/E2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/E3.py b/test/VisuPrs/CutLines/E3.py index 5e557b43..61f760a8 100644 --- a/test/VisuPrs/CutLines/E3.py +++ b/test/VisuPrs/CutLines/E3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/E3") file = datadir + "hydro_d10.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/E4.py b/test/VisuPrs/CutLines/E4.py index c7bcac4e..70af846e 100644 --- a/test/VisuPrs/CutLines/E4.py +++ b/test/VisuPrs/CutLines/E4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/E4") file = datadir + "champc.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/E5.py b/test/VisuPrs/CutLines/E5.py index 52ddb248..079d0763 100644 --- a/test/VisuPrs/CutLines/E5.py +++ b/test/VisuPrs/CutLines/E5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/E5") file = datadir + "hydro_sea_alv.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/E6.py b/test/VisuPrs/CutLines/E6.py index 99d65463..11f6cd33 100644 --- a/test/VisuPrs/CutLines/E6.py +++ b/test/VisuPrs/CutLines/E6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/E6") file = datadir + "toto.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/E7.py b/test/VisuPrs/CutLines/E7.py index 6dce9bcc..c4b15e10 100644 --- a/test/VisuPrs/CutLines/E7.py +++ b/test/VisuPrs/CutLines/E7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/E7") file = datadir + "couplex_alain.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/E8.py b/test/VisuPrs/CutLines/E8.py index 365105cd..63e70bcf 100644 --- a/test/VisuPrs/CutLines/E8.py +++ b/test/VisuPrs/CutLines/E8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/E8") file = datadir + "KCOUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/E9.py b/test/VisuPrs/CutLines/E9.py index 93cba74c..3989a84b 100644 --- a/test/VisuPrs/CutLines/E9.py +++ b/test/VisuPrs/CutLines/E9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/E9") file = datadir + "test_hydro.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/F1.py b/test/VisuPrs/CutLines/F1.py index 9011ea1b..7bb8fbac 100644 --- a/test/VisuPrs/CutLines/F1.py +++ b/test/VisuPrs/CutLines/F1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/F1") file = datadir + "ml.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/F2.py b/test/VisuPrs/CutLines/F2.py index 74012d2f..ff322631 100644 --- a/test/VisuPrs/CutLines/F2.py +++ b/test/VisuPrs/CutLines/F2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/F2") file = datadir + "T_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/F3.py b/test/VisuPrs/CutLines/F3.py index decf9c39..fba507d6 100644 --- a/test/VisuPrs/CutLines/F3.py +++ b/test/VisuPrs/CutLines/F3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/F3") file = datadir + "test_hydro_darcy4_out.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/F4.py b/test/VisuPrs/CutLines/F4.py index ccf61e05..c91c3fff 100644 --- a/test/VisuPrs/CutLines/F4.py +++ b/test/VisuPrs/CutLines/F4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/F4") file = datadir + "UO2_250ans.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/F5.py b/test/VisuPrs/CutLines/F5.py index 5462a7c4..564eb8b5 100644 --- a/test/VisuPrs/CutLines/F5.py +++ b/test/VisuPrs/CutLines/F5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/F5") file = datadir + "maill.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/F6.py b/test/VisuPrs/CutLines/F6.py index 815a5604..2e6d7a61 100644 --- a/test/VisuPrs/CutLines/F6.py +++ b/test/VisuPrs/CutLines/F6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/F6") file = datadir + "maill.0.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/F8.py b/test/VisuPrs/CutLines/F8.py index c8d5743e..410c4b68 100755 --- a/test/VisuPrs/CutLines/F8.py +++ b/test/VisuPrs/CutLines/F8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/F8") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/F9.py b/test/VisuPrs/CutLines/F9.py index 5cf55e5a..e380aa8f 100644 --- a/test/VisuPrs/CutLines/F9.py +++ b/test/VisuPrs/CutLines/F9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/F9") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/G0.py b/test/VisuPrs/CutLines/G0.py index 762af51f..2359b4a5 100644 --- a/test/VisuPrs/CutLines/G0.py +++ b/test/VisuPrs/CutLines/G0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/G0") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/G1.py b/test/VisuPrs/CutLines/G1.py index 6f342114..fc2ff5f9 100644 --- a/test/VisuPrs/CutLines/G1.py +++ b/test/VisuPrs/CutLines/G1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutLines/G1") file = datadir + "maill.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTLINES], picturedir, pictureext) diff --git a/test/VisuPrs/CutLines/G2.py b/test/VisuPrs/CutLines/G2.py index 90566f70..9b54f7f7 100644 --- a/test/VisuPrs/CutLines/G2.py +++ b/test/VisuPrs/CutLines/G2.py @@ -28,17 +28,17 @@ from pvsimple import * picturedir = get_picture_dir("CutLines/G2") theFileName = datadir + "Bug829_resu_mode.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") """Build presentations of the given types for all fields of the given file.""" #print "Import %s..." % theFileName.split('/')[-1], result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") # Get viewScalarMap aView = GetRenderView() @@ -52,7 +52,7 @@ for i in range(1,11): hide_all(aView, True) aPrs = CutLinesOnField(aProxy, aFieldEntity,aFieldName , i) if aPrs is None: - raise RuntimeError, "Presentation is None!!!" + raise RuntimeError("Presentation is None!!!") #display only current scalar map aPrs.Visibility=1 reset_view(aView) diff --git a/test/VisuPrs/CutPlanes/A0.py b/test/VisuPrs/CutPlanes/A0.py index ef9b12d8..d09bc000 100644 --- a/test/VisuPrs/CutPlanes/A0.py +++ b/test/VisuPrs/CutPlanes/A0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/A0") file = datadir + "fra.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/A1.py b/test/VisuPrs/CutPlanes/A1.py index 7bd27e48..9f9cc10f 100644 --- a/test/VisuPrs/CutPlanes/A1.py +++ b/test/VisuPrs/CutPlanes/A1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/A1") file = datadir + "hexa_28320_ELEM.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/A2.py b/test/VisuPrs/CutPlanes/A2.py index ded112ae..1da11c3c 100755 --- a/test/VisuPrs/CutPlanes/A2.py +++ b/test/VisuPrs/CutPlanes/A2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/A2") file = datadir + "pointe.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/A3.py b/test/VisuPrs/CutPlanes/A3.py index 978ccf96..52eb7457 100755 --- a/test/VisuPrs/CutPlanes/A3.py +++ b/test/VisuPrs/CutPlanes/A3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/A3") file = datadir + "Fields_group3D.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/A4.py b/test/VisuPrs/CutPlanes/A4.py index 9487034c..dd4d589d 100644 --- a/test/VisuPrs/CutPlanes/A4.py +++ b/test/VisuPrs/CutPlanes/A4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/A4") file = datadir + "Hexa8.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/A5.py b/test/VisuPrs/CutPlanes/A5.py index 26ddc11b..21c58dcc 100644 --- a/test/VisuPrs/CutPlanes/A5.py +++ b/test/VisuPrs/CutPlanes/A5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/A5") file = datadir + "Penta6.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/A6.py b/test/VisuPrs/CutPlanes/A6.py index 571f1a4f..ce76e62e 100644 --- a/test/VisuPrs/CutPlanes/A6.py +++ b/test/VisuPrs/CutPlanes/A6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/A6") file = datadir + "clo.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/A7.py b/test/VisuPrs/CutPlanes/A7.py index e1bb944c..35d28b3e 100644 --- a/test/VisuPrs/CutPlanes/A7.py +++ b/test/VisuPrs/CutPlanes/A7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/A7") file = datadir + "Tetra4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/A8.py b/test/VisuPrs/CutPlanes/A8.py index 628c192f..8a24e6e8 100644 --- a/test/VisuPrs/CutPlanes/A8.py +++ b/test/VisuPrs/CutPlanes/A8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/A8") file = datadir + "Tria3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/A9.py b/test/VisuPrs/CutPlanes/A9.py index 8979fe4a..875df75b 100644 --- a/test/VisuPrs/CutPlanes/A9.py +++ b/test/VisuPrs/CutPlanes/A9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/A9") file = datadir + "Quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/B0.py b/test/VisuPrs/CutPlanes/B0.py index c0a51220..657c18be 100644 --- a/test/VisuPrs/CutPlanes/B0.py +++ b/test/VisuPrs/CutPlanes/B0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/B0") file = datadir + "carre_en_quad4_seg2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/B1.py b/test/VisuPrs/CutPlanes/B1.py index 6b1b6670..e2264f8f 100644 --- a/test/VisuPrs/CutPlanes/B1.py +++ b/test/VisuPrs/CutPlanes/B1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/B1") file = datadir + "carre_en_quad4_seg2_fields.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/B2.py b/test/VisuPrs/CutPlanes/B2.py index 661d2912..7b5c2d33 100644 --- a/test/VisuPrs/CutPlanes/B2.py +++ b/test/VisuPrs/CutPlanes/B2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/B2") file = datadir + "cube_hexa8_quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/B3.py b/test/VisuPrs/CutPlanes/B3.py index 4460bb3e..99afd73b 100644 --- a/test/VisuPrs/CutPlanes/B3.py +++ b/test/VisuPrs/CutPlanes/B3.py @@ -24,29 +24,29 @@ from presentations import CutPlanesOnField, EntityType import pvsimple #====================Stage1: Importing MED file==================== -print "**** Stage1: Importing MED file" +print("**** Stage1: Importing MED file") -print 'Import "ResOK_0000.med"...............', +print('Import "ResOK_0000.med"...............', end=' ') file_path = datadir + "ResOK_0000.med" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") #====================Stage2: Creating CutPlanes==================== -print "*****Stage2: Creating CutPlanes" +print("*****Stage2: Creating CutPlanes") -print "Creating Cut Planes.......", +print("Creating Cut Planes.......", end=' ') node_entity = EntityType.NODE field_name = 'vitesse' cutplanes = CutPlanesOnField(med_reader, node_entity, field_name, 1) if cutplanes is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") diff --git a/test/VisuPrs/CutPlanes/E0.py b/test/VisuPrs/CutPlanes/E0.py index a6369a7c..9eb46a04 100644 --- a/test/VisuPrs/CutPlanes/E0.py +++ b/test/VisuPrs/CutPlanes/E0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/E0") file = datadir + "test_55_solid_concentr_dom.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/E1.py b/test/VisuPrs/CutPlanes/E1.py index b360e411..f4918801 100644 --- a/test/VisuPrs/CutPlanes/E1.py +++ b/test/VisuPrs/CutPlanes/E1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/E1") file = datadir + "H_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/E2.py b/test/VisuPrs/CutPlanes/E2.py index 289dcf14..f97e6994 100644 --- a/test/VisuPrs/CutPlanes/E2.py +++ b/test/VisuPrs/CutPlanes/E2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/E3.py b/test/VisuPrs/CutPlanes/E3.py index e96bf3a6..384a36b4 100644 --- a/test/VisuPrs/CutPlanes/E3.py +++ b/test/VisuPrs/CutPlanes/E3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/E3") file = datadir + "hydro_d10.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/E4.py b/test/VisuPrs/CutPlanes/E4.py index 58ba729d..92199608 100644 --- a/test/VisuPrs/CutPlanes/E4.py +++ b/test/VisuPrs/CutPlanes/E4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/E4") file = datadir + "champc.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/E5.py b/test/VisuPrs/CutPlanes/E5.py index 9d6333b1..1875c2a3 100644 --- a/test/VisuPrs/CutPlanes/E5.py +++ b/test/VisuPrs/CutPlanes/E5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/E5") file = datadir + "hydro_sea_alv.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/E6.py b/test/VisuPrs/CutPlanes/E6.py index 212c1d2e..b302cf9e 100644 --- a/test/VisuPrs/CutPlanes/E6.py +++ b/test/VisuPrs/CutPlanes/E6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/E6") file = datadir + "toto.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/E7.py b/test/VisuPrs/CutPlanes/E7.py index 7593d650..054a7c0e 100644 --- a/test/VisuPrs/CutPlanes/E7.py +++ b/test/VisuPrs/CutPlanes/E7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/E7") file = datadir + "couplex_alain.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/E8.py b/test/VisuPrs/CutPlanes/E8.py index a094a773..9731b9e4 100644 --- a/test/VisuPrs/CutPlanes/E8.py +++ b/test/VisuPrs/CutPlanes/E8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/E8") file = datadir + "KCOUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/E9.py b/test/VisuPrs/CutPlanes/E9.py index 95a35864..696dafb6 100644 --- a/test/VisuPrs/CutPlanes/E9.py +++ b/test/VisuPrs/CutPlanes/E9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/E9") file = datadir + "test_hydro.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/F1.py b/test/VisuPrs/CutPlanes/F1.py index 00be64c1..00afe452 100644 --- a/test/VisuPrs/CutPlanes/F1.py +++ b/test/VisuPrs/CutPlanes/F1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/F1") file = datadir + "ml.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/F2.py b/test/VisuPrs/CutPlanes/F2.py index 7c02134a..c10ba36d 100644 --- a/test/VisuPrs/CutPlanes/F2.py +++ b/test/VisuPrs/CutPlanes/F2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/F2") file = datadir + "T_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/F3.py b/test/VisuPrs/CutPlanes/F3.py index 9428314a..fbdb1590 100644 --- a/test/VisuPrs/CutPlanes/F3.py +++ b/test/VisuPrs/CutPlanes/F3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/F3") file = datadir + "test_hydro_darcy4_out.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/F4.py b/test/VisuPrs/CutPlanes/F4.py index f7d158d2..f94add9c 100644 --- a/test/VisuPrs/CutPlanes/F4.py +++ b/test/VisuPrs/CutPlanes/F4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/F4") file = datadir + "UO2_250ans.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/F5.py b/test/VisuPrs/CutPlanes/F5.py index b048d605..74d9c776 100644 --- a/test/VisuPrs/CutPlanes/F5.py +++ b/test/VisuPrs/CutPlanes/F5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/F5") file = datadir + "maill.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/F6.py b/test/VisuPrs/CutPlanes/F6.py index 1560f047..d0a889ac 100644 --- a/test/VisuPrs/CutPlanes/F6.py +++ b/test/VisuPrs/CutPlanes/F6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/F6") file = datadir + "maill.0.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/F8.py b/test/VisuPrs/CutPlanes/F8.py index 8be2299e..bbd9c94d 100644 --- a/test/VisuPrs/CutPlanes/F8.py +++ b/test/VisuPrs/CutPlanes/F8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/F8") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/F9.py b/test/VisuPrs/CutPlanes/F9.py index 2ef4f143..264a55b7 100644 --- a/test/VisuPrs/CutPlanes/F9.py +++ b/test/VisuPrs/CutPlanes/F9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/F9") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/G0.py b/test/VisuPrs/CutPlanes/G0.py index 7db57ebe..6b0f228b 100644 --- a/test/VisuPrs/CutPlanes/G0.py +++ b/test/VisuPrs/CutPlanes/G0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/G0") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/G1.py b/test/VisuPrs/CutPlanes/G1.py index c3369316..4ae48b1a 100644 --- a/test/VisuPrs/CutPlanes/G1.py +++ b/test/VisuPrs/CutPlanes/G1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("CutPlanes/G1") file = datadir + "maill.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.CUTPLANES], picturedir, pictureext) diff --git a/test/VisuPrs/CutPlanes/G2.py b/test/VisuPrs/CutPlanes/G2.py index 7d1337c3..c7e661bd 100644 --- a/test/VisuPrs/CutPlanes/G2.py +++ b/test/VisuPrs/CutPlanes/G2.py @@ -28,17 +28,17 @@ from pvsimple import * picturedir = get_picture_dir("CutPlanes/G2") theFileName = datadir + "Bug829_resu_mode.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") """Build presentations of the given types for all fields of the given file.""" #print "Import %s..." % theFileName.split('/')[-1], result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") # Get viewScalarMap aView = GetRenderView() @@ -52,7 +52,7 @@ for i in range(1,11): hide_all(aView, True) aPrs = CutPlanesOnField(aProxy, aFieldEntity,aFieldName , i) if aPrs is None: - raise RuntimeError, "Presentation is None!!!" + raise RuntimeError("Presentation is None!!!") #display only current scalar map aPrs.Visibility=1 reset_view(aView) diff --git a/test/VisuPrs/DeformedShape/A0.py b/test/VisuPrs/DeformedShape/A0.py index 48917f4d..a7b79cef 100644 --- a/test/VisuPrs/DeformedShape/A0.py +++ b/test/VisuPrs/DeformedShape/A0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/A0") file = datadir + "fra.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/A1.py b/test/VisuPrs/DeformedShape/A1.py index eb1c8946..8b0e10c2 100644 --- a/test/VisuPrs/DeformedShape/A1.py +++ b/test/VisuPrs/DeformedShape/A1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/A1") file = datadir + "hexa_28320_ELEM.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/A2.py b/test/VisuPrs/DeformedShape/A2.py index 9097b3a1..ae3417c1 100755 --- a/test/VisuPrs/DeformedShape/A2.py +++ b/test/VisuPrs/DeformedShape/A2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/A2") file = datadir + "pointe.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/A3.py b/test/VisuPrs/DeformedShape/A3.py index b06419dd..4e5ad317 100755 --- a/test/VisuPrs/DeformedShape/A3.py +++ b/test/VisuPrs/DeformedShape/A3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/A3") file = datadir + "Fields_group3D.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/A4.py b/test/VisuPrs/DeformedShape/A4.py index f838981b..38eb3442 100755 --- a/test/VisuPrs/DeformedShape/A4.py +++ b/test/VisuPrs/DeformedShape/A4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/A4") file = datadir + "Hexa8.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/A5.py b/test/VisuPrs/DeformedShape/A5.py index e364bbb8..a2cda6da 100644 --- a/test/VisuPrs/DeformedShape/A5.py +++ b/test/VisuPrs/DeformedShape/A5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/A5") file = datadir + "Penta6.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/A6.py b/test/VisuPrs/DeformedShape/A6.py index 3728fa53..ab72cc2d 100755 --- a/test/VisuPrs/DeformedShape/A6.py +++ b/test/VisuPrs/DeformedShape/A6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/A6") file = datadir + "clo.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/A7.py b/test/VisuPrs/DeformedShape/A7.py index 8f81180d..25ffb682 100644 --- a/test/VisuPrs/DeformedShape/A7.py +++ b/test/VisuPrs/DeformedShape/A7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/A7") file = datadir + "Tetra4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/A8.py b/test/VisuPrs/DeformedShape/A8.py index ac1e0772..64d8d8a6 100644 --- a/test/VisuPrs/DeformedShape/A8.py +++ b/test/VisuPrs/DeformedShape/A8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/A8") file = datadir + "Tria3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/A9.py b/test/VisuPrs/DeformedShape/A9.py index 5d36d7e6..731e3852 100644 --- a/test/VisuPrs/DeformedShape/A9.py +++ b/test/VisuPrs/DeformedShape/A9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/A9") file = datadir + "Quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/B0.py b/test/VisuPrs/DeformedShape/B0.py index e6356daf..9ca61ae1 100644 --- a/test/VisuPrs/DeformedShape/B0.py +++ b/test/VisuPrs/DeformedShape/B0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/B0") file = datadir + "carre_en_quad4_seg2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/B1.py b/test/VisuPrs/DeformedShape/B1.py index 6ffe6acf..1ce40dda 100644 --- a/test/VisuPrs/DeformedShape/B1.py +++ b/test/VisuPrs/DeformedShape/B1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/B1") file = datadir + "carre_en_quad4_seg2_fields.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/B2.py b/test/VisuPrs/DeformedShape/B2.py index 2f86d288..fd529962 100644 --- a/test/VisuPrs/DeformedShape/B2.py +++ b/test/VisuPrs/DeformedShape/B2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/B2") file = datadir + "cube_hexa8_quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/B3.py b/test/VisuPrs/DeformedShape/B3.py index cd6f504b..d6f8f3c4 100755 --- a/test/VisuPrs/DeformedShape/B3.py +++ b/test/VisuPrs/DeformedShape/B3.py @@ -24,23 +24,23 @@ from presentations import DeformedShapeOnField, EntityType import pvsimple #====================Stage1: Import from MED file in ParaVis============ -print "**** Stage1: Import from MED file in ParaVis" +print("**** Stage1: Import from MED file in ParaVis") -print 'Import "Tria3.med"....................', +print('Import "Tria3.med"....................', end=' ') file_path = datadir + "Tria3.med" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") #====================Stage2: Creating Deformed Shape==================== -print "**** Stage2: Creating Deformed Shape" +print("**** Stage2: Creating Deformed Shape") -print "Creating Deformed Shape...............", +print("Creating Deformed Shape...............", end=' ') cell_entity = EntityType.CELL field_name = 'vectoriel field' @@ -48,60 +48,60 @@ defshape = DeformedShapeOnField(med_reader, cell_entity, field_name, 1) pvsimple.ResetCamera() if defshape is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") #====================Stage3: Scale of Deformed Shape==================== -print "**** Stage3: Scale of Deformed Shape" +print("**** Stage3: Scale of Deformed Shape") warp_vector = pvsimple.GetActiveSource() -print "Default scale: ", warp_vector.ScaleFactor +print("Default scale: ", warp_vector.ScaleFactor) -print "Set positive scale of Deformed Shape" +print("Set positive scale of Deformed Shape") scale = 1 warp_vector.ScaleFactor = scale pvsimple.Render() -print "Scale: ", warp_vector.ScaleFactor +print("Scale: ", warp_vector.ScaleFactor) -print "Set negative scale of Deformed Shape" +print("Set negative scale of Deformed Shape") scale = -1 warp_vector.ScaleFactor = scale pvsimple.Render() -print "Scale: ", warp_vector.ScaleFactor +print("Scale: ", warp_vector.ScaleFactor) -print "Set zero scale of Deformed Shape" +print("Set zero scale of Deformed Shape") scale = 0 warp_vector.ScaleFactor = scale pvsimple.Render() -print "Scale: ", warp_vector.ScaleFactor +print("Scale: ", warp_vector.ScaleFactor) #====================Stage4: Coloring method of Deformed Shape=========== -print "**** Stage4: Coloring of Deformed Shape" +print("**** Stage4: Coloring of Deformed Shape") color_array = defshape.ColorArrayName[1] if color_array: - print "Default shape is colored by array: ", color_array + print("Default shape is colored by array: ", color_array) else: - print "Default shape is colored by solid color: ", defshape.AmbientColor + print("Default shape is colored by solid color: ", defshape.AmbientColor) -print "Set colored by array mode .... ", +print("Set colored by array mode .... ", end=' ') defshape.ColorArrayName = ("CELLS", field_name) pvsimple.Render() if defshape.ColorArrayName[1] == field_name: - print "OK" + print("OK") else: - print "FAILED" + print("FAILED") -print "Set colored by solid color mode .... ", +print("Set colored by solid color mode .... ", end=' ') defshape.ColorArrayName = (None, '') pvsimple.Render() if defshape.ColorArrayName[1]: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") diff --git a/test/VisuPrs/DeformedShape/B4.py b/test/VisuPrs/DeformedShape/B4.py index b370d6ca..2800730d 100644 --- a/test/VisuPrs/DeformedShape/B4.py +++ b/test/VisuPrs/DeformedShape/B4.py @@ -24,23 +24,23 @@ from presentations import DeformedShapeOnField, EntityType import pvsimple #====================Stage1: Import from MED file in ParaVis============ -print "**** Stage1: Import from MED file in ParaVis" +print("**** Stage1: Import from MED file in ParaVis") -print 'Import "Hexa8.med"....................', +print('Import "Hexa8.med"....................', end=' ') file_path = datadir + "Hexa8.med" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") #====================Stage2: Creating Deformed Shape==================== -print "**** Stage2: Creating Deformed Shape" +print("**** Stage2: Creating Deformed Shape") -print "Creating Deformed Shape...............", +print("Creating Deformed Shape...............", end=' ') cell_entity = EntityType.CELL field_name = 'vectoriel field' @@ -48,51 +48,51 @@ defshape = DeformedShapeOnField(med_reader, cell_entity, field_name, 1) pvsimple.ResetCamera() if defshape is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") #====================Stage3: Color of Deformed Shape==================== -print "**** Stage3: Color of Deformed Shape" +print("**** Stage3: Color of Deformed Shape") # Step1 -print "Getting the current color of Deformed Shape in RGB ... ", +print("Getting the current color of Deformed Shape in RGB ... ", end=' ') color = defshape.AmbientColor -print color +print(color) # Step2 -print "Set the positive color in RGB" +print("Set the positive color in RGB") color = [0.3, 0.3, 0.3] defshape.AmbientColor = color pvsimple.Render() color = defshape.AmbientColor -print "Color: ", color +print("Color: ", color) # Step3 -print "Set the negative R and positive GB" +print("Set the negative R and positive GB") color = [-0.3, 0.3, 0.3] defshape.AmbientColor = color pvsimple.Render() color = defshape.AmbientColor -print "Color: ", color +print("Color: ", color) # Step4 -print "Set the negative R and positive GB" +print("Set the negative R and positive GB") color = [0.3, -0.3, 0.3] defshape.AmbientColor = color pvsimple.Render() color = defshape.AmbientColor -print "Color: ", color +print("Color: ", color) # Step5 -print "Set the negative B and positive RG" -print "Set the negative R and positive GB" +print("Set the negative B and positive RG") +print("Set the negative R and positive GB") color = [0.3, 0.3, -0.3] defshape.AmbientColor = color pvsimple.Render() color = defshape.AmbientColor -print "Color: ", color +print("Color: ", color) diff --git a/test/VisuPrs/DeformedShape/E0.py b/test/VisuPrs/DeformedShape/E0.py index 8489eaf4..16a5b6fe 100644 --- a/test/VisuPrs/DeformedShape/E0.py +++ b/test/VisuPrs/DeformedShape/E0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/E0") file = datadir + "test_55_solid_concentr_dom.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/E1.py b/test/VisuPrs/DeformedShape/E1.py index 590d6034..948fafb9 100644 --- a/test/VisuPrs/DeformedShape/E1.py +++ b/test/VisuPrs/DeformedShape/E1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/E1") file = datadir + "H_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/E2.py b/test/VisuPrs/DeformedShape/E2.py index b3c36789..344fdba4 100644 --- a/test/VisuPrs/DeformedShape/E2.py +++ b/test/VisuPrs/DeformedShape/E2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/E3.py b/test/VisuPrs/DeformedShape/E3.py index 1842c448..db27e920 100755 --- a/test/VisuPrs/DeformedShape/E3.py +++ b/test/VisuPrs/DeformedShape/E3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/E3") file = datadir + "hydro_d10.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/E4.py b/test/VisuPrs/DeformedShape/E4.py index c2702598..eb538abf 100644 --- a/test/VisuPrs/DeformedShape/E4.py +++ b/test/VisuPrs/DeformedShape/E4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/E4") file = datadir + "champc.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/E5.py b/test/VisuPrs/DeformedShape/E5.py index b672c163..e045da86 100644 --- a/test/VisuPrs/DeformedShape/E5.py +++ b/test/VisuPrs/DeformedShape/E5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/E5") file = datadir + "hydro_sea_alv.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/E6.py b/test/VisuPrs/DeformedShape/E6.py index 8e9db77d..41ba8b7e 100644 --- a/test/VisuPrs/DeformedShape/E6.py +++ b/test/VisuPrs/DeformedShape/E6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/E6") file = datadir + "toto.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/E7.py b/test/VisuPrs/DeformedShape/E7.py index 10b2ffdc..71ed8e24 100644 --- a/test/VisuPrs/DeformedShape/E7.py +++ b/test/VisuPrs/DeformedShape/E7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/E7") file = datadir + "couplex_alain.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/E8.py b/test/VisuPrs/DeformedShape/E8.py index 11c1cee3..4652a01f 100644 --- a/test/VisuPrs/DeformedShape/E8.py +++ b/test/VisuPrs/DeformedShape/E8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/E8") file = datadir + "KCOUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/E9.py b/test/VisuPrs/DeformedShape/E9.py index 58d42771..7a3eb0b1 100644 --- a/test/VisuPrs/DeformedShape/E9.py +++ b/test/VisuPrs/DeformedShape/E9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/E9") file = datadir + "test_hydro.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/F1.py b/test/VisuPrs/DeformedShape/F1.py index f4bdce9b..9750740d 100644 --- a/test/VisuPrs/DeformedShape/F1.py +++ b/test/VisuPrs/DeformedShape/F1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/F1") file = datadir + "ml.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/F2.py b/test/VisuPrs/DeformedShape/F2.py index 0274df60..d56e33fb 100644 --- a/test/VisuPrs/DeformedShape/F2.py +++ b/test/VisuPrs/DeformedShape/F2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/F2") file = datadir + "T_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/F3.py b/test/VisuPrs/DeformedShape/F3.py index 9159f0ae..766acc2a 100644 --- a/test/VisuPrs/DeformedShape/F3.py +++ b/test/VisuPrs/DeformedShape/F3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/F3") file = datadir + "test_hydro_darcy4_out.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/F4.py b/test/VisuPrs/DeformedShape/F4.py index 0e9b552a..e83147fa 100644 --- a/test/VisuPrs/DeformedShape/F4.py +++ b/test/VisuPrs/DeformedShape/F4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/F4") file = datadir + "UO2_250ans.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/F5.py b/test/VisuPrs/DeformedShape/F5.py index 96531fea..933cc593 100644 --- a/test/VisuPrs/DeformedShape/F5.py +++ b/test/VisuPrs/DeformedShape/F5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/F5") file = datadir + "maill.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/F6.py b/test/VisuPrs/DeformedShape/F6.py index 5fb8e963..b79704e3 100644 --- a/test/VisuPrs/DeformedShape/F6.py +++ b/test/VisuPrs/DeformedShape/F6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/F6") file = datadir + "maill.0.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/F8.py b/test/VisuPrs/DeformedShape/F8.py index 01704cd5..8bdad32c 100644 --- a/test/VisuPrs/DeformedShape/F8.py +++ b/test/VisuPrs/DeformedShape/F8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("DeformedShape/F8") file = datadir + "maill.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPE], picturedir, pictureext) diff --git a/test/VisuPrs/DeformedShape/F9.py b/test/VisuPrs/DeformedShape/F9.py index ec501854..6fd9761d 100644 --- a/test/VisuPrs/DeformedShape/F9.py +++ b/test/VisuPrs/DeformedShape/F9.py @@ -28,17 +28,17 @@ from pvsimple import * picturedir = get_picture_dir("DeformedShape/F9") theFileName = datadir + "Bug829_resu_mode.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") """Build presentations of the given types for all fields of the given file.""" #print "Import %s..." % theFileName.split('/')[-1], result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") # Get view aView = GetRenderView() @@ -56,7 +56,7 @@ for colored in [False,True]: hide_all(aView, True) aPrs = DeformedShapeOnField(aProxy, aFieldEntity, aFieldName, i, is_colored=colored) if aPrs is None: - raise RuntimeError, "Presentation is None!!!" + raise RuntimeError("Presentation is None!!!") # display only current deformed shape #display_only(aView,aPrs) aPrs.Visibility =1 diff --git a/test/VisuPrs/GaussPoints/A0.py b/test/VisuPrs/GaussPoints/A0.py index 8222b5cb..86973286 100644 --- a/test/VisuPrs/GaussPoints/A0.py +++ b/test/VisuPrs/GaussPoints/A0.py @@ -50,7 +50,7 @@ pvsimple.UpdatePipeline(time=time, proxy=med_reader) # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot pic_name = picturedir + field_name + "_" + str(time) + "_GAUSSPOINTS." + pictureext diff --git a/test/VisuPrs/GaussPoints/A1.py b/test/VisuPrs/GaussPoints/A1.py index 65959994..ebefa1a9 100644 --- a/test/VisuPrs/GaussPoints/A1.py +++ b/test/VisuPrs/GaussPoints/A1.py @@ -46,7 +46,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/A2.py b/test/VisuPrs/GaussPoints/A2.py index 00856ddc..a5a22733 100644 --- a/test/VisuPrs/GaussPoints/A2.py +++ b/test/VisuPrs/GaussPoints/A2.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/A3.py b/test/VisuPrs/GaussPoints/A3.py index bcdb6c65..e193a37e 100644 --- a/test/VisuPrs/GaussPoints/A3.py +++ b/test/VisuPrs/GaussPoints/A3.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/A4.py b/test/VisuPrs/GaussPoints/A4.py index 977f7711..9df38080 100644 --- a/test/VisuPrs/GaussPoints/A4.py +++ b/test/VisuPrs/GaussPoints/A4.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/A5.py b/test/VisuPrs/GaussPoints/A5.py index 5d9840c8..b9020743 100644 --- a/test/VisuPrs/GaussPoints/A5.py +++ b/test/VisuPrs/GaussPoints/A5.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/A6.py b/test/VisuPrs/GaussPoints/A6.py index 0129bdbd..686d4c41 100644 --- a/test/VisuPrs/GaussPoints/A6.py +++ b/test/VisuPrs/GaussPoints/A6.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/A7.py b/test/VisuPrs/GaussPoints/A7.py index 91fac260..d3a9478d 100644 --- a/test/VisuPrs/GaussPoints/A7.py +++ b/test/VisuPrs/GaussPoints/A7.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/A9.py b/test/VisuPrs/GaussPoints/A9.py index 68459615..9a19eb6e 100644 --- a/test/VisuPrs/GaussPoints/A9.py +++ b/test/VisuPrs/GaussPoints/A9.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/B0.py b/test/VisuPrs/GaussPoints/B0.py index 1b8147c4..cee47c08 100644 --- a/test/VisuPrs/GaussPoints/B0.py +++ b/test/VisuPrs/GaussPoints/B0.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/B1.py b/test/VisuPrs/GaussPoints/B1.py index 92059cdd..96896ab1 100644 --- a/test/VisuPrs/GaussPoints/B1.py +++ b/test/VisuPrs/GaussPoints/B1.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/B2.py b/test/VisuPrs/GaussPoints/B2.py index e7044974..b33494a9 100644 --- a/test/VisuPrs/GaussPoints/B2.py +++ b/test/VisuPrs/GaussPoints/B2.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/B3.py b/test/VisuPrs/GaussPoints/B3.py index be8a90fa..1b9ae0bc 100644 --- a/test/VisuPrs/GaussPoints/B3.py +++ b/test/VisuPrs/GaussPoints/B3.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/B4.py b/test/VisuPrs/GaussPoints/B4.py index 7db16194..54c05aa8 100644 --- a/test/VisuPrs/GaussPoints/B4.py +++ b/test/VisuPrs/GaussPoints/B4.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/B5.py b/test/VisuPrs/GaussPoints/B5.py index c3cc6501..b4623e1a 100644 --- a/test/VisuPrs/GaussPoints/B5.py +++ b/test/VisuPrs/GaussPoints/B5.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/B6.py b/test/VisuPrs/GaussPoints/B6.py index fb746a16..ee7f6cc3 100644 --- a/test/VisuPrs/GaussPoints/B6.py +++ b/test/VisuPrs/GaussPoints/B6.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/B7.py b/test/VisuPrs/GaussPoints/B7.py index ff98d33d..25a1b404 100644 --- a/test/VisuPrs/GaussPoints/B7.py +++ b/test/VisuPrs/GaussPoints/B7.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/B8.py b/test/VisuPrs/GaussPoints/B8.py index c84edcff..4cc90fcb 100644 --- a/test/VisuPrs/GaussPoints/B8.py +++ b/test/VisuPrs/GaussPoints/B8.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/B9.py b/test/VisuPrs/GaussPoints/B9.py index 1c5fe93a..420bc00d 100644 --- a/test/VisuPrs/GaussPoints/B9.py +++ b/test/VisuPrs/GaussPoints/B9.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/C0.py b/test/VisuPrs/GaussPoints/C0.py index 6162adf6..1081b1eb 100644 --- a/test/VisuPrs/GaussPoints/C0.py +++ b/test/VisuPrs/GaussPoints/C0.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/C1.py b/test/VisuPrs/GaussPoints/C1.py index 65774a05..02bd7474 100644 --- a/test/VisuPrs/GaussPoints/C1.py +++ b/test/VisuPrs/GaussPoints/C1.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/C2.py b/test/VisuPrs/GaussPoints/C2.py index 17b59002..d77fd597 100644 --- a/test/VisuPrs/GaussPoints/C2.py +++ b/test/VisuPrs/GaussPoints/C2.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/C3.py b/test/VisuPrs/GaussPoints/C3.py index d93f096d..d78c18b7 100644 --- a/test/VisuPrs/GaussPoints/C3.py +++ b/test/VisuPrs/GaussPoints/C3.py @@ -45,7 +45,7 @@ if med_reader is None: # Create Gauss Points presentation prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/GaussPoints/C4.py b/test/VisuPrs/GaussPoints/C4.py index 0a0f570d..2f066b38 100644 --- a/test/VisuPrs/GaussPoints/C4.py +++ b/test/VisuPrs/GaussPoints/C4.py @@ -49,7 +49,7 @@ time = get_time(med_reader, timestamp_nb) for field_name in field_names: prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot pic_name = picturedir + field_name + "_" + str(time) + "_GAUSSPOINTS." + pictureext diff --git a/test/VisuPrs/GaussPoints/C6.py b/test/VisuPrs/GaussPoints/C6.py index 376c8487..502d8c0a 100644 --- a/test/VisuPrs/GaussPoints/C6.py +++ b/test/VisuPrs/GaussPoints/C6.py @@ -49,7 +49,7 @@ time = get_time(med_reader, timestamp_nb) for field_name in field_names: prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot pic_name = picturedir + field_name + "_" + str(time) + "_GAUSSPOINTS." + pictureext diff --git a/test/VisuPrs/GaussPoints/C7.py b/test/VisuPrs/GaussPoints/C7.py index 194b9f07..4c457ee4 100644 --- a/test/VisuPrs/GaussPoints/C7.py +++ b/test/VisuPrs/GaussPoints/C7.py @@ -49,7 +49,7 @@ time = get_time(med_reader, timestamp_nb) for field_name in field_names: prs = GaussPointsOnField(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot pic_name = picturedir + field_name + "_" + str(time) + "_GAUSSPOINTS." + pictureext diff --git a/test/VisuPrs/GaussPoints/C8.py b/test/VisuPrs/GaussPoints/C8.py index 16d88aac..3b358195 100644 --- a/test/VisuPrs/GaussPoints/C8.py +++ b/test/VisuPrs/GaussPoints/C8.py @@ -51,7 +51,7 @@ time = get_time(med_reader, timestamp_nb) prs = GaussPointsOnField1(med_reader, EntityType.CELL, field_name, timestamp_nb) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot pic_name = picturedir + field_name + "_" + str(time) + "_GAUSSPOINTS." + pictureext diff --git a/test/VisuPrs/GaussPoints/C9.py b/test/VisuPrs/GaussPoints/C9.py index ef64671d..cbe3eb38 100644 --- a/test/VisuPrs/GaussPoints/C9.py +++ b/test/VisuPrs/GaussPoints/C9.py @@ -48,7 +48,7 @@ time = get_time(med_reader, timestamp_nb) prs = GaussPointsOnField1(med_reader, EntityType.CELL, field_name, timestamp_nb, multiplier=4E-9) if prs is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") # Display presentation and get snapshot pic_name = picturedir + field_name + "_" + str(time) + "_GAUSSPOINTS." + pictureext diff --git a/test/VisuPrs/ImportMedField/A1.py b/test/VisuPrs/ImportMedField/A1.py index a7f00961..599bb11a 100644 --- a/test/VisuPrs/ImportMedField/A1.py +++ b/test/VisuPrs/ImportMedField/A1.py @@ -24,6 +24,6 @@ from paravistest import datadir, Import_Med_Field med_file = datadir + "TimeStamps.med" field_names = ["pression", "temperature", "vitesse"] -prs_list = [ [0,1,2,3,4,8], [1,2,3,4,8], range(1,10) ] +prs_list = [ [0,1,2,3,4,8], [1,2,3,4,8], list(range(1,10)) ] Import_Med_Field(med_file, field_names, 1, prs_list) diff --git a/test/VisuPrs/ImportMedField/A2.py b/test/VisuPrs/ImportMedField/A2.py index a981fe80..937a1b1c 100644 --- a/test/VisuPrs/ImportMedField/A2.py +++ b/test/VisuPrs/ImportMedField/A2.py @@ -24,6 +24,6 @@ from paravistest import datadir, Import_Med_Field med_file = datadir + "carre_en_quad4_import22.med" field_names = ["fieldcelldouble", "fieldnodedouble", "fieldnodedouble", "fieldnodedouble", "fieldnodeint"] -prs_list = [ range(10), [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8] ] +prs_list = [ list(range(10)), [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8] ] Import_Med_Field(med_file, field_names, 1, prs_list) diff --git a/test/VisuPrs/ImportMedField/A3.py b/test/VisuPrs/ImportMedField/A3.py index f2612700..6a6c4686 100644 --- a/test/VisuPrs/ImportMedField/A3.py +++ b/test/VisuPrs/ImportMedField/A3.py @@ -24,6 +24,6 @@ from paravistest import datadir, Import_Med_Field med_file = datadir + "carre_en_quad4_seg2.med" field_names = ["fieldcelldouble", "fieldnodedouble", "fieldnodedouble", "fieldnodedouble", "fieldnodeint"] -prs_list = [ range(10), [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8] ] +prs_list = [ list(range(10)), [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8] ] Import_Med_Field(med_file, field_names, 1, prs_list) diff --git a/test/VisuPrs/ImportMedField/A4.py b/test/VisuPrs/ImportMedField/A4.py index c15061c2..447c1bea 100644 --- a/test/VisuPrs/ImportMedField/A4.py +++ b/test/VisuPrs/ImportMedField/A4.py @@ -24,6 +24,6 @@ from paravistest import datadir, Import_Med_Field med_file = datadir + "test_hydro_darcy1a_out.med" field_names = ["DarcyVelocity","Head"] -prs_list = [ range(10), [0,1,2,3,4,8] ] +prs_list = [ list(range(10)), [0,1,2,3,4,8] ] Import_Med_Field(med_file, field_names, 1, prs_list) diff --git a/test/VisuPrs/ImportMedField/A5.py b/test/VisuPrs/ImportMedField/A5.py index 985c5442..0544d60d 100644 --- a/test/VisuPrs/ImportMedField/A5.py +++ b/test/VisuPrs/ImportMedField/A5.py @@ -24,6 +24,6 @@ from paravistest import datadir, Import_Med_Field med_file = datadir + "clo2.med" field_names = ["PRESSION", "TAUX_DE_VIDE", "VITESSE"] -prs_list = [ [0,1,2,3,4,8], [1,2,3,4,8], range(1,10) ] +prs_list = [ [0,1,2,3,4,8], [1,2,3,4,8], list(range(1,10)) ] Import_Med_Field(med_file, field_names, 1, prs_list) diff --git a/test/VisuPrs/ImportMedField/A6.py b/test/VisuPrs/ImportMedField/A6.py index 71dfaecc..e0e7d19b 100644 --- a/test/VisuPrs/ImportMedField/A6.py +++ b/test/VisuPrs/ImportMedField/A6.py @@ -24,6 +24,6 @@ from paravistest import datadir, Import_Med_Field med_file = datadir + "cube_hexa8_import22.med" field_names = ["fieldcelldouble", "fieldnodedouble", "fieldnodedouble", "fieldnodedouble", "fieldnodeint"] -prs_list = [ range(10), [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8] ] +prs_list = [ list(range(10)), [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8] ] Import_Med_Field(med_file, field_names, 1, prs_list) diff --git a/test/VisuPrs/ImportMedField/A7.py b/test/VisuPrs/ImportMedField/A7.py index d1def28f..4744c3c9 100644 --- a/test/VisuPrs/ImportMedField/A7.py +++ b/test/VisuPrs/ImportMedField/A7.py @@ -24,6 +24,6 @@ from paravistest import datadir, Import_Med_Field med_file = datadir + "cube_hexa8_quad4_import22.med" field_names = ["fieldcelldouble", "fieldnodedouble", "fieldnodedouble", "fieldnodedouble", "fieldnodeint"] -prs_list = [ range(10), [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8] ] +prs_list = [ list(range(10)), [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8] ] Import_Med_Field(med_file, field_names, 1, prs_list) diff --git a/test/VisuPrs/ImportMedField/A8.py b/test/VisuPrs/ImportMedField/A8.py index f5bae6c9..5b40b01f 100644 --- a/test/VisuPrs/ImportMedField/A8.py +++ b/test/VisuPrs/ImportMedField/A8.py @@ -24,6 +24,6 @@ from paravistest import datadir, Import_Med_Field med_file = datadir + "fra1.med" field_names = ["TAUX_DE_VIDE", "VITESSE"] -prs_list = [ [1,2,3,4,8], range(1,10) ] +prs_list = [ [1,2,3,4,8], list(range(1,10)) ] Import_Med_Field(med_file, field_names, 1, prs_list) diff --git a/test/VisuPrs/ImportMedField/A9.py b/test/VisuPrs/ImportMedField/A9.py index 43a44584..68f7a796 100644 --- a/test/VisuPrs/ImportMedField/A9.py +++ b/test/VisuPrs/ImportMedField/A9.py @@ -24,6 +24,6 @@ from paravistest import datadir, Import_Med_Field med_file = datadir + "maill.0.med" field_names = ["REQT_GD_________________________", "RESUTRQUDEPL____________________", "RESUTRQUERRE_ELGA_NORE__________", "RESUTRQUSIEF_ELGA_DEPL__________", "RESUTRQUSIGM_ELNO_DEPL__________"] -prs_list = [ range(1,10), range(1,10), range(10), range(10), range(10)] +prs_list = [ list(range(1,10)), list(range(1,10)), list(range(10)), list(range(10)), list(range(10))] Import_Med_Field(med_file, field_names, 1, prs_list) diff --git a/test/VisuPrs/ImportMedField/B0.py b/test/VisuPrs/ImportMedField/B0.py index af320d0a..e697adae 100644 --- a/test/VisuPrs/ImportMedField/B0.py +++ b/test/VisuPrs/ImportMedField/B0.py @@ -24,6 +24,6 @@ from paravistest import datadir, Import_Med_Field med_file = datadir + "maill.0_volumes.med" field_names = ["RETH____FLUX_NOEU_TEMP__________", "RETH____TEMP____________________"] -prs_list = [ range(1,10), [1,2,3,4,8] ] +prs_list = [ list(range(1,10)), [1,2,3,4,8] ] Import_Med_Field(med_file, field_names, 1, prs_list) diff --git a/test/VisuPrs/ImportMedField/B1.py b/test/VisuPrs/ImportMedField/B1.py index 82802feb..26c8253a 100644 --- a/test/VisuPrs/ImportMedField/B1.py +++ b/test/VisuPrs/ImportMedField/B1.py @@ -24,6 +24,6 @@ from paravistest import datadir, Import_Med_Field med_file = datadir + "maill.1.med" field_names = ["RETH____FLUX_NOEU_TEMP__________", "RETH____TEMP____________________"] -prs_list = [ range(1,10), [1,2,3,4,8] ] +prs_list = [ list(range(1,10)), [1,2,3,4,8] ] Import_Med_Field(med_file, field_names, 1, prs_list) diff --git a/test/VisuPrs/ImportMedField/B2.py b/test/VisuPrs/ImportMedField/B2.py index a6343f06..d08c7646 100644 --- a/test/VisuPrs/ImportMedField/B2.py +++ b/test/VisuPrs/ImportMedField/B2.py @@ -24,6 +24,6 @@ from paravistest import datadir, Import_Med_Field med_file = datadir + "maill.2.med" field_names = ["RETH____FLUX_NOEU_TEMP__________","RETH____TEMP____________________"] -prs_list = [ range(1,10), [1,2,3,4,8] ] +prs_list = [ list(range(1,10)), [1,2,3,4,8] ] Import_Med_Field(med_file, field_names, 1, prs_list) diff --git a/test/VisuPrs/ImportMedField/B4.py b/test/VisuPrs/ImportMedField/B4.py index b6714cd9..d76d33c7 100644 --- a/test/VisuPrs/ImportMedField/B4.py +++ b/test/VisuPrs/ImportMedField/B4.py @@ -24,6 +24,6 @@ from paravistest import datadir, Import_Med_Field med_file = datadir + "pointe_4fields.med" field_names = ["fieldcelldoublescalar", "fieldcelldoublevector", "fieldnodedouble", "fieldnodedouble", "fieldnodedouble", "fieldnodeint"] -prs_list = [ [0,1,2,3,4,8], range(10), [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8] ] +prs_list = [ [0,1,2,3,4,8], list(range(10)), [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8] ] Import_Med_Field(med_file, field_names, 1, prs_list) diff --git a/test/VisuPrs/ImportMedField/B5.py b/test/VisuPrs/ImportMedField/B5.py index 16d55596..6c7ee132 100644 --- a/test/VisuPrs/ImportMedField/B5.py +++ b/test/VisuPrs/ImportMedField/B5.py @@ -24,6 +24,6 @@ from paravistest import datadir, Import_Med_Field med_file = datadir + "pointe.med" field_names = ["fieldcelldoublescalar", "fieldcelldoublevector", "fieldnodedouble", "fieldnodedouble", "fieldnodedouble", "fieldnodeint"] -prs_list = [ [0,1,2,3,4,8], range(10), [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8] ] +prs_list = [ [0,1,2,3,4,8], list(range(10)), [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8], [1,2,3,4,8] ] Import_Med_Field(med_file, field_names, 1, prs_list) diff --git a/test/VisuPrs/ImportMedField/B8.py b/test/VisuPrs/ImportMedField/B8.py index 8ec816fd..fc0a8e34 100644 --- a/test/VisuPrs/ImportMedField/B8.py +++ b/test/VisuPrs/ImportMedField/B8.py @@ -24,6 +24,6 @@ from paravistest import datadir, Import_Med_Field med_file = datadir + "resu.2.med" field_names = ["RETH____FLUX_NOEU_TEMP__________","RETH____TEMP____________________"] -prs_list = [ range(1,10), [1,2,3,4,8] ] +prs_list = [ list(range(1,10)), [1,2,3,4,8] ] Import_Med_Field(med_file, field_names, 1, prs_list) diff --git a/test/VisuPrs/IsoSurfaces/A0.py b/test/VisuPrs/IsoSurfaces/A0.py index ee0897a6..13f0d733 100644 --- a/test/VisuPrs/IsoSurfaces/A0.py +++ b/test/VisuPrs/IsoSurfaces/A0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/A0") file = datadir + "fra.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/A1.py b/test/VisuPrs/IsoSurfaces/A1.py index f02d86f4..e50ccc98 100755 --- a/test/VisuPrs/IsoSurfaces/A1.py +++ b/test/VisuPrs/IsoSurfaces/A1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/A1") file = datadir + "hexa_28320_ELEM.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/A2.py b/test/VisuPrs/IsoSurfaces/A2.py index 1e0e9f4d..fc05398f 100755 --- a/test/VisuPrs/IsoSurfaces/A2.py +++ b/test/VisuPrs/IsoSurfaces/A2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/A2") file = datadir + "pointe.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/A3.py b/test/VisuPrs/IsoSurfaces/A3.py index c33748b5..27d710e6 100755 --- a/test/VisuPrs/IsoSurfaces/A3.py +++ b/test/VisuPrs/IsoSurfaces/A3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/A3") file = datadir + "Fields_group3D.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/A4.py b/test/VisuPrs/IsoSurfaces/A4.py index ad329aab..f2dcac16 100755 --- a/test/VisuPrs/IsoSurfaces/A4.py +++ b/test/VisuPrs/IsoSurfaces/A4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/A4") file = datadir + "Hexa8.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/A5.py b/test/VisuPrs/IsoSurfaces/A5.py index deb61b76..b8620558 100755 --- a/test/VisuPrs/IsoSurfaces/A5.py +++ b/test/VisuPrs/IsoSurfaces/A5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/A5") file = datadir + "Penta6.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/A6.py b/test/VisuPrs/IsoSurfaces/A6.py index 1f1bf400..49f66380 100644 --- a/test/VisuPrs/IsoSurfaces/A6.py +++ b/test/VisuPrs/IsoSurfaces/A6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/A6") file = datadir + "clo.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/A7.py b/test/VisuPrs/IsoSurfaces/A7.py index 46e1bcc9..5752ccb1 100755 --- a/test/VisuPrs/IsoSurfaces/A7.py +++ b/test/VisuPrs/IsoSurfaces/A7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/A7") file = datadir + "Tetra4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/A8.py b/test/VisuPrs/IsoSurfaces/A8.py index ded10785..470d1666 100755 --- a/test/VisuPrs/IsoSurfaces/A8.py +++ b/test/VisuPrs/IsoSurfaces/A8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/A8") file = datadir + "Tria3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/A9.py b/test/VisuPrs/IsoSurfaces/A9.py index 66282cd9..6f734d31 100755 --- a/test/VisuPrs/IsoSurfaces/A9.py +++ b/test/VisuPrs/IsoSurfaces/A9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/A9") file = datadir + "Quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/B0.py b/test/VisuPrs/IsoSurfaces/B0.py index 097e20fd..5434fd50 100755 --- a/test/VisuPrs/IsoSurfaces/B0.py +++ b/test/VisuPrs/IsoSurfaces/B0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/B0") file = datadir + "carre_en_quad4_seg2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/B1.py b/test/VisuPrs/IsoSurfaces/B1.py index 082ea5a2..ce835c5a 100644 --- a/test/VisuPrs/IsoSurfaces/B1.py +++ b/test/VisuPrs/IsoSurfaces/B1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/B1") file = datadir + "carre_en_quad4_seg2_fields.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/B2.py b/test/VisuPrs/IsoSurfaces/B2.py index 802fa61b..1c13a719 100755 --- a/test/VisuPrs/IsoSurfaces/B2.py +++ b/test/VisuPrs/IsoSurfaces/B2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/B2") file = datadir + "cube_hexa8_quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/E0.py b/test/VisuPrs/IsoSurfaces/E0.py index 9ec18ed0..8316ba4c 100755 --- a/test/VisuPrs/IsoSurfaces/E0.py +++ b/test/VisuPrs/IsoSurfaces/E0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/E0") file = datadir + "test_55_solid_concentr_dom.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/E1.py b/test/VisuPrs/IsoSurfaces/E1.py index ff267cce..166c78bf 100755 --- a/test/VisuPrs/IsoSurfaces/E1.py +++ b/test/VisuPrs/IsoSurfaces/E1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/E1") file = datadir + "H_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/E2.py b/test/VisuPrs/IsoSurfaces/E2.py index d3ed904e..9d974d76 100755 --- a/test/VisuPrs/IsoSurfaces/E2.py +++ b/test/VisuPrs/IsoSurfaces/E2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/E3.py b/test/VisuPrs/IsoSurfaces/E3.py index 748e8436..a6ef7029 100644 --- a/test/VisuPrs/IsoSurfaces/E3.py +++ b/test/VisuPrs/IsoSurfaces/E3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/E3") file = datadir + "hydro_d10.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/E4.py b/test/VisuPrs/IsoSurfaces/E4.py index 63df9fd8..abc92723 100755 --- a/test/VisuPrs/IsoSurfaces/E4.py +++ b/test/VisuPrs/IsoSurfaces/E4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/E4") file = datadir + "champc.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/E5.py b/test/VisuPrs/IsoSurfaces/E5.py index 60c00f2c..ef49135e 100755 --- a/test/VisuPrs/IsoSurfaces/E5.py +++ b/test/VisuPrs/IsoSurfaces/E5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/E5") file = datadir + "hydro_sea_alv.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/E6.py b/test/VisuPrs/IsoSurfaces/E6.py index b44fbb48..2e8afb7e 100755 --- a/test/VisuPrs/IsoSurfaces/E6.py +++ b/test/VisuPrs/IsoSurfaces/E6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/E6") file = datadir + "toto.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/E7.py b/test/VisuPrs/IsoSurfaces/E7.py index 1a41f1d2..4ba89263 100755 --- a/test/VisuPrs/IsoSurfaces/E7.py +++ b/test/VisuPrs/IsoSurfaces/E7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/E7") file = datadir + "couplex_alain.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/E8.py b/test/VisuPrs/IsoSurfaces/E8.py index 826a1f06..cb20678f 100755 --- a/test/VisuPrs/IsoSurfaces/E8.py +++ b/test/VisuPrs/IsoSurfaces/E8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/E8") file = datadir + "KCOUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/E9.py b/test/VisuPrs/IsoSurfaces/E9.py index d5b87d73..3bd9a671 100644 --- a/test/VisuPrs/IsoSurfaces/E9.py +++ b/test/VisuPrs/IsoSurfaces/E9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/E9") file = datadir + "test_hydro.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/F1.py b/test/VisuPrs/IsoSurfaces/F1.py index b1e3fbec..f4eac2ec 100755 --- a/test/VisuPrs/IsoSurfaces/F1.py +++ b/test/VisuPrs/IsoSurfaces/F1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/F1") file = datadir + "ml.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/F2.py b/test/VisuPrs/IsoSurfaces/F2.py index 3b989763..ea519cd4 100755 --- a/test/VisuPrs/IsoSurfaces/F2.py +++ b/test/VisuPrs/IsoSurfaces/F2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/F2") file = datadir + "T_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/F3.py b/test/VisuPrs/IsoSurfaces/F3.py index a2050147..0bb019d7 100755 --- a/test/VisuPrs/IsoSurfaces/F3.py +++ b/test/VisuPrs/IsoSurfaces/F3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/F3") file = datadir + "test_hydro_darcy4_out.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/F4.py b/test/VisuPrs/IsoSurfaces/F4.py index cd35b8da..adb114a3 100755 --- a/test/VisuPrs/IsoSurfaces/F4.py +++ b/test/VisuPrs/IsoSurfaces/F4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/F4") file = datadir + "UO2_250ans.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/F5.py b/test/VisuPrs/IsoSurfaces/F5.py index d007cc22..5e4184b3 100755 --- a/test/VisuPrs/IsoSurfaces/F5.py +++ b/test/VisuPrs/IsoSurfaces/F5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/F5") file = datadir + "maill.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/F6.py b/test/VisuPrs/IsoSurfaces/F6.py index b2e1169c..ce5d6e5e 100755 --- a/test/VisuPrs/IsoSurfaces/F6.py +++ b/test/VisuPrs/IsoSurfaces/F6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/F6") file = datadir + "maill.0.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/F8.py b/test/VisuPrs/IsoSurfaces/F8.py index 5f9ae184..5affd56f 100755 --- a/test/VisuPrs/IsoSurfaces/F8.py +++ b/test/VisuPrs/IsoSurfaces/F8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/F8") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/F9.py b/test/VisuPrs/IsoSurfaces/F9.py index c468ae9a..1c594348 100644 --- a/test/VisuPrs/IsoSurfaces/F9.py +++ b/test/VisuPrs/IsoSurfaces/F9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/F9") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/G0.py b/test/VisuPrs/IsoSurfaces/G0.py index 05b226ef..25afb8f5 100644 --- a/test/VisuPrs/IsoSurfaces/G0.py +++ b/test/VisuPrs/IsoSurfaces/G0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/G0") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/G1.py b/test/VisuPrs/IsoSurfaces/G1.py index ee1ec151..73ac2355 100755 --- a/test/VisuPrs/IsoSurfaces/G1.py +++ b/test/VisuPrs/IsoSurfaces/G1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("IsoSurfaces/G1") file = datadir + "maill.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.ISOSURFACES], picturedir, pictureext) diff --git a/test/VisuPrs/IsoSurfaces/G2.py b/test/VisuPrs/IsoSurfaces/G2.py index 3817bc91..5f2dbb21 100644 --- a/test/VisuPrs/IsoSurfaces/G2.py +++ b/test/VisuPrs/IsoSurfaces/G2.py @@ -28,17 +28,17 @@ from pvsimple import * picturedir = get_picture_dir("IsoSurfaces/G2") theFileName = datadir + "Bug829_resu_mode.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") """Build presentations of the given types for all fields of the given file.""" #print "Import %s..." % theFileName.split('/')[-1], result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") # Get viewScalarMap aView = GetRenderView() @@ -52,7 +52,7 @@ for i in range(1,11): #hide_all(aView, True) aPrs = IsoSurfacesOnField(aProxy, aFieldEntity,aFieldName , i) if aPrs is None: - raise RuntimeError, "Presentation is None!!!" + raise RuntimeError("Presentation is None!!!") #display only current scalar map display_only(aPrs, aView) reset_view(aView) diff --git a/test/VisuPrs/MeshPresentation/A0.py b/test/VisuPrs/MeshPresentation/A0.py index 18ccb4bd..b79c764a 100644 --- a/test/VisuPrs/MeshPresentation/A0.py +++ b/test/VisuPrs/MeshPresentation/A0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/A0") file = datadir + "fra.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/A1.py b/test/VisuPrs/MeshPresentation/A1.py index aeb25ebc..da6d76bc 100644 --- a/test/VisuPrs/MeshPresentation/A1.py +++ b/test/VisuPrs/MeshPresentation/A1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/A1") file = datadir + "hexa_28320_ELEM.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/A2.py b/test/VisuPrs/MeshPresentation/A2.py index 90a0d542..a0e7c53a 100644 --- a/test/VisuPrs/MeshPresentation/A2.py +++ b/test/VisuPrs/MeshPresentation/A2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/A2") file = datadir + "pointe.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/A3.py b/test/VisuPrs/MeshPresentation/A3.py index 03a7b248..bb95683d 100644 --- a/test/VisuPrs/MeshPresentation/A3.py +++ b/test/VisuPrs/MeshPresentation/A3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/A3") file = datadir + "Fields_group3D.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/A4.py b/test/VisuPrs/MeshPresentation/A4.py index 158fcd44..3bf9e79c 100644 --- a/test/VisuPrs/MeshPresentation/A4.py +++ b/test/VisuPrs/MeshPresentation/A4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/A4") file = datadir + "Hexa8.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/A5.py b/test/VisuPrs/MeshPresentation/A5.py index 163e2743..86ea1440 100644 --- a/test/VisuPrs/MeshPresentation/A5.py +++ b/test/VisuPrs/MeshPresentation/A5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/A5") file = datadir + "Penta6.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/A6.py b/test/VisuPrs/MeshPresentation/A6.py index 27d27813..ef5afbb4 100644 --- a/test/VisuPrs/MeshPresentation/A6.py +++ b/test/VisuPrs/MeshPresentation/A6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/A6") file = datadir + "clo.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/A7.py b/test/VisuPrs/MeshPresentation/A7.py index 1b7e0fb6..3de39df9 100644 --- a/test/VisuPrs/MeshPresentation/A7.py +++ b/test/VisuPrs/MeshPresentation/A7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/A7") file = datadir + "Tetra4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/A8.py b/test/VisuPrs/MeshPresentation/A8.py index e913fd3a..0dce3f03 100644 --- a/test/VisuPrs/MeshPresentation/A8.py +++ b/test/VisuPrs/MeshPresentation/A8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/A8") file = datadir + "Tria3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/A9.py b/test/VisuPrs/MeshPresentation/A9.py index 024dc8ae..5f650c6d 100644 --- a/test/VisuPrs/MeshPresentation/A9.py +++ b/test/VisuPrs/MeshPresentation/A9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/A9") file = datadir + "Quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/B0.py b/test/VisuPrs/MeshPresentation/B0.py index df250131..d50997b2 100644 --- a/test/VisuPrs/MeshPresentation/B0.py +++ b/test/VisuPrs/MeshPresentation/B0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/B0") file = datadir + "carre_en_quad4_seg2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/B1.py b/test/VisuPrs/MeshPresentation/B1.py index f207b905..d16ac2e6 100644 --- a/test/VisuPrs/MeshPresentation/B1.py +++ b/test/VisuPrs/MeshPresentation/B1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/B1") file = datadir + "carre_en_quad4_seg2_fields.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/B2.py b/test/VisuPrs/MeshPresentation/B2.py index 96efd372..a4fe5812 100644 --- a/test/VisuPrs/MeshPresentation/B2.py +++ b/test/VisuPrs/MeshPresentation/B2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/B2") file = datadir + "cube_hexa8_quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/E0.py b/test/VisuPrs/MeshPresentation/E0.py index 902351b5..ca2941ea 100644 --- a/test/VisuPrs/MeshPresentation/E0.py +++ b/test/VisuPrs/MeshPresentation/E0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/E0") file = datadir + "test_55_solid_concentr_dom.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/E1.py b/test/VisuPrs/MeshPresentation/E1.py index ffd53df4..a1b6ceca 100644 --- a/test/VisuPrs/MeshPresentation/E1.py +++ b/test/VisuPrs/MeshPresentation/E1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/E1") file = datadir + "H_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/E2.py b/test/VisuPrs/MeshPresentation/E2.py index b0462bce..fe81bc85 100644 --- a/test/VisuPrs/MeshPresentation/E2.py +++ b/test/VisuPrs/MeshPresentation/E2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/E3.py b/test/VisuPrs/MeshPresentation/E3.py index 3be663fd..8565447d 100644 --- a/test/VisuPrs/MeshPresentation/E3.py +++ b/test/VisuPrs/MeshPresentation/E3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/E3") file = datadir + "hydro_d10.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/E4.py b/test/VisuPrs/MeshPresentation/E4.py index 070af260..29d7b9c3 100644 --- a/test/VisuPrs/MeshPresentation/E4.py +++ b/test/VisuPrs/MeshPresentation/E4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/E4") file = datadir + "champc.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/E5.py b/test/VisuPrs/MeshPresentation/E5.py index 06caadb9..94c054c1 100644 --- a/test/VisuPrs/MeshPresentation/E5.py +++ b/test/VisuPrs/MeshPresentation/E5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/E5") file = datadir + "hydro_sea_alv.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/E6.py b/test/VisuPrs/MeshPresentation/E6.py index 6735bde3..6812f8b2 100644 --- a/test/VisuPrs/MeshPresentation/E6.py +++ b/test/VisuPrs/MeshPresentation/E6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/E6") file = datadir + "toto.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/E7.py b/test/VisuPrs/MeshPresentation/E7.py index 60595b50..9f7dea80 100644 --- a/test/VisuPrs/MeshPresentation/E7.py +++ b/test/VisuPrs/MeshPresentation/E7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/E7") file = datadir + "couplex_alain.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/E8.py b/test/VisuPrs/MeshPresentation/E8.py index 22f392db..e55c86ab 100644 --- a/test/VisuPrs/MeshPresentation/E8.py +++ b/test/VisuPrs/MeshPresentation/E8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/E8") file = datadir + "KCOUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/E9.py b/test/VisuPrs/MeshPresentation/E9.py index 499939ef..2d26c240 100644 --- a/test/VisuPrs/MeshPresentation/E9.py +++ b/test/VisuPrs/MeshPresentation/E9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/E9") file = datadir + "test_hydro.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/F0.py b/test/VisuPrs/MeshPresentation/F0.py index 7adf33cb..58d0b2a3 100644 --- a/test/VisuPrs/MeshPresentation/F0.py +++ b/test/VisuPrs/MeshPresentation/F0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/F0") file = datadir + "gro5couches.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/F1.py b/test/VisuPrs/MeshPresentation/F1.py index e921f7b1..1bdfeba5 100644 --- a/test/VisuPrs/MeshPresentation/F1.py +++ b/test/VisuPrs/MeshPresentation/F1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/F1") file = datadir + "ml.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/F2.py b/test/VisuPrs/MeshPresentation/F2.py index bf178e9d..81bf0a55 100644 --- a/test/VisuPrs/MeshPresentation/F2.py +++ b/test/VisuPrs/MeshPresentation/F2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/F2") file = datadir + "T_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/F3.py b/test/VisuPrs/MeshPresentation/F3.py index b4a3ca55..d0877332 100644 --- a/test/VisuPrs/MeshPresentation/F3.py +++ b/test/VisuPrs/MeshPresentation/F3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/F3") file = datadir + "test_hydro_darcy4_out.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/F4.py b/test/VisuPrs/MeshPresentation/F4.py index 5ec95b2b..9e91c942 100644 --- a/test/VisuPrs/MeshPresentation/F4.py +++ b/test/VisuPrs/MeshPresentation/F4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/F4") file = datadir + "UO2_250ans.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/F5.py b/test/VisuPrs/MeshPresentation/F5.py index d97e64a3..c8f28efe 100644 --- a/test/VisuPrs/MeshPresentation/F5.py +++ b/test/VisuPrs/MeshPresentation/F5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/F5") file = datadir + "maill.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/F6.py b/test/VisuPrs/MeshPresentation/F6.py index 4bf3d1c6..6fade79e 100644 --- a/test/VisuPrs/MeshPresentation/F6.py +++ b/test/VisuPrs/MeshPresentation/F6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/F6") file = datadir + "maill.0.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/F8.py b/test/VisuPrs/MeshPresentation/F8.py index e7cae27e..1ccfc174 100644 --- a/test/VisuPrs/MeshPresentation/F8.py +++ b/test/VisuPrs/MeshPresentation/F8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/F8") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/F9.py b/test/VisuPrs/MeshPresentation/F9.py index 00febd05..98323209 100644 --- a/test/VisuPrs/MeshPresentation/F9.py +++ b/test/VisuPrs/MeshPresentation/F9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/F9") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/G0.py b/test/VisuPrs/MeshPresentation/G0.py index 477889a6..bad6fafc 100644 --- a/test/VisuPrs/MeshPresentation/G0.py +++ b/test/VisuPrs/MeshPresentation/G0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/G0") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/G1.py b/test/VisuPrs/MeshPresentation/G1.py index 208e8316..66ded1a5 100644 --- a/test/VisuPrs/MeshPresentation/G1.py +++ b/test/VisuPrs/MeshPresentation/G1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("MeshPresentation/G1") file = datadir + "maill.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.MESH], picturedir, pictureext) diff --git a/test/VisuPrs/MeshPresentation/G3.py b/test/VisuPrs/MeshPresentation/G3.py index 3219dd77..d01079f4 100644 --- a/test/VisuPrs/MeshPresentation/G3.py +++ b/test/VisuPrs/MeshPresentation/G3.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/G3") theFileName = datadir + "Box1.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name, entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/G4.py b/test/VisuPrs/MeshPresentation/G4.py index 9d56813b..33a9650d 100644 --- a/test/VisuPrs/MeshPresentation/G4.py +++ b/test/VisuPrs/MeshPresentation/G4.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/G4") theFileName = datadir + "Box1Moderate.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/G5.py b/test/VisuPrs/MeshPresentation/G5.py index 0d0366bf..e15f5957 100644 --- a/test/VisuPrs/MeshPresentation/G5.py +++ b/test/VisuPrs/MeshPresentation/G5.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/G5") theFileName = datadir + "Box2.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/G6.py b/test/VisuPrs/MeshPresentation/G6.py index b1c2d212..505f7745 100644 --- a/test/VisuPrs/MeshPresentation/G6.py +++ b/test/VisuPrs/MeshPresentation/G6.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/G6") theFileName = datadir + "Box2Moderate.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/G7.py b/test/VisuPrs/MeshPresentation/G7.py index 6e2051fb..a6394d0e 100644 --- a/test/VisuPrs/MeshPresentation/G7.py +++ b/test/VisuPrs/MeshPresentation/G7.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/G7") theFileName = datadir + "Box3.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/G8.py b/test/VisuPrs/MeshPresentation/G8.py index 31532f9a..13386884 100644 --- a/test/VisuPrs/MeshPresentation/G8.py +++ b/test/VisuPrs/MeshPresentation/G8.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/G8") theFileName = datadir + "BoxEvenSmaller1.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/G9.py b/test/VisuPrs/MeshPresentation/G9.py index 8ef59768..5eadbb0e 100644 --- a/test/VisuPrs/MeshPresentation/G9.py +++ b/test/VisuPrs/MeshPresentation/G9.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/G9") theFileName = datadir + "BoxHexa1.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/H0.py b/test/VisuPrs/MeshPresentation/H0.py index cefca612..7abac391 100644 --- a/test/VisuPrs/MeshPresentation/H0.py +++ b/test/VisuPrs/MeshPresentation/H0.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/H0") theFileName = datadir + "BoxHexa2.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/H1.py b/test/VisuPrs/MeshPresentation/H1.py index fa48c1bf..d613118e 100644 --- a/test/VisuPrs/MeshPresentation/H1.py +++ b/test/VisuPrs/MeshPresentation/H1.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/H1") theFileName = datadir + "BoxModSmall1.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/H2.py b/test/VisuPrs/MeshPresentation/H2.py index 0a98e637..d6b99ec1 100644 --- a/test/VisuPrs/MeshPresentation/H2.py +++ b/test/VisuPrs/MeshPresentation/H2.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/H2") theFileName = datadir + "BoxModSmall2.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/H3.py b/test/VisuPrs/MeshPresentation/H3.py index 2c3fcb44..b97e0664 100644 --- a/test/VisuPrs/MeshPresentation/H3.py +++ b/test/VisuPrs/MeshPresentation/H3.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/H3") theFileName = datadir + "BoxTetra2.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/H4.py b/test/VisuPrs/MeshPresentation/H4.py index 1395f2de..92f700d9 100644 --- a/test/VisuPrs/MeshPresentation/H4.py +++ b/test/VisuPrs/MeshPresentation/H4.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/H4") theFileName = datadir + "ComplexIncludedTetra.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/H5.py b/test/VisuPrs/MeshPresentation/H5.py index 9aaed611..600c3435 100644 --- a/test/VisuPrs/MeshPresentation/H5.py +++ b/test/VisuPrs/MeshPresentation/H5.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/H5") theFileName = datadir + "ComplexIncludingTetra.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/H6.py b/test/VisuPrs/MeshPresentation/H6.py index 67c089d9..70f8908f 100644 --- a/test/VisuPrs/MeshPresentation/H6.py +++ b/test/VisuPrs/MeshPresentation/H6.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/H6") theFileName = datadir + "CornerTetra.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/H7.py b/test/VisuPrs/MeshPresentation/H7.py index 545074ca..9c83f37e 100644 --- a/test/VisuPrs/MeshPresentation/H7.py +++ b/test/VisuPrs/MeshPresentation/H7.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/H7") theFileName = datadir + "DegenEdgeXY.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/H8.py b/test/VisuPrs/MeshPresentation/H8.py index ba1ffe57..0a30c0a4 100644 --- a/test/VisuPrs/MeshPresentation/H8.py +++ b/test/VisuPrs/MeshPresentation/H8.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/H8") theFileName = datadir + "DegenFaceXYZ.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/H9.py b/test/VisuPrs/MeshPresentation/H9.py index d2f0beed..0a87a0eb 100644 --- a/test/VisuPrs/MeshPresentation/H9.py +++ b/test/VisuPrs/MeshPresentation/H9.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/H9") theFileName = datadir + "DegenTranslatedInPlane.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/I0.py b/test/VisuPrs/MeshPresentation/I0.py index 5813277a..145be8e2 100644 --- a/test/VisuPrs/MeshPresentation/I0.py +++ b/test/VisuPrs/MeshPresentation/I0.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/I0") theFileName = datadir + "TinyBox.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/I1.py b/test/VisuPrs/MeshPresentation/I1.py index 83911acd..f384ef20 100644 --- a/test/VisuPrs/MeshPresentation/I1.py +++ b/test/VisuPrs/MeshPresentation/I1.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/I1") theFileName = datadir + "TrickyTetra1.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/I2.py b/test/VisuPrs/MeshPresentation/I2.py index 39f1d4e2..95a60aa4 100644 --- a/test/VisuPrs/MeshPresentation/I2.py +++ b/test/VisuPrs/MeshPresentation/I2.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/I2") theFileName = datadir + "UnitTetra.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/I3.py b/test/VisuPrs/MeshPresentation/I3.py index 2d182730..12105882 100644 --- a/test/VisuPrs/MeshPresentation/I3.py +++ b/test/VisuPrs/MeshPresentation/I3.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/I3") theFileName = datadir + "UnitTetraDegenT.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/I4.py b/test/VisuPrs/MeshPresentation/I4.py index 8fccbccc..18fef298 100644 --- a/test/VisuPrs/MeshPresentation/I4.py +++ b/test/VisuPrs/MeshPresentation/I4.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/I4") theFileName = datadir + "square1.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/I5.py b/test/VisuPrs/MeshPresentation/I5.py index db6ad64e..a717c0c7 100644 --- a/test/VisuPrs/MeshPresentation/I5.py +++ b/test/VisuPrs/MeshPresentation/I5.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/I5") theFileName = datadir + "square1_split1.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/I6.py b/test/VisuPrs/MeshPresentation/I6.py index c963a0fc..5bf3c328 100644 --- a/test/VisuPrs/MeshPresentation/I6.py +++ b/test/VisuPrs/MeshPresentation/I6.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/I6") theFileName = datadir + "square1_split2.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/I7.py b/test/VisuPrs/MeshPresentation/I7.py index fd67aea1..0ae80333 100644 --- a/test/VisuPrs/MeshPresentation/I7.py +++ b/test/VisuPrs/MeshPresentation/I7.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/I7") theFileName = datadir + "square1_split3.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/I8.py b/test/VisuPrs/MeshPresentation/I8.py index 5799a202..e9820a67 100644 --- a/test/VisuPrs/MeshPresentation/I8.py +++ b/test/VisuPrs/MeshPresentation/I8.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/I8") theFileName = datadir + "square2.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/I9.py b/test/VisuPrs/MeshPresentation/I9.py index d3f290fd..7cfb7072 100644 --- a/test/VisuPrs/MeshPresentation/I9.py +++ b/test/VisuPrs/MeshPresentation/I9.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/I9") theFileName = datadir + "square2_split1.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/J0.py b/test/VisuPrs/MeshPresentation/J0.py index 6261bc58..c4eede46 100644 --- a/test/VisuPrs/MeshPresentation/J0.py +++ b/test/VisuPrs/MeshPresentation/J0.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/J0") theFileName = datadir + "DividedGenTetra1.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/J1.py b/test/VisuPrs/MeshPresentation/J1.py index 90717f71..0e83e473 100644 --- a/test/VisuPrs/MeshPresentation/J1.py +++ b/test/VisuPrs/MeshPresentation/J1.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/J1") theFileName = datadir + "DividedGenTetra2.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/J2.py b/test/VisuPrs/MeshPresentation/J2.py index b8d3843b..c2efa630 100644 --- a/test/VisuPrs/MeshPresentation/J2.py +++ b/test/VisuPrs/MeshPresentation/J2.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/J2") theFileName = datadir + "DividedUnitTetra.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/J3.py b/test/VisuPrs/MeshPresentation/J3.py index f41590ea..9bb32886 100644 --- a/test/VisuPrs/MeshPresentation/J3.py +++ b/test/VisuPrs/MeshPresentation/J3.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/J3") theFileName = datadir + "DividedUnitTetraSimpler.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/J4.py b/test/VisuPrs/MeshPresentation/J4.py index 40874a58..a180bde1 100644 --- a/test/VisuPrs/MeshPresentation/J4.py +++ b/test/VisuPrs/MeshPresentation/J4.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/J4") theFileName = datadir + "GenTetra1.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/J5.py b/test/VisuPrs/MeshPresentation/J5.py index 405612fb..5e25acda 100644 --- a/test/VisuPrs/MeshPresentation/J5.py +++ b/test/VisuPrs/MeshPresentation/J5.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/J5") theFileName = datadir + "GenTetra2.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/J6.py b/test/VisuPrs/MeshPresentation/J6.py index 2de1b35b..9d9e7816 100644 --- a/test/VisuPrs/MeshPresentation/J6.py +++ b/test/VisuPrs/MeshPresentation/J6.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/J6") theFileName = datadir + "GeneralTetra.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/J7.py b/test/VisuPrs/MeshPresentation/J7.py index a85be6f2..7a65f1d1 100644 --- a/test/VisuPrs/MeshPresentation/J7.py +++ b/test/VisuPrs/MeshPresentation/J7.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/J7") theFileName = datadir + "HalfstripOnly.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/J8.py b/test/VisuPrs/MeshPresentation/J8.py index 87266977..2e21714c 100644 --- a/test/VisuPrs/MeshPresentation/J8.py +++ b/test/VisuPrs/MeshPresentation/J8.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/J8") theFileName = datadir + "HalfstripOnly2.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/J9.py b/test/VisuPrs/MeshPresentation/J9.py index d0e5abe0..db881118 100644 --- a/test/VisuPrs/MeshPresentation/J9.py +++ b/test/VisuPrs/MeshPresentation/J9.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/J9") theFileName = datadir + "LargeInconsistentTetra.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/K0.py b/test/VisuPrs/MeshPresentation/K0.py index 700b8352..cede10e8 100644 --- a/test/VisuPrs/MeshPresentation/K0.py +++ b/test/VisuPrs/MeshPresentation/K0.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/K0") theFileName = datadir + "LargeUnitTetra.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/K1.py b/test/VisuPrs/MeshPresentation/K1.py index 173e22b8..4373d539 100644 --- a/test/VisuPrs/MeshPresentation/K1.py +++ b/test/VisuPrs/MeshPresentation/K1.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/K1") theFileName = datadir + "MovedHexaBox1.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/K2.py b/test/VisuPrs/MeshPresentation/K2.py index 1fd21ba5..4c1e23bc 100644 --- a/test/VisuPrs/MeshPresentation/K2.py +++ b/test/VisuPrs/MeshPresentation/K2.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/K2") theFileName = datadir + "MovedHexaBox2.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/K3.py b/test/VisuPrs/MeshPresentation/K3.py index 30ec2566..0a82bc33 100644 --- a/test/VisuPrs/MeshPresentation/K3.py +++ b/test/VisuPrs/MeshPresentation/K3.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/K3") theFileName = datadir + "NudgedDividedUnitTetra.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/K4.py b/test/VisuPrs/MeshPresentation/K4.py index 9c2f5f57..e6e953da 100644 --- a/test/VisuPrs/MeshPresentation/K4.py +++ b/test/VisuPrs/MeshPresentation/K4.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/K4") theFileName = datadir + "NudgedDividedUnitTetraSimpler.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/K5.py b/test/VisuPrs/MeshPresentation/K5.py index 642bd415..2cb0bfd9 100644 --- a/test/VisuPrs/MeshPresentation/K5.py +++ b/test/VisuPrs/MeshPresentation/K5.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/K5") theFileName = datadir + "NudgedSimpler.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/K6.py b/test/VisuPrs/MeshPresentation/K6.py index 6a597d9e..3c2a7c8b 100644 --- a/test/VisuPrs/MeshPresentation/K6.py +++ b/test/VisuPrs/MeshPresentation/K6.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/K6") theFileName = datadir + "NudgedTetra.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/K7.py b/test/VisuPrs/MeshPresentation/K7.py index 6594da5a..28ae66c6 100644 --- a/test/VisuPrs/MeshPresentation/K7.py +++ b/test/VisuPrs/MeshPresentation/K7.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/K7") theFileName = datadir + "SimpleHalfstripOnly.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/K8.py b/test/VisuPrs/MeshPresentation/K8.py index c3d967bf..14430881 100644 --- a/test/VisuPrs/MeshPresentation/K8.py +++ b/test/VisuPrs/MeshPresentation/K8.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/K8") theFileName = datadir + "SimpleIncludedTetra.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/K9.py b/test/VisuPrs/MeshPresentation/K9.py index 87b78bca..5e6539ff 100644 --- a/test/VisuPrs/MeshPresentation/K9.py +++ b/test/VisuPrs/MeshPresentation/K9.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/K9") theFileName = datadir + "SimpleIncludingTetra.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/L0.py b/test/VisuPrs/MeshPresentation/L0.py index 52c4fb12..74227353 100644 --- a/test/VisuPrs/MeshPresentation/L0.py +++ b/test/VisuPrs/MeshPresentation/L0.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/L0") theFileName = datadir + "square2_split2.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/MeshPresentation/L1.py b/test/VisuPrs/MeshPresentation/L1.py index 0381782c..f72bd1ea 100644 --- a/test/VisuPrs/MeshPresentation/L1.py +++ b/test/VisuPrs/MeshPresentation/L1.py @@ -28,16 +28,16 @@ from pvsimple import * picturedir = get_picture_dir("MeshPresentation/L1") theFileName = datadir + "Bug829_resu_mode.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") aView = GetRenderView() @@ -51,7 +51,7 @@ for entity_type in entity_types: mesh = MeshOnEntity(aProxy, mesh_name ,entity_type) if mesh is None: msg = "ERROR!!!Presentation of mesh on '"+entity_name+"' family wasn't created..." - raise RuntimeError, msg + raise RuntimeError(msg) mesh.Visibility=1 reset_view(aView) Render() diff --git a/test/VisuPrs/Plot3D/A0.py b/test/VisuPrs/Plot3D/A0.py index 602c0bac..44ab315c 100644 --- a/test/VisuPrs/Plot3D/A0.py +++ b/test/VisuPrs/Plot3D/A0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/A0") file = datadir + "fra.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/A1.py b/test/VisuPrs/Plot3D/A1.py index fbc3a66f..819ce749 100755 --- a/test/VisuPrs/Plot3D/A1.py +++ b/test/VisuPrs/Plot3D/A1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/A1") file = datadir + "hexa_28320_ELEM.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/A2.py b/test/VisuPrs/Plot3D/A2.py index 1f7c97ca..14098832 100755 --- a/test/VisuPrs/Plot3D/A2.py +++ b/test/VisuPrs/Plot3D/A2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/A2") file = datadir + "pointe.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/A3.py b/test/VisuPrs/Plot3D/A3.py index b438dd19..a7801d2b 100755 --- a/test/VisuPrs/Plot3D/A3.py +++ b/test/VisuPrs/Plot3D/A3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/A3") file = datadir + "Fields_group3D.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/A4.py b/test/VisuPrs/Plot3D/A4.py index c6baf8bf..3ad46e9b 100755 --- a/test/VisuPrs/Plot3D/A4.py +++ b/test/VisuPrs/Plot3D/A4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/A4") file = datadir + "Hexa8.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/A5.py b/test/VisuPrs/Plot3D/A5.py index c4dd0f77..a6047627 100755 --- a/test/VisuPrs/Plot3D/A5.py +++ b/test/VisuPrs/Plot3D/A5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/A5") file = datadir + "Penta6.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/A6.py b/test/VisuPrs/Plot3D/A6.py index d2fb0a0a..35617a5e 100644 --- a/test/VisuPrs/Plot3D/A6.py +++ b/test/VisuPrs/Plot3D/A6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/A6") file = datadir + "clo.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/A7.py b/test/VisuPrs/Plot3D/A7.py index f2edca37..b42acc8f 100755 --- a/test/VisuPrs/Plot3D/A7.py +++ b/test/VisuPrs/Plot3D/A7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/A7") file = datadir + "Tetra4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/A8.py b/test/VisuPrs/Plot3D/A8.py index 2382b7d7..17ba0a67 100755 --- a/test/VisuPrs/Plot3D/A8.py +++ b/test/VisuPrs/Plot3D/A8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/A8") file = datadir + "Tria3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/A9.py b/test/VisuPrs/Plot3D/A9.py index 7e161f53..44df0bc6 100755 --- a/test/VisuPrs/Plot3D/A9.py +++ b/test/VisuPrs/Plot3D/A9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/A9") file = datadir + "Quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/B0.py b/test/VisuPrs/Plot3D/B0.py index 371e0445..4f61d888 100755 --- a/test/VisuPrs/Plot3D/B0.py +++ b/test/VisuPrs/Plot3D/B0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/B0") file = datadir + "carre_en_quad4_seg2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/B1.py b/test/VisuPrs/Plot3D/B1.py index 3d0b1560..6005b73d 100755 --- a/test/VisuPrs/Plot3D/B1.py +++ b/test/VisuPrs/Plot3D/B1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/B1") file = datadir + "carre_en_quad4_seg2_fields.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/B2.py b/test/VisuPrs/Plot3D/B2.py index a9e580d7..5c6a7830 100755 --- a/test/VisuPrs/Plot3D/B2.py +++ b/test/VisuPrs/Plot3D/B2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/B2") file = datadir + "cube_hexa8_quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/E0.py b/test/VisuPrs/Plot3D/E0.py index 9a5ff92b..4df6fc0f 100755 --- a/test/VisuPrs/Plot3D/E0.py +++ b/test/VisuPrs/Plot3D/E0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/E0") file = datadir + "test_55_solid_concentr_dom.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/E1.py b/test/VisuPrs/Plot3D/E1.py index 2a4fa3b5..1e7f7023 100755 --- a/test/VisuPrs/Plot3D/E1.py +++ b/test/VisuPrs/Plot3D/E1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/E1") file = datadir + "H_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/E2.py b/test/VisuPrs/Plot3D/E2.py index ee51a092..eaef027c 100755 --- a/test/VisuPrs/Plot3D/E2.py +++ b/test/VisuPrs/Plot3D/E2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/E3.py b/test/VisuPrs/Plot3D/E3.py index 49596546..d7c96174 100644 --- a/test/VisuPrs/Plot3D/E3.py +++ b/test/VisuPrs/Plot3D/E3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/E3") file = datadir + "hydro_d10.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/E4.py b/test/VisuPrs/Plot3D/E4.py index b055178d..6199a54c 100755 --- a/test/VisuPrs/Plot3D/E4.py +++ b/test/VisuPrs/Plot3D/E4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/E4") file = datadir + "champc.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/E5.py b/test/VisuPrs/Plot3D/E5.py index 24199196..32f5eb4b 100755 --- a/test/VisuPrs/Plot3D/E5.py +++ b/test/VisuPrs/Plot3D/E5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/E5") file = datadir + "hydro_sea_alv.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/E6.py b/test/VisuPrs/Plot3D/E6.py index 2291723a..c3e0976f 100755 --- a/test/VisuPrs/Plot3D/E6.py +++ b/test/VisuPrs/Plot3D/E6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/E6") file = datadir + "toto.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/E7.py b/test/VisuPrs/Plot3D/E7.py index 1d818b73..69cc52f9 100755 --- a/test/VisuPrs/Plot3D/E7.py +++ b/test/VisuPrs/Plot3D/E7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/E7") file = datadir + "couplex_alain.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/E8.py b/test/VisuPrs/Plot3D/E8.py index 67f16c94..4bcd3a56 100755 --- a/test/VisuPrs/Plot3D/E8.py +++ b/test/VisuPrs/Plot3D/E8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/E8") file = datadir + "KCOUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/E9.py b/test/VisuPrs/Plot3D/E9.py index 35664996..da9afd56 100755 --- a/test/VisuPrs/Plot3D/E9.py +++ b/test/VisuPrs/Plot3D/E9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/E9") file = datadir + "test_hydro.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/F1.py b/test/VisuPrs/Plot3D/F1.py index 8325d4bd..93690d39 100755 --- a/test/VisuPrs/Plot3D/F1.py +++ b/test/VisuPrs/Plot3D/F1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/F1") file = datadir + "ml.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/F2.py b/test/VisuPrs/Plot3D/F2.py index ddbb507b..d0b52acb 100755 --- a/test/VisuPrs/Plot3D/F2.py +++ b/test/VisuPrs/Plot3D/F2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/F2") file = datadir + "T_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/F3.py b/test/VisuPrs/Plot3D/F3.py index 4e5b92a1..df8c989f 100755 --- a/test/VisuPrs/Plot3D/F3.py +++ b/test/VisuPrs/Plot3D/F3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/F3") file = datadir + "test_hydro_darcy4_out.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/F4.py b/test/VisuPrs/Plot3D/F4.py index 276fd364..011c426b 100755 --- a/test/VisuPrs/Plot3D/F4.py +++ b/test/VisuPrs/Plot3D/F4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/F4") file = datadir + "UO2_250ans.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/F5.py b/test/VisuPrs/Plot3D/F5.py index cc82d4b7..1f930b43 100755 --- a/test/VisuPrs/Plot3D/F5.py +++ b/test/VisuPrs/Plot3D/F5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/F5") file = datadir + "maill.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/F6.py b/test/VisuPrs/Plot3D/F6.py index ed18ccfd..5fd5ee53 100755 --- a/test/VisuPrs/Plot3D/F6.py +++ b/test/VisuPrs/Plot3D/F6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/F6") file = datadir + "maill.0.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/F8.py b/test/VisuPrs/Plot3D/F8.py index 6b81332d..ee444432 100755 --- a/test/VisuPrs/Plot3D/F8.py +++ b/test/VisuPrs/Plot3D/F8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/F8") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/F9.py b/test/VisuPrs/Plot3D/F9.py index 31914d1b..eca84c5a 100644 --- a/test/VisuPrs/Plot3D/F9.py +++ b/test/VisuPrs/Plot3D/F9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/F9") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/G0.py b/test/VisuPrs/Plot3D/G0.py index 23b9d6f8..4d4953cb 100644 --- a/test/VisuPrs/Plot3D/G0.py +++ b/test/VisuPrs/Plot3D/G0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/G0") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/G1.py b/test/VisuPrs/Plot3D/G1.py index 286822ec..5579f9a7 100755 --- a/test/VisuPrs/Plot3D/G1.py +++ b/test/VisuPrs/Plot3D/G1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Plot3D/G1") file = datadir + "maill.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.PLOT3D], picturedir, pictureext) diff --git a/test/VisuPrs/Plot3D/G2.py b/test/VisuPrs/Plot3D/G2.py index 3700fc43..f15af4cc 100755 --- a/test/VisuPrs/Plot3D/G2.py +++ b/test/VisuPrs/Plot3D/G2.py @@ -28,17 +28,17 @@ from pvsimple import * picturedir = get_picture_dir("Plot3D/G2") theFileName = datadir + "Bug829_resu_mode.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") #print "Import %s..." % theFileName.split('/')[-1], result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") # Get viewScalarMap aView = GetRenderView() @@ -50,7 +50,7 @@ for i in range(1,11): hide_all(aView, True) aPrs = Plot3DOnField(aProxy, aFieldEntity,aFieldName , i) if aPrs is None: - raise RuntimeError, "Presentation is None!!!" + raise RuntimeError("Presentation is None!!!") #display only current scalar map aPrs.Visibility=1 reset_view(aView) diff --git a/test/VisuPrs/SWIG_scripts/A1.py b/test/VisuPrs/SWIG_scripts/A1.py index 3ec915e4..8ffbd28c 100644 --- a/test/VisuPrs/SWIG_scripts/A1.py +++ b/test/VisuPrs/SWIG_scripts/A1.py @@ -25,37 +25,37 @@ import pvsimple #====================Stage1: Importing MED file==================== -print "**** Stage1: Importing MED file" +print("**** Stage1: Importing MED file") -print 'Import "ResOK_0000.med"...............', +print('Import "ResOK_0000.med"...............', end=' ') file_path = datadir + "ResOK_0000.med" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") cell_entity = EntityType.CELL node_entity = EntityType.NODE #====================Stage2: Displaying vector field=============== -print "**** Stage3: Displaying vector field" +print("**** Stage3: Displaying vector field") -print 'Get view...................', +print('Get view...................', end=' ') view = pvsimple.GetRenderView() if view is None: - print "FAILED" + print("FAILED") else: reset_view(view) - print "OK" + print("OK") -print "Creating Scalar Map.......", +print("Creating Scalar Map.......", end=' ') scalarmap = ScalarMapOnField(med_reader, node_entity, 'vitesse', 1) if scalarmap is None: - print "FAILED" + print("FAILED") else: bar = get_bar() bar.Orientation = 'Horizontal' @@ -64,44 +64,44 @@ else: bar.AspectRatio = 3 display_only(scalarmap, view) - print "OK" + print("OK") view.ResetCamera() -print "Creating Stream Lines.....", +print("Creating Stream Lines.....", end=' ') streamlines = StreamLinesOnField(med_reader, node_entity, 'vitesse', 1) if streamlines is None: - print "FAILED" + print("FAILED") else: display_only(streamlines, view) - print "OK" + print("OK") -print "Creating Vectors..........", +print("Creating Vectors..........", end=' ') vectors = VectorsOnField(med_reader, node_entity, 'vitesse', 1) if vectors is None: - print "FAILED" + print("FAILED") else: display_only(vectors, view) - print "OK" + print("OK") -print "Creating Iso Surfaces.....", +print("Creating Iso Surfaces.....", end=' ') isosurfaces = IsoSurfacesOnField(med_reader, node_entity, 'vitesse', 1) if isosurfaces is None: - print "FAILED" + print("FAILED") else: display_only(isosurfaces, view) - print "OK" + print("OK") -print "Creating Cut Planes.......", +print("Creating Cut Planes.......", end=' ') cutplanes = CutPlanesOnField(med_reader, node_entity, 'vitesse', 1, nb_planes=30, orientation=Orientation.YZ) if cutplanes is None: - print "FAILED" + print("FAILED") else: display_only(cutplanes, view) - print "OK" + print("OK") -print "Creating Scalar Map On Deformed Shape.......", +print("Creating Scalar Map On Deformed Shape.......", end=' ') scalarmapondefshape = DeformedShapeAndScalarMapOnField(med_reader, node_entity, 'vitesse', 2, @@ -109,103 +109,103 @@ scalarmapondefshape = DeformedShapeAndScalarMapOnField(med_reader, cell_entity, 'pression') if scalarmapondefshape is None: - print "FAILED" + print("FAILED") else: display_only(scalarmapondefshape, view) - print "OK" + print("OK") #====================Stage3: Another Med file import==================== -print 'Import "Fields_group3D.med"...............', +print('Import "Fields_group3D.med"...............', end=' ') file_path = datadir + "Fields_group3D.med" pvsimple.OpenDataFile(file_path) med_reader1 = pvsimple.GetActiveSource() if med_reader1 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") #====================Stage4: Displaying scalar field==================== -print "**** Stage4: Displaying scalar field" +print("**** Stage4: Displaying scalar field") -print "Creating Scalar Map.......", +print("Creating Scalar Map.......", end=' ') scalarmap1 = ScalarMapOnField(med_reader1, cell_entity, 'scalar field', 1) if scalarmap1 is None: - print "FAILED" + print("FAILED") else: display_only(scalarmap1, view) - print "OK" + print("OK") view.ResetCamera() -print "Creating Iso Surfaces.....", +print("Creating Iso Surfaces.....", end=' ') isosurfaces1 = IsoSurfacesOnField(med_reader1, cell_entity, 'scalar field', 1) if isosurfaces1 is None: - print "FAILED" + print("FAILED") else: display_only(isosurfaces1, view) - print "OK" + print("OK") -print "Creating Cut Planes.......", +print("Creating Cut Planes.......", end=' ') cutplanes1 = CutPlanesOnField(med_reader1, cell_entity, 'scalar field', 1, orientation=Orientation.YZ) if cutplanes1 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") slice_filter = pvsimple.GetActiveSource() slice_filter.SliceType.Normal = [1.0, 0.0, 0.0] display_only(cutplanes1, view) -print "Creating Scalar Map On Deformed Shape.......", +print("Creating Scalar Map On Deformed Shape.......", end=' ') scalarmapondefshape1 = DeformedShapeAndScalarMapOnField(med_reader1, cell_entity, 'vectoriel field', 1) if scalarmapondefshape1 is None: - print "FAILED" + print("FAILED") else: display_only(scalarmapondefshape1, view) - print "OK" + print("OK") #====================Stage5: Object browser popup==================== -print "**** Stage5: Object browser popup" +print("**** Stage5: Object browser popup") -print "Creating mesh.............", +print("Creating mesh.............", end=' ') mesh_name = 'mailles_MED' mesh = MeshOnEntity(med_reader1, mesh_name, cell_entity) if mesh is None: - print "FAILED" + print("FAILED") else: display_only(mesh, view) - print "OK" + print("OK") -print "Changing type of presentation of mesh:" +print("Changing type of presentation of mesh:") mesh.Representation = 'Wireframe' pvsimple.Render() prs_type = mesh.Representation -print "Presentation type..", prs_type +print("Presentation type..", prs_type) mesh.Representation = 'Points' pvsimple.Render() prs_type = mesh.Representation -print "Presentation type..", prs_type +print("Presentation type..", prs_type) mesh.Representation = 'Surface' pvsimple.Render() prs_type = mesh.Representation -print "Presentation type..", prs_type +print("Presentation type..", prs_type) shrink = pvsimple.Shrink(med_reader1) mesh_shrinked = pvsimple.GetRepresentation(shrink) display_only(mesh_shrinked, view) -print "Changing color of mesh....", +print("Changing color of mesh....", end=' ') color = [0, 0, 1] mesh.DiffuseColor = color display_only(mesh, view) -print "OK" +print("OK") diff --git a/test/VisuPrs/SWIG_scripts/A3.py b/test/VisuPrs/SWIG_scripts/A3.py index 9b526b42..144d1c82 100644 --- a/test/VisuPrs/SWIG_scripts/A3.py +++ b/test/VisuPrs/SWIG_scripts/A3.py @@ -23,44 +23,44 @@ from paravistest import datadir from presentations import * import pvsimple -print 'Importing "TimeStamps.med"...............', +print('Importing "TimeStamps.med"...............', end=' ') file_path = datadir + "TimeStamps.med" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Creating Cut Lines........................", +print("Creating Cut Lines........................", end=' ') med_field = "vitesse" cutlines = CutLinesOnField(med_reader, EntityType.NODE, med_field, 1, nb_lines=20, orientation1=Orientation.XY, orientation2=Orientation.ZX) if cutlines is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Getting a viewer.........................", +print("Getting a viewer.........................", end=' ') view = pvsimple.GetRenderView() if view is None: - print "FAILED" + print("FAILED") else: reset_view(view) - print "OK" + print("OK") cutlines.Visibility = 1 view.ResetCamera() pvsimple.Render() -print "Creating an Animation.....................", +print("Creating an Animation.....................", end=' ') scalarmap = ScalarMapOnField(med_reader, EntityType.NODE, med_field, 2) scene = pvsimple.AnimateReader(med_reader, view) if scene is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") diff --git a/test/VisuPrs/SWIG_scripts/A4.py b/test/VisuPrs/SWIG_scripts/A4.py index 63b7f51b..28bf1fad 100644 --- a/test/VisuPrs/SWIG_scripts/A4.py +++ b/test/VisuPrs/SWIG_scripts/A4.py @@ -57,15 +57,15 @@ med_reader = pvsimple.GetActiveSource() # Create scalar map scalarmap = ScalarMapOnField(med_reader, entity, field_name, timestamp) -print "ScalarMapOnField(...)" +print("ScalarMapOnField(...)") pvsimple.Show(scalarmap.Input) # Set view properties -print "view.CameraFocalPoint = [0, 0, 0]" +print("view.CameraFocalPoint = [0, 0, 0]") view.CameraFocalPoint = [0, 0, 0] -print "view.CameraParallelScale = 2" +print("view.CameraParallelScale = 2") view.CameraParallelScale = 2 -print "pvsimple.ResetCamera(view)" +print("pvsimple.ResetCamera(view)") pvsimple.ResetCamera(view) # Play with scalar bar @@ -78,7 +78,7 @@ delta = (range_max - range_min) / 2.0 nb_colors = lt.NumberOfTableValues nb_colors = 64 lt.Discretize = 1 -for i in xrange(2, nb_colors): +for i in range(2, nb_colors): lt.NumberOfTableValues = nb_colors x = range_min + delta * i / nb_colors y = range_max - delta * i / nb_colors @@ -90,12 +90,12 @@ for i in xrange(2, nb_colors): lt.RGBPoints[0] = range_min lt.RGBPoints[4] = range_max -print "pvsimple.ResetCamera(view)" +print("pvsimple.ResetCamera(view)") pvsimple.Render(view) sleep(DELAY) # Destroy the view -print "Destroy the view with Scalar Map" +print("Destroy the view with Scalar Map") delete_pv_object(view) @@ -112,14 +112,14 @@ orient = Orientation.YZ cutplanes = CutPlanesOnField(med_reader, entity, field_name, timestamp, orientation=orient, displacement=displacement) -print "CutPlanesOnField(...)" +print("CutPlanesOnField(...)") display_only(cutplanes, view) -print "display_only(cutplanes, view)" +print("display_only(cutplanes, view)") cam_pos = view.CameraPosition cam_pos[0] = cam_pos[0] + 10 -print "Set view.CameraPosition" +print("Set view.CameraPosition") cutplanes.Scale[0] = 3 cutplanes.Scale[1] = 10 pvsimple.Render(view) @@ -132,7 +132,7 @@ offset_vals = slice_filter.SliceOffsetValues nb_planes = len(offset_vals) nb_planes = 30 bounds = get_bounds(med_reader) -for i in xrange(nb_planes, 1, -1): +for i in range(nb_planes, 1, -1): x = math.pi / 2.0 * (nb_planes - i) / nb_planes y = math.pi / 2.0 * (nb_planes - i) / nb_planes normal = get_normal_by_orientation(orient, x, y) @@ -145,7 +145,7 @@ for i in xrange(nb_planes, 1, -1): nb_planes = 10 normal = [0, 1, 0] slice_filter.SliceType.Normal = normal -for i in xrange(1, nb_planes): +for i in range(1, nb_planes): pos = get_positions(i, normal, bounds, displacement) slice_filter.SliceOffsetValues = pos pvsimple.Render(view) @@ -153,12 +153,12 @@ for i in xrange(1, nb_planes): slice_filter.SliceType.Normal = [0, 0, 1] slice_filter.UpdatePipeline() -print "pvsimple.ResetCamera(view)" +print("pvsimple.ResetCamera(view)") pvsimple.ResetCamera(view) sleep(DELAY) # Destroy the view -print "Destroy the view with Cut Planes" +print("Destroy the view with Cut Planes") delete_pv_object(view) @@ -172,17 +172,17 @@ pvsimple.Render(view) sleep(DELAY) isosurf = IsoSurfacesOnField(med_reader, entity, field_name, timestamp) -print "IsoSurfacesOnField(...)" +print("IsoSurfacesOnField(...)") display_only(isosurf, view) pvsimple.ResetCamera(view) -print "display_only(isosurf, view)" +print("display_only(isosurf, view)") sleep(DELAY) contour = isosurf.Input nb_surfaces = len(contour.Isosurfaces) nb_surfaces = 32 scalar_range = get_data_range(med_reader, entity, field_name, cut_off=True) -for i in xrange(2, nb_surfaces): +for i in range(2, nb_surfaces): contours = get_contours(scalar_range, i) contour.Isosurfaces = contours pvsimple.Render(view) @@ -190,12 +190,12 @@ for i in xrange(2, nb_surfaces): contour.Isosurfaces = get_contours(scalar_range, 10) contour.UpdatePipeline() -print "pvsimple.ResetCamera(view)" +print("pvsimple.ResetCamera(view)") pvsimple.ResetCamera(view) sleep(DELAY) # Destroy the view -print "Destroy the view with Iso Surfaces" +print("Destroy the view with Iso Surfaces") delete_pv_object(view) @@ -212,14 +212,14 @@ cutlines, curves = CutLinesOnField(med_reader, entity, field_name, timestamp, orientation1=Orientation.ZX, orientation2=Orientation.YZ, generate_curves=True) -print "CutLinesOnField(...)" +print("CutLinesOnField(...)") display_only(cutlines, view) pvsimple.ResetCamera(view) -print "display_only(cutlines, view)" +print("display_only(cutlines, view)") sleep(DELAY) xy_view = pvsimple.CreateXYPlotView() -print "pvsimple.CreateXYPlotView()" +print("pvsimple.CreateXYPlotView()") index = 0 for curve in curves: xyrep = pvsimple.Show(curve, xy_view) @@ -256,8 +256,8 @@ pvsimple.OpenDataFile(med_file) med_reader = pvsimple.GetActiveSource() isosurf = IsoSurfacesOnField(med_reader, entity, field_name, timestamp) -print "IsoSurfacesOnField(...)" +print("IsoSurfacesOnField(...)") pvsimple.ResetCamera(view) -print "Start Animation" +print("Start Animation") pvsimple.AnimateReader(med_reader, view) diff --git a/test/VisuPrs/SWIG_scripts/A7.py b/test/VisuPrs/SWIG_scripts/A7.py index e834b06d..7a2b14e6 100644 --- a/test/VisuPrs/SWIG_scripts/A7.py +++ b/test/VisuPrs/SWIG_scripts/A7.py @@ -30,21 +30,21 @@ reset_view(view) delay = 1 def after_set(error_string, prop_name, old_value, new_value): - print prop_name, ": old_value = ", old_value, "new_value = ", new_value + print(prop_name, ": old_value = ", old_value, "new_value = ", new_value) if error_string == "": time.sleep(delay) else: - print prop_name, " error = ", error_string + print(prop_name, " error = ", error_string) pass pass def change_representation(prs, repres, opacity, linew): if prs is None: - print "FAILED" + print("FAILED") return else: - print "OK" + print("OK") display_only(prs, view) view.ResetCamera() @@ -81,13 +81,13 @@ def change_representation(prs, repres, opacity, linew): after_set(err_str, "LineWidth", old_linew, linew) pass - print "" + print("") pass # ResOK_0000.med -print 'Import "ResOK_0000.med"...............', +print('Import "ResOK_0000.med"...............', end=' ') file_path = datadir + "ResOK_0000.med" field_name = 'vitesse' node_entity = EntityType.NODE @@ -96,34 +96,34 @@ pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Creating Scalar Map.......", +print("Creating Scalar Map.......", end=' ') scmap = ScalarMapOnField(med_reader, node_entity, field_name, 1) change_representation(scmap, 'Surface With Edges', 0.3, 5) -print "Creating Stream Lines.......", +print("Creating Stream Lines.......", end=' ') slines = StreamLinesOnField(med_reader, node_entity, field_name, 1) change_representation(slines, 'Wireframe', 0.5, 3) -print "Creating Vectors..........", +print("Creating Vectors..........", end=' ') vec = VectorsOnField(med_reader, node_entity, field_name, 1) change_representation(vec, 'Wireframe', 0.7, 2) -print "Creating Iso Surfaces.....", +print("Creating Iso Surfaces.....", end=' ') iso = IsoSurfacesOnField(med_reader, node_entity, field_name, 1) change_representation(iso, 'Surface', 0.4, 8) -print "Creating Cut Planes.......", +print("Creating Cut Planes.......", end=' ') clines = CutPlanesOnField(med_reader, node_entity, field_name, 1) change_representation(clines, 'Points', 0.6, 4) # fra.med -print 'Import "fra.med"...............', +print('Import "fra.med"...............', end=' ') file_path = datadir + "fra.med" field_name = 'VITESSE' @@ -132,37 +132,37 @@ pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Creating Scalar Map.......", +print("Creating Scalar Map.......", end=' ') scmap = ScalarMapOnField(med_reader, node_entity, field_name, 1) change_representation(scmap, 'Wireframe', 0.5, 3) -print "Creating Iso Surfaces.....", +print("Creating Iso Surfaces.....", end=' ') iso = IsoSurfacesOnField(med_reader, node_entity, field_name, 1) change_representation(iso, 'Wireframe', 0.5, 3) -print "Creating Cut Planes.......", +print("Creating Cut Planes.......", end=' ') cplanes = CutPlanesOnField(med_reader, node_entity, field_name, 1) change_representation(cplanes, 'Surface', 0.5, 3) -print "Creating Scalar Map On Deformed Shape.......", +print("Creating Scalar Map On Deformed Shape.......", end=' ') defmap = DeformedShapeAndScalarMapOnField(med_reader, node_entity, field_name, 1) change_representation(defmap, 'Surface', 0.5, 3) -print "Creating Deformed Shape.......", +print("Creating Deformed Shape.......", end=' ') defshape = DeformedShapeOnField(med_reader, node_entity, field_name, 1) defshape.ColorArrayName = field_name change_representation(defshape, 'Wireframe', 0.5, 3) -print "Creating Cut Lines.......", +print("Creating Cut Lines.......", end=' ') clines = CutLinesOnField(med_reader, node_entity, field_name, 1) change_representation(clines, 'Wireframe', 0.5, 3) -print "Creating Plot 3D.......", +print("Creating Plot 3D.......", end=' ') plot3d = Plot3DOnField(med_reader, node_entity, field_name, 1) change_representation(plot3d, 'Surface', 0.5, 3) change_representation(plot3d, 'Outline', 0.8, 2) diff --git a/test/VisuPrs/SWIG_scripts/A9.py b/test/VisuPrs/SWIG_scripts/A9.py index 38693b98..a6a5716f 100644 --- a/test/VisuPrs/SWIG_scripts/A9.py +++ b/test/VisuPrs/SWIG_scripts/A9.py @@ -80,11 +80,11 @@ scalarmap = ScalarMapOnField(med_reader, entity, field_name, timestamp) pvs.Show(scalarmap.Input) # Set view properties -print "view.CameraFocalPoint = [0, 0, 0]" +print("view.CameraFocalPoint = [0, 0, 0]") view.CameraFocalPoint = [0, 0, 0] -print "view.CameraParallelScale = 2" +print("view.CameraParallelScale = 2") view.CameraParallelScale = 2 -print "pvs.ResetCamera(view)" +print("pvs.ResetCamera(view)") pvs.ResetCamera(view) # Play with scalar bar @@ -97,7 +97,7 @@ delta = (range_max - range_min) / 2.0 nb_colors = lt.NumberOfTableValues nb_colors = 64 lt.Discretize = 1 -for i in xrange(2, nb_colors): +for i in range(2, nb_colors): lt.NumberOfTableValues = nb_colors x = range_min + delta * i / nb_colors y = range_max - delta * i / nb_colors @@ -109,7 +109,7 @@ for i in xrange(2, nb_colors): lt.RGBPoints[0] = range_min lt.RGBPoints[4] = range_max -print "pvs.ResetCamera(view)" +print("pvs.ResetCamera(view)") pvs.ResetCamera(view) # Create another view for cut planes @@ -125,14 +125,14 @@ orient = Orientation.YZ cutplanes = CutPlanesOnField(med_reader, entity, field_name, timestamp, orientation=orient, displacement=displacement) -print "CutPlanesOnField(...)" +print("CutPlanesOnField(...)") display_only(cutplanes, view) -print "display_only(cutplanes, view)" +print("display_only(cutplanes, view)") cam_pos = view.CameraPosition cam_pos[0] = cam_pos[0] + 10 -print "Set view.CameraPosition" +print("Set view.CameraPosition") cutplanes.Scale[0] = 3 cutplanes.Scale[1] = 10 pvs.Render(view) @@ -145,7 +145,7 @@ offset_vals = slice_filter.SliceOffsetValues nb_planes = len(offset_vals) nb_planes = 30 bounds = get_bounds(med_reader) -for i in xrange(nb_planes, 1, -1): +for i in range(nb_planes, 1, -1): x = math.pi / 2.0 * (nb_planes - i) / nb_planes y = math.pi / 2.0 * (nb_planes - i) / nb_planes normal = get_normal_by_orientation(orient, x, y) @@ -158,7 +158,7 @@ for i in xrange(nb_planes, 1, -1): nb_planes = 10 normal = [0, 1, 0] slice_filter.SliceType.Normal = normal -for i in xrange(1, nb_planes): +for i in range(1, nb_planes): pos = get_positions(i, normal, bounds, displacement) slice_filter.SliceOffsetValues = pos pvs.Render(view) @@ -166,7 +166,7 @@ for i in xrange(1, nb_planes): slice_filter.SliceType.Normal = [0, 0, 1] slice_filter.UpdatePipeline() -print "pvs.ResetCamera(view)" +print("pvs.ResetCamera(view)") pvs.ResetCamera(view) # Create one more view for iso surfaces @@ -181,14 +181,14 @@ sleep(DELAY) isosurf = IsoSurfacesOnField(med_reader, entity, field_name, timestamp) display_only(isosurf, view) pvs.ResetCamera(view) -print "display_only(isosurf, view)" +print("display_only(isosurf, view)") sleep(DELAY) contour = isosurf.Input nb_surfaces = len(contour.Isosurfaces) nb_surfaces = 32 scalar_range = get_data_range(med_reader, entity, field_name, cut_off=True) -for i in xrange(2, nb_surfaces): +for i in range(2, nb_surfaces): contours = get_contours(scalar_range, i) contour.Isosurfaces = contours pvs.Render(view) @@ -196,7 +196,7 @@ for i in xrange(2, nb_surfaces): contour.Isosurfaces = get_contours(scalar_range, 10) contour.UpdatePipeline() -print "pvs.ResetCamera(view)" +print("pvs.ResetCamera(view)") pvs.ResetCamera(view) # Create one more view for cut lines @@ -212,14 +212,14 @@ cutlines, curves = CutLinesOnField(med_reader, entity, field_name, timestamp, orientation1=Orientation.ZX, orientation2=Orientation.YZ, generate_curves=True) -print "CutLinesOnField(...)" +print("CutLinesOnField(...)") display_only(cutlines, view) pvs.ResetCamera(view) -print "display_only(cutlines, view)" +print("display_only(cutlines, view)") sleep(DELAY) xy_view = pvs.CreateXYPlotView() -print "pvs.CreateXYPlotView()" +print("pvs.CreateXYPlotView()") index = 0 for curve in curves: xyrep = pvs.Show(curve, xy_view) @@ -251,10 +251,10 @@ point1 = [0.0, -1.0, 2.5] point2 = [0.0, 1.0, 2.5] cutsegment = CutSegmentOnField(med_reader, entity, field_name, timestamp, point1, point2) -print "CutSegmentOnField(...)" +print("CutSegmentOnField(...)") display_only(cutsegment, view) pvs.ResetCamera(view) -print "display_only(cutsegment, view)" +print("display_only(cutsegment, view)") sleep(DELAY) xy_view = pvs.CreateXYPlotView() @@ -282,5 +282,5 @@ med_reader = pvs.MEDReader(FileName=med_file) isosurf = IsoSurfacesOnField(med_reader, entity, field_name, timestamp) pvs.ResetCamera(view) -print "Start Animation" +print("Start Animation") pvs.AnimateReader(med_reader, view) diff --git a/test/VisuPrs/SWIG_scripts/B1.py b/test/VisuPrs/SWIG_scripts/B1.py index 6a922731..f7a47d33 100644 --- a/test/VisuPrs/SWIG_scripts/B1.py +++ b/test/VisuPrs/SWIG_scripts/B1.py @@ -57,15 +57,15 @@ med_reader = pvsimple.GetActiveSource() # Create scalar map scalarmap = ScalarMapOnField(med_reader, entity, field_name, timestamp) -print "ScalarMapOnField(...)" +print("ScalarMapOnField(...)") pvsimple.Show(scalarmap.Input) # Set view properties -print "view.CameraFocalPoint = [0, 0, 0]" +print("view.CameraFocalPoint = [0, 0, 0]") view.CameraFocalPoint = [0, 0, 0] -print "view.CameraParallelScale = 2" +print("view.CameraParallelScale = 2") view.CameraParallelScale = 2 -print "pvsimple.ResetCamera(view)" +print("pvsimple.ResetCamera(view)") pvsimple.ResetCamera(view) # Play with scalar bar @@ -78,7 +78,7 @@ delta = (range_max - range_min) / 2.0 nb_colors = lt.NumberOfTableValues nb_colors = 64 lt.Discretize = 1 -for i in xrange(2, nb_colors): +for i in range(2, nb_colors): lt.NumberOfTableValues = nb_colors x = range_min + delta * i / nb_colors y = range_max - delta * i / nb_colors @@ -90,12 +90,12 @@ for i in xrange(2, nb_colors): lt.RGBPoints[0] = range_min lt.RGBPoints[4] = range_max -print "pvsimple.ResetCamera(view)" +print("pvsimple.ResetCamera(view)") pvsimple.Render(view) sleep(DELAY) # Destroy the view -print "Destroy the view with Scalar Map" +print("Destroy the view with Scalar Map") delete_pv_object(view) @@ -112,14 +112,14 @@ orient = Orientation.YZ cutplanes = CutPlanesOnField(med_reader, entity, field_name, timestamp, orientation=orient, displacement=displacement) -print "CutPlanesOnField(...)" +print("CutPlanesOnField(...)") display_only(cutplanes, view) -print "display_only(cutplanes, view)" +print("display_only(cutplanes, view)") cam_pos = view.CameraPosition cam_pos[0] = cam_pos[0] + 10 -print "Set view.CameraPosition" +print("Set view.CameraPosition") cutplanes.Scale[0] = 3 cutplanes.Scale[1] = 10 pvsimple.Render(view) @@ -132,7 +132,7 @@ offset_vals = slice_filter.SliceOffsetValues nb_planes = len(offset_vals) nb_planes = 30 bounds = get_bounds(med_reader) -for i in xrange(nb_planes, 1, -1): +for i in range(nb_planes, 1, -1): x = math.pi / 2.0 * (nb_planes - i) / nb_planes y = math.pi / 2.0 * (nb_planes - i) / nb_planes normal = get_normal_by_orientation(orient, x, y) @@ -145,7 +145,7 @@ for i in xrange(nb_planes, 1, -1): nb_planes = 10 normal = [0, 1, 0] slice_filter.SliceType.Normal = normal -for i in xrange(1, nb_planes): +for i in range(1, nb_planes): pos = get_positions(i, normal, bounds, displacement) slice_filter.SliceOffsetValues = pos pvsimple.Render(view) @@ -153,12 +153,12 @@ for i in xrange(1, nb_planes): slice_filter.SliceType.Normal = [0, 0, 1] slice_filter.UpdatePipeline() -print "pvsimple.ResetCamera(view)" +print("pvsimple.ResetCamera(view)") pvsimple.ResetCamera(view) sleep(DELAY) # Destroy the view -print "Destroy the view with Cut Planes" +print("Destroy the view with Cut Planes") delete_pv_object(view) @@ -172,17 +172,17 @@ pvsimple.Render(view) sleep(DELAY) isosurf = IsoSurfacesOnField(med_reader, entity, field_name, timestamp) -print "IsoSurfacesOnField(...)" +print("IsoSurfacesOnField(...)") display_only(isosurf, view) pvsimple.ResetCamera(view) -print "display_only(isosurf, view)" +print("display_only(isosurf, view)") sleep(DELAY) contour = isosurf.Input nb_surfaces = len(contour.Isosurfaces) nb_surfaces = 32 scalar_range = get_data_range(med_reader, entity, field_name, cut_off=True) -for i in xrange(2, nb_surfaces): +for i in range(2, nb_surfaces): contours = get_contours(scalar_range, i) contour.Isosurfaces = contours pvsimple.Render(view) @@ -190,12 +190,12 @@ for i in xrange(2, nb_surfaces): contour.Isosurfaces = get_contours(scalar_range, 10) contour.UpdatePipeline() -print "pvsimple.ResetCamera(view)" +print("pvsimple.ResetCamera(view)") pvsimple.ResetCamera(view) sleep(DELAY) # Destroy the view -print "Destroy the view with Iso Surfaces" +print("Destroy the view with Iso Surfaces") delete_pv_object(view) @@ -212,14 +212,14 @@ cutlines, curves = CutLinesOnField(med_reader, entity, field_name, timestamp, orientation1=Orientation.ZX, orientation2=Orientation.YZ, generate_curves=True) -print "CutLinesOnField(...)" +print("CutLinesOnField(...)") display_only(cutlines, view) pvsimple.ResetCamera(view) -print "display_only(cutlines, view)" +print("display_only(cutlines, view)") sleep(DELAY) xy_view = pvsimple.CreateXYPlotView() -print "pvsimple.CreateXYPlotView()" +print("pvsimple.CreateXYPlotView()") index = 0 for curve in curves: xyrep = pvsimple.Show(curve, xy_view) @@ -258,10 +258,10 @@ point2 = [0.0, 1.0, 2.5] cutsegment = CutSegmentOnField(med_reader, entity, field_name, timestamp, point1, point2) -print "CutSegmentOnField(...)" +print("CutSegmentOnField(...)") display_only(cutsegment, view) pvsimple.ResetCamera(view) -print "display_only(cutsegment, view)" +print("display_only(cutsegment, view)") sleep(DELAY) xy_view = pvsimple.CreateXYPlotView() @@ -288,8 +288,8 @@ pvsimple.OpenDataFile(med_file) med_reader = pvsimple.GetActiveSource() isosurf = IsoSurfacesOnField(med_reader, entity, field_name, timestamp) -print "IsoSurfacesOnField(...)" +print("IsoSurfacesOnField(...)") pvsimple.ResetCamera(view) -print "Start Animation" +print("Start Animation") pvsimple.AnimateReader(med_reader, view) diff --git a/test/VisuPrs/SWIG_scripts/B4.py b/test/VisuPrs/SWIG_scripts/B4.py index 15173fc8..45f09620 100644 --- a/test/VisuPrs/SWIG_scripts/B4.py +++ b/test/VisuPrs/SWIG_scripts/B4.py @@ -33,7 +33,7 @@ pvsimple.OpenDataFile(med_file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - raise RuntimeError, "MED file was not imported successfully." + raise RuntimeError("MED file was not imported successfully.") # Create presentations try: @@ -51,12 +51,12 @@ try: mesh = MeshOnEntity(med_reader, mesh_name, entity) else: - print "We have no permission to rewrite medFile" + print("We have no permission to rewrite medFile") else: - print "We have no permission to read medFile, it will not be opened"; + print("We have no permission to read medFile, it will not be opened"); except: - print sys.exc_type - print sys.exc_value - print sys.exc_traceback + print(sys.exc_info()[0]) + print(sys.exc_info()[1]) + print(sys.exc_info()[2]) diff --git a/test/VisuPrs/SWIG_scripts/B5.py b/test/VisuPrs/SWIG_scripts/B5.py index c720eaf9..f7b8ccf1 100644 --- a/test/VisuPrs/SWIG_scripts/B5.py +++ b/test/VisuPrs/SWIG_scripts/B5.py @@ -28,15 +28,15 @@ import pvsimple DELAY = 2 # Step 1 -print 'Importing "pointe.med"...............', +print('Importing "pointe.med"...............', end=' ') file_path = datadir + "pointe.med" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") field_name = "fieldnodedouble" entity = EntityType.NODE @@ -45,36 +45,36 @@ timestamp = 1 # Step 2 view1 = pvsimple.GetRenderView() -print "view1 = pvsimple.GetRenderView()" +print("view1 = pvsimple.GetRenderView()") sleep(DELAY) delete_pv_object(view1) -print "delete_pv_object(view1)" +print("delete_pv_object(view1)") # Step 3 view2 = pvsimple.CreateRenderView() -print "view2 = pvsimple.CreateRenderView()" +print("view2 = pvsimple.CreateRenderView()") color = [0.0, 0.3, 1.0] view2.Background = color -print "view2.Background =", str(color) +print("view2.Background =", str(color)) pvsimple.Render(view2) scalarmap = ScalarMapOnField(med_reader, entity, field_name, timestamp) -print "ScalarMapOnField(...)" +print("ScalarMapOnField(...)") scalarmap.Visibility = 1 pvsimple.Render(view2) view2.CameraFocalPoint = [0, 0, 0] -print "view2.CameraFocalPoint = [0, 0, 0]" +print("view2.CameraFocalPoint = [0, 0, 0]") view2.CameraParallelScale = 2 -print "view2.CameraParallelScale = 2" +print("view2.CameraParallelScale = 2") pvsimple.Render(view2) view2.ResetCamera() -print "view2.ResetCamera()" +print("view2.ResetCamera()") pvsimple.Render(view2) sleep(DELAY) @@ -82,74 +82,74 @@ sleep(DELAY) # Step 4 view3 = pvsimple.CreateRenderView() -print "view3 = pvsimple.CreateRenderView()" +print("view3 = pvsimple.CreateRenderView()") color = [0.0, 0.7, 0.0] view3.Background = color -print "view3.Background = ", str(color) +print("view3.Background = ", str(color)) pvsimple.Render(view3) cutplanes = CutPlanesOnField(med_reader, entity, field_name, timestamp, orientation=Orientation.XY) -print "CutPlanesOnField(...)" +print("CutPlanesOnField(...)") display_only(cutplanes, view3) -print "display_only(cutplanes, view3)" +print("display_only(cutplanes, view3)") point = view3.CameraFocalPoint point[0] = point[0] + 10 view3.CameraFocalPoint = point -print "view3.CameraFocalPoint = ", str(point) +print("view3.CameraFocalPoint = ", str(point)) view3.ResetCamera() -print "view3.ResetCamera()" +print("view3.ResetCamera()") pvsimple.Render(view3) -print "pvsimple.Render(view3)" +print("pvsimple.Render(view3)") sleep(DELAY) # Step 5 view4 = pvsimple.CreateRenderView() -print "view4 = pvsimple.CreateRenderView()" +print("view4 = pvsimple.CreateRenderView()") color = [1.0, 0.7, 0.0] view4.Background = color -print "view5.Background = ", str(color) +print("view5.Background = ", str(color)) pvsimple.Render(view4) isosurfaces = IsoSurfacesOnField(med_reader, entity, field_name, timestamp) -print "isosurfaces = IsoSurfacesOnField(...)" +print("isosurfaces = IsoSurfacesOnField(...)") display_only(isosurfaces, view4) -print "display_only(isosurfaces, view4)" +print("display_only(isosurfaces, view4)") view4.ResetCamera() -print "view4.ResetCamera()" +print("view4.ResetCamera()") pvsimple.Render(view4) -print "pvsimple.Render(view4)" +print("pvsimple.Render(view4)") sleep(DELAY) # Step 6 view5 = pvsimple.CreateRenderView() -print "view5 = pvsimple.CreateRenderView()" +print("view5 = pvsimple.CreateRenderView()") color = [0.7, 0.7, 0.7] view5.Background = color -print "view5.Background =", str(color) +print("view5.Background =", str(color)) pvsimple.Render(view5) cutlines = CutLinesOnField(med_reader, entity, field_name, timestamp, orientation1=Orientation.ZX, orientation2=Orientation.YZ) -print "cutlines = CutLinesOnField(...)" +print("cutlines = CutLinesOnField(...)") display_only(cutlines, view5) -print "display_only(cutlines, view5)" +print("display_only(cutlines, view5)") pvsimple.ResetCamera(view5) -print "pvsimple.ResetCamera(view5)" +print("pvsimple.ResetCamera(view5)") sleep(DELAY) @@ -160,7 +160,7 @@ sinus_csv = pvsimple.CSVReader(FileName=file_path) sinus_csv.FieldDelimiterCharacters = ' ' view6 = pvsimple.CreateXYPlotView() -print "view6 = pvsimple.CreateXYPlotView()" +print("view6 = pvsimple.CreateXYPlotView()") xy_rep = pvsimple.Show(sinus_csv) xy_rep.AttributeType = 'Row Data' diff --git a/test/VisuPrs/SWIG_scripts/C6.py b/test/VisuPrs/SWIG_scripts/C6.py index 696a290b..4b0ade54 100644 --- a/test/VisuPrs/SWIG_scripts/C6.py +++ b/test/VisuPrs/SWIG_scripts/C6.py @@ -28,7 +28,7 @@ import pvsimple file_path = tablesdir + "tables_test.xls" table_reader = pvsimple.CSVReader(FileName=file_path) if table_reader is None: - print "FAILED to import tables from tables_test.xls file." + print("FAILED to import tables from tables_test.xls file.") # 2. Create curves viewer cur_view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/SWIG_scripts/C7.py b/test/VisuPrs/SWIG_scripts/C7.py index d45f0ca4..4b5b20cf 100755 --- a/test/VisuPrs/SWIG_scripts/C7.py +++ b/test/VisuPrs/SWIG_scripts/C7.py @@ -28,13 +28,13 @@ from presentations import * import pvsimple # Import table from file -print 'Import file with tables....', +print('Import file with tables....', end=' ') file_path = tablesdir + "table_test.xls" table_reader = pvsimple.TableReader(FileName=file_path) if table_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # Get default settings of the reader available_tables = table_reader.GetPropertyValue("AvailableTables") @@ -43,12 +43,12 @@ first_str_as_title = table_reader.FirstStringAsTitles delimiter = table_reader.ValueDelimiter table_nb = table_reader.TableNumber -print "Default reader settings:" -print "Available tables: ", available_tables -print "Detect Numeric Columns: ", is_detect_num -print "Interpret First String As Column Titles: ", first_str_as_title -print "Value Delimiter: '%s'" % delimiter -print "Table Number: ", table_nb +print("Default reader settings:") +print("Available tables: ", available_tables) +print("Detect Numeric Columns: ", is_detect_num) +print("Interpret First String As Column Titles: ", first_str_as_title) +print("Value Delimiter: '%s'" % delimiter) +print("Table Number: ", table_nb) # Create 3D representation of the table with the @@ -56,34 +56,34 @@ print "Table Number: ", table_nb # in Post-Pro this representation is known as "Pointmap3d" table_to_3d = pvsimple.TableTo3D(table_reader) -print 'Create "Table To 3D" filter....', +print('Create "Table To 3D" filter....', end=' ') if table_to_3d is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Default 'Table To 3D' filter settings:" -print "Scale Factor: ", table_to_3d.ScaleFactor -print "Use Optimus Scale: ", table_to_3d.UseOptimusScale -print "Presentation Type: ", table_to_3d.PresentationType -print "Number Of Contours: ", table_to_3d.NumberOfContours +print("Default 'Table To 3D' filter settings:") +print("Scale Factor: ", table_to_3d.ScaleFactor) +print("Use Optimus Scale: ", table_to_3d.UseOptimusScale) +print("Presentation Type: ", table_to_3d.PresentationType) +print("Number Of Contours: ", table_to_3d.NumberOfContours) # Show table 3D representation # Get 3D view -print 'Get 3D view...................', +print('Get 3D view...................', end=' ') view = pvsimple.GetRenderView() if view is None: - print "FAILED" + print("FAILED") else: reset_view(view) - print "OK" + print("OK") pointmap3d = pvsimple.GetRepresentation(table_to_3d) table_name = available_tables -if type(available_tables) == list: +if isinstance(available_tables, list): table_name = available_tables[table_nb] vector_mode = 'Magnitude' diff --git a/test/VisuPrs/ScalarMap/A0.py b/test/VisuPrs/ScalarMap/A0.py index bf5d33b7..912bd1b9 100755 --- a/test/VisuPrs/ScalarMap/A0.py +++ b/test/VisuPrs/ScalarMap/A0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/A0") file = datadir + "fra.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/A1.py b/test/VisuPrs/ScalarMap/A1.py index 670f2679..0cdecd44 100644 --- a/test/VisuPrs/ScalarMap/A1.py +++ b/test/VisuPrs/ScalarMap/A1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/A1") file = datadir + "hexa_28320_ELEM.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/A2.py b/test/VisuPrs/ScalarMap/A2.py index 7894d0a2..b598e49d 100755 --- a/test/VisuPrs/ScalarMap/A2.py +++ b/test/VisuPrs/ScalarMap/A2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/A2") file = datadir + "pointe.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/A3.py b/test/VisuPrs/ScalarMap/A3.py index 1bf9f6cb..9ffeebe4 100755 --- a/test/VisuPrs/ScalarMap/A3.py +++ b/test/VisuPrs/ScalarMap/A3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/A3") file = datadir + "Fields_group3D.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/A4.py b/test/VisuPrs/ScalarMap/A4.py index d160aef5..7524f9f7 100755 --- a/test/VisuPrs/ScalarMap/A4.py +++ b/test/VisuPrs/ScalarMap/A4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/A4") file = datadir + "Hexa8.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/A5.py b/test/VisuPrs/ScalarMap/A5.py index 2077b3ee..7e74e68c 100644 --- a/test/VisuPrs/ScalarMap/A5.py +++ b/test/VisuPrs/ScalarMap/A5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/A5") file = datadir + "Penta6.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/A6.py b/test/VisuPrs/ScalarMap/A6.py index e5b24286..9c285e5f 100755 --- a/test/VisuPrs/ScalarMap/A6.py +++ b/test/VisuPrs/ScalarMap/A6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/A6") file = datadir + "clo.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/A7.py b/test/VisuPrs/ScalarMap/A7.py index 76fc9feb..b5a9ee19 100644 --- a/test/VisuPrs/ScalarMap/A7.py +++ b/test/VisuPrs/ScalarMap/A7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/A7") file = datadir + "Tetra4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/A8.py b/test/VisuPrs/ScalarMap/A8.py index adf09d16..a40392c5 100644 --- a/test/VisuPrs/ScalarMap/A8.py +++ b/test/VisuPrs/ScalarMap/A8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/A8") file = datadir + "Tria3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/A9.py b/test/VisuPrs/ScalarMap/A9.py index 7d3b1979..7d561e77 100644 --- a/test/VisuPrs/ScalarMap/A9.py +++ b/test/VisuPrs/ScalarMap/A9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/A9") file = datadir + "Quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/B0.py b/test/VisuPrs/ScalarMap/B0.py index 57ab5598..c00ee570 100644 --- a/test/VisuPrs/ScalarMap/B0.py +++ b/test/VisuPrs/ScalarMap/B0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/B0") file = datadir + "carre_en_quad4_seg2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/B1.py b/test/VisuPrs/ScalarMap/B1.py index a8469a86..5cfce7a9 100644 --- a/test/VisuPrs/ScalarMap/B1.py +++ b/test/VisuPrs/ScalarMap/B1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/B1") file = datadir + "carre_en_quad4_seg2_fields.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/B2.py b/test/VisuPrs/ScalarMap/B2.py index 1a151bf2..e0108d15 100644 --- a/test/VisuPrs/ScalarMap/B2.py +++ b/test/VisuPrs/ScalarMap/B2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/B2") file = datadir + "cube_hexa8_quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/B3.py b/test/VisuPrs/ScalarMap/B3.py index 4378e7c3..02c8b16e 100644 --- a/test/VisuPrs/ScalarMap/B3.py +++ b/test/VisuPrs/ScalarMap/B3.py @@ -26,15 +26,15 @@ import pvsimple # 1. Import MED file -print 'Importing "fra.med"...', +print('Importing "fra.med"...', end=' ') file_path = datadir + "fra.med" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # 2. Create ScalarMap field_name = 'TAUX_DE_VIDE' @@ -43,89 +43,89 @@ myMeshName='LE VOLUME' scalarmap = presentations.ScalarMapOnField(med_reader, entity, field_name, 1) if scalarmap is None: - print "FAILED" + print("FAILED") # 3. Scalar mode lookup_table = scalarmap.LookupTable -print "Vector mode .....", lookup_table.VectorMode -print "Vector component .....", lookup_table.VectorComponent +print("Vector mode .....", lookup_table.VectorMode) +print("Vector component .....", lookup_table.VectorComponent) lookup_table.VectorMode = 'Component' lookup_table.VectorComponent = 0 scalarmap.LookupTable = lookup_table -print "Vector mode .....", scalarmap.LookupTable.VectorMode -print "Vector component .....", scalarmap.LookupTable.VectorComponent +print("Vector mode .....", scalarmap.LookupTable.VectorMode) +print("Vector component .....", scalarmap.LookupTable.VectorComponent) # 4. Scaling mode scalarmap.LookupTable.UseLogScale = 1 -print "Use logarithmic scaling ....", scalarmap.LookupTable.UseLogScale +print("Use logarithmic scaling ....", scalarmap.LookupTable.UseLogScale) scalarmap.LookupTable.UseLogScale = 0 -print "Use logarithmic scaling ....", scalarmap.LookupTable.UseLogScale +print("Use logarithmic scaling ....", scalarmap.LookupTable.UseLogScale) # 5. Scalar range -print "Set scalar range min=12 < max=120 ...", +print("Set scalar range min=12 < max=120 ...", end=' ') rmin = 12 rmax = 120 scalarmap.LookupTable.RGBPoints[0] = rmin scalarmap.LookupTable.RGBPoints[4] = rmax -print "min = ", scalarmap.LookupTable.RGBPoints[0]," : max = ",scalarmap.LookupTable.RGBPoints[4] +print("min = ", scalarmap.LookupTable.RGBPoints[0]," : max = ",scalarmap.LookupTable.RGBPoints[4]) -print "Set scalar range min=max=12 ...", +print("Set scalar range min=max=12 ...", end=' ') rmin = 120 rmax = rmin scalarmap.LookupTable.RGBPoints[0] = rmin scalarmap.LookupTable.RGBPoints[4] = rmax -print "min = ", scalarmap.LookupTable.RGBPoints[0]," : max = ",scalarmap.LookupTable.RGBPoints[4] +print("min = ", scalarmap.LookupTable.RGBPoints[0]," : max = ",scalarmap.LookupTable.RGBPoints[4]) -print "Set scalar range min=120 > max=15 ...", +print("Set scalar range min=120 > max=15 ...", end=' ') rmin = 120 rmax = 15 scalarmap.LookupTable.RGBPoints[0] = rmin scalarmap.LookupTable.RGBPoints[4] = rmax -print "min = ", scalarmap.LookupTable.RGBPoints[0]," : max = ",scalarmap.LookupTable.RGBPoints[4] +print("min = ", scalarmap.LookupTable.RGBPoints[0]," : max = ",scalarmap.LookupTable.RGBPoints[4]) # 6. Bar orientation bar = presentations.get_bar() -print "Set bar orientation = 'Horizontal'" +print("Set bar orientation = 'Horizontal'") bar.Orientation = 'Horizontal' -print "Bar orientation ....", bar.Orientation +print("Bar orientation ....", bar.Orientation) -print "Set bar orientation = 'Vertical'" +print("Set bar orientation = 'Vertical'") bar.Orientation = 'Vertical' -print "Bar orientation ....", bar.Orientation +print("Bar orientation ....", bar.Orientation) # 7. Position of scalar bar -print "Default position ....", bar.Position +print("Default position ....", bar.Position) -print "Set left down corner position" +print("Set left down corner position") bar.Position = [0, 0] -print "Position =", bar.Position +print("Position =", bar.Position) -print "Set position outside of the screen" +print("Set position outside of the screen") bar.Position = [-1, -1] -print "Position =", bar.Position +print("Position =", bar.Position) # 8. Size of scalar bar -print "Default Height=", bar.Position2[1]," : Width=", bar.Position2[0] +print("Default Height=", bar.Position2[1]," : Width=", bar.Position2[0]) -print "Set positive Height and Width" +print("Set positive Height and Width") h = 0.4 w = 0.2 bar.Position2 = [w, h] -print "Size =", bar.Position2 +print("Size =", bar.Position2) -print "Set negative Height and Width" +print("Set negative Height and Width") h = -0.4 w = -0.2 bar.Position2 = [w, h] -print "Size =", bar.Position2 +print("Size =", bar.Position2) # 9. Number of colors -print "Default number of colors = ", scalarmap.LookupTable.NumberOfTableValues +print("Default number of colors = ", scalarmap.LookupTable.NumberOfTableValues) scalarmap.LookupTable.Discretize = 1 @@ -134,43 +134,43 @@ scalarmap.LookupTable.Discretize = 1 #scalarmap.LookupTable.NumberOfTableValues = nb_colors #print "Number of colors =", scalarmap.LookupTable.NumberOfTableValues -print "Set zero number of colors" +print("Set zero number of colors") nb_colors = 0 scalarmap.LookupTable.NumberOfTableValues = nb_colors -print "Number of colors =", scalarmap.LookupTable.NumberOfTableValues +print("Number of colors =", scalarmap.LookupTable.NumberOfTableValues) -print "Set positive number of colors" +print("Set positive number of colors") nb_colors = 256 scalarmap.LookupTable.NumberOfTableValues = nb_colors -print "Number of colors =", scalarmap.LookupTable.NumberOfTableValues +print("Number of colors =", scalarmap.LookupTable.NumberOfTableValues) # 10. Number of labels -print "Default number of labels = ", bar.NumberOfLabels +print("Default number of labels = ", bar.NumberOfLabels) -print "Set negative number of labels" +print("Set negative number of labels") nb_labels = -10 bar.NumberOfLabels = nb_labels -print "Number of labels=", bar.NumberOfLabels +print("Number of labels=", bar.NumberOfLabels) -print "Set zero number of labels" +print("Set zero number of labels") nb_labels = 0 bar.NumberOfLabels = nb_labels -print "Number of labels=", bar.NumberOfLabels +print("Number of labels=", bar.NumberOfLabels) -print "Set positive number of labels" +print("Set positive number of labels") nb_labels = 10 bar.NumberOfLabels = nb_labels -print "Number of labels=", bar.NumberOfLabels +print("Number of labels=", bar.NumberOfLabels) # 11. Scalar bar title -print 'Default Title ="', bar.Title, '"' +print('Default Title ="', bar.Title, '"') -print "Set not null title" +print("Set not null title") title = "Scalar Bar Title" bar.Title = title -print ' Title ="', bar.Title, '"' +print(' Title ="', bar.Title, '"') -print "Set title from spaces" +print("Set title from spaces") title=' ' bar.Title = title -print ' Title ="', bar.Title, '"' +print(' Title ="', bar.Title, '"') diff --git a/test/VisuPrs/ScalarMap/E0.py b/test/VisuPrs/ScalarMap/E0.py index 2c85cfb7..7861715d 100644 --- a/test/VisuPrs/ScalarMap/E0.py +++ b/test/VisuPrs/ScalarMap/E0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/E0") file = datadir + "test_55_solid_concentr_dom.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/E1.py b/test/VisuPrs/ScalarMap/E1.py index 117151e1..a611bd59 100644 --- a/test/VisuPrs/ScalarMap/E1.py +++ b/test/VisuPrs/ScalarMap/E1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/E1") file = datadir + "H_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/E2.py b/test/VisuPrs/ScalarMap/E2.py index 690bac58..e4d95486 100644 --- a/test/VisuPrs/ScalarMap/E2.py +++ b/test/VisuPrs/ScalarMap/E2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/E3.py b/test/VisuPrs/ScalarMap/E3.py index 39a2c522..159c103d 100755 --- a/test/VisuPrs/ScalarMap/E3.py +++ b/test/VisuPrs/ScalarMap/E3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/E3") file = datadir + "hydro_d10.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/E4.py b/test/VisuPrs/ScalarMap/E4.py index 30ff7692..e220ab07 100644 --- a/test/VisuPrs/ScalarMap/E4.py +++ b/test/VisuPrs/ScalarMap/E4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/E4") file = datadir + "champc.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/E5.py b/test/VisuPrs/ScalarMap/E5.py index a1a08352..f555d44d 100644 --- a/test/VisuPrs/ScalarMap/E5.py +++ b/test/VisuPrs/ScalarMap/E5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/E5") file = datadir + "hydro_sea_alv.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/E6.py b/test/VisuPrs/ScalarMap/E6.py index 68be4817..85cb8053 100644 --- a/test/VisuPrs/ScalarMap/E6.py +++ b/test/VisuPrs/ScalarMap/E6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/E6") file = datadir + "toto.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/E7.py b/test/VisuPrs/ScalarMap/E7.py index f0191ef8..3ea5c7d1 100644 --- a/test/VisuPrs/ScalarMap/E7.py +++ b/test/VisuPrs/ScalarMap/E7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/E7") file = datadir + "couplex_alain.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/E8.py b/test/VisuPrs/ScalarMap/E8.py index 2ad77187..486aadd3 100644 --- a/test/VisuPrs/ScalarMap/E8.py +++ b/test/VisuPrs/ScalarMap/E8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/E8") file = datadir + "KCOUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/E9.py b/test/VisuPrs/ScalarMap/E9.py index c4b8e90e..5927cb8c 100644 --- a/test/VisuPrs/ScalarMap/E9.py +++ b/test/VisuPrs/ScalarMap/E9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/E9") file = datadir + "test_hydro.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/F1.py b/test/VisuPrs/ScalarMap/F1.py index 833816c9..a2447701 100644 --- a/test/VisuPrs/ScalarMap/F1.py +++ b/test/VisuPrs/ScalarMap/F1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/F1") file = datadir + "ml.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/F2.py b/test/VisuPrs/ScalarMap/F2.py index eca1130f..f09e16c9 100644 --- a/test/VisuPrs/ScalarMap/F2.py +++ b/test/VisuPrs/ScalarMap/F2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/F2") file = datadir + "T_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/F3.py b/test/VisuPrs/ScalarMap/F3.py index 78c6cf35..e10537a6 100644 --- a/test/VisuPrs/ScalarMap/F3.py +++ b/test/VisuPrs/ScalarMap/F3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/F3") file = datadir + "test_hydro_darcy4_out.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/F4.py b/test/VisuPrs/ScalarMap/F4.py index c082864d..c307282d 100644 --- a/test/VisuPrs/ScalarMap/F4.py +++ b/test/VisuPrs/ScalarMap/F4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/F4") file = datadir + "UO2_250ans.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/F5.py b/test/VisuPrs/ScalarMap/F5.py index 5e2cbd87..9a17e95b 100644 --- a/test/VisuPrs/ScalarMap/F5.py +++ b/test/VisuPrs/ScalarMap/F5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/F5") file = datadir + "maill.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/F6.py b/test/VisuPrs/ScalarMap/F6.py index e1b5fb21..98101045 100644 --- a/test/VisuPrs/ScalarMap/F6.py +++ b/test/VisuPrs/ScalarMap/F6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/F6") file = datadir + "maill.0.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/F8.py b/test/VisuPrs/ScalarMap/F8.py index e181da31..df8be398 100644 --- a/test/VisuPrs/ScalarMap/F8.py +++ b/test/VisuPrs/ScalarMap/F8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/F8") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/F9.py b/test/VisuPrs/ScalarMap/F9.py index abb29fc9..fb1c07b0 100644 --- a/test/VisuPrs/ScalarMap/F9.py +++ b/test/VisuPrs/ScalarMap/F9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/F9") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/G0.py b/test/VisuPrs/ScalarMap/G0.py index 2da6a775..bec65bfb 100644 --- a/test/VisuPrs/ScalarMap/G0.py +++ b/test/VisuPrs/ScalarMap/G0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/G0") file = datadir + "homard_ASTER_OSF_MEDV2.1.5_1_v2.3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/G1.py b/test/VisuPrs/ScalarMap/G1.py index 67059e7d..93b6a493 100644 --- a/test/VisuPrs/ScalarMap/G1.py +++ b/test/VisuPrs/ScalarMap/G1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap/G1") file = datadir + "maill.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.SCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap/G2.py b/test/VisuPrs/ScalarMap/G2.py index 2f4ea4df..036d25c2 100644 --- a/test/VisuPrs/ScalarMap/G2.py +++ b/test/VisuPrs/ScalarMap/G2.py @@ -29,17 +29,17 @@ from presentations import ScalarMapOnField, hide_all, EntityType, PrsTypeEnum,re picturedir = get_picture_dir("ScalarMap/G2") theFileName = datadir + "Bug829_resu_mode.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") """Build presentations of the given types for all fields of the given file.""" #print "Import %s..." % theFileName.split('/')[-1], result = OpenDataFile(theFileName) proxy = GetActiveSource() if proxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") # Get view aView = GetRenderView() @@ -53,7 +53,7 @@ for i in range(1,11): hide_all(aView, True) aPrs = ScalarMapOnField(proxy, aFieldEntity,aFieldName , i) if aPrs is None: - raise RuntimeError, "Presentation is None!!!" + raise RuntimeError("Presentation is None!!!") #display only current scalar map aPrs.Visibility=1 reset_view(aView) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A0.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A0.py index fd51e801..f34e3f67 100644 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A0.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A0") file = datadir + "fra.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A1.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A1.py index 53a1b666..b7120d16 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A1.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A1") file = datadir + "hexa_28320_ELEM.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A2.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A2.py index 71841f3d..126a9038 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A2.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A2") file = datadir + "pointe.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A3.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A3.py index 37478318..576983d2 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A3.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A3") file = datadir + "Fields_group3D.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A4.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A4.py index f45d6973..0a60f017 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A4.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A4") file = datadir + "Hexa8.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A5.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A5.py index 67da052f..e05e8b5e 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A5.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A5") file = datadir + "Penta6.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A6.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A6.py index e1495c8b..e863418e 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A6.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A6") file = datadir + "clo.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A7.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A7.py index 8bf7db48..007b986a 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A7.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A7") file = datadir + "Tetra4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A8.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A8.py index b791dd56..37114cfb 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A8.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A8") file = datadir + "Tria3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/A9.py b/test/VisuPrs/ScalarMap_On_DeformedShape/A9.py index 06214f19..619ac545 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/A9.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/A9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/A9") file = datadir + "Quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/B0.py b/test/VisuPrs/ScalarMap_On_DeformedShape/B0.py index 1de45d78..4cff8cce 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/B0.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/B0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/B0") file = datadir + "carre_en_quad4_seg2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/B1.py b/test/VisuPrs/ScalarMap_On_DeformedShape/B1.py index d607e8de..f71a5a0d 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/B1.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/B1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/B1") file = datadir + "carre_en_quad4_seg2_fields.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/B2.py b/test/VisuPrs/ScalarMap_On_DeformedShape/B2.py index a75f4d33..a09bb531 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/B2.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/B2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/B2") file = datadir + "cube_hexa8_quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/B3.py b/test/VisuPrs/ScalarMap_On_DeformedShape/B3.py index 17e7de0e..05d205b7 100644 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/B3.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/B3.py @@ -24,15 +24,15 @@ from presentations import * import pvsimple #====================Stage1: Import MED file========================= -print 'Importing "fra.med"...................', +print('Importing "fra.med"...................', end=' ') medFile = datadir + "fra.med" pvsimple.OpenDataFile(medFile) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") view = pvsimple.GetRenderView() reset_view(view) @@ -42,16 +42,16 @@ field_name = "VITESSE" node_entity = EntityType.NODE timestamp = 1 -print "Creating Scalar Map On Deformed Shape...................", +print("Creating Scalar Map On Deformed Shape...................", end=' ') smondefshape1 = DeformedShapeAndScalarMapOnField(med_reader, node_entity, field_name, 1) if smondefshape1 is None: - print "FAILED" + print("FAILED") else: display_only(smondefshape1, view) pvsimple.ResetCamera(view) - print "OK" + print("OK") #=============Stage3: Create with 'Y' vector mode======================== hide_all(view) @@ -60,113 +60,113 @@ smondefshape2 = DeformedShapeAndScalarMapOnField(med_reader, field_name, 1, vector_mode='Y') -print "Creating Scalar Map On Deformed Shape with 'Y' scalar mode.....", +print("Creating Scalar Map On Deformed Shape with 'Y' scalar mode.....", end=' ') if smondefshape2 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") #=============Stage4: scaling of Scalar Map On Deformed Shape============ bar = get_bar() lt = bar.LookupTable -print "Changing scaling mode:" +print("Changing scaling mode:") lt.UseLogScale = 0 -print "Log scaling ....", lt.UseLogScale +print("Log scaling ....", lt.UseLogScale) pvsimple.Render(view) lt.UseLogScale = 1 -print "Log scaling ....", lt.UseLogScale +print("Log scaling ....", lt.UseLogScale) pvsimple.Render() #=============Stage5: range of Scalar Map On Deformed Shape============== -print "Changing scalar range:" +print("Changing scalar range:") range_min = 12 range_max = 120 lt.RGBPoints[0] = range_min lt.RGBPoints[4] = range_max -print "min = " + str(lt.RGBPoints[0]) + "; max = " + str(lt.RGBPoints[4]) +print("min = " + str(lt.RGBPoints[0]) + "; max = " + str(lt.RGBPoints[4])) pvsimple.Render(view) range_min = 120 range_max = 120 lt.RGBPoints[0] = range_min lt.RGBPoints[4] = range_max -print "min = " + str(lt.RGBPoints[0]) + "; max = " + str(lt.RGBPoints[4]) +print("min = " + str(lt.RGBPoints[0]) + "; max = " + str(lt.RGBPoints[4])) pvsimple.Render(view) range_min = 120 range_max = 15 lt.RGBPoints[0] = range_min lt.RGBPoints[4] = range_max -print "min = " + str(lt.RGBPoints[0]) + "; max = " + str(lt.RGBPoints[4]) +print("min = " + str(lt.RGBPoints[0]) + "; max = " + str(lt.RGBPoints[4])) pvsimple.Render(view) #=============Stage6: bar orientation of Scalar Map On Deformed Shape== -print "Changing bar orientation:" -print "Default orientation: ", bar.Orientation +print("Changing bar orientation:") +print("Default orientation: ", bar.Orientation) -print "Set horizontal bar orientation" +print("Set horizontal bar orientation") bar.Orientation = 'Horizontal' -print "Bar orientation: ", bar.Orientation +print("Bar orientation: ", bar.Orientation) pvsimple.Render(view) -print "Set vertical bar orientation" +print("Set vertical bar orientation") bar.Orientation = 'Vertical' -print "Bar orientation: ", bar.Orientation +print("Bar orientation: ", bar.Orientation) pvsimple.Render(view) #=============Stage7: bar position of Scalar Map On Deformed Shape ==== -print "Changing bar position:" -print "Default position: ", bar.Position +print("Changing bar position:") +print("Default position: ", bar.Position) -print "Set position X,Y positive" +print("Set position X,Y positive") x_pos = 200 y_pos = 100 bar.Position = [x_pos, y_pos] -print "Bar position [X,Y]: ", bar.Position +print("Bar position [X,Y]: ", bar.Position) pvsimple.Render(view) -print "Set position X negative ,Y positive" +print("Set position X negative ,Y positive") x_pos = -100 y_pos = 150 bar.Position = [x_pos, y_pos] -print "Bar position [X,Y]: ", bar.Position +print("Bar position [X,Y]: ", bar.Position) pvsimple.Render(view) -print "Set position X positive, Y negative" +print("Set position X positive, Y negative") x_pos = 100 y_pos = -100 bar.Position = [x_pos, y_pos] -print "Bar position [X,Y]: ", bar.Position +print("Bar position [X,Y]: ", bar.Position) pvsimple.Render(view) -print "Set position X = 0.1, Y = 0.01" +print("Set position X = 0.1, Y = 0.01") x_pos = 0.1 y_pos = 0.01 bar.Position = [x_pos, y_pos] -print "Bar position [X,Y]: ", bar.Position +print("Bar position [X,Y]: ", bar.Position) pvsimple.Render(view) #============Stage8: bar size of Scalar Map On Deformed Shape=========== -print "Changing bar size:" -print "Default [width, height]: ", bar.Position2 +print("Changing bar size:") +print("Default [width, height]: ", bar.Position2) -print "Set height = height*1.2" +print("Set height = height*1.2") height = bar.Position2[1] * 1.2 bar.Position2[1] = height -print "Bar [width, height]: ", bar.Position2 +print("Bar [width, height]: ", bar.Position2) pvsimple.Render(view) -print "Set width = width*2" +print("Set width = width*2") width = bar.Position2[0] * 2 bar.Position2[0] = width -print "Bar [width, height]: ", bar.Position2 +print("Bar [width, height]: ", bar.Position2) pvsimple.Render(view) #=============Stage9: nb of colors of Scalar Map On Deformed Shape====== -print "Changing number of colors:" -print "Default number of colors: ", lt.NumberOfTableValues +print("Changing number of colors:") +print("Default number of colors: ", lt.NumberOfTableValues) lt.Discretize = 1 #print "Set negative number of colors" @@ -175,64 +175,64 @@ lt.Discretize = 1 #print "Number of colors: ", lt.NumberOfTableValues #pvsimple.Render(view) -print "Set zero number of colors" +print("Set zero number of colors") num = 0 lt.NumberOfTableValues = num -print "Number of colors: ", lt.NumberOfTableValues +print("Number of colors: ", lt.NumberOfTableValues) pvsimple.Render(view) -print "Set positive number of colors" +print("Set positive number of colors") num = 256 lt.NumberOfTableValues = num -print "Number of colors: ", lt.NumberOfTableValues +print("Number of colors: ", lt.NumberOfTableValues) pvsimple.Render(view) #=============Stage10: nb of labels of Scalar Map On Deformed Shape===== -print "Changing number of labels:" -print "Default number of labels: ", bar.NumberOfLabels +print("Changing number of labels:") +print("Default number of labels: ", bar.NumberOfLabels) -print "Set negative number of labels" +print("Set negative number of labels") num = -128 bar.NumberOfLabels = num -print "Number of labels: ", bar.NumberOfLabels +print("Number of labels: ", bar.NumberOfLabels) pvsimple.Render(view) -print "Set zero number of labels" +print("Set zero number of labels") num = 0 bar.NumberOfLabels = num -print "Number of labels: ", bar.NumberOfLabels +print("Number of labels: ", bar.NumberOfLabels) pvsimple.Render(view) -print "Set positive number of labels" +print("Set positive number of labels") num = 256 bar.NumberOfLabels = num -print "Number of labels: ", bar.NumberOfLabels +print("Number of labels: ", bar.NumberOfLabels) pvsimple.Render(view) #=============Stage11: bar title of Scalar Map On Deformed Shape========= -print "Changing bar title:" -print "Default bar title: ", bar.Title +print("Changing bar title:") +print("Default bar title: ", bar.Title) -print "Set not null title" +print("Set not null title") title = "Scalar Bar Title" bar.Title = title -print 'Bar title: "' + bar.Title + '"' +print('Bar title: "' + bar.Title + '"') pvsimple.Render(view) -print "Set title from spaces" +print("Set title from spaces") title = ' ' bar.Title = title -print 'Bar title: "' + bar.Title + '"' +print('Bar title: "' + bar.Title + '"') pvsimple.Render(view) #============Stage12: scale factor of ScalarMap On Deformed Shape ===== -print "Changing scale factor:" +print("Changing scale factor:") warp_vector = smondefshape2.Input -print 'Default scale: ', warp_vector.ScaleFactor +print('Default scale: ', warp_vector.ScaleFactor) scale = 0.8 warp_vector.ScaleFactor = scale warp_vector.UpdatePipeline() -print "Scale: ", warp_vector.ScaleFactor +print("Scale: ", warp_vector.ScaleFactor) pvsimple.Render(view) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E0.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E0.py index 3c65cf5b..31d34217 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E0.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E0") file = datadir + "test_55_solid_concentr_dom.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E1.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E1.py index 538ac45f..85d5d773 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E1.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E1") file = datadir + "H_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E2.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E2.py index 750693e6..68047727 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E2.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E3.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E3.py index 5be30f59..b90e9adf 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E3.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E3") file = datadir + "hydro_d10.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E4.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E4.py index 5eac3828..67dc261f 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E4.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E4") file = datadir + "champc.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E5.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E5.py index 0ffa0c14..10c76f3d 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E5.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E5") file = datadir + "hydro_sea_alv.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E6.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E6.py index 33e0339c..ab35d5e9 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E6.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E6") file = datadir + "toto.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E7.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E7.py index 36313327..c7879cc3 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E7.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E7") file = datadir + "couplex_alain.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E8.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E8.py index 8649e22c..da3fde31 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E8.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E8") file = datadir + "KCOUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/E9.py b/test/VisuPrs/ScalarMap_On_DeformedShape/E9.py index 14142529..a1b633b0 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/E9.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/E9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/E9") file = datadir + "test_hydro.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F1.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F1.py index 5b93fa06..85d4121c 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/F1.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/F1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/F1") file = datadir + "ml.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F2.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F2.py index 910a1a2f..5a0f2aa0 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/F2.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/F2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/F2") file = datadir + "T_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F3.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F3.py index f4835bff..34d76574 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/F3.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/F3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/F3") file = datadir + "test_hydro_darcy4_out.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F4.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F4.py index 15fb00e0..3b5f127f 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/F4.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/F4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/F4") file = datadir + "UO2_250ans.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F5.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F5.py index 6b1189fb..5a612dbb 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/F5.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/F5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/F5") file = datadir + "maill.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F6.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F6.py index 7644a12b..a30978a3 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/F6.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/F6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/F6") file = datadir + "maill.0.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/F8.py b/test/VisuPrs/ScalarMap_On_DeformedShape/F8.py index 4c05f42d..196712bd 100755 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/F8.py +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/F8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("ScalarMap_On_DeformedShape/F8") file = datadir + "maill.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.DEFORMEDSHAPESCALARMAP], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/A0.py b/test/VisuPrs/StreamLines/A0.py index b47748a3..456c1d51 100644 --- a/test/VisuPrs/StreamLines/A0.py +++ b/test/VisuPrs/StreamLines/A0.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/A0") file = datadir + "fra.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/A1.py b/test/VisuPrs/StreamLines/A1.py index d7830d49..82184052 100644 --- a/test/VisuPrs/StreamLines/A1.py +++ b/test/VisuPrs/StreamLines/A1.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/A1") file = datadir + "hexa_28320_ELEM.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/A2.py b/test/VisuPrs/StreamLines/A2.py index df81df62..ff087627 100644 --- a/test/VisuPrs/StreamLines/A2.py +++ b/test/VisuPrs/StreamLines/A2.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/A2") file = datadir + "pointe.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/A3.py b/test/VisuPrs/StreamLines/A3.py index e04bec9e..2455ae35 100644 --- a/test/VisuPrs/StreamLines/A3.py +++ b/test/VisuPrs/StreamLines/A3.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/A3") file = datadir + "Fields_group3D.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/A4.py b/test/VisuPrs/StreamLines/A4.py index bdc840f3..c3c40521 100644 --- a/test/VisuPrs/StreamLines/A4.py +++ b/test/VisuPrs/StreamLines/A4.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/A4") file = datadir + "Hexa8.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/A5.py b/test/VisuPrs/StreamLines/A5.py index 58eacdab..edc99b9c 100644 --- a/test/VisuPrs/StreamLines/A5.py +++ b/test/VisuPrs/StreamLines/A5.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/A5") file = datadir + "Penta6.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/A6.py b/test/VisuPrs/StreamLines/A6.py index 5042ac96..4f87f338 100644 --- a/test/VisuPrs/StreamLines/A6.py +++ b/test/VisuPrs/StreamLines/A6.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/A6") file = datadir + "clo.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/A7.py b/test/VisuPrs/StreamLines/A7.py index 03324cfd..0fce2539 100644 --- a/test/VisuPrs/StreamLines/A7.py +++ b/test/VisuPrs/StreamLines/A7.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/A7") file = datadir + "Tetra4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/A8.py b/test/VisuPrs/StreamLines/A8.py index 00ed4962..a0c241a2 100644 --- a/test/VisuPrs/StreamLines/A8.py +++ b/test/VisuPrs/StreamLines/A8.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/A8") file = datadir + "Tria3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/A9.py b/test/VisuPrs/StreamLines/A9.py index 4e989bcb..66d953b8 100644 --- a/test/VisuPrs/StreamLines/A9.py +++ b/test/VisuPrs/StreamLines/A9.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/A9") file = datadir + "Quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/B0.py b/test/VisuPrs/StreamLines/B0.py index 3e98b35d..24c9157a 100644 --- a/test/VisuPrs/StreamLines/B0.py +++ b/test/VisuPrs/StreamLines/B0.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/B0") file = datadir + "carre_en_quad4_seg2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/B1.py b/test/VisuPrs/StreamLines/B1.py index 40029e53..686b33f1 100644 --- a/test/VisuPrs/StreamLines/B1.py +++ b/test/VisuPrs/StreamLines/B1.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/B1") file = datadir + "carre_en_quad4_seg2_fields.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/B2.py b/test/VisuPrs/StreamLines/B2.py index c8910e56..7a9a17d9 100644 --- a/test/VisuPrs/StreamLines/B2.py +++ b/test/VisuPrs/StreamLines/B2.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/B2") file = datadir + "cube_hexa8_quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/B3.py b/test/VisuPrs/StreamLines/B3.py index a2338e3b..7a8bd1e7 100644 --- a/test/VisuPrs/StreamLines/B3.py +++ b/test/VisuPrs/StreamLines/B3.py @@ -33,8 +33,8 @@ files = ["fra", "TimeStamps", "pointe", "Fields_group3D", "Hexa8", "Penta6", "Qu for item in files: file = datadir + item + ".med" - print " --------------------------------- " - print "file ", file - print "\nCreatePrsForFile..." - print "BREAKPOINT_1" + print(" --------------------------------- ") + print("file ", file) + print("\nCreatePrsForFile...") + print("BREAKPOINT_1") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/B4.py b/test/VisuPrs/StreamLines/B4.py index f41944ab..e95002f1 100644 --- a/test/VisuPrs/StreamLines/B4.py +++ b/test/VisuPrs/StreamLines/B4.py @@ -25,39 +25,39 @@ from presentations import * import pvsimple # 1. Import MED file -print 'Import "ResOK_0000.med"...............', +print('Import "ResOK_0000.med"...............', end=' ') file_path = datadir + "ResOK_0000.med" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # 2. Creating StreamLines -print "Creating Stream Lines.....", +print("Creating Stream Lines.....", end=' ') streamlines = StreamLinesOnField(med_reader, EntityType.NODE, 'vitesse', 1) if streamlines is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # 3. StreamLines parameters stream_tracer = pvsimple.GetActiveSource() -print "Initial Step Length: ", stream_tracer.InitialStepLength -print "Integration Direction: ", stream_tracer.IntegrationDirection -print "Integration Step Unit: ", stream_tracer.IntegrationStepUnit -print "Integrator Type: ", stream_tracer.IntegratorType -print "Interpolator Type: ", stream_tracer.InterpolatorType -print "Maximum Error: ", stream_tracer.MaximumError -print "Minimum Step Length: ", stream_tracer.MinimumStepLength -print "Maximum Step Length: ", stream_tracer.MaximumStepLength -print "Maximum Steps: ", stream_tracer.MaximumSteps -print "Maximum Streamline Length: ", stream_tracer.MaximumStreamlineLength -print "Seed Type: ", type(stream_tracer.SeedType) -print "Point1: ", stream_tracer.SeedType.Point1 -print "Point2: ", stream_tracer.SeedType.Point2 +print("Initial Step Length: ", stream_tracer.InitialStepLength) +print("Integration Direction: ", stream_tracer.IntegrationDirection) +print("Integration Step Unit: ", stream_tracer.IntegrationStepUnit) +print("Integrator Type: ", stream_tracer.IntegratorType) +print("Interpolator Type: ", stream_tracer.InterpolatorType) +print("Maximum Error: ", stream_tracer.MaximumError) +print("Minimum Step Length: ", stream_tracer.MinimumStepLength) +print("Maximum Step Length: ", stream_tracer.MaximumStepLength) +print("Maximum Steps: ", stream_tracer.MaximumSteps) +print("Maximum Streamline Length: ", stream_tracer.MaximumStreamlineLength) +print("Seed Type: ", type(stream_tracer.SeedType)) +print("Point1: ", stream_tracer.SeedType.Point1) +print("Point2: ", stream_tracer.SeedType.Point2) # print "Center: ", stream_tracer.SeedType.Center # print "Number Of Points: ", stream_tracer.SeedType.NumberOfPoints # print "Radius: ", stream_tracer.SeedType.Radius diff --git a/test/VisuPrs/StreamLines/E0.py b/test/VisuPrs/StreamLines/E0.py index 237ee503..c075ff00 100644 --- a/test/VisuPrs/StreamLines/E0.py +++ b/test/VisuPrs/StreamLines/E0.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/E0") file = datadir + "test_55_solid_concentr_dom.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/E1.py b/test/VisuPrs/StreamLines/E1.py index 8605450f..18107dd8 100644 --- a/test/VisuPrs/StreamLines/E1.py +++ b/test/VisuPrs/StreamLines/E1.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/E1") file = datadir + "H_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/E2.py b/test/VisuPrs/StreamLines/E2.py index b45c0763..1c6d7a07 100644 --- a/test/VisuPrs/StreamLines/E2.py +++ b/test/VisuPrs/StreamLines/E2.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/E3.py b/test/VisuPrs/StreamLines/E3.py index ec04c7a7..ea0682d0 100644 --- a/test/VisuPrs/StreamLines/E3.py +++ b/test/VisuPrs/StreamLines/E3.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/E3") file = datadir + "hydro_d10.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/E4.py b/test/VisuPrs/StreamLines/E4.py index d1cdfff2..3fe6c65a 100644 --- a/test/VisuPrs/StreamLines/E4.py +++ b/test/VisuPrs/StreamLines/E4.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/E4") file = datadir + "champc.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/E5.py b/test/VisuPrs/StreamLines/E5.py index 67734415..00e2ce69 100644 --- a/test/VisuPrs/StreamLines/E5.py +++ b/test/VisuPrs/StreamLines/E5.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/E5") file = datadir + "hydro_sea_alv.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/E6.py b/test/VisuPrs/StreamLines/E6.py index d8756abe..0752fd01 100644 --- a/test/VisuPrs/StreamLines/E6.py +++ b/test/VisuPrs/StreamLines/E6.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/E6") file = datadir + "toto.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/E7.py b/test/VisuPrs/StreamLines/E7.py index 5924e19e..90163fe0 100644 --- a/test/VisuPrs/StreamLines/E7.py +++ b/test/VisuPrs/StreamLines/E7.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/E7") file = datadir + "couplex_alain.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/E8.py b/test/VisuPrs/StreamLines/E8.py index a88ca360..6fec0a45 100644 --- a/test/VisuPrs/StreamLines/E8.py +++ b/test/VisuPrs/StreamLines/E8.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/E8") file = datadir + "KCOUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/E9.py b/test/VisuPrs/StreamLines/E9.py index 3579b055..3811f4f3 100644 --- a/test/VisuPrs/StreamLines/E9.py +++ b/test/VisuPrs/StreamLines/E9.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/E9") file = datadir + "test_hydro.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/F1.py b/test/VisuPrs/StreamLines/F1.py index f2dc033d..ed9d8d01 100644 --- a/test/VisuPrs/StreamLines/F1.py +++ b/test/VisuPrs/StreamLines/F1.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/F1") file = datadir + "ml.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/F2.py b/test/VisuPrs/StreamLines/F2.py index 763b73cf..59cb8bf1 100644 --- a/test/VisuPrs/StreamLines/F2.py +++ b/test/VisuPrs/StreamLines/F2.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/F2") file = datadir + "T_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/F3.py b/test/VisuPrs/StreamLines/F3.py index 114986bd..5d413065 100644 --- a/test/VisuPrs/StreamLines/F3.py +++ b/test/VisuPrs/StreamLines/F3.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/F3") file = datadir + "test_hydro_darcy4_out.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/F4.py b/test/VisuPrs/StreamLines/F4.py index 54b91c22..0db3b28c 100644 --- a/test/VisuPrs/StreamLines/F4.py +++ b/test/VisuPrs/StreamLines/F4.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/F4") file = datadir + "UO2_250ans.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/F5.py b/test/VisuPrs/StreamLines/F5.py index 5f380dfb..0a55b840 100644 --- a/test/VisuPrs/StreamLines/F5.py +++ b/test/VisuPrs/StreamLines/F5.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/F5") file = datadir + "maill.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/F6.py b/test/VisuPrs/StreamLines/F6.py index c55bc507..88400921 100644 --- a/test/VisuPrs/StreamLines/F6.py +++ b/test/VisuPrs/StreamLines/F6.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/F6") file = datadir + "maill.0.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/F8.py b/test/VisuPrs/StreamLines/F8.py index 9f17a54d..64924479 100644 --- a/test/VisuPrs/StreamLines/F8.py +++ b/test/VisuPrs/StreamLines/F8.py @@ -29,8 +29,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("StreamLines/F8") file = datadir + "maill.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "\nCreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("\nCreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.STREAMLINES], picturedir, pictureext) diff --git a/test/VisuPrs/StreamLines/F9.py b/test/VisuPrs/StreamLines/F9.py index 240b0336..2586ea04 100644 --- a/test/VisuPrs/StreamLines/F9.py +++ b/test/VisuPrs/StreamLines/F9.py @@ -42,7 +42,7 @@ if med_reader is None: view = pvsimple.GetRenderView() # Create a set of Stream Lines, based on time stamps of "MODES_DEPL" field -print "BREAKPOINT_1" +print("BREAKPOINT_1") for i in range(1, 11): prs = StreamLinesOnField(med_reader, EntityType.NODE, "MODES___DEPL____________________", i) @@ -53,4 +53,4 @@ for i in range(1, 11): picture_path = picturedir + "/" + "time_stamp_" + str(i) + "." + pictureext process_prs_for_test(prs, view, picture_path) -print "BREAKPOINT_2" +print("BREAKPOINT_2") diff --git a/test/VisuPrs/StreamLines/G0.py b/test/VisuPrs/StreamLines/G0.py index 587c2112..537192b4 100644 --- a/test/VisuPrs/StreamLines/G0.py +++ b/test/VisuPrs/StreamLines/G0.py @@ -29,9 +29,9 @@ file_path = datadir + "new_case.rmed" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - raise RuntimeError, "new_case.rmed was not imported!!!" + raise RuntimeError("new_case.rmed was not imported!!!") # 2. Creation of a set of "StreamLines" presentations, based on time stamps of "RESU_DEPL" field streamlines = StreamLinesOnField(med_reader, EntityType.NODE, 'RESU____DEPL____________________', 1) if streamlines is None: - raise RuntimeError, "Presentation is None!!!" + raise RuntimeError("Presentation is None!!!") diff --git a/test/VisuPrs/Tables/A0.py b/test/VisuPrs/Tables/A0.py index ee40126d..cf1ececf 100755 --- a/test/VisuPrs/Tables/A0.py +++ b/test/VisuPrs/Tables/A0.py @@ -28,21 +28,21 @@ from presentations import * import pvsimple # Import table from file -print 'Import tables_test.xls ....', +print('Import tables_test.xls ....', end=' ') file_path = tablesdir + "tables_test.xls" table_reader = pvsimple.TableReader(FileName=file_path) if table_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # Get available tables -print 'Get available tables .....' +print('Get available tables .....') available_tables = table_reader.GetPropertyValue("AvailableTables") if (available_tables is None) or (len(available_tables) == 0): - print "FAILED" + print("FAILED") else: - print available_tables + print(available_tables) # Choose 'sinus' table table_reader.TableNumber = available_tables.GetData().index('sinus') diff --git a/test/VisuPrs/Tables/A2.py b/test/VisuPrs/Tables/A2.py index 155b8595..fd9490b9 100755 --- a/test/VisuPrs/Tables/A2.py +++ b/test/VisuPrs/Tables/A2.py @@ -28,21 +28,21 @@ from presentations import * import pvsimple # Import table from file -print 'Import flux.tab.txt ....', +print('Import flux.tab.txt ....', end=' ') file_path = tablesdir + "flux.tab.txt" table_reader = pvsimple.TableReader(FileName=file_path) if table_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # Get available tables -print 'Get available tables .....' +print('Get available tables .....') available_tables = table_reader.GetPropertyValue("AvailableTables") if (available_tables is None) or (len(available_tables) == 0): - print "FAILED" + print("FAILED") else: - print available_tables + print(available_tables) # Create curves cur_view = pvsimple.GetRenderView() diff --git a/test/VisuPrs/Util/paravistest.py b/test/VisuPrs/Util/paravistest.py index 663f4598..c9732cc6 100755 --- a/test/VisuPrs/Util/paravistest.py +++ b/test/VisuPrs/Util/paravistest.py @@ -85,7 +85,7 @@ def test_values(value, et_value, check_error=0): et_length = len(et_value) if (length != et_length): err_msg = "ERROR!!! There is different number of created " + str(length) + " and etalon " + str(et_length) + " values!!!" - print err_msg + print(err_msg) error = error + 1 else: for i in range(et_length): @@ -93,7 +93,7 @@ def test_values(value, et_value, check_error=0): max_val = abs(0.001 * et_value[i]) if abs(et_value[i] - value[i]) > max_val: err_msg = "ERROR!!! Got value " + str(value[i]) + " is not equal to etalon value " + str(ret_value[i]) + "!!!" - print err_msg + print(err_msg) error = error + 1 else: max_val = 0.001 @@ -152,7 +152,7 @@ def call_and_check(prs, property_name, value, do_raise=1, compare_toler=-1.0): if do_raise: raise RuntimeError(error_string) else: - print error_string + print(error_string) else: # compare just set value and the one got from presentation really_set_value = prs.GetPropertyValue(property_name) @@ -166,7 +166,7 @@ def call_and_check(prs, property_name, value, do_raise=1, compare_toler=-1.0): if do_raise: raise RuntimeError(msg) else: - print msg + print(msg) is_good = False return is_good @@ -187,7 +187,7 @@ def compare_lists(value, et_value, check_error=0, eps=1e-04): length = len(value) et_length = len(et_value) if length != et_length: - print "ERROR!!! There is different number of items in created ", length, " and etalon ", et_length, " lists!!!" + print("ERROR!!! There is different number of items in created ", length, " and etalon ", et_length, " lists!!!") error=error+1 else: for i in range(et_length): @@ -196,10 +196,10 @@ def compare_lists(value, et_value, check_error=0, eps=1e-04): else: MAX = eps if abs(et_value[i] - value[i])> MAX: - print "ERROR!!!", i, "-th item", value[i], " is not equal to etalon item", et_value[i], "!!!" + print("ERROR!!!", i, "-th item", value[i], " is not equal to etalon item", et_value[i], "!!!") error=error+1 if check_error and error > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") return error @@ -258,33 +258,33 @@ def Import_Med_Field(filename, field_names, check_errors=0, prs=[]): nb_errors = 0 - print "File: ", filename + print("File: ", filename) # check the file accessibility if not os.access(filename, os.F_OK): msg = "File " + filename + " does not exist!!!" - raise RuntimeError, msg + raise RuntimeError(msg) # import MED file import pvsimple pvsimple.OpenDataFile(filename) proxy = presentations.pvs.GetActiveSource() if proxy is None: - raise RuntimeError, "ERROR!!! Can't import file!!!" + raise RuntimeError("ERROR!!! Can't import file!!!") for i in range(len(field_names)): - print "Name of the field: ", field_names[i] + print("Name of the field: ", field_names[i]) if len(prs) != 0: if len(prs[i]) != 0: mesh_name, iterations = TimeStampId(proxy) - if iterations.has_key(field_names[i]): + if field_names[i] in iterations: entity = iterations[field_names[i]][0] iteration = iterations[field_names[i]][1] else: msg="There is no information about TimeStampId of the " + field_names[i] + " field!!!" - raise RuntimeError, msg + raise RuntimeError(msg) err = nb_errors @@ -292,34 +292,34 @@ def Import_Med_Field(filename, field_names, check_errors=0, prs=[]): try: if type==0: if presentations.GaussPointsOnField(proxy, entity, field_names[i], iteration) is None: - print "ERROR!!! Created GaussPoints presentation is None!!!"; nb_errors+=1 + print("ERROR!!! Created GaussPoints presentation is None!!!"); nb_errors+=1 if type==1: if presentations.ScalarMapOnField(proxy, entity, field_names[i], iteration) is None: - print "ERROR!!! Created ScalarMap presentation is None!!!"; nb_errors+=1 + print("ERROR!!! Created ScalarMap presentation is None!!!"); nb_errors+=1 if type==2: if presentations.IsoSurfacesOnField(proxy, entity, field_names[i], iteration) is None: - print "ERROR!!! Created IsoSurfaces presentation is None!!!"; nb_errors+=1 + print("ERROR!!! Created IsoSurfaces presentation is None!!!"); nb_errors+=1 if type==3: if presentations.CutPlanesOnField(proxy, entity, field_names[i], iteration) is None: - print "ERROR!!! Created CutPlanes presentation is None!!!"; nb_errors+=1 + print("ERROR!!! Created CutPlanes presentation is None!!!"); nb_errors+=1 if type==4: if presentations.CutLinesOnField(proxy, entity, field_names[i], iteration) is None: - print "ERROR!!! Created CutLines presentation is None!!!"; nb_errors+=1 + print("ERROR!!! Created CutLines presentation is None!!!"); nb_errors+=1 if type==5: if presentations.DeformedShapeOnField(proxy, entity, field_names[i], iteration) is None: - print "ERROR!!! Created DeformedShape presentation is None!!!"; nb_errors+=1 + print("ERROR!!! Created DeformedShape presentation is None!!!"); nb_errors+=1 if type==6: if presentations.VectorsOnField(proxy, entity, field_names[i], iteration) is None: - print "ERROR!!! Created Vectors presentation is None!!!"; nb_errors+=1 + print("ERROR!!! Created Vectors presentation is None!!!"); nb_errors+=1 if type==7: if presentations.StreamLinesOnField(proxy, entity, field_names[i], iteration) is None: - print "ERROR!!! Created StreamLines presentation is None!!!"; nb_errors+=1 + print("ERROR!!! Created StreamLines presentation is None!!!"); nb_errors+=1 if type==8: if presentations.Plot3DOnField(proxy, entity, field_names[i], iteration) is None: - print "ERROR!!! Created Plot3D presentation is None!!!"; nb_errors+=1 + print("ERROR!!! Created Plot3D presentation is None!!!"); nb_errors+=1 if type==9: if presentations.DeformedShapeAndScalarMapOnField(proxy, entity, field_names[i], iteration) is None: - print "ERROR!!! Created ScalarMapOnDeformedShape presentation is None!!!"; nb_errors+=1 + print("ERROR!!! Created ScalarMapOnDeformedShape presentation is None!!!"); nb_errors+=1 except ValueError: """ This exception comes from get_nb_components(...) function. The reason of exception is an implementation of MEDReader @@ -327,15 +327,15 @@ def Import_Med_Field(filename, field_names, check_errors=0, prs=[]): MEDFileFieldRepresentationTree::activateTheFirst() and MEDFileFieldRepresentationTree::getTheSingleActivated(...) methods). """ - print "ValueError exception is catched" + print("ValueError exception is catched") continue # check if number of errors has increased if err == nb_errors: - print "Presentation(s) creation...OK" + print("Presentation(s) creation...OK") if nb_errors > 0 and check_errors: - raise RuntimeError, "Errors occured!!! For more information see ERRORs above..." + raise RuntimeError("Errors occured!!! For more information see ERRORs above...") else: return nb_errors @@ -386,8 +386,8 @@ def compare_view_to_ref_image(view, image_file, threshold=10): vtk.test.Testing.interact() except: sys.argv = save_sys_argv - print "ERROR!!! Pictures differs from reference image !!!"; - print "Picture: "+image_file + print("ERROR!!! Pictures differs from reference image !!!"); + print("Picture: "+image_file) raise pass sys.argv = save_sys_argv diff --git a/test/VisuPrs/Vectors/A0.py b/test/VisuPrs/Vectors/A0.py index e929670f..dbd88627 100644 --- a/test/VisuPrs/Vectors/A0.py +++ b/test/VisuPrs/Vectors/A0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/A0") file = datadir + "fra.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/A1.py b/test/VisuPrs/Vectors/A1.py index e442f278..02fd308e 100755 --- a/test/VisuPrs/Vectors/A1.py +++ b/test/VisuPrs/Vectors/A1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/A1") file = datadir + "hexa_28320_ELEM.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/A2.py b/test/VisuPrs/Vectors/A2.py index cc98c096..2c405fae 100644 --- a/test/VisuPrs/Vectors/A2.py +++ b/test/VisuPrs/Vectors/A2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/A2") file = datadir + "pointe.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/A3.py b/test/VisuPrs/Vectors/A3.py index 0b63020f..0994ed0b 100755 --- a/test/VisuPrs/Vectors/A3.py +++ b/test/VisuPrs/Vectors/A3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/A3") file = datadir + "Fields_group3D.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/A4.py b/test/VisuPrs/Vectors/A4.py index 1555cedf..5a0b07c6 100755 --- a/test/VisuPrs/Vectors/A4.py +++ b/test/VisuPrs/Vectors/A4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/A4") file = datadir + "Hexa8.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/A5.py b/test/VisuPrs/Vectors/A5.py index c73237ab..687610fc 100755 --- a/test/VisuPrs/Vectors/A5.py +++ b/test/VisuPrs/Vectors/A5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/A5") file = datadir + "Penta6.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/A6.py b/test/VisuPrs/Vectors/A6.py index fcf17808..a905267f 100644 --- a/test/VisuPrs/Vectors/A6.py +++ b/test/VisuPrs/Vectors/A6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/A6") file = datadir + "clo.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/A7.py b/test/VisuPrs/Vectors/A7.py index 25c7a210..6421a519 100755 --- a/test/VisuPrs/Vectors/A7.py +++ b/test/VisuPrs/Vectors/A7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/A7") file = datadir + "Tetra4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/A8.py b/test/VisuPrs/Vectors/A8.py index eca786b6..615fb87e 100755 --- a/test/VisuPrs/Vectors/A8.py +++ b/test/VisuPrs/Vectors/A8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/A8") file = datadir + "Tria3.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/A9.py b/test/VisuPrs/Vectors/A9.py index 6e2a6b64..44b0e010 100755 --- a/test/VisuPrs/Vectors/A9.py +++ b/test/VisuPrs/Vectors/A9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/A9") file = datadir + "Quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/B0.py b/test/VisuPrs/Vectors/B0.py index 90134e74..a4313d3e 100755 --- a/test/VisuPrs/Vectors/B0.py +++ b/test/VisuPrs/Vectors/B0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/B0") file = datadir + "carre_en_quad4_seg2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/B1.py b/test/VisuPrs/Vectors/B1.py index ff224540..9096f13d 100755 --- a/test/VisuPrs/Vectors/B1.py +++ b/test/VisuPrs/Vectors/B1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/B1") file = datadir + "carre_en_quad4_seg2_fields.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/B2.py b/test/VisuPrs/Vectors/B2.py index 2643d179..dab349f7 100755 --- a/test/VisuPrs/Vectors/B2.py +++ b/test/VisuPrs/Vectors/B2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/B2") file = datadir + "cube_hexa8_quad4.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/B3.py b/test/VisuPrs/Vectors/B3.py index 03d14dd1..8770fba7 100644 --- a/test/VisuPrs/Vectors/B3.py +++ b/test/VisuPrs/Vectors/B3.py @@ -27,40 +27,40 @@ import pvsimple #====================Stage1: Importing MED file==================== -print "**** Stage1: Importing MED file" +print("**** Stage1: Importing MED file") -print 'Import "ResOK_0000.med"...............', +print('Import "ResOK_0000.med"...............', end=' ') medFile = datadir + "ResOK_0000.med" pvsimple.OpenDataFile(medFile) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") cell_entity = EntityType.CELL node_entity = EntityType.NODE #====================Stage2: Creation of Vectors==================== -print "Creating Vectors..........", +print("Creating Vectors..........", end=' ') vectors = VectorsOnField(med_reader, node_entity, 'vitesse', 1) if vectors is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") #====================Stage3: Change properties====================== glyph = vectors.Input -print "Default LineWidth : ", vectors.LineWidth -print "Default GlyphType : ", glyph.GlyphType -print "Default subtype : ", glyph.GlyphType.GlyphType -print "Default GlyphPos : ", glyph.GlyphType.Center +print("Default LineWidth : ", vectors.LineWidth) +print("Default GlyphType : ", glyph.GlyphType) +print("Default subtype : ", glyph.GlyphType.GlyphType) +print("Default GlyphPos : ", glyph.GlyphType.Center) -print "Changing value of line width" +print("Changing value of line width") #width = -10 #vectors.LineWidth = width #print "Negative value -10 : ", vectors.LineWidth @@ -68,7 +68,7 @@ print "Changing value of line width" width = 10 vectors.LineWidth = width -print "Positive value 10 : ", vectors.LineWidth +print("Positive value 10 : ", vectors.LineWidth) pvsimple.Render() # width = 0 @@ -78,29 +78,29 @@ pvsimple.Render() width = 2 vectors.LineWidth = width -print "Positive value 2 : ", vectors.LineWidth +print("Positive value 2 : ", vectors.LineWidth) pvsimple.Render() -print "Changing glyph type" +print("Changing glyph type") gtype = "Arrow" glyph.GlyphType = gtype -print "Arrow type : ", glyph.GlyphType +print("Arrow type : ", glyph.GlyphType) pvsimple.Render() gtype = "Cone" glyph.GlyphType = gtype glyph.GlyphType.Resolution = 3 glyph.GlyphType.Height = 4 -print "Cone type: " + str(glyph.GlyphType) + ", resolution: " + str(glyph.GlyphType.Resolution) +print("Cone type: " + str(glyph.GlyphType) + ", resolution: " + str(glyph.GlyphType.Resolution)) pvsimple.Render() glyph.GlyphType.Resolution = 6 -print "Cone type: " + str(glyph.GlyphType) + ", resolution: " + str(glyph.GlyphType.Resolution) +print("Cone type: " + str(glyph.GlyphType) + ", resolution: " + str(glyph.GlyphType.Resolution)) pvsimple.Render() gtype = "Line" glyph.GlyphType = gtype -print "Line Type : ", glyph.GlyphType +print("Line Type : ", glyph.GlyphType) pvsimple.Render() gtype = "2D Glyph" @@ -108,18 +108,18 @@ glyph.GlyphType = gtype glyph.GlyphType.GlyphType = "Arrow" pvsimple.Render() -print "Changing glyph position" +print("Changing glyph position") pos = [0.0, 0.0, 0.0] glyph.GlyphType.Center = pos -print "Center position : ", glyph.GlyphType.Center +print("Center position : ", glyph.GlyphType.Center) pvsimple.Render() pos = [0.5, 0.0, 0.0] glyph.GlyphType.Center = pos -print "Tail position : ", glyph.GlyphType.Center +print("Tail position : ", glyph.GlyphType.Center) pvsimple.Render() pos = [-0.5, 0.0, 0.0] glyph.GlyphType.Center = pos -print "Head position : ", glyph.GlyphType.Center +print("Head position : ", glyph.GlyphType.Center) pvsimple.Render() diff --git a/test/VisuPrs/Vectors/E0.py b/test/VisuPrs/Vectors/E0.py index 0fe92b27..a60a7526 100755 --- a/test/VisuPrs/Vectors/E0.py +++ b/test/VisuPrs/Vectors/E0.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/E0") file = datadir + "test_55_solid_concentr_dom.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/E1.py b/test/VisuPrs/Vectors/E1.py index 4c2b4dab..7102ecd6 100755 --- a/test/VisuPrs/Vectors/E1.py +++ b/test/VisuPrs/Vectors/E1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/E1") file = datadir + "H_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/E2.py b/test/VisuPrs/Vectors/E2.py index d6b505b6..35f20903 100755 --- a/test/VisuPrs/Vectors/E2.py +++ b/test/VisuPrs/Vectors/E2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/E2") file = datadir + "cas2_2d_couplage_chess_castem.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/E3.py b/test/VisuPrs/Vectors/E3.py index 87ea423d..566bbe71 100644 --- a/test/VisuPrs/Vectors/E3.py +++ b/test/VisuPrs/Vectors/E3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/E3") file = datadir + "hydro_d10.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/E4.py b/test/VisuPrs/Vectors/E4.py index 26c77e0f..3200e1b1 100755 --- a/test/VisuPrs/Vectors/E4.py +++ b/test/VisuPrs/Vectors/E4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/E4") file = datadir + "champc.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/E5.py b/test/VisuPrs/Vectors/E5.py index 8c40cb04..ec76495b 100755 --- a/test/VisuPrs/Vectors/E5.py +++ b/test/VisuPrs/Vectors/E5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/E5") file = datadir + "hydro_sea_alv.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/E6.py b/test/VisuPrs/Vectors/E6.py index 9f591969..35fc0e00 100755 --- a/test/VisuPrs/Vectors/E6.py +++ b/test/VisuPrs/Vectors/E6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/E6") file = datadir + "toto.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/E7.py b/test/VisuPrs/Vectors/E7.py index 29fe1f56..24d7a980 100755 --- a/test/VisuPrs/Vectors/E7.py +++ b/test/VisuPrs/Vectors/E7.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/E7") file = datadir + "couplex_alain.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/E8.py b/test/VisuPrs/Vectors/E8.py index a73a48f5..68c748ab 100755 --- a/test/VisuPrs/Vectors/E8.py +++ b/test/VisuPrs/Vectors/E8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/E8") file = datadir + "KCOUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/E9.py b/test/VisuPrs/Vectors/E9.py index 8ec45f60..4cdfa7e9 100755 --- a/test/VisuPrs/Vectors/E9.py +++ b/test/VisuPrs/Vectors/E9.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/E9") file = datadir + "test_hydro.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/F1.py b/test/VisuPrs/Vectors/F1.py index 9b0e56af..dc6a23f3 100755 --- a/test/VisuPrs/Vectors/F1.py +++ b/test/VisuPrs/Vectors/F1.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/F1") file = datadir + "ml.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/F2.py b/test/VisuPrs/Vectors/F2.py index 0474b30e..a9365478 100755 --- a/test/VisuPrs/Vectors/F2.py +++ b/test/VisuPrs/Vectors/F2.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/F2") file = datadir + "T_COUPLEX1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/F3.py b/test/VisuPrs/Vectors/F3.py index 76fce421..d8f5e871 100755 --- a/test/VisuPrs/Vectors/F3.py +++ b/test/VisuPrs/Vectors/F3.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/F3") file = datadir + "test_hydro_darcy4_out.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/F4.py b/test/VisuPrs/Vectors/F4.py index 8859e1e1..914d8cf1 100755 --- a/test/VisuPrs/Vectors/F4.py +++ b/test/VisuPrs/Vectors/F4.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/F4") file = datadir + "UO2_250ans.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/F5.py b/test/VisuPrs/Vectors/F5.py index 7630496a..25fd3e68 100755 --- a/test/VisuPrs/Vectors/F5.py +++ b/test/VisuPrs/Vectors/F5.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/F5") file = datadir + "maill.1.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/F6.py b/test/VisuPrs/Vectors/F6.py index 753025d5..00abd6c1 100755 --- a/test/VisuPrs/Vectors/F6.py +++ b/test/VisuPrs/Vectors/F6.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/F6") file = datadir + "maill.0.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/F8.py b/test/VisuPrs/Vectors/F8.py index cf8ba2dc..be51fe65 100755 --- a/test/VisuPrs/Vectors/F8.py +++ b/test/VisuPrs/Vectors/F8.py @@ -28,8 +28,8 @@ from presentations import CreatePrsForFile, PrsTypeEnum picturedir = get_picture_dir("Vectors/F8") file = datadir + "maill.2.med" -print " --------------------------------- " -print "file ", file -print " --------------------------------- " -print "CreatePrsForFile..." +print(" --------------------------------- ") +print("file ", file) +print(" --------------------------------- ") +print("CreatePrsForFile...") CreatePrsForFile(file, [PrsTypeEnum.VECTORS], picturedir, pictureext) diff --git a/test/VisuPrs/Vectors/F9.py b/test/VisuPrs/Vectors/F9.py index 445069c1..a3db31c0 100644 --- a/test/VisuPrs/Vectors/F9.py +++ b/test/VisuPrs/Vectors/F9.py @@ -29,17 +29,17 @@ from presentations import VectorsOnField, hide_all,EntityType,PrsTypeEnum,reset_ picturedir = get_picture_dir("Vectors/F9") theFileName = datadir + "Bug829_resu_mode.med" -print " --------------------------------- " -print "file ", theFileName -print " --------------------------------- " +print(" --------------------------------- ") +print("file ", theFileName) +print(" --------------------------------- ") """Build presentations of the given types for all fields of the given file.""" #print "Import %s..." % theFileName.split('/')[-1], result = OpenDataFile(theFileName) aProxy = GetActiveSource() if aProxy is None: - raise RuntimeError, "Error: can't import file." -else: print "OK" + raise RuntimeError("Error: can't import file.") +else: print("OK") # Get view aView = GetRenderView() time_value = get_time(aProxy, 0) @@ -60,7 +60,7 @@ for colored in [False,True]: hide_all(aView, True) aPrs = VectorsOnField(aProxy, aFieldEntity, aFieldName, i, is_colored=colored) if aPrs is None: - raise RuntimeError, "Presentation is None!!!" + raise RuntimeError("Presentation is None!!!") # display only current deformed shape #display_only(aView,aPrs) aPrs.Visibility =1 diff --git a/test/VisuPrs/bugs/A0.py b/test/VisuPrs/bugs/A0.py index 8a37f587..6b328a96 100644 --- a/test/VisuPrs/bugs/A0.py +++ b/test/VisuPrs/bugs/A0.py @@ -28,15 +28,15 @@ import pvsimple picturedir = get_picture_dir("bugs/A0") # 1. Import MED file -print 'Importing "hydro_sea_alv.med"...', +print('Importing "hydro_sea_alv.med"...', end=' ') file_path = datadir + "hydro_sea_alv.med" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # 2. Create cut lines on "Head" field mesh_name = "maillage_migr3d" @@ -44,14 +44,14 @@ field_name = "Head" cell_entity = presentations.EntityType.CELL timestamps = med_reader.TimestepValues.GetData() -for ts in xrange(1, len(timestamps) + 1): - print "Timestamp: ", ts +for ts in range(1, len(timestamps) + 1): + print("Timestamp: ", ts) cutlines = presentations.CutLinesOnField(med_reader, cell_entity, field_name, ts, orientation1=presentations.Orientation.ZX, orientation2=presentations.Orientation.YZ) pic_name = mesh_name + "_" + str(cell_entity) + "_" + field_name + "_" + str(ts) + "_TCUTLINES." + pictureext pic_path = os.path.join(picturedir, pic_name) - print pic_path + print(pic_path) presentations.process_prs_for_test(cutlines, pvsimple.GetRenderView(), pic_path) nb_lines = len(cutlines.Input.SliceOffsetValues) - print "Number of lines = ", nb_lines + print("Number of lines = ", nb_lines) diff --git a/test/VisuPrs/bugs/A1.py b/test/VisuPrs/bugs/A1.py index e33d66cd..fdbb44bd 100644 --- a/test/VisuPrs/bugs/A1.py +++ b/test/VisuPrs/bugs/A1.py @@ -54,6 +54,6 @@ view.ResetCamera() pvsimple.Render(view) -print "Picure file name is " + pic_path +print("Picure file name is " + pic_path) pvs.WriteImage(pic_path, view=view, Magnification=1) time.sleep(1) diff --git a/test/VisuPrs/bugs/A2.py b/test/VisuPrs/bugs/A2.py index 8f0e874b..2e63ccf1 100644 --- a/test/VisuPrs/bugs/A2.py +++ b/test/VisuPrs/bugs/A2.py @@ -31,26 +31,26 @@ picturedir = get_picture_dir("bugs/A2") med_file_path = datadir + "carre_MIXTE_0000.med" pic_path = os.path.join(picturedir, "A2." + pictureext) -print "BREAKPOINT_1" +print("BREAKPOINT_1") # 1. Import MED file -print 'Importing "carre_MIXTE_0000.med"...', +print('Importing "carre_MIXTE_0000.med"...', end=' ') pvsimple.OpenDataFile(med_file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # 2. Create mesh -print "Creating MeshOnEntity..............", +print("Creating MeshOnEntity..............", end=' ') mesh = MeshOnEntity(med_reader, "dom", EntityType.CELL) if mesh is None: - print "FAILED" + print("FAILED") else: mesh.Representation = 'Surface With Edges' - print "OK" + print("OK") # 3. Display mesh and make snapshot view = pvsimple.GetRenderView() @@ -67,6 +67,6 @@ view.CameraParallelScale = 0.1 pvsimple.Render(view) -print "Picure file name is " + pic_path +print("Picure file name is " + pic_path) pvs.WriteImage(pic_path, view=view, Magnification=1) time.sleep(1) diff --git a/test/VisuPrs/bugs/A5.py b/test/VisuPrs/bugs/A5.py index 357194dc..c319c507 100644 --- a/test/VisuPrs/bugs/A5.py +++ b/test/VisuPrs/bugs/A5.py @@ -38,7 +38,7 @@ if tmp_dir == None: tmp_dir = tempfile.mkdtemp() save_file = os.path.join(tmp_dir, "TimeStamps_save.hdf") -print "Save to file ", save_file +print("Save to file ", save_file) pvsimple.OpenDataFile(data_file) myStudyManager.SaveAs(save_file, myStudy, 0) @@ -49,4 +49,4 @@ myStudyManager.Close(openedStudy) os.remove(save_file) -print "OK" +print("OK") diff --git a/test/VisuPrs/bugs/A6.py b/test/VisuPrs/bugs/A6.py index 7910d06e..f882d027 100644 --- a/test/VisuPrs/bugs/A6.py +++ b/test/VisuPrs/bugs/A6.py @@ -30,26 +30,26 @@ picturedir = get_picture_dir("bugs/A6") med_file_path = datadir + "fra.med" # 1. Import MED file -print 'Importing "fra.med"....', +print('Importing "fra.med"....', end=' ') pvsimple.OpenDataFile(med_file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - raise RuntimeError, "Error" + raise RuntimeError("Error") else: - print "OK" + print("OK") # 2. Create mesh mesh_names = get_mesh_full_names(med_reader) for mesh_name in [get_field_short_name(name) for name in mesh_names]: - print "Mesh name: ", mesh_name + print("Mesh name: ", mesh_name) mesh = MeshOnEntity(med_reader, mesh_name, EntityType.CELL) if mesh is None: - raise RuntimeError, "Error" + raise RuntimeError("Error") mesh.Representation = 'Wireframe' pic_path = os.path.join(picturedir, mesh_name + "_Cell." + pictureext) pic_path = re.sub("\s+","_", pic_path) - print "Save picture ", pic_path + print("Save picture ", pic_path) process_prs_for_test(mesh, pvsimple.GetRenderView(), pic_path) diff --git a/test/VisuPrs/bugs/A9.py b/test/VisuPrs/bugs/A9.py index 9c7985d9..1ee437e5 100644 --- a/test/VisuPrs/bugs/A9.py +++ b/test/VisuPrs/bugs/A9.py @@ -29,25 +29,25 @@ import pvsimple picturedir = get_picture_dir("bugs/A9") # 1. Step1: Import MED file -print "**** Step1: Importing MED file" +print("**** Step1: Importing MED file") -print 'Import "sortie_med_volumique.med"...............', +print('Import "sortie_med_volumique.med"...............', end=' ') file_path = datadir + "sortie_med_volumique.med" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print 'Get view........................................', +print('Get view........................................', end=' ') view = pvsimple.GetRenderView() if view is None: - print "FAILED" + print("FAILED") else: reset_view(view) - print "OK" + print("OK") mesh_name = 'Volume fluide' cell_entity = EntityType.CELL @@ -56,114 +56,114 @@ node_entity = EntityType.NODE # 2. Step2: Displaying mesh errors = 0 -print "**** Step2: Display mesh" -print "BREAKPOINT_1" +print("**** Step2: Display mesh") +print("BREAKPOINT_1") # Creation of Mesh presentation on nodes -print "Creating Mesh presentation on nodes......." +print("Creating Mesh presentation on nodes.......") mesh = MeshOnEntity(med_reader, mesh_name, node_entity) if mesh is None: - print "ERROR!!! Mesh presentation on nodes creation FAILED!!!" + print("ERROR!!! Mesh presentation on nodes creation FAILED!!!") errors += 1 else: picture_path = os.path.join(picturedir, "MeshPresentation_OnNodes." + pictureext) process_prs_for_test(mesh, view, picture_path) - print "OK" + print("OK") # Creation of Mesh presentation on cells -print "Creating Mesh presentation on cells......." +print("Creating Mesh presentation on cells.......") mesh = MeshOnEntity(med_reader, mesh_name, cell_entity) if mesh is None: - print "ERROR!!! Mesh presentation on cells creation FAILED!!!" + print("ERROR!!! Mesh presentation on cells creation FAILED!!!") errors += 1 else: picture_path = os.path.join(picturedir, "MeshPresentation_OnCells." + pictureext) process_prs_for_test(mesh, view, picture_path) - print "OK" + print("OK") # 3. Step3: Displaying scalar field 'Dissip' -print "**** Step3: Display scalar field 'Dissip'" +print("**** Step3: Display scalar field 'Dissip'") entity = cell_entity # Scalar Map creation -print "Creating Scalar Map.......", +print("Creating Scalar Map.......", end=' ') scalarmap = ScalarMapOnField(med_reader, entity, 'Dissip', 1) if scalarmap is None: - print "ERROR!!! Scalar Map creation FAILED!!!" + print("ERROR!!! Scalar Map creation FAILED!!!") errors += 1 else: picture_path = os.path.join(picturedir, "ScalarMap_Dissip." + pictureext) process_prs_for_test(scalarmap, view, picture_path) - print "OK" + print("OK") # Iso Surfaces creation -print "Creating Iso Surfaces.......", +print("Creating Iso Surfaces.......", end=' ') isosurfaces = IsoSurfacesOnField(med_reader, entity, 'Dissip', 1) if isosurfaces is None: - print "ERROR!!! Iso Surfaces creation FAILED!!!" + print("ERROR!!! Iso Surfaces creation FAILED!!!") errors += 1 else: picture_path = os.path.join(picturedir, "IsoSurfaces_Dissip." + pictureext) process_prs_for_test(isosurfaces, view, picture_path) - print "OK" + print("OK") # Gauss Points creation -print "Creating Gauss Points.......", +print("Creating Gauss Points.......", end=' ') gausspoints = GaussPointsOnField(med_reader, entity, 'Dissip', 1) if gausspoints is None: - print "ERROR!!! Gauss Points creation FAILED!!!" + print("ERROR!!! Gauss Points creation FAILED!!!") errors += 1 else: picture_path = os.path.join(picturedir, "GaussPoints_Dissip." + pictureext) process_prs_for_test(isosurfaces, view, picture_path) - print "OK" + print("OK") # 4. Step4: Displaying vectoriel field 'VitesseX' entity = cell_entity -print "**** Step5: Display vectoriel field 'VitesseX'" +print("**** Step5: Display vectoriel field 'VitesseX'") # Deformed Shape creation -print "Creating Deformed Shape.......", +print("Creating Deformed Shape.......", end=' ') defshape = DeformedShapeOnField(med_reader, entity, 'VitesseX', 1) if defshape is None: - print "ERROR!!! Deformed Shape creation FAILED!!!" + print("ERROR!!! Deformed Shape creation FAILED!!!") errors += 1 else: picture_path = os.path.join(picturedir, "DeformedShape_VitesseX." + pictureext) process_prs_for_test(defshape, view, picture_path) - print "OK" + print("OK") # Vectors creation -print "Creating Vectors.......", +print("Creating Vectors.......", end=' ') vectors = VectorsOnField(med_reader, entity, 'VitesseX', 1) if vectors is None: - print "ERROR!!! Vectors creation FAILED!!!" + print("ERROR!!! Vectors creation FAILED!!!") errors += 1 else: picture_path = os.path.join(picturedir, "Vectors_VitesseX." + pictureext) process_prs_for_test(vectors, view, picture_path) - print "OK" + print("OK") # Scalar Map On Deformed Shape creation -print "Creating Scalar Map On Deformed Shape.......", +print("Creating Scalar Map On Deformed Shape.......", end=' ') smapondefshape = DeformedShapeAndScalarMapOnField(med_reader, entity, 'VitesseX', 1) if smapondefshape is None: - print "ERROR!!! ScalarMapOnDeformedShape creation failed!!!" + print("ERROR!!! ScalarMapOnDeformedShape creation failed!!!") errors += 1 else: picture_path = os.path.join(picturedir, "ScalMapOnDefShape_VitesseX." + pictureext) process_prs_for_test(smapondefshape, view, picture_path) - print "OK" + print("OK") if errors == 1: - raise RuntimeError, "There is an error was occured... For more info see ERROR message above.." + raise RuntimeError("There is an error was occured... For more info see ERROR message above..") elif errors > 1: - raise RuntimeError, "There are some errors were occured... For more info see ERRORs messages above.." -print "BREAKPOINT_2" + raise RuntimeError("There are some errors were occured... For more info see ERRORs messages above..") +print("BREAKPOINT_2") diff --git a/test/VisuPrs/bugs/B1.py b/test/VisuPrs/bugs/B1.py index 9966aff8..828ca8f6 100644 --- a/test/VisuPrs/bugs/B1.py +++ b/test/VisuPrs/bugs/B1.py @@ -30,14 +30,14 @@ picturedir = get_picture_dir("bugs/B1") # 1. Import MED file med_file_path = datadir + "resultat.01.med" -print 'Importing "resultat.01.med"....', +print('Importing "resultat.01.med"....', end=' ') pvsimple.OpenDataFile(med_file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - raise RuntimeError, "resultat.01.med was not imported!!!" + raise RuntimeError("resultat.01.med was not imported!!!") else: - print "OK" + print("OK") # 2. Creation of presentation of each group extGrp = pvs.ExtractGroup() @@ -49,21 +49,21 @@ i = 0 for group in groups: i += 1 shor_name = group.split('/')[-1] - print "group: ", shor_name + print("group: ", shor_name) prs = MeshOnGroup(med_reader, extGrp, group) if prs is None : - print "FAILED!!! Created presentation is None!!!" + print("FAILED!!! Created presentation is None!!!") errors += 1 else : - print "Presentation was created!" + print("Presentation was created!") pic_path = os.path.join(picturedir, shor_name.strip().split("_")[0]+str(i)+"."+pictureext) process_prs_for_test(prs, pvsimple.GetRenderView(), pic_path) # check errors if errors == 1: - raise RuntimeError, "There is an error was occured... For more info see ERROR message above.." + raise RuntimeError("There is an error was occured... For more info see ERROR message above..") elif errors > 1: - raise RuntimeError, "There are some errors were occured... For more info see ERRORs messages above.." + raise RuntimeError("There are some errors were occured... For more info see ERRORs messages above..") diff --git a/test/VisuPrs/bugs/C3.py b/test/VisuPrs/bugs/C3.py index 90b0c54d..3026dfee 100644 --- a/test/VisuPrs/bugs/C3.py +++ b/test/VisuPrs/bugs/C3.py @@ -26,14 +26,14 @@ import pvsimple # 1. Import MED file med_file_path = datadir + "MEDfileForStructuredMesh.med" -print 'Importing "MEDfileForStructuredMesh.med"....', +print('Importing "MEDfileForStructuredMesh.med"....', end=' ') pvsimple.OpenDataFile(med_file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - raise RuntimeError, "MEDfileForStructuredMesh.med was not imported!" + raise RuntimeError("MEDfileForStructuredMesh.med was not imported!") else: - print "OK" + print("OK") errors = 0 @@ -42,8 +42,8 @@ mesh_name = "AssemblyMesh" for entity in [EntityType.NODE, EntityType.CELL]: if MeshOnEntity(med_reader, mesh_name, entity) is None: - print "Entity:", str(entity) - print "ERROR!!! Mesh presentation for \""+mesh_name+"\" wasn't created!!!" + print("Entity:", str(entity)) + print("ERROR!!! Mesh presentation for \""+mesh_name+"\" wasn't created!!!") errors += 1 # 3. Creation of the mesh presentations for the "CoreMesh" mesh @@ -51,9 +51,9 @@ mesh_name = "CoreMesh" for entity in [EntityType.NODE, EntityType.CELL]: if MeshOnEntity(med_reader, mesh_name, entity) is None: - print "Entity:", str(entity) - print "ERROR!!! Mesh presentation for \""+mesh_name+"\" wasn't created!!!" + print("Entity:", str(entity)) + print("ERROR!!! Mesh presentation for \""+mesh_name+"\" wasn't created!!!") errors += 1 if errors > 0: - raise RuntimeError, "Some errors were occured during execution... See ERRORs above for details!" + raise RuntimeError("Some errors were occured during execution... See ERRORs above for details!") diff --git a/test/VisuPrs/bugs/C5.py b/test/VisuPrs/bugs/C5.py index 1cad218a..2bf08218 100644 --- a/test/VisuPrs/bugs/C5.py +++ b/test/VisuPrs/bugs/C5.py @@ -67,7 +67,7 @@ class DisplayManager: def DisplayMap(self, aView, aMap, title, aDelay=0): if aMap is None: - print "Null scalar map is created" + print("Null scalar map is created") display_only(aMap, aView) reset_view(aView) time.sleep(aDelay) @@ -100,12 +100,12 @@ class DisplayManager: path = None if aPath is not "": - print "Define save path" + print("Define save path") path = aPath scene = pvsimple.AnimateReader(theObj, aView, path) - print "Start Animation" + print("Start Animation") scene.Duration = theDuration NbOfFrames = len(scene.TimeKeeper.TimestepValues) @@ -118,7 +118,7 @@ class DisplayManager: scene.Play() ind = ind + 1 - print "Stop Animation" + print("Stop Animation") scene.Stop() return scene diff --git a/test/VisuPrs/bugs/C6.py b/test/VisuPrs/bugs/C6.py index 363d0de2..0cd1b159 100644 --- a/test/VisuPrs/bugs/C6.py +++ b/test/VisuPrs/bugs/C6.py @@ -30,24 +30,24 @@ picturedir = get_picture_dir("bugs/C6") # 1. Import MED file med_file_path = datadir + "relachement_brutal_sans_dudg_gauss.med" -print 'Importing "relachement_brutal_sans_dudg_gauss.med"....', +print('Importing "relachement_brutal_sans_dudg_gauss.med"....', end=' ') pvsimple.OpenDataFile(med_file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - raise RuntimeError, "File wasn't imported!!!" + raise RuntimeError("File wasn't imported!!!") else: - print "OK" + print("OK") # 2. Creation of GaussPoints presentations mesh_name = "Maillage" field_name = "Result__EQUI_ELGA_SIGM__________" -timestamp_list = range(1, 5) +timestamp_list = list(range(1, 5)) for timestamp in timestamp_list: - print "Creation of the GaussPoints presentation.. Field: ", field_name, "; Timestamp: ", timestamp + print("Creation of the GaussPoints presentation.. Field: ", field_name, "; Timestamp: ", timestamp) gauss_points = GaussPointsOnField1(med_reader, EntityType.CELL, field_name, timestamp) if gauss_points is None: - raise RuntimeError, "Created presentation is None!!!" + raise RuntimeError("Created presentation is None!!!") pic_path = os.path.join(picturedir, "GaussPoints_" + mesh_name + "_" + field_name + "_" + str(timestamp) + "." + pictureext) process_prs_for_test(gauss_points, pvsimple.GetRenderView(), pic_path) diff --git a/test/VisuPrs/bugs/C8.py b/test/VisuPrs/bugs/C8.py index 139b5dc0..49efbd46 100644 --- a/test/VisuPrs/bugs/C8.py +++ b/test/VisuPrs/bugs/C8.py @@ -26,14 +26,14 @@ import pvsimple # 1. Import table from file file_path = tablesdir + "tables_test.xls" -print 'Import tables_test.xls ....', +print('Import tables_test.xls ....', end=' ') file_path = tablesdir + "tables_test.xls" table_reader = pvsimple.TableReader(FileName=file_path) table_reader.UpdatePipeline() if table_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # 2. Show curves cur_view = pvsimple.GetRenderView() @@ -44,12 +44,12 @@ xy_view = pvsimple.CreateXYPlotView() xy_view.ChartTitle = "The viewer for Curves from the Table" -print 'Get available tables .....' +print('Get available tables .....') available_tables = table_reader.GetPropertyValue("AvailableTables") if (available_tables is None) or (len(available_tables) == 0): - print "FAILED" + print("FAILED") else: - print available_tables + print(available_tables) for table in available_tables: table_reader.TableNumber = available_tables.GetData().index(table) diff --git a/test/VisuPrs/bugs/C9.py b/test/VisuPrs/bugs/C9.py index ca4ca478..fc968ef2 100644 --- a/test/VisuPrs/bugs/C9.py +++ b/test/VisuPrs/bugs/C9.py @@ -30,12 +30,12 @@ pvsimple.OpenDataFile(med_file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - raise RuntimeError, "TimeStamps.med was not imported!!!" + raise RuntimeError("TimeStamps.med was not imported!!!") # 2. Creation of presentations mesh_on_cells = MeshOnEntity(med_reader, "dom", EntityType.CELL) if mesh_on_cells is None : - raise RuntimeError, "Mesh presentation is None!!!" + raise RuntimeError("Mesh presentation is None!!!") view = pvsimple.GetRenderView() display_only(mesh_on_cells, view) @@ -45,7 +45,7 @@ mesh_on_cells.Representation = 'Wireframe' scalar_map = ScalarMapOnField(med_reader, EntityType.NODE, "vitesse", 1) if scalar_map is None : - raise RuntimeError, "ScalarMap presentation is None!!!" + raise RuntimeError("ScalarMap presentation is None!!!") scalar_map.Visibility = 1 pvsimple.Render() diff --git a/test/VisuPrs/bugs/D1.py b/test/VisuPrs/bugs/D1.py index 554f9095..8c7d728d 100644 --- a/test/VisuPrs/bugs/D1.py +++ b/test/VisuPrs/bugs/D1.py @@ -32,7 +32,7 @@ med_file_path = datadir + "Bug829_resu_mode.med" pvsimple.OpenDataFile(med_file_path) med_reader1 = pvsimple.GetActiveSource() if med_reader1 is None: - raise RuntimeError, "Bug829_resu_mode.med was not imported!!!" + raise RuntimeError("Bug829_resu_mode.med was not imported!!!") # 2. Creation of a set of "DeformedShape and ScalarMap" presentations, based on time stamps of "MODES_DEPL" field errors=0 @@ -42,7 +42,7 @@ sizeh=[] for i in range(1,11): presentation = DeformedShapeAndScalarMapOnField(med_reader1, EntityType.NODE, "MODES___DEPL____________________", i) if presentation is None : - raise RuntimeError, "Presentation is None!!!" + raise RuntimeError("Presentation is None!!!") pic_path = os.path.join(picturedir, "npal19999_1_time_stamp_" + str(i) + "." + pictureext) process_prs_for_test(presentation, pvsimple.GetRenderView(), pic_path) @@ -52,26 +52,26 @@ for i in range(1,11): sizeh.append(h) if abs(max(sizeh)-min(sizeh)) > 0.01*max(sizeh): - print "WARNING!!! Pictures have different height !!!" + print("WARNING!!! Pictures have different height !!!") errors += 1 for i in range(1,11): picture_name = "npal19999_2_time_stamp_" + str(i) + "." + pictureext - print "Picture: " + picture_name + "; height : " + str(sizeh[i-1]) + print("Picture: " + picture_name + "; height : " + str(sizeh[i-1])) raise RuntimeError if abs(max(sizew)-min(sizew)) > 0.01*max(sizew): - print "WARNING!!! Pictures have different width !!!" + print("WARNING!!! Pictures have different width !!!") errors += 1 for i in range(1,11): picture_name = "npal19999_2_time_stamp_" + str(i) + "." + pictureext - print "Picture: " + picture_name + "; width : " + str(sizew[i-1]) + print("Picture: " + picture_name + "; width : " + str(sizew[i-1])) raise RuntimeError # 3. Import of the "Bug829_resu_mode.med" file at second time pvsimple.OpenDataFile(med_file_path) med_reader2 = pvsimple.GetActiveSource() if med_reader2 is None: - raise RuntimeError, "Bug829_resu_mode.med was not imported second time!!!" + raise RuntimeError("Bug829_resu_mode.med was not imported second time!!!") # 4. Creation of a set of "DeformedShape and ScalarMap" presentations, based on time stamps of "MODES_DEPL" field errors = 0 @@ -81,7 +81,7 @@ sizeh=[] for i in range(1,11): presentation = DeformedShapeAndScalarMapOnField(med_reader2, EntityType.NODE, "MODES___DEPL____________________", 11-i) if presentation is None : - raise RuntimeError, "Presentation is None!!!" + raise RuntimeError("Presentation is None!!!") pic_path = os.path.join(picturedir, "npal19999_2_time_stamp_" + str(i) + "." + pictureext) process_prs_for_test(presentation, pvsimple.GetRenderView(), pic_path) @@ -90,18 +90,18 @@ for i in range(1,11): sizeh.append(h) if abs(max(sizeh)-min(sizeh)) > 0.01*max(sizeh): - print "WARNING!!! Pictures have different height !!!" + print("WARNING!!! Pictures have different height !!!") errors += 1 for i in range(1,11): picture_name = "npal19999_2_time_stamp_" + str(i) + "." + pictureext - print "Picture: " + picture_name + "; height : " + str(sizeh[i-1]) + print("Picture: " + picture_name + "; height : " + str(sizeh[i-1])) raise RuntimeError if abs(max(sizew)-min(sizew)) > 0.01*max(sizew): - print "WARNING!!! Pictures have different width !!!" + print("WARNING!!! Pictures have different width !!!") errors += 1 for i in range(1,11): picture_name = "npal19999_2_time_stamp_" + str(i) + "." + pictureext - print "Picture: " + picture_name + "; width : " + str(sizew[i-1]) + print("Picture: " + picture_name + "; width : " + str(sizew[i-1])) raise RuntimeError diff --git a/test/VisuPrs/bugs/D3.py b/test/VisuPrs/bugs/D3.py index 83a4321e..c3503518 100644 --- a/test/VisuPrs/bugs/D3.py +++ b/test/VisuPrs/bugs/D3.py @@ -28,14 +28,14 @@ med_file_path = datadir + "LinearStaticsSTA9.resu.med" pvsimple.OpenDataFile(med_file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - raise RuntimeError, "LinearStaticsSTA9.resu.med was not imported!!!" + raise RuntimeError("LinearStaticsSTA9.resu.med was not imported!!!") view = pvsimple.GetRenderView() # Creation of colored "DeformedShape" presentations, based on time stamps of "RESU_DEPL" field presentation = DeformedShapeOnField(med_reader, EntityType.NODE, 'RESU____DEPL____________________', 1, is_colored=True) if presentation is None : - raise RuntimeError, "DeformedShapeOnField Presentation is None!!!" + raise RuntimeError("DeformedShapeOnField Presentation is None!!!") display_only(presentation, view) reset_view(view) @@ -43,7 +43,7 @@ reset_view(view) # Creation of colored "Vectors" presentations, based on time stamps of "RESU_DEPL" field presentation = VectorsOnField(med_reader, EntityType.NODE, 'RESU____DEPL____________________', 1, is_colored=True) if presentation is None : - raise RuntimeError, "Vectors Presentation is None!!!" + raise RuntimeError("Vectors Presentation is None!!!") display_only(presentation, view) reset_view(view) @@ -51,7 +51,7 @@ reset_view(view) # Creation of colored "DeformedShapeAndScalarMap" presentations, based on time stamps of "RESU_DEPL" field presentation = DeformedShapeAndScalarMapOnField(med_reader, EntityType.NODE, 'RESU____DEPL____________________', 1) if presentation is None : - raise RuntimeError, "DeformedShapeAndScalarMap Presentation is None!!!" + raise RuntimeError("DeformedShapeAndScalarMap Presentation is None!!!") display_only(presentation, view) reset_view(view) @@ -59,7 +59,7 @@ reset_view(view) # Creation of colored "CutPlanes" presentations, based on time stamps of "RESU_DEPL" field presentation = CutPlanesOnField(med_reader, EntityType.NODE, 'RESU____DEPL____________________', 1) if presentation is None : - raise RuntimeError, "CutPlanes Presentation is None!!!" + raise RuntimeError("CutPlanes Presentation is None!!!") display_only(presentation, view) reset_view(view) diff --git a/test/VisuPrs/bugs/D5.py b/test/VisuPrs/bugs/D5.py index 35e340b5..355bd8e1 100644 --- a/test/VisuPrs/bugs/D5.py +++ b/test/VisuPrs/bugs/D5.py @@ -22,15 +22,15 @@ from presentations import * import pvsimple # Import table from file -print 'Import file with tables....', +print('Import file with tables....', end=' ') file_path = tablesdir + "tables_test.xls" table_reader = pvsimple.TableReader(FileName=file_path) if table_reader is None: - print "FAILED" + print("FAILED") else: table_reader.UpdatePipeline() - print "OK" + print("OK") # Display table_to_3d = pvsimple.TableTo3D(table_reader) diff --git a/test/VisuPrs/bugs/D6.py b/test/VisuPrs/bugs/D6.py index 4db1a502..9ba01870 100644 --- a/test/VisuPrs/bugs/D6.py +++ b/test/VisuPrs/bugs/D6.py @@ -35,7 +35,7 @@ point2 = [0.4, 0.05, 1.0] cut_segment1 = CutSegmentOnField(med_reader, EntityType.NODE, "VITESSE", 1, point1, point2) if cut_segment1 == None: - raise RuntimeError, "ERROR!!! The first CutSegment presentation is not built!" + raise RuntimeError("ERROR!!! The first CutSegment presentation is not built!") # 3. Creation of CutSegment presentations, based on time stamps of "TAUX_DE_VIDE" field point1 = [0, 0, 1] @@ -43,7 +43,7 @@ point2 = [0.2055, 0.0685, 0.541] cut_segment2 = CutSegmentOnField(med_reader, EntityType.NODE, "TAUX_DE_VIDE", 1, point1, point2) if cut_segment2 == None: - raise RuntimeError, "ERROR!!! The second CutSegment presentation is not built!" + raise RuntimeError("ERROR!!! The second CutSegment presentation is not built!") # 4. Creation of Table based on CutSegment presentation @@ -56,11 +56,11 @@ xy_view = pvs.CreateXYPlotView() curve1 = pvs.Show(cut_segment1.Input, xy_view) if curve1 == None: - raise RuntimeError, " ERROR!!! Curve based on the first CutSegment is not built!" + raise RuntimeError(" ERROR!!! Curve based on the first CutSegment is not built!") curve2 = pvs.Show(cut_segment2.Input, xy_view) if curve2 == None: - raise RuntimeError, " ERROR!!! Curve based on the second CutSegment is not built!" + raise RuntimeError(" ERROR!!! Curve based on the second CutSegment is not built!") curves = [curve1, curve2] for c in curves: diff --git a/test/VisuPrs/bugs/D7.py b/test/VisuPrs/bugs/D7.py index f324b527..57f383c9 100644 --- a/test/VisuPrs/bugs/D7.py +++ b/test/VisuPrs/bugs/D7.py @@ -26,31 +26,31 @@ from presentations import * import pvsimple # 1. MED file import -print 'Importing "Fields_group3D.med"........', +print('Importing "Fields_group3D.med"........', end=' ') med_file_path = datadir + "Fields_group3D.med" pvsimple.OpenDataFile(med_file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print 'Get view..............................', +print('Get view..............................', end=' ') view = pvsimple.GetRenderView() if view is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # 2. Displaying scalar field -print "Creating Scalar Map.......", +print("Creating Scalar Map.......", end=' ') scalarmap = ScalarMapOnField(med_reader, EntityType.CELL, 'scalar field', 1) if scalarmap is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") extract_group = pvsimple.ExtractGroup(med_reader) extract_group.UpdatePipelineInformation() diff --git a/test/VisuPrs/bugs/E0.py b/test/VisuPrs/bugs/E0.py index 6e84303a..97a0d8be 100644 --- a/test/VisuPrs/bugs/E0.py +++ b/test/VisuPrs/bugs/E0.py @@ -27,14 +27,14 @@ import pvsimple sleep_delay = 1 # 1. MED file import -print 'Import "ResOK_0000.med"...............', +print('Import "ResOK_0000.med"...............', end=' ') med_file_path = datadir + "ResOK_0000.med" pvsimple.OpenDataFile(med_file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - raise RuntimeError, "ResOK_0000.med was not imported!!!" + raise RuntimeError("ResOK_0000.med was not imported!!!") else: - print "OK" + print("OK") # TODO: in the original VISU script the timestamp id was equal to 2, # but in PARAVIS it's inly one timestamp accessible @@ -43,70 +43,70 @@ timestamp_id = 1 # 2. Create Scalar Map field_name = 'vitesse' -print "Creating Scalar Map......." +print("Creating Scalar Map.......") scmap1 = ScalarMapOnField(med_reader, EntityType.NODE, field_name, timestamp_id) if scmap1 is None : - raise RuntimeError, "ScalarMap presentation is None!!!" + raise RuntimeError("ScalarMap presentation is None!!!") else: - print "OK" + print("OK") display_only(scmap1) reset_view() -print "WIREFRAME sur scmap1" +print("WIREFRAME sur scmap1") scmap1.Representation = 'Wireframe' time.sleep(sleep_delay) -print "POINT sur scmap1" +print("POINT sur scmap1") scmap1.Representation = 'Points' time.sleep(sleep_delay) -print "SURFACEFRAME sur scmap1" +print("SURFACEFRAME sur scmap1") scmap1.Representation = 'Surface With Edges' time.sleep(sleep_delay) # 3. Create Deformed Shape And Scalar Map -print "Creating DeformedShapeAndScalarMap......." +print("Creating DeformedShapeAndScalarMap.......") scmap2 = DeformedShapeAndScalarMapOnField(med_reader, EntityType.NODE, field_name, timestamp_id) if scmap2 is None : - raise RuntimeError, "DeformedShapeAndScalarMapOnField presentation is None!!!" + raise RuntimeError("DeformedShapeAndScalarMapOnField presentation is None!!!") else: - print "OK" + print("OK") scmap2.Input.ScaleFactor = 1.0 display_only(scmap2) reset_view() -print "WIREFRAME sur scmap2" +print("WIREFRAME sur scmap2") scmap2.Representation = 'Wireframe' time.sleep(sleep_delay) -print "POINT sur scmap2" +print("POINT sur scmap2") scmap2.Representation = 'Points' time.sleep(sleep_delay) -print "SURFACEFRAME sur scmap2" +print("SURFACEFRAME sur scmap2") scmap2.Representation = 'Surface With Edges' time.sleep(sleep_delay) # 4.Create Deformed Shape -print "Creating DeformedShape........" +print("Creating DeformedShape........") scmap3 = DeformedShapeOnField(med_reader, EntityType.NODE, field_name, timestamp_id) if scmap3 is None : - raise RuntimeError, "DeformedShapeOnField presentation is None!!!" + raise RuntimeError("DeformedShapeOnField presentation is None!!!") else: - print "OK" + print("OK") -print "WIREFRAME sur scmap3" +print("WIREFRAME sur scmap3") scmap3.Representation = 'Wireframe' time.sleep(sleep_delay) -print "POINT sur scmap3" +print("POINT sur scmap3") scmap3.Representation = 'Points' time.sleep(sleep_delay) -print "SURFACEFRAME sur scmap3" +print("SURFACEFRAME sur scmap3") scmap3.Representation = 'Surface With Edges' time.sleep(sleep_delay) diff --git a/test/VisuPrs/dump_study/A0.py b/test/VisuPrs/dump_study/A0.py index 327379d5..f2cebabc 100644 --- a/test/VisuPrs/dump_study/A0.py +++ b/test/VisuPrs/dump_study/A0.py @@ -38,7 +38,7 @@ file_path = datadir + "TimeStamps.med" OpenDataFile(file_path) med_reader = GetActiveSource() if med_reader is None : - raise RuntimeError, "TimeStamps.med wasn't imported..." + raise RuntimeError("TimeStamps.med wasn't imported...") # 2. ScalarMap creation med_field = "vitesse" @@ -74,7 +74,7 @@ delete_pv_object(GetActiveView()) view = CreateRenderView() # 5. Execution of the created script -execfile(path_to_save) +exec(compile(open(path_to_save).read(), path_to_save, 'exec')) # 6. Checking of the settings done before dump recreated_bar = view.Representations[1] @@ -87,7 +87,7 @@ tolerance = 1e-05 offset = recreated_scalarmap.Position for i in range(len(settings["Offset"])): if abs(offset[i] - settings["Offset"][i]) > tolerance: - print "ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i] + print("ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i]) errors += 1 # Scalar mode @@ -95,10 +95,10 @@ vector_mode = recreated_scalarmap.LookupTable.VectorMode vector_component = recreated_scalarmap.LookupTable.VectorComponent if vector_mode != settings["ScalarMode"][0]: - print "ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0] + print("ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0]) errors += 1 if vector_component != settings["ScalarMode"][1]: - print "ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1] + print("ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1]) errors += 1 # Position of scalar bar @@ -106,10 +106,10 @@ pos_x = recreated_bar.Position[0] pos_y = recreated_bar.Position[1] if abs(pos_x - settings["Position"][0]) > tolerance: - print "ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0] + print("ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0]) errors += 1 if abs(pos_y - settings["Position"][1]) > tolerance: - print "ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1] + print("ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1]) errors += 1 # Size of scalar bar @@ -117,50 +117,50 @@ width = recreated_bar.Position2[0] height = recreated_bar.Position2[1] if abs(width - settings["Size"][0]) > tolerance: - print "ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0] + print("ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0]) errors += 1 if abs(height - settings["Size"][1]) > tolerance: - print "ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1] + print("ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1]) errors += 1 # Discretize discretize = recreated_scalarmap.LookupTable.Discretize if discretize != settings["Discretize"]: - print "ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"] + print("ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"]) errors += 1 # Number of colors nb_colors = recreated_scalarmap.LookupTable.NumberOfTableValues if nb_colors != settings["NbColors"]: - print "ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"] + print("ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"]) errors += 1 # Number of labels nb_labels = recreated_bar.NumberOfLabels if nb_labels != settings["NbLabels"]: - print "ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"] + print("ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"]) errors += 1 # Title title = recreated_bar.Title if title != settings["Title"]: - print "ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"] + print("ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"]) errors += 1 # Scaling use_log_scale = recreated_scalarmap.LookupTable.UseLogScale if use_log_scale != settings["UseLogScale"]: - print "ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"] + print("ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"]) errors += 1 # Bar Orientation orientation = recreated_bar.Orientation if orientation != settings["Orientation"]: - print "ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"] + print("ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"]) errors += 1 if errors > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/dump_study/A1.py b/test/VisuPrs/dump_study/A1.py index f1725d3c..82449db7 100644 --- a/test/VisuPrs/dump_study/A1.py +++ b/test/VisuPrs/dump_study/A1.py @@ -39,7 +39,7 @@ file_path = datadir + "TimeStamps.med" OpenDataFile(file_path) med_reader = GetActiveSource() if med_reader is None : - raise RuntimeError, "TimeStamps.med wasn't imported..." + raise RuntimeError("TimeStamps.med wasn't imported...") # 2. IsoSurfaces creation med_field = "vitesse" @@ -80,7 +80,7 @@ delete_pv_object(GetActiveView()) view = CreateRenderView() # 5. Execution of the created script -execfile(path_to_save) +exec(compile(open(path_to_save).read(), path_to_save, 'exec')) # 6. Checking of the settings done before dump recreated_bar = view.Representations[1] @@ -93,7 +93,7 @@ tolerance = 1e-05 offset = recreated_isosurfaces.Position for i in range(len(settings["Offset"])): if abs(offset[i] - settings["Offset"][i]) > tolerance: - print "ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i] + print("ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i]) errors += 1 # Scalar mode @@ -101,10 +101,10 @@ vector_mode = recreated_isosurfaces.LookupTable.VectorMode vector_component = recreated_isosurfaces.LookupTable.VectorComponent if vector_mode != settings["ScalarMode"][0]: - print "ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0] + print("ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0]) errors += 1 if vector_component != settings["ScalarMode"][1]: - print "ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1] + print("ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1]) errors += 1 # Position of scalar bar @@ -112,10 +112,10 @@ pos_x = recreated_bar.Position[0] pos_y = recreated_bar.Position[1] if abs(pos_x - settings["Position"][0]) > tolerance: - print "ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0] + print("ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0]) errors += 1 if abs(pos_y - settings["Position"][1]) > tolerance: - print "ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1] + print("ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1]) errors += 1 # Size of scalar bar @@ -123,53 +123,53 @@ width = recreated_bar.Position2[0] height = recreated_bar.Position2[1] if abs(width - settings["Size"][0]) > tolerance: - print "ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0] + print("ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0]) errors += 1 if abs(height - settings["Size"][1]) > tolerance: - print "ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1] + print("ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1]) errors += 1 # Discretize discretize = recreated_isosurfaces.LookupTable.Discretize if discretize != settings["Discretize"]: - print "ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"] + print("ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"]) errors += 1 # Number of colors nb_colors = recreated_isosurfaces.LookupTable.NumberOfTableValues if nb_colors != settings["NbColors"]: - print "ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"] + print("ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"]) errors += 1 # Number of labels nb_labels = recreated_bar.NumberOfLabels if nb_labels != settings["NbLabels"]: - print "ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"] + print("ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"]) errors += 1 # Title title = recreated_bar.Title if title != settings["Title"]: - print "ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"] + print("ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"]) errors += 1 # Scaling use_log_scale = recreated_isosurfaces.LookupTable.UseLogScale if use_log_scale != settings["UseLogScale"]: - print "ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"] + print("ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"]) errors += 1 # Bar Orientation orientation = recreated_bar.Orientation if orientation != settings["Orientation"]: - print "ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"] + print("ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"]) errors += 1 # NbSurfaces nb_surfaces = len(recreated_isosurfaces.Input.Isosurfaces) if nb_surfaces != settings["NbSurfaces"]: - print "ERROR!!! Number of surfaces of presentation is incorrect: ", nb_surfaces, " instead of ", settings["NbSurfaces"] + print("ERROR!!! Number of surfaces of presentation is incorrect: ", nb_surfaces, " instead of ", settings["NbSurfaces"]) errors += 1 if errors > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/dump_study/A2.py b/test/VisuPrs/dump_study/A2.py index c2092c3c..20e3cdbb 100644 --- a/test/VisuPrs/dump_study/A2.py +++ b/test/VisuPrs/dump_study/A2.py @@ -38,7 +38,7 @@ file_path = datadir + "TimeStamps.med" OpenDataFile(file_path) med_reader = GetActiveSource() if med_reader is None : - raise RuntimeError, "TimeStamps.med wasn't imported..." + raise RuntimeError("TimeStamps.med wasn't imported...") # 2. CutPlanes creation med_field = "vitesse" @@ -80,7 +80,7 @@ delete_pv_object(GetActiveView()) view = CreateRenderView() # 5. Execution of the created script -execfile(path_to_save) +exec(compile(open(path_to_save).read(), path_to_save, 'exec')) # 6. Checking of the settings done before dump recreated_bar = view.Representations[1] @@ -93,7 +93,7 @@ tolerance = 1e-05 offset = recreated_cutplanes.Position for i in range(len(settings["Offset"])): if abs(offset[i] - settings["Offset"][i]) > tolerance: - print "ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i] + print("ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i]) errors += 1 # Scalar mode @@ -101,10 +101,10 @@ vector_mode = recreated_cutplanes.LookupTable.VectorMode vector_component = recreated_cutplanes.LookupTable.VectorComponent if vector_mode != settings["ScalarMode"][0]: - print "ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0] + print("ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0]) errors += 1 if vector_component != settings["ScalarMode"][1]: - print "ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1] + print("ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1]) errors += 1 # Position of scalar bar @@ -112,10 +112,10 @@ pos_x = recreated_bar.Position[0] pos_y = recreated_bar.Position[1] if abs(pos_x - settings["Position"][0]) > tolerance: - print "ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0] + print("ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0]) errors += 1 if abs(pos_y - settings["Position"][1]) > tolerance: - print "ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1] + print("ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1]) errors += 1 # Size of scalar bar @@ -123,59 +123,59 @@ width = recreated_bar.Position2[0] height = recreated_bar.Position2[1] if abs(width - settings["Size"][0]) > tolerance: - print "ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0] + print("ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0]) errors += 1 if abs(height - settings["Size"][1]) > tolerance: - print "ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1] + print("ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1]) errors += 1 # Discretize discretize = recreated_cutplanes.LookupTable.Discretize if discretize != settings["Discretize"]: - print "ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"] + print("ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"]) errors += 1 # Number of colors nb_colors = recreated_cutplanes.LookupTable.NumberOfTableValues if nb_colors != settings["NbColors"]: - print "ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"] + print("ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"]) errors += 1 # Number of labels nb_labels = recreated_bar.NumberOfLabels if nb_labels != settings["NbLabels"]: - print "ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"] + print("ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"]) errors += 1 # Title title = recreated_bar.Title if title != settings["Title"]: - print "ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"] + print("ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"]) errors += 1 # Scaling use_log_scale = recreated_cutplanes.LookupTable.UseLogScale if use_log_scale != settings["UseLogScale"]: - print "ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"] + print("ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"]) errors += 1 # Bar Orientation orientation = recreated_bar.Orientation if orientation != settings["Orientation"]: - print "ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"] + print("ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"]) errors += 1 # Normal cur_normal = list(recreated_cutplanes.Input.SliceType.Normal) if cur_normal != normal: - print "ERROR!!! Normal of cut planes is incorrect: ", cur_normal, " instead of ", normal + print("ERROR!!! Normal of cut planes is incorrect: ", cur_normal, " instead of ", normal) errors += 1 # Position cur_pos = list(recreated_cutplanes.Input.SliceOffsetValues) if cur_pos != pos: - print "ERROR!!! Positions of cut planes is incorrect: ", cur_pos, " instead of ", pos + print("ERROR!!! Positions of cut planes is incorrect: ", cur_pos, " instead of ", pos) errors += 1 if errors > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/dump_study/A3.py b/test/VisuPrs/dump_study/A3.py index e5bf8f77..808c9ea6 100644 --- a/test/VisuPrs/dump_study/A3.py +++ b/test/VisuPrs/dump_study/A3.py @@ -38,7 +38,7 @@ file_path = datadir + "TimeStamps.med" OpenDataFile(file_path) med_reader = GetActiveSource() if med_reader is None : - raise RuntimeError, "TimeStamps.med wasn't imported..." + raise RuntimeError("TimeStamps.med wasn't imported...") # 2. DeformedShape creation med_field = "vitesse" @@ -77,7 +77,7 @@ delete_pv_object(GetActiveView()) view = CreateRenderView() # 5. Execution of the created script -execfile(path_to_save) +exec(compile(open(path_to_save).read(), path_to_save, 'exec')) # 6. Checking of the settings done before dump recreated_bar = view.Representations[1] @@ -90,7 +90,7 @@ tolerance = 1e-05 offset = recreated_deformedshape.Position for i in range(len(settings["Offset"])): if abs(offset[i] - settings["Offset"][i]) > tolerance: - print "ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i] + print("ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i]) errors += 1 # Scalar mode @@ -98,10 +98,10 @@ vector_mode = recreated_deformedshape.LookupTable.VectorMode vector_component = recreated_deformedshape.LookupTable.VectorComponent if vector_mode != settings["ScalarMode"][0]: - print "ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0] + print("ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0]) errors += 1 if vector_component != settings["ScalarMode"][1]: - print "ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1] + print("ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1]) errors += 1 # Position of scalar bar @@ -109,10 +109,10 @@ pos_x = recreated_bar.Position[0] pos_y = recreated_bar.Position[1] if abs(pos_x - settings["Position"][0]) > tolerance: - print "ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0] + print("ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0]) errors += 1 if abs(pos_y - settings["Position"][1]) > tolerance: - print "ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1] + print("ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1]) errors += 1 # Size of scalar bar @@ -120,65 +120,65 @@ width = recreated_bar.Position2[0] height = recreated_bar.Position2[1] if abs(width - settings["Size"][0]) > tolerance: - print "ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0] + print("ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0]) errors += 1 if abs(height - settings["Size"][1]) > tolerance: - print "ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1] + print("ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1]) errors += 1 # Discretize discretize = recreated_deformedshape.LookupTable.Discretize if discretize != settings["Discretize"]: - print "ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"] + print("ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"]) errors += 1 # Number of colors nb_colors = recreated_deformedshape.LookupTable.NumberOfTableValues if nb_colors != settings["NbColors"]: - print "ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"] + print("ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"]) errors += 1 # Number of labels nb_labels = recreated_bar.NumberOfLabels if nb_labels != settings["NbLabels"]: - print "ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"] + print("ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"]) errors += 1 # Title title = recreated_bar.Title if title != settings["Title"]: - print "ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"] + print("ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"]) errors += 1 # Scaling use_log_scale = recreated_deformedshape.LookupTable.UseLogScale if use_log_scale != settings["UseLogScale"]: - print "ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"] + print("ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"]) errors += 1 # Bar Orientation orientation = recreated_bar.Orientation if orientation != settings["Orientation"]: - print "ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"] + print("ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"]) errors += 1 # Scale factor scale = recreated_deformedshape.Input.ScaleFactor if abs(scale - settings["Scale"]) > tolerance: - print "ERROR!!! Scale of presentation is incorrect: ", scale, " instead of ", settings["Scale"] + print("ERROR!!! Scale of presentation is incorrect: ", scale, " instead of ", settings["Scale"]) errors += 1 # Color array name array_name = recreated_deformedshape.ColorArrayName[1] if array_name != med_field: - print "ERROR!!! Color array name of presentation is incorrect: ", array_name , " instead of ", med_field + print("ERROR!!! Color array name of presentation is incorrect: ", array_name , " instead of ", med_field) errors += 1 # Color color = list(recreated_deformedshape.AmbientColor) if color != settings["ColorComponents"]: - print "ERROR!!! Color of presentation is incorrect: ", color, " instead of ", settings["ColorComponents"] + print("ERROR!!! Color of presentation is incorrect: ", color, " instead of ", settings["ColorComponents"]) errors += 1 if errors > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/dump_study/A4.py b/test/VisuPrs/dump_study/A4.py index fcea7616..5ed08d0b 100644 --- a/test/VisuPrs/dump_study/A4.py +++ b/test/VisuPrs/dump_study/A4.py @@ -39,7 +39,7 @@ file_path = datadir + "TimeStamps.med" OpenDataFile(file_path) med_reader = GetActiveSource() if med_reader is None : - raise RuntimeError, "TimeStamps.med wasn't imported..." + raise RuntimeError("TimeStamps.med wasn't imported...") # 2. GaussPoints creation med_field = "pression" @@ -72,7 +72,7 @@ delete_pv_object(GetActiveView()) view = CreateRenderView() # 5. Execution of the created script -execfile(path_to_save) +exec(compile(open(path_to_save).read(), path_to_save, 'exec')) # 6. Checking of the settings done before dump recreated_bar = view.Representations[1] @@ -85,7 +85,7 @@ tolerance = 1e-05 offset = recreated_gausspoints.Position for i in range(len(settings["Offset"])): if abs(offset[i] - settings["Offset"][i]) > tolerance: - print "ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i] + print("ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i]) errors += 1 # Scalar mode @@ -93,10 +93,10 @@ vector_mode = recreated_gausspoints.LookupTable.VectorMode vector_component = recreated_gausspoints.LookupTable.VectorComponent if vector_mode != settings["ScalarMode"][0]: - print "ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0] + print("ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0]) errors += 1 if vector_component != settings["ScalarMode"][1]: - print "ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1] + print("ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1]) errors += 1 # Position of scalar bar @@ -104,10 +104,10 @@ pos_x = recreated_bar.Position[0] pos_y = recreated_bar.Position[1] if abs(pos_x - settings["Position"][0]) > tolerance: - print "ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0] + print("ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0]) errors += 1 if abs(pos_y - settings["Position"][1]) > tolerance: - print "ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1] + print("ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1]) errors += 1 # Size of scalar bar @@ -115,35 +115,35 @@ width = recreated_bar.Position2[0] height = recreated_bar.Position2[1] if abs(width - settings["Size"][0]) > tolerance: - print "ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0] + print("ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0]) errors += 1 if abs(height - settings["Size"][1]) > tolerance: - print "ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1] + print("ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1]) errors += 1 # Discretize discretize = recreated_gausspoints.LookupTable.Discretize if discretize != settings["Discretize"]: - print "ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"] + print("ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"]) errors += 1 # Number of colors nb_colors = recreated_gausspoints.LookupTable.NumberOfTableValues if nb_colors != settings["NbColors"]: - print "ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"] + print("ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"]) errors += 1 # Number of labels nb_labels = recreated_bar.NumberOfLabels if nb_labels != settings["NbLabels"]: - print "ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"] + print("ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"]) errors += 1 # Title title = recreated_bar.Title if title != settings["Title"]: - print "ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"] + print("ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"]) errors += 1 if errors > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/dump_study/A5.py b/test/VisuPrs/dump_study/A5.py index af97474e..1d571c5b 100644 --- a/test/VisuPrs/dump_study/A5.py +++ b/test/VisuPrs/dump_study/A5.py @@ -38,7 +38,7 @@ file_path = datadir + "fra.med" OpenDataFile(file_path) med_reader = GetActiveSource() if med_reader is None : - raise RuntimeError, "TimeStamps.med wasn't imported..." + raise RuntimeError("TimeStamps.med wasn't imported...") # 2. Plot3D creation med_field = "VITESSE" @@ -88,7 +88,7 @@ delete_pv_object(GetActiveView()) view = CreateRenderView() # 5. Execution of the created script -execfile(path_to_save) +exec(compile(open(path_to_save).read(), path_to_save, 'exec')) # 6. Checking of the settings done before dump recreated_bar = view.Representations[1] @@ -101,7 +101,7 @@ tolerance = 1e-05 offset = recreated_plot3d.Position for i in range(len(settings["Offset"])): if abs(offset[i] - settings["Offset"][i]) > tolerance: - print "ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i] + print("ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i]) errors += 1 # Scalar mode @@ -109,10 +109,10 @@ vector_mode = recreated_plot3d.LookupTable.VectorMode vector_component = recreated_plot3d.LookupTable.VectorComponent if vector_mode != settings["ScalarMode"][0]: - print "ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0] + print("ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0]) errors += 1 if vector_component != settings["ScalarMode"][1]: - print "ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1] + print("ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1]) errors += 1 # Position of scalar bar @@ -120,10 +120,10 @@ pos_x = recreated_bar.Position[0] pos_y = recreated_bar.Position[1] if abs(pos_x - settings["Position"][0]) > tolerance: - print "ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0] + print("ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0]) errors += 1 if abs(pos_y - settings["Position"][1]) > tolerance: - print "ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1] + print("ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1]) errors += 1 # Size of scalar bar @@ -131,52 +131,52 @@ width = recreated_bar.Position2[0] height = recreated_bar.Position2[1] if abs(width - settings["Size"][0]) > tolerance: - print "ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0] + print("ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0]) errors += 1 if abs(height - settings["Size"][1]) > tolerance: - print "ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1] + print("ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1]) errors += 1 # Discretize discretize = recreated_plot3d.LookupTable.Discretize if discretize != settings["Discretize"]: - print "ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"] + print("ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"]) errors += 1 # Number of colors nb_colors = recreated_plot3d.LookupTable.NumberOfTableValues if nb_colors != settings["NbColors"]: - print "ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"] + print("ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"]) errors += 1 # Number of labels nb_labels = recreated_bar.NumberOfLabels if nb_labels != settings["NbLabels"]: - print "ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"] + print("ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"]) errors += 1 # Title title = recreated_bar.Title if title != settings["Title"]: - print "ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"] + print("ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"]) errors += 1 # Scaling use_log_scale = recreated_plot3d.LookupTable.UseLogScale if use_log_scale != settings["UseLogScale"]: - print "ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"] + print("ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"]) errors += 1 # Bar Orientation orientation = recreated_bar.Orientation if orientation != settings["Orientation"]: - print "ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"] + print("ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"]) errors += 1 # Scale Factor scale_factor = recreated_plot3d.Input.Input.ScaleFactor if abs(scale_factor - settings["ScaleFactor"]) > tolerance: - print "ERROR!!! Scale factor of presentation is incorrect: ", scale_factor, " instead of ", settings["ScaleFactor"] + print("ERROR!!! Scale factor of presentation is incorrect: ", scale_factor, " instead of ", settings["ScaleFactor"]) errors += 1 # Cutting plane @@ -184,19 +184,19 @@ cur_slice_filter = recreated_plot3d.Input.Input.Input.Input cur_normal = list(cur_slice_filter.SliceType.Normal) if cur_normal != normal: - print "ERROR!!! Normal of the cutting plane is incorrect: ", cur_normal, " instead of ", normal + print("ERROR!!! Normal of the cutting plane is incorrect: ", cur_normal, " instead of ", normal) errors += 1 cur_pos = list(cur_slice_filter.SliceOffsetValues) if cur_pos != pos: - print "ERROR!!! Position of the cuttting plane is incorrect: ", cur_pos, " instead of ", pos + print("ERROR!!! Position of the cuttting plane is incorrect: ", cur_pos, " instead of ", pos) errors += 1 # Contours cur_surfaces = list(recreated_plot3d.Input.Isosurfaces) if cur_surfaces != surfaces: - print "ERROR!!! Contours is incorrect: ", cur_surfaces, " instead of ", surfaces + print("ERROR!!! Contours is incorrect: ", cur_surfaces, " instead of ", surfaces) errors += 1 if errors > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/dump_study/A6.py b/test/VisuPrs/dump_study/A6.py index 249cc22e..44c5ac3a 100644 --- a/test/VisuPrs/dump_study/A6.py +++ b/test/VisuPrs/dump_study/A6.py @@ -38,7 +38,7 @@ file_path = datadir + "TimeStamps.med" OpenDataFile(file_path) med_reader = GetActiveSource() if med_reader is None: - raise RuntimeError, "TimeStamps.med wasn't imported..." + raise RuntimeError("TimeStamps.med wasn't imported...") # 2. ScalarMapOnDeformedShape creation med_field = "vitesse" @@ -77,7 +77,7 @@ delete_pv_object(GetActiveView()) view = CreateRenderView() # 5. Execution of the created script -execfile(path_to_save) +exec(compile(open(path_to_save).read(), path_to_save, 'exec')) # 6. Checking of the settings done before dump recreated_bar = view.Representations[1] @@ -90,7 +90,7 @@ tolerance = 1e-05 offset = recreated_prs.Position for i in range(len(settings["Offset"])): if abs(offset[i] - settings["Offset"][i]) > tolerance: - print "ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i] + print("ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i]) errors += 1 # Scalar mode @@ -98,10 +98,10 @@ vector_mode = recreated_prs.LookupTable.VectorMode vector_component = recreated_prs.LookupTable.VectorComponent if vector_mode != settings["ScalarMode"][0]: - print "ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0] + print("ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0]) errors += 1 if vector_component != settings["ScalarMode"][1]: - print "ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1] + print("ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1]) errors += 1 # Position of scalar bar @@ -109,10 +109,10 @@ pos_x = recreated_bar.Position[0] pos_y = recreated_bar.Position[1] if abs(pos_x - settings["Position"][0]) > tolerance: - print "ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0] + print("ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0]) errors += 1 if abs(pos_y - settings["Position"][1]) > tolerance: - print "ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1] + print("ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1]) errors += 1 # Size of scalar bar @@ -120,46 +120,46 @@ width = recreated_bar.Position2[0] height = recreated_bar.Position2[1] if abs(width - settings["Size"][0]) > tolerance: - print "ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0] + print("ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0]) errors += 1 if abs(height - settings["Size"][1]) > tolerance: - print "ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1] + print("ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1]) errors += 1 # Discretize discretize = recreated_prs.LookupTable.Discretize if discretize != settings["Discretize"]: - print "ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"] + print("ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"]) errors += 1 # Number of colors nb_colors = recreated_prs.LookupTable.NumberOfTableValues if nb_colors != settings["NbColors"]: - print "ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"] + print("ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"]) errors += 1 # Number of labels nb_labels = recreated_bar.NumberOfLabels if nb_labels != settings["NbLabels"]: - print "ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"] + print("ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"]) errors += 1 # Title title = recreated_bar.Title if title != settings["Title"]: - print "ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"] + print("ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"]) errors += 1 # Scaling use_log_scale = recreated_prs.LookupTable.UseLogScale if use_log_scale != settings["UseLogScale"]: - print "ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"] + print("ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"]) errors += 1 # Bar Orientation orientation = recreated_bar.Orientation if orientation != settings["Orientation"]: - print "ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"] + print("ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"]) errors += 1 # Range @@ -167,18 +167,18 @@ cur_range_min = recreated_prs.LookupTable.RGBPoints[0] cur_range_max = recreated_prs.LookupTable.RGBPoints[4] if abs(cur_range_min - range_min) > tolerance: - print "ERROR!!! Minimum value of range of presentation is incorrect: ", cur_range_min, " instead of ", range_min + print("ERROR!!! Minimum value of range of presentation is incorrect: ", cur_range_min, " instead of ", range_min) errors += 1 if abs(cur_range_max - range_max) > tolerance: - print "ERROR!!! Maximum value of range of presentation is incorrect: ", cur_range_max, " instead of ", range_max + print("ERROR!!! Maximum value of range of presentation is incorrect: ", cur_range_max, " instead of ", range_max) errors += 1 # Scale factor scale = recreated_prs.Input.ScaleFactor if abs(scale - settings["Scale"]) > tolerance: - print "ERROR!!! Scale of presentation is incorrect: ", scale, " instead of ", settings["Scale"] + print("ERROR!!! Scale of presentation is incorrect: ", scale, " instead of ", settings["Scale"]) errors += 1 if errors > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/dump_study/A7.py b/test/VisuPrs/dump_study/A7.py index 8acbffe6..a32762c0 100644 --- a/test/VisuPrs/dump_study/A7.py +++ b/test/VisuPrs/dump_study/A7.py @@ -55,7 +55,7 @@ file_path = datadir + "TimeStamps.med" OpenDataFile(file_path) med_reader = GetActiveSource() if med_reader is None : - raise RuntimeError, "TimeStamps.med wasn't imported..." + raise RuntimeError("TimeStamps.med wasn't imported...") # 2. StreamLines creation field_name = "vitesse" @@ -91,88 +91,88 @@ save_trace( path_to_save, text ) delete_with_inputs(stream) # 5. Execution of the created script -execfile(path_to_save) +exec(compile(open(path_to_save).read(), path_to_save, 'exec')) # 6. Find the recreated StreamTracer object recreated_stream = FindSource(settings['name']) if recreated_stream is None: - raise RuntimeError, "There is no StreamLines in the study (must be created by executed python script)!!!" + raise RuntimeError("There is no StreamLines in the study (must be created by executed python script)!!!") -print settings['name'] + " was found!!!" +print(settings['name'] + " was found!!!") # 7. Check settings # IntegrationDirection param = stream.IntegrationDirection if param != settings['IntegrationDirection']: - print "ERROR!!! IntegrationDirection of presentation is incorrect: ", param, " instead of ", settings["IntegrationDirection"] + print("ERROR!!! IntegrationDirection of presentation is incorrect: ", param, " instead of ", settings["IntegrationDirection"]) errors += 1 # InitialStepLength param = stream.InitialStepLength if param != settings['InitialStepLength']: - print "ERROR!!! InitialStepLength of presentation is incorrect: ", param, " instead of ", settings["InitialStepLength"] + print("ERROR!!! InitialStepLength of presentation is incorrect: ", param, " instead of ", settings["InitialStepLength"]) errors += 1 # IntegrationStepUnit param = stream.IntegrationStepUnit if param != settings['IntegrationStepUnit']: - print "ERROR!!! IntegrationStepUnit of presentation is incorrect: ", param, " instead of ", settings["IntegrationStepUnit"] + print("ERROR!!! IntegrationStepUnit of presentation is incorrect: ", param, " instead of ", settings["IntegrationStepUnit"]) errors += 1 # IntegratorType param = stream.IntegratorType if param != settings['IntegratorType']: - print "ERROR!!! IntegratorType of presentation is incorrect: ", param, " instead of ", settings["IntegratorType"] + print("ERROR!!! IntegratorType of presentation is incorrect: ", param, " instead of ", settings["IntegratorType"]) errors += 1 # MaximumError param = stream.MaximumError if param != settings['MaximumError']: - print "ERROR!!! MaximumError of presentation is incorrect: ", param, " instead of ", settings["MaximumError"] + print("ERROR!!! MaximumError of presentation is incorrect: ", param, " instead of ", settings["MaximumError"]) errors += 1 # MinimumStepLength param = stream.MinimumStepLength if param != settings['MinimumStepLength']: - print "ERROR!!! MinimumStepLength of presentation is incorrect: ", param, " instead of ", settings["MinimumStepLength"] + print("ERROR!!! MinimumStepLength of presentation is incorrect: ", param, " instead of ", settings["MinimumStepLength"]) errors += 1 # MaximumStepLength param = stream.MaximumStepLength if param != settings['MaximumStepLength']: - print "ERROR!!! MaximumStepLength of presentation is incorrect: ", param, " instead of ", settings["MaximumStepLength"] + print("ERROR!!! MaximumStepLength of presentation is incorrect: ", param, " instead of ", settings["MaximumStepLength"]) errors += 1 # MaximumSteps param = stream.MaximumSteps if param != settings['MaximumSteps']: - print "ERROR!!! MaximumSteps of presentation is incorrect: ", param, " instead of ", settings["MaximumSteps"] + print("ERROR!!! MaximumSteps of presentation is incorrect: ", param, " instead of ", settings["MaximumSteps"]) errors += 1 # MaximumStreamlineLength param = stream.MaximumStreamlineLength if param != settings['MaximumStreamlineLength']: - print "ERROR!!! MaximumStreamlineLength of presentation is incorrect: ", param, " instead of ", settings["MaximumStreamlineLength"] + print("ERROR!!! MaximumStreamlineLength of presentation is incorrect: ", param, " instead of ", settings["MaximumStreamlineLength"]) errors += 1 # SeedType.Center param = list(stream.SeedType.Center) if param != settings['SeedType.Center']: - print "ERROR!!! SeedType.Center of presentation is incorrect: ", param, " instead of ", settings["SeedType.Center"] + print("ERROR!!! SeedType.Center of presentation is incorrect: ", param, " instead of ", settings["SeedType.Center"]) errors += 1 # SeedType.NumberOfPoints param = stream.SeedType.NumberOfPoints if param != settings['SeedType.NumberOfPoints']: - print "ERROR!!! SeedType.NumberOfPoints of presentation is incorrect: ", param, " instead of ", settings["SeedType.NumberOfPoints"] + print("ERROR!!! SeedType.NumberOfPoints of presentation is incorrect: ", param, " instead of ", settings["SeedType.NumberOfPoints"]) errors += 1 # SeedType.Radius param = stream.SeedType.Radius if param != settings['SeedType.Radius']: - print "ERROR!!! SeedType.Radius of presentation is incorrect: ", param, " instead of ", settings["SeedType.Radius"] + print("ERROR!!! SeedType.Radius of presentation is incorrect: ", param, " instead of ", settings["SeedType.Radius"]) errors += 1 if errors > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/dump_study/A8.py b/test/VisuPrs/dump_study/A8.py index 38c27eed..411f11ef 100644 --- a/test/VisuPrs/dump_study/A8.py +++ b/test/VisuPrs/dump_study/A8.py @@ -39,7 +39,7 @@ file_path = datadir + "TimeStamps.med" OpenDataFile(file_path) med_reader = GetActiveSource() if med_reader is None : - raise RuntimeError, "TimeStamps.med wasn't imported..." + raise RuntimeError("TimeStamps.med wasn't imported...") # 2. Vectors creation med_field = "vitesse" @@ -83,7 +83,7 @@ delete_pv_object(GetActiveView()) view = CreateRenderView() # 5. Execution of the created script -execfile(path_to_save) +exec(compile(open(path_to_save).read(), path_to_save, 'exec')) # 6. Checking of the settings done before dump recreated_bar = view.Representations[1] @@ -96,7 +96,7 @@ tolerance = 1e-05 offset = recreated_vectors.Position for i in range(len(settings["Offset"])): if abs(offset[i] - settings["Offset"][i]) > tolerance: - print "ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i] + print("ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i]) errors += 1 # Scalar mode @@ -104,10 +104,10 @@ vector_mode = recreated_vectors.LookupTable.VectorMode vector_component = recreated_vectors.LookupTable.VectorComponent if vector_mode != settings["ScalarMode"][0]: - print "ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0] + print("ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0]) errors += 1 if vector_component != settings["ScalarMode"][1]: - print "ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1] + print("ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1]) errors += 1 # Position of scalar bar @@ -115,10 +115,10 @@ pos_x = recreated_bar.Position[0] pos_y = recreated_bar.Position[1] if abs(pos_x - settings["Position"][0]) > tolerance: - print "ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0] + print("ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0]) errors += 1 if abs(pos_y - settings["Position"][1]) > tolerance: - print "ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1] + print("ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1]) errors += 1 # Size of scalar bar @@ -126,83 +126,83 @@ width = recreated_bar.Position2[0] height = recreated_bar.Position2[1] if abs(width - settings["Size"][0]) > tolerance: - print "ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0] + print("ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0]) errors += 1 if abs(height - settings["Size"][1]) > tolerance: - print "ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1] + print("ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1]) errors += 1 # Discretize discretize = recreated_vectors.LookupTable.Discretize if discretize != settings["Discretize"]: - print "ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"] + print("ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"]) errors += 1 # Number of colors nb_colors = recreated_vectors.LookupTable.NumberOfTableValues if nb_colors != settings["NbColors"]: - print "ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"] + print("ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"]) errors += 1 # Number of labels nb_labels = recreated_bar.NumberOfLabels if nb_labels != settings["NbLabels"]: - print "ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"] + print("ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"]) errors += 1 # Title title = recreated_bar.Title if title != settings["Title"]: - print "ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"] + print("ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"]) errors += 1 # Scaling use_log_scale = recreated_vectors.LookupTable.UseLogScale if use_log_scale != settings["UseLogScale"]: - print "ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"] + print("ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"]) errors += 1 # Bar Orientation orientation = recreated_bar.Orientation if orientation != settings["Orientation"]: - print "ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"] + print("ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"]) errors += 1 # Scale factor scale = recreated_vectors.Input.ScaleFactor if abs(scale - settings["Scale"]) > tolerance: - print "ERROR!!! Scale of presentation is incorrect: ", scale, " instead of ", settings["Scale"] + print("ERROR!!! Scale of presentation is incorrect: ", scale, " instead of ", settings["Scale"]) errors += 1 # Color array name array_name = recreated_vectors.ColorArrayName[1] if array_name != med_field: - print "ERROR!!! Color array name of presentation is incorrect: ", array_name, " instead of ", med_field + print("ERROR!!! Color array name of presentation is incorrect: ", array_name, " instead of ", med_field) errors += 1 # Color color = list(recreated_vectors.AmbientColor) if color != settings["ColorComponents"]: - print "ERROR!!! Color of presentation is incorrect: ", color, " instead of ", settings["ColorComponents"] + print("ERROR!!! Color of presentation is incorrect: ", color, " instead of ", settings["ColorComponents"]) errors += 1 # Line width line_width = recreated_vectors.LineWidth if abs(line_width - settings["LineWidth"]) > tolerance: - print "ERROR!!! Line width of presentation is incorrect: ", line_width, " instead of ", settings["LineWidth"] + print("ERROR!!! Line width of presentation is incorrect: ", line_width, " instead of ", settings["LineWidth"]) errors += 1 # Glyph type glyph_type = type(recreated_vectors.Input.GlyphType) if glyph_type != cone_glyth_type: - print "ERROR!!! Glyph type is incorrect: ", glyph_type, " instead of ", cone_glyth_type + print("ERROR!!! Glyph type is incorrect: ", glyph_type, " instead of ", cone_glyth_type) errors += 1 # Glyph position glyph_position = list(recreated_vectors.Input.GlyphType.Center) if glyph_position != settings["GlyphPos"]: - print "ERROR!!! Glyph position is incorrect: ", glyph_position, " instead of ", settings["GlyphPos"] + print("ERROR!!! Glyph position is incorrect: ", glyph_position, " instead of ", settings["GlyphPos"]) errors += 1 if errors > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/dump_study/A9.py b/test/VisuPrs/dump_study/A9.py index fda0b94a..e05318c2 100644 --- a/test/VisuPrs/dump_study/A9.py +++ b/test/VisuPrs/dump_study/A9.py @@ -38,7 +38,7 @@ file_path = datadir + "TimeStamps.med" OpenDataFile(file_path) med_reader = GetActiveSource() if med_reader is None : - raise RuntimeError, "TimeStamps.med wasn't imported..." + raise RuntimeError("TimeStamps.med wasn't imported...") # 2. CutLines creation med_field = "vitesse" @@ -91,7 +91,7 @@ delete_pv_object(GetActiveView()) view = CreateRenderView() # 5. Execution of the created script -execfile(path_to_save) +exec(compile(open(path_to_save).read(), path_to_save, 'exec')) # 6. Checking of the settings done before dump recreated_bar = view.Representations[0] @@ -104,7 +104,7 @@ tolerance = 1e-05 offset = recreated_cutlines.Position for i in range(len(settings["Offset"])): if abs(offset[i] - settings["Offset"][i]) > tolerance: - print "ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i] + print("ERROR!!! Offset value with ", i, " index is incorrect: ", offset[i], " instead of ", settings["Offset"][i]) errors += 1 # Scalar mode @@ -112,10 +112,10 @@ vector_mode = recreated_cutlines.LookupTable.VectorMode vector_component = recreated_cutlines.LookupTable.VectorComponent if vector_mode != settings["ScalarMode"][0]: - print "ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0] + print("ERROR!!! Vector mode value is incorrect: ", vector_mode, " instead of ", settings["ScalarMode"][0]) errors += 1 if vector_component != settings["ScalarMode"][1]: - print "ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1] + print("ERROR!!! Vector component value is incorrect: ", vector_component, " instead of ", settings["ScalarMode"][1]) errors += 1 # Position of scalar bar @@ -123,10 +123,10 @@ pos_x = recreated_bar.Position[0] pos_y = recreated_bar.Position[1] if abs(pos_x - settings["Position"][0]) > tolerance: - print "ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0] + print("ERROR!!! X coordinate of position of scalar bar is incorrect: ", pos_x, " instead of ", settings["Position"][0]) errors += 1 if abs(pos_y - settings["Position"][1]) > tolerance: - print "ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1] + print("ERROR!!! Y coordinate of position of scalar bar is incorrect: ", pos_y, " instead of ", settings["Position"][1]) errors += 1 # Size of scalar bar @@ -134,71 +134,71 @@ width = recreated_bar.Position2[0] height = recreated_bar.Position2[1] if abs(width - settings["Size"][0]) > tolerance: - print "ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0] + print("ERROR!!! Width of scalar bar is incorrect: ", width, " instead of ", settings["Size"][0]) errors += 1 if abs(height - settings["Size"][1]) > tolerance: - print "ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1] + print("ERROR!!! Height of scalar bar is incorrect: ", height, " instead of ", settings["Size"][1]) errors += 1 # Discretize discretize = recreated_cutlines.LookupTable.Discretize if discretize != settings["Discretize"]: - print "ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"] + print("ERROR!!! Discretize property is incorrect: ", discretize, " instead of ", settings["Discretize"]) errors += 1 # Number of colors nb_colors = recreated_cutlines.LookupTable.NumberOfTableValues if nb_colors != settings["NbColors"]: - print "ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"] + print("ERROR!!! Number of colors of scalar bar is incorrect: ", nb_colors, " instead of ", settings["NbColors"]) errors += 1 # Number of labels nb_labels = recreated_bar.NumberOfLabels if nb_labels != settings["NbLabels"]: - print "ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"] + print("ERROR!!! Number of labels of scalar bar is incorrect: ", nb_labels, " instead of ", settings["NbLabels"]) errors += 1 # Title title = recreated_bar.Title if title != settings["Title"]: - print "ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"] + print("ERROR!!! Title of presentation is incorrect: ", title, " instead of ", settings["Title"]) errors += 1 # Scaling use_log_scale = recreated_cutlines.LookupTable.UseLogScale if use_log_scale != settings["UseLogScale"]: - print "ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"] + print("ERROR!!! Scaling of presentation is incorrect: ", use_log_scale, " instead of ", settings["UseLogScale"]) errors += 1 # Bar Orientation orientation = recreated_bar.Orientation if orientation != settings["Orientation"]: - print "ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"] + print("ERROR!!! Orientation of scalar bar is incorrect: ", orientation, " instead of ", settings["Orientation"]) errors += 1 # Base Plane Normal cur_normal = list(recreated_cutlines.Input.Input.SliceType.Normal) if cur_normal != normal1: - print "ERROR!!! Normal of base plane is incorrect: ", cur_normal, " instead of ", normal1 + print("ERROR!!! Normal of base plane is incorrect: ", cur_normal, " instead of ", normal1) errors += 1 # Base Plane Position cur_pos = list(recreated_cutlines.Input.Input.SliceOffsetValues) if cur_pos != pos1: - print "ERROR!!! Position of base plane is incorrect: ", cur_pos, " instead of ", pos1 + print("ERROR!!! Position of base plane is incorrect: ", cur_pos, " instead of ", pos1) errors += 1 # Base Plane Normal cur_normal = list(recreated_cutlines.Input.SliceType.Normal) if cur_normal != normal2: - print "ERROR!!! Normal of cutting planes is incorrect: ", cur_normal, " instead of ", normal2 + print("ERROR!!! Normal of cutting planes is incorrect: ", cur_normal, " instead of ", normal2) errors += 1 # Cutting Planes Position cur_pos = list(recreated_cutlines.Input.SliceOffsetValues) if cur_pos != pos2: - print "ERROR!!! Positions of cutting planes are incorrect: ", cur_pos, " instead of ", pos2 + print("ERROR!!! Positions of cutting planes are incorrect: ", cur_pos, " instead of ", pos2) errors += 1 if errors > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/dump_study/B0.py b/test/VisuPrs/dump_study/B0.py index c9809480..7d4345cc 100644 --- a/test/VisuPrs/dump_study/B0.py +++ b/test/VisuPrs/dump_study/B0.py @@ -36,7 +36,7 @@ file_path = datadir + "TimeStamps.med" OpenDataFile(file_path) med_reader = GetActiveSource() if med_reader is None : - raise RuntimeError, "TimeStamps.med wasn't imported..." + raise RuntimeError("TimeStamps.med wasn't imported...") # 2. Presentations creation errors = 0 @@ -46,18 +46,18 @@ prs_list = [] med_field = "vitesse" for name in prs_names: - print "Creation of ", name, " presentation..." + print("Creation of ", name, " presentation...") if name == "GaussPoints": prs = GaussPointsOnField(med_reader, EntityType.CELL, "pression", 1) pass else: prs = eval(name + "OnField(med_reader, EntityType.NODE, med_field, 1)") if prs is None: - print "ERROR!!! ", name," presentation wasn't created..." + print("ERROR!!! ", name," presentation wasn't created...") # StreamLines presentation is empty for "vitesse" field defined in the loaded MED file. # TODO: check why stream lines prs is empty if name == "StreamLines": - print "WARNING: Stream lines presentation is empty!" + print("WARNING: Stream lines presentation is empty!") else: errors += 1 else: @@ -70,7 +70,7 @@ path_to_save = os.path.join(os.getenv("HOME"), "AllPresentations.py") save_trace( path_to_save, text ) # 4. Delete the created objects, recreate the view -source_list = GetSources().values() +source_list = list(GetSources().values()) for source in source_list: delete_pv_object(source) @@ -78,16 +78,16 @@ delete_pv_object(GetActiveView()) view = CreateRenderView() # 5. Execution of the created script -execfile(path_to_save) +exec(compile(open(path_to_save).read(), path_to_save, 'exec')) # 6. Check the restored objects for name in prs_names: source = FindSource(name) if source is None: - print "There is no ", name, " in the study (must be created by executed python script)!!!" + print("There is no ", name, " in the study (must be created by executed python script)!!!") errors += 1 else: - print name + " was found..." + print(name + " was found...") if errors > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/dump_study/B1.py b/test/VisuPrs/dump_study/B1.py index 42a7f5b7..6d2a4d57 100644 --- a/test/VisuPrs/dump_study/B1.py +++ b/test/VisuPrs/dump_study/B1.py @@ -27,7 +27,7 @@ from pvsimple import * xls_file = tablesdir + "tables_test.xls" table_reader = TableReader(FileName=xls_file) if table_reader is None: - raise RuntimeError, "Table was not imported..." + raise RuntimeError("Table was not imported...") table_reader.UpdatePipeline() RenameSource("tables_test.xls", table_reader) @@ -40,12 +40,12 @@ SaveTrace(path_to_save) delete_pv_object(table_reader) # 4. Execution of the created script -execfile(path_to_save) +exec(compile(open(path_to_save).read(), path_to_save, 'exec')) # 5. Check the restored table restored_obj = FindSource("tables_test.xls") if restored_obj is None: - raise RuntimeError, "There is no tables_test.xls table in the study (must be created by executed python script)!!!" + raise RuntimeError("There is no tables_test.xls table in the study (must be created by executed python script)!!!") available_tables = restored_obj.GetPropertyValue("AvailableTables") @@ -56,14 +56,14 @@ count_not=0 for name in tables: if name not in available_tables: count_not += 1 - print "ERROR!!! Table with ", name, " name was not found" + print("ERROR!!! Table with ", name, " name was not found") errors += 1 else: - print "\"" + name + "\" table was found..." + print("\"" + name + "\" table was found...") if count_not > 0: - print "ERROR!!! "+str(count_not)+" table(s) was(were) not found!!!" + print("ERROR!!! "+str(count_not)+" table(s) was(were) not found!!!") errors += 1 if errors > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/dump_study/B3.py b/test/VisuPrs/dump_study/B3.py index c1d21298..11130509 100644 --- a/test/VisuPrs/dump_study/B3.py +++ b/test/VisuPrs/dump_study/B3.py @@ -83,17 +83,17 @@ save_trace( path_to_save, text ) delete_pv_object(table) # 4. Execution of the created script -execfile(path_to_save) +exec(compile(open(path_to_save).read(), path_to_save, 'exec')) # 5. Check the restored table table = FindSource(title) if table is None: - raise RuntimeError, "There is no table in the study (must be created by executed python script)!!!" + raise RuntimeError("There is no table in the study (must be created by executed python script)!!!") if table.Script != orig_script: - print "ERROR!!! The script value is incorrect:" - print table.Script + print("ERROR!!! The script value is incorrect:") + print(table.Script) errors += 1 if errors > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/dump_study/B4.py b/test/VisuPrs/dump_study/B4.py index 6db45cba..d3dc4f3a 100644 --- a/test/VisuPrs/dump_study/B4.py +++ b/test/VisuPrs/dump_study/B4.py @@ -84,17 +84,17 @@ save_trace( path_to_save, text ) delete_pv_object(table) # 4. Execution of the created script -execfile(path_to_save) +exec(compile(open(path_to_save).read(), path_to_save, 'exec')) # 5. Check the restored table table = FindSource(title) if table is None: - raise RuntimeError, "There is no table in the study (must be created by executed python script)!!!" + raise RuntimeError("There is no table in the study (must be created by executed python script)!!!") if table.Script != orig_script: - print "ERROR!!! The script value is incorrect:" - print table.Script + print("ERROR!!! The script value is incorrect:") + print(table.Script) errors += 1 if errors > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/dump_study/B5.py b/test/VisuPrs/dump_study/B5.py index cd54ea55..dbfa1ba7 100644 --- a/test/VisuPrs/dump_study/B5.py +++ b/test/VisuPrs/dump_study/B5.py @@ -53,13 +53,13 @@ from pvsimple import * import presentations obj = FindSource('IsoSurfaces') if obj is None: - print "FAILED: can't find IsoSurfaces!!!" + print("FAILED: can't find IsoSurfaces!!!") # 4. Remove med reader object and all other sources -for obj in GetSources().values(): +for obj in list(GetSources().values()): presentations.delete_pv_object(obj) # 5. Check results obj = FindSource('ScalarMap') if obj is not None: - print "FAILED: ScalarMap was not deleted!!!" + print("FAILED: ScalarMap was not deleted!!!") diff --git a/test/VisuPrs/imps/A1.py b/test/VisuPrs/imps/A1.py index 95695413..05004f6b 100644 --- a/test/VisuPrs/imps/A1.py +++ b/test/VisuPrs/imps/A1.py @@ -59,34 +59,34 @@ def set_prs_colored(prs, proxy, entity, field_name, vector_mode, timestamp_nb): # 1. Import of the "Penta6.med" file -print 'Import "Penta6.med" file........', +print('Import "Penta6.med" file........', end=' ') file_path = datadir + "Penta6.med" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - raise RuntimeError, "Penta6.med was not imported!!!" + raise RuntimeError("Penta6.med was not imported!!!") else: - print "OK" + print("OK") view = pvsimple.GetRenderView() # 2. Creation of "CutPlanes" presentation, based on time stamp of "scalar field" field -print 'Creation of "CutPlanes" presentation, based on time stamp of "scalar field" field....' +print('Creation of "CutPlanes" presentation, based on time stamp of "scalar field" field....') cutplanes = CutPlanesOnField(med_reader, EntityType.CELL, "scalar field", 1) if cutplanes is None : - raise RuntimeError, "Presentation is None!!!" + raise RuntimeError("Presentation is None!!!") else: - print "OK" + print("OK") select_cells_with_data(med_reader, on_cells=["scalar field", "vectoriel field"]) -print "Setting of deformation:" +print("Setting of deformation:") warp_vector = pvsimple.WarpByVector(cutplanes.Input) warp_vector.Vectors = ["scalar field"] warp_vector.ScaleFactor = 5.0 -print "Got scale : ", warp_vector.ScaleFactor -print "Got field name: ", warp_vector.Vectors +print("Got scale : ", warp_vector.ScaleFactor) +print("Got field name: ", warp_vector.Vectors) presentation = pvsimple.GetRepresentation(warp_vector) set_prs_colored(presentation, med_reader, EntityType.CELL, "scalar field", 'Magnitude', 1) @@ -95,21 +95,21 @@ pic_path = os.path.join(picturedir, "deformed_cut_planes_scalar" + "." + picture process_prs_for_test(presentation, view, pic_path) # 3. Creation of "CutPlanes" presentation, based on time stamp of "vectoriel field" field -print 'Creation of "CutPlanes" presentation, based on time stamp of "vectoriel field" field....' +print('Creation of "CutPlanes" presentation, based on time stamp of "vectoriel field" field....') cutplanes = CutPlanesOnField(med_reader, EntityType.CELL, "vectoriel field", 1) if cutplanes is None : - raise RuntimeError, "Presentation is None!!!" + raise RuntimeError("Presentation is None!!!") else: - print "OK" + print("OK") -print "Setting of deformation:" +print("Setting of deformation:") warp_vector = pvsimple.WarpByVector(cutplanes.Input) warp_vector.Vectors = ["vectoriel field"] warp_vector.ScaleFactor = 5.0 -print "Got scale : ", warp_vector.ScaleFactor -print "Got field name: ", warp_vector.Vectors +print("Got scale : ", warp_vector.ScaleFactor) +print("Got field name: ", warp_vector.Vectors) presentation = pvsimple.GetRepresentation(warp_vector) set_prs_colored(presentation, med_reader, EntityType.CELL, "vectoriel field", 'Magnitude', 1) diff --git a/test/VisuPrs/imps/A2.py b/test/VisuPrs/imps/A2.py index bfb44a0c..c73d6e6b 100644 --- a/test/VisuPrs/imps/A2.py +++ b/test/VisuPrs/imps/A2.py @@ -32,18 +32,18 @@ field_name = "fieldnodedouble"; timestamp = 1 # 1. Import MED file -print 'Import "pointe.med"....................', +print('Import "pointe.med"....................', end=' ') med_file_path = datadir + med_file pvsimple.OpenDataFile(med_file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # 2. Create Scalar Map -print "Build Scalar Map presentation" +print("Build Scalar Map presentation") scalar_map = ScalarMapOnField(med_reader, entity, field_name, timestamp) display_only(scalar_map) @@ -51,13 +51,13 @@ reset_view() time.sleep(sleep_delay) # 3. Set representation type to Point -print "Set representation type to Point" +print("Set representation type to Point") scalar_map.Representation = 'Points' pvsimple.Render() time.sleep(sleep_delay) # 4. Set representation type to Point Sprite -print "Set Point Sprite representation" +print("Set Point Sprite representation") scalar_map.Representation = 'Point Sprite' data_range = get_data_range(med_reader, entity, diff --git a/test/VisuPrs/imps/A3.py b/test/VisuPrs/imps/A3.py index 64363de6..f85c4ef9 100644 --- a/test/VisuPrs/imps/A3.py +++ b/test/VisuPrs/imps/A3.py @@ -31,24 +31,24 @@ pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "Error!!! med file is not imported" + print("Error!!! med file is not imported") error = error+1 # Create Scalar Map scalarmap = ScalarMapOnField(med_reader, EntityType.NODE, 'TAUX_DE_VIDE', 1); if scalarmap is None: - print "Error!!! ScalarMap is not created" + print("Error!!! ScalarMap is not created") error = error+1 display_only(scalarmap) # Check Scalar bar default properties bar = get_bar() if bar.Orientation != 'Vertical': - print "Error!!! Default Scalar Bar Orientation is wrong - not vertical but ", scalarmap.Orientation + print("Error!!! Default Scalar Bar Orientation is wrong - not vertical but ", scalarmap.Orientation) error = error+1 error = error + compare_lists(bar.Position, [0.85, 0.05]) error = error + compare_lists(bar.Position2, [0.12, 0.43]) if error > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/imps/A4.py b/test/VisuPrs/imps/A4.py index 88fb9723..09522ff5 100644 --- a/test/VisuPrs/imps/A4.py +++ b/test/VisuPrs/imps/A4.py @@ -31,7 +31,7 @@ pvsimple.OpenDataFile(med_file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "Error!!! med file is not imported" + print("Error!!! med file is not imported") error = error+1 # Create Mesh @@ -39,7 +39,7 @@ mesh_name = 'LE VOLUME' cell_entity = EntityType.CELL mesh = MeshOnEntity(med_reader, mesh_name, cell_entity) if mesh is None: - print "Error!!! Mesh is not created" + print("Error!!! Mesh is not created") error = error+1 mesh.Visibility = 1 @@ -51,15 +51,15 @@ mesh_shrinked.ShrinkFactor = 0.75 mesh_shrinked = pvsimple.GetRepresentation(mesh_shrinked) if mesh_shrinked is None: - print "Error!!! Mesh is not shrinked" + print("Error!!! Mesh is not shrinked") error = error+1 # Create Scalar Map scalarmap = ScalarMapOnField(med_reader, EntityType.NODE, 'TAUX_DE_VIDE', 1); if scalarmap is None: - print "Error!!! ScalarMap is not created" + print("Error!!! ScalarMap is not created") error = error+1 display_only(scalarmap) if error > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/imps/A6.py b/test/VisuPrs/imps/A6.py index ecdebe67..0089b766 100644 --- a/test/VisuPrs/imps/A6.py +++ b/test/VisuPrs/imps/A6.py @@ -31,17 +31,17 @@ pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "Error!!! med file is not imported" + print("Error!!! med file is not imported") error = error+1 # Create Scalar Map scalarmap = ScalarMapOnField(med_reader, EntityType.NODE, 'RESUMECAEQUI_ELGA_SIGM__________', 1) if scalarmap is None: - print "Error!!! ScalarMap is not created" + print("Error!!! ScalarMap is not created") error = error+1 scalarmap.Visibility = 1 reset_view() if error > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/VisuPrs/imps/B2.py b/test/VisuPrs/imps/B2.py index f715c973..b54de6ee 100644 --- a/test/VisuPrs/imps/B2.py +++ b/test/VisuPrs/imps/B2.py @@ -24,16 +24,16 @@ from presentations import * import pvsimple # 1. Import MED file -print 'Import "ResOK_0000.med"...............', +print('Import "ResOK_0000.med"...............', end=' ') file_path = datadir + "ResOK_0000.med" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - raise RuntimeError, "import failed" + raise RuntimeError("import failed") else: - print "OK" + print("OK") def _extract_all_arrays_of_type(array_type, source): @@ -61,19 +61,19 @@ def _extract_point_arrays(source): # 2. Get some information on the MED file #fields_on_nodes = med_reader.PointArrays fields_on_nodes = _extract_point_arrays(med_reader) -print "Field names on NODE: ", fields_on_nodes +print("Field names on NODE: ", fields_on_nodes) is_ok = len(fields_on_nodes) == 2 and ("temperature" in fields_on_nodes) and ("vitesse" in fields_on_nodes) if not is_ok: - raise RuntimeError, "=> Error in PointArrays property" + raise RuntimeError("=> Error in PointArrays property") #fields_on_cells = med_reader.CellArrays fields_on_cells = _extract_cell_arrays(med_reader) -print "Field names on CELL: ", fields_on_cells +print("Field names on CELL: ", fields_on_cells) is_ok = len(fields_on_cells) == 1 and ("pression" in fields_on_cells) if not is_ok: - raise RuntimeError, "=> Error in CellArrays property" + raise RuntimeError("=> Error in CellArrays property") timestamps = med_reader.TimestepValues.GetData()[1:] -print "timestamps: ", timestamps +print("timestamps: ", timestamps) if timestamps != [17.030882013694594]: - raise RuntimeError, "=> Wrong TimestepValues property value" + raise RuntimeError("=> Wrong TimestepValues property value") diff --git a/test/VisuPrs/united/A1.py b/test/VisuPrs/united/A1.py index 63f97027..3b82286f 100644 --- a/test/VisuPrs/united/A1.py +++ b/test/VisuPrs/united/A1.py @@ -24,36 +24,36 @@ from presentations import * import pvsimple # 1. Import MED file -print "**** Step1: Import MED file" +print("**** Step1: Import MED file") -print 'Import "ResOK_0000.med"...', +print('Import "ResOK_0000.med"...', end=' ') file_path = datadir + "ResOK_0000.med" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print 'Get view...................', +print('Get view...................', end=' ') view = pvsimple.GetRenderView() if view is None: - print "FAILED" + print("FAILED") else: reset_view(view) - print "OK" + print("OK") cell_entity = EntityType.CELL node_entity = EntityType.NODE # 2. Displaying vector field -print "**** Step2: Displaying vector field" +print("**** Step2: Displaying vector field") -print "Creating Scalar Map.......", +print("Creating Scalar Map.......", end=' ') scalarmap = ScalarMapOnField(med_reader, node_entity, 'vitesse', 1) if scalarmap is None: - print "FAILED" + print("FAILED") else: bar = get_bar() bar.Orientation = 'Horizontal' @@ -62,130 +62,130 @@ else: bar.AspectRatio = 3 display_only(scalarmap, view) - print "OK" + print("OK") reset_view(view) -print "Creating Stream Lines.....", +print("Creating Stream Lines.....", end=' ') streamlines = StreamLinesOnField(med_reader, node_entity, 'vitesse', 1) if streamlines is None: - print "FAILED" + print("FAILED") else: display_only(streamlines, view) - print "OK" + print("OK") -print "Creating Vectors..........", +print("Creating Vectors..........", end=' ') vectors = VectorsOnField(med_reader, node_entity, 'vitesse', 1) if vectors is None: - print "FAILED" + print("FAILED") else: display_only(vectors, view) - print "OK" + print("OK") -print "Creating Iso Surfaces.....", +print("Creating Iso Surfaces.....", end=' ') isosurfaces = IsoSurfacesOnField(med_reader, node_entity, 'vitesse', 1) contour_filter = pvsimple.GetActiveSource() if isosurfaces is None: - print "FAILED" + print("FAILED") else: display_only(isosurfaces, view) - print "OK" + print("OK") -print "Creating Cut Planes.......", +print("Creating Cut Planes.......", end=' ') cutplanes = CutPlanesOnField(med_reader, node_entity, 'vitesse', 1, nb_planes=30, orientation=Orientation.YZ) if cutplanes is None: - print "FAILED" + print("FAILED") else: display_only(cutplanes, view) - print "OK" + print("OK") # 3. Another MED file import -print "**** Step3: Import another MED file" +print("**** Step3: Import another MED file") -print 'Import "Fields_group3D.med"...............', +print('Import "Fields_group3D.med"...............', end=' ') file_path = datadir + "Fields_group3D.med" pvsimple.OpenDataFile(file_path) med_reader1 = pvsimple.GetActiveSource() if med_reader1 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # 4. Displaying scalar field -print "**** Step4: Displaying scalar field" +print("**** Step4: Displaying scalar field") -print "Creating Scalar Map.......", +print("Creating Scalar Map.......", end=' ') scalarmap1 = ScalarMapOnField(med_reader1, cell_entity, 'scalar field', 1) if scalarmap1 is None: - print "FAILED" + print("FAILED") else: display_only(scalarmap1, view) - print "OK" + print("OK") reset_view(view) -print "Creating Iso Surfaces.....", +print("Creating Iso Surfaces.....", end=' ') isosurfaces1 = IsoSurfacesOnField(med_reader1, cell_entity, 'scalar field', 1) if isosurfaces1 is None: - print "FAILED" + print("FAILED") else: display_only(isosurfaces1, view) - print "OK" + print("OK") -print "Creating Cut Planes.......", +print("Creating Cut Planes.......", end=' ') cutplanes1 = CutPlanesOnField(med_reader1, cell_entity, 'scalar field', 1, orientation=Orientation.YZ) if cutplanes1 is None: - print "FAILED" + print("FAILED") else: slice_filter = pvsimple.GetActiveSource() slice_filter.SliceType.Normal = [1.0, 0.0, 0.0] display_only(cutplanes1, view) - print "OK" + print("OK") # 5. Object browser popup -print "**** Step5: Object browser popup" +print("**** Step5: Object browser popup") mesh_name = 'mailles_MED' -print "Creating mesh.............", +print("Creating mesh.............", end=' ') mesh = MeshOnEntity(med_reader1, mesh_name, cell_entity) if mesh is None: - print "FAILED" + print("FAILED") else: display_only(mesh, view) - print "OK" + print("OK") -print "Changing type of presentation of mesh:" +print("Changing type of presentation of mesh:") mesh.Representation = 'Wireframe' pvsimple.Render() prs_type = mesh.Representation -print "Presentation type..", prs_type +print("Presentation type..", prs_type) mesh.Representation = 'Points' pvsimple.Render() prs_type = mesh.Representation -print "Presentation type..", prs_type +print("Presentation type..", prs_type) mesh.Representation = 'Surface' pvsimple.Render() prs_type = mesh.Representation -print "Presentation type..", prs_type +print("Presentation type..", prs_type) shrink = pvsimple.Shrink(med_reader1) mesh_shrinked = pvsimple.GetRepresentation(shrink) display_only(mesh_shrinked, view) -print "Changing color of mesh....", +print("Changing color of mesh....", end=' ') color = [0, 0, 1] mesh.DiffuseColor = color display_only(mesh, view) -print "OK" +print("OK") -print "Changing first IsoSurfaces", +print("Changing first IsoSurfaces", end=' ') display_only(isosurfaces, view) reset_view(view) rgb_points = isosurfaces.LookupTable.RGBPoints @@ -193,9 +193,9 @@ scalar_range = [rgb_points[0], rgb_points[4]] surfaces = get_contours(scalar_range, 25) contour_filter.Isosurfaces = surfaces pvsimple.Render(view=view) -print "OK" +print("OK") -print "Hide IsoSurfaces..........", +print("Hide IsoSurfaces..........", end=' ') isosurfaces.Visibility = 0 pvsimple.Render(view=view) -print "OK" +print("OK") diff --git a/test/VisuPrs/united/A2.py b/test/VisuPrs/united/A2.py index 21abe0c6..85d1e39b 100644 --- a/test/VisuPrs/united/A2.py +++ b/test/VisuPrs/united/A2.py @@ -28,92 +28,92 @@ cell_entity = EntityType.CELL node_entity = EntityType.NODE # 1. Import MED file -print "**** Step1: Import MED file" +print("**** Step1: Import MED file") -print 'Import "fra.med"....................', +print('Import "fra.med"....................', end=' ') file_path = datadir + "fra.med" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") view = pvsimple.GetRenderView() field_name = 'VITESSE' -print "Creating Cut Planes.................", +print("Creating Cut Planes.................", end=' ') orient = Orientation.YZ cutplanes = CutPlanesOnField(med_reader, node_entity, field_name, 1, orientation=orient) if cutplanes is None: - print "FAILED" + print("FAILED") else: display_only(cutplanes, view) - print "OK" + print("OK") slice_filter = pvsimple.GetActiveSource() # 2. Changing view -print "**** Step2: Changing view" +print("**** Step2: Changing view") -print "Fit All.............................", +print("Fit All.............................", end=' ') reset_view(view) -print "OK" +print("OK") -print "Rotate..............................", +print("Rotate..............................", end=' ') x_angle = 0 y_angle = 0 nb_planes = len(slice_filter.SliceOffsetValues) -for i in xrange(1, 50): +for i in range(1, 50): y_angle = y_angle + 0.05 normal = get_normal_by_orientation(orient, x_angle, radians(y_angle)) slice_filter.SliceType.Normal = normal pvsimple.Render() -for i in xrange(1,50): +for i in range(1,50): y_angle = y_angle - 0.05 normal = get_normal_by_orientation(orient, x_angle, radians(y_angle)) slice_filter.SliceType.Normal = normal pvsimple.Render() -print "OK" +print("OK") -print "View Point (FRONT)..................", +print("View Point (FRONT)..................", end=' ') view.CameraViewUp = [0.0, 0.0, 1.0] view.CameraPosition = [2.4453961849843453, 0.03425, 0.541] pvsimple.Render() -print "OK" +print("OK") -print "View Point (BACK)...................", +print("View Point (BACK)...................", end=' ') view.CameraPosition = [-2.0343961849843457, 0.03425, 0.541] pvsimple.Render() -print "OK" +print("OK") -print "View Point (TOP)....................", +print("View Point (TOP)....................", end=' ') view.CameraViewUp = [0.0, 1.0, 0.0] view.CameraPosition = [0.2055, 0.03425, 2.7808961849843454] pvsimple.Render() -print "OK" +print("OK") -print "View Point (BOTTOM).................", +print("View Point (BOTTOM).................", end=' ') view.CameraPosition = [0.2055, 0.03425, -1.6988961849843456] pvsimple.Render() -print "OK" +print("OK") -print "View Point (LEFT)...................", +print("View Point (LEFT)...................", end=' ') view.CameraViewUp = [0.0, 0.0, 1.0] view.CameraPosition = [0.2055, -2.2056461849843454, 0.541] pvsimple.Render() -print "OK" +print("OK") -print "View Point (RIGHT) .................", +print("View Point (RIGHT) .................", end=' ') view.CameraPosition = [0.2055, 2.2741461849843456, 0.541] pvsimple.Render() -print "OK" +print("OK") -print "Restore View........................", +print("Restore View........................", end=' ') reset_view(view) -print "OK" +print("OK") diff --git a/test/VisuPrs/united/A4.py b/test/VisuPrs/united/A4.py index a129bdd5..5fec936d 100644 --- a/test/VisuPrs/united/A4.py +++ b/test/VisuPrs/united/A4.py @@ -27,337 +27,337 @@ cell_entity = EntityType.CELL node_entity = EntityType.NODE # 1. Import MED file -print "**** Step1: Import MED file" +print("**** Step1: Import MED file") -print 'Import "Hexa8.med"....................', +print('Import "Hexa8.med"....................', end=' ') file_path = datadir + "Hexa8.med" pvsimple.OpenDataFile(file_path) med_reader1 = pvsimple.GetActiveSource() if med_reader1 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") mesh_name1 = 'Maillage MED_HEXA8' scalar_field = 'scalar field' vectoriel_field = 'vectoriel field' view = pvsimple.GetRenderView() -print "Creating Scalar Map...................", +print("Creating Scalar Map...................", end=' ') scalarmap1 = ScalarMapOnField(med_reader1, cell_entity, scalar_field, 1) if scalarmap1 is None: - print "FAILED" + print("FAILED") else: display_only(scalarmap1, view) reset_view(view) - print "OK" + print("OK") -print "Creating Vectors......................", +print("Creating Vectors......................", end=' ') vectors1 = VectorsOnField(med_reader1, cell_entity, vectoriel_field, 1) if vectors1 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Creating Deformed Shape...............", +print("Creating Deformed Shape...............", end=' ') defshape1 = DeformedShapeOnField(med_reader1, cell_entity, vectoriel_field, 1) if defshape1 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Creating mesh.........................", +print("Creating mesh.........................", end=' ') mesh1 = MeshOnEntity(med_reader1, mesh_name1, cell_entity) if mesh1 is None: - print "FAILED" + print("FAILED") else: mesh1.Representation = 'Wireframe' display_only(mesh1, view) reset_view(view) - print "OK" + print("OK") -print "Displaying vectors....................", +print("Displaying vectors....................", end=' ') display_only(vectors1, view) -print "OK" +print("OK") -print "Displaying Deformed Shape.............", +print("Displaying Deformed Shape.............", end=' ') display_only(defshape1, view) -print "OK" +print("OK") -print "Set scale factor of Deformed Shape...", +print("Set scale factor of Deformed Shape...", end=' ') warp_vector = defshape1.Input warp_vector.ScaleFactor = 10 -print "OK" +print("OK") -print "Displaying changed Deformed Shape.....", +print("Displaying changed Deformed Shape.....", end=' ') display_only(defshape1, view) -print "OK" +print("OK") -print "Editing Vectors.......................", +print("Editing Vectors.......................", end=' ') glyph = vectors1.Input glyph.ScaleFactor = 2 vectors1.LineWidth = 2 glyph.GlyphType.Center = [0.5, 0.0, 0.0] # TAIL position -print "OK" +print("OK") -print "Displaying changed Vectors............", +print("Displaying changed Vectors............", end=' ') vectors1.Visibility = 1 pvsimple.Render() -print "OK" +print("OK") hide_all(view) # 2. Second MED file import -print 'Importing file "cube_hexa8_quad4.med".', +print('Importing file "cube_hexa8_quad4.med".', end=' ') file_path = datadir + "cube_hexa8_quad4.med" mesh_name2 = 'CUBE_EN_HEXA8_QUAD4' pvsimple.OpenDataFile(file_path) med_reader2 = pvsimple.GetActiveSource() if med_reader2 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Creating mesh.........................", +print("Creating mesh.........................", end=' ') mesh2 = MeshOnEntity(med_reader2, mesh_name2, cell_entity) if mesh2 is None: - print "FAILED" + print("FAILED") else: display_only(mesh2, view) - print "OK" + print("OK") -print "Setting wireframe repr. of mesh.......", +print("Setting wireframe repr. of mesh.......", end=' ') mesh2.Representation = 'Wireframe' -print "OK" +print("OK") -print "Creating Vectors......................", +print("Creating Vectors......................", end=' ') vectors2 = VectorsOnField(med_reader2, cell_entity, "fieldcelldouble", 1) if vectors1 is None: - print "FAILED" + print("FAILED") else: glyph2 = vectors2.Input glyph2.ScaleFactor = 0.2 vectors2.LineWidth = 2 glyph2.GlyphType.Center = [0.5, 0.0, 0.0] # TAIL position - print "OK" + print("OK") -print "Displaying Vectors (with mesh)........", +print("Displaying Vectors (with mesh)........", end=' ') vectors2.Visibility = 1 pvsimple.Render() -print "OK" +print("OK") hide_all(view) # 3. Third MED file import -print 'Importing file "Penta6.med"...........', +print('Importing file "Penta6.med"...........', end=' ') file_path = datadir + "Penta6.med" pvsimple.OpenDataFile(file_path) med_reader3 = pvsimple.GetActiveSource() if med_reader3 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Creating Cut Planes...................", +print("Creating Cut Planes...................", end=' ') cutplanes1 = CutPlanesOnField(med_reader3, cell_entity, scalar_field, 1) if cutplanes1 is None: - print "FAILED" + print("FAILED") else: display_only(cutplanes1, view) reset_view(view) - print "OK" + print("OK") -print "Creating Deformed Shape...............", +print("Creating Deformed Shape...............", end=' ') defshape2 = DeformedShapeOnField(med_reader3, cell_entity, vectoriel_field, 1) if defshape2 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Creating Vectors......................", +print("Creating Vectors......................", end=' ') vectors3 = VectorsOnField(med_reader3, cell_entity, vectoriel_field, 1) if vectors3 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Creating Iso Surfaces.....", +print("Creating Iso Surfaces.....", end=' ') isosurfaces1 = IsoSurfacesOnField(med_reader3, cell_entity, vectoriel_field, 1) if isosurfaces1 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Displaying Vectors (l.w.=2, s.f.=1.5).", +print("Displaying Vectors (l.w.=2, s.f.=1.5).", end=' ') glyph3 = vectors3.Input glyph3.ScaleFactor = 1.5 vectors3.LineWidth = 2 display_only(vectors3, view) -print "OK" +print("OK") -print "Displaying Deformed Shape.............", +print("Displaying Deformed Shape.............", end=' ') defshape2.Visibility = 1 pvsimple.Render() -print "OK" +print("OK") -print "Displaying Iso Surfaces...............", +print("Displaying Iso Surfaces...............", end=' ') isosurfaces1.Visibility = 1 pvsimple.Render() -print "OK" +print("OK") hide_all(view) # 4. Import Quad4,Tetra4 and Tria3 MED files -print 'Importing "Quad4.med".................', +print('Importing "Quad4.med".................', end=' ') file_path = datadir + "Quad4.med" pvsimple.OpenDataFile(file_path) med_reader4 = pvsimple.GetActiveSource() if med_reader4 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") mesh_name4 = 'Maillage MED_QUAD4' -print "Creating Iso Surfaces.................", +print("Creating Iso Surfaces.................", end=' ') isosurfaces2 = IsoSurfacesOnField(med_reader4, cell_entity, scalar_field, 1) if isosurfaces2 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Creating Cut Planes...................", +print("Creating Cut Planes...................", end=' ') cutplanes2 = CutPlanesOnField(med_reader4, cell_entity, scalar_field, 1, orientation=Orientation.YZ) if cutplanes2 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Creating Deformed Shape...............", +print("Creating Deformed Shape...............", end=' ') defshape3 = DeformedShapeOnField(med_reader4, cell_entity, vectoriel_field, 1, scale_factor=10) if defshape3 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Creating Vectors......................", +print("Creating Vectors......................", end=' ') vectors4 = VectorsOnField(med_reader4, cell_entity, vectoriel_field, 1) if vectors4 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Displaying Iso Surfaces, Def. Shape and Vectors.", +print("Displaying Iso Surfaces, Def. Shape and Vectors.", end=' ') display_only(isosurfaces2, view) defshape3.Visibility = 1 vectors4.Visibility = 1 pvsimple.Render() -print "OK" +print("OK") -print 'Importing "Tetra4.med"................', +print('Importing "Tetra4.med"................', end=' ') file_path = datadir + "Tetra4.med" pvsimple.OpenDataFile(file_path) med_reader5 = pvsimple.GetActiveSource() if med_reader5 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") mesh_name5 = 'Maillage MED_TETRA4' -print "Creating Scalar Map...................", +print("Creating Scalar Map...................", end=' ') scalarmap2 = ScalarMapOnField(med_reader5, cell_entity, scalar_field, 1) if scalarmap2 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") -print "Creating Vectors......................", +print("Creating Vectors......................", end=' ') vectors5 = VectorsOnField(med_reader5, cell_entity, vectoriel_field, 1) if vectors5 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") vectors5.LineWidth = 3 vectors5.Input.ScaleFactor = 2 -print "Displaying Scalar Map and Vectoes.....", +print("Displaying Scalar Map and Vectoes.....", end=' ') hide_all(view) display_only(scalarmap2, view) vectors5.Visibility = 1 reset_view(view) -print "OK" +print("OK") -print 'Importing "Tria3.med".................', +print('Importing "Tria3.med".................', end=' ') file_path = datadir + "Tria3.med" pvsimple.OpenDataFile(file_path) med_reader6 = pvsimple.GetActiveSource() if med_reader6 is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") mesh_name6 = 'Maillage MED_TRIA3' -print "Creating Scalar Map...................", +print("Creating Scalar Map...................", end=' ') scalarmap3 = ScalarMapOnField(med_reader6, cell_entity, scalar_field, 1) if scalarmap3 is None: - print "FAILED" + print("FAILED") else: display_only(scalarmap3, view) - print "OK" + print("OK") reset_view(view) -print "Creating Iso Surfaces.................", +print("Creating Iso Surfaces.................", end=' ') isosurfaces3 = IsoSurfacesOnField(med_reader6, cell_entity, scalar_field, 1) if isosurfaces3 is None: - print "FAILED" + print("FAILED") else: display_only(isosurfaces3, view) - print "OK" + print("OK") reset_view(view) -print "Creating Deformed Shape...............", +print("Creating Deformed Shape...............", end=' ') defshape4 = DeformedShapeOnField(med_reader6, cell_entity, vectoriel_field, 1) if defshape4 is None: - print "FAILED" + print("FAILED") else: display_only(defshape4, view) - print "OK" + print("OK") reset_view(view) -print "Creating Vectors......................", +print("Creating Vectors......................", end=' ') vectors6 = VectorsOnField(med_reader6, cell_entity, vectoriel_field, 1) if vectors6 is None: - print "FAILED" + print("FAILED") else: glyph = vectors6.Input glyph.GlyphType.Center = [0.5, 0.0, 0.0] # TAIL position vectors6.LineWidth = 2 glyph.ScaleFactor = 1 display_only(vectors6, view) - print "OK" + print("OK") reset_view(view) -print "Displaying only Def. Shape and Vectors", +print("Displaying only Def. Shape and Vectors", end=' ') display_only(defshape4, view) vectors6.Visibility = 1 pvsimple.Render() -print "OK" +print("OK") diff --git a/test/VisuPrs/united/A5.py b/test/VisuPrs/united/A5.py index 2498488e..cec920d6 100644 --- a/test/VisuPrs/united/A5.py +++ b/test/VisuPrs/united/A5.py @@ -27,32 +27,32 @@ cell_entity = EntityType.CELL node_entity = EntityType.NODE # 1. Import MED file -print "**** Step1: Import MED file" +print("**** Step1: Import MED file") -print 'Import "ResOK_0000.med"...............', +print('Import "ResOK_0000.med"...............', end=' ') file_path = datadir + "ResOK_0000.med" pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") mesh_name = 'dom' # 2. Creating mesh -print "**** Step2: Mesh creation" +print("**** Step2: Mesh creation") -print "Creating mesh.............", +print("Creating mesh.............", end=' ') mesh = MeshOnEntity(med_reader, mesh_name, cell_entity) if mesh is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # 3. Changing type of presentation of mesh -print "**** Step3: Changing type of presentation of mesh" +print("**** Step3: Changing type of presentation of mesh") view = pvsimple.GetRenderView() display_only(mesh, view) @@ -61,12 +61,12 @@ reset_view(view) mesh.Representation = 'Wireframe' pvsimple.Render() prs_type = mesh.Representation -print "Presentation type..", prs_type +print("Presentation type..", prs_type) mesh.Representation = 'Points' pvsimple.Render() prs_type = mesh.Representation -print "Presentation type..", prs_type +print("Presentation type..", prs_type) # make shrink, in PARAVIS it's not a representation type: use shrink filter shrink = pvsimple.Shrink(med_reader) @@ -77,30 +77,30 @@ display_only(mesh, view) mesh.Representation = 'Surface With Edges' pvsimple.Render() prs_type = mesh.Representation -print "Presentation type..", prs_type +print("Presentation type..", prs_type) # 4. Changing Cell color of mesh -print "**** Step4: Changing Cell color of mesh" +print("**** Step4: Changing Cell color of mesh") color = mesh.DiffuseColor -print "Mesh Cell color in RGB....(", color[0], ",", color[1], ",", color[2], ")" +print("Mesh Cell color in RGB....(", color[0], ",", color[1], ",", color[2], ")") color = [0, 0, 1] mesh.DiffuseColor = color color = mesh.DiffuseColor -print "Mesh Cell color in RGB....(", color[0], ",", color[1], ",", color[2], ")" +print("Mesh Cell color in RGB....(", color[0], ",", color[1], ",", color[2], ")") pvsimple.Render() # 5. Changing Node color of mesh -print "**** Step4: Changing Node color of mesh" +print("**** Step4: Changing Node color of mesh") color = mesh.AmbientColor -print "Mesh Node color in RGB....(", color[0], ",", color[1], ",", color[2], ")" +print("Mesh Node color in RGB....(", color[0], ",", color[1], ",", color[2], ")") color = [0, 1, 0] mesh.AmbientColor = color color = mesh.AmbientColor -print "Mesh Node color in RGB....(", color[0], ",", color[1], ",", color[2], ")" +print("Mesh Node color in RGB....(", color[0], ",", color[1], ",", color[2], ")") pvsimple.Render() ## Note: no special property for edge color in PARAVIS; skip link color changing ( SetLinkColor()/GetLinkColor() methods ) diff --git a/test/VisuPrs/united/B0.py b/test/VisuPrs/united/B0.py index 937eb392..d6b11f93 100644 --- a/test/VisuPrs/united/B0.py +++ b/test/VisuPrs/united/B0.py @@ -31,16 +31,16 @@ pvsimple.OpenDataFile(file_path) med_reader = pvsimple.GetActiveSource() if med_reader is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # 2. Create scalar map on deformed shape smondefshape = DeformedShapeAndScalarMapOnField(med_reader, EntityType.NODE, 'vitesse', 1) if smondefshape is None: - print "FAILED" + print("FAILED") else: - print "OK" + print("OK") # 3. Make compare @@ -51,7 +51,7 @@ error = error + compare_lists(smondefshape.Position, [0,0,0]) # Scalar mode smondefshape.LookupTable.VectorMode = 'Magnitude' if smondefshape.LookupTable.VectorMode != 'Magnitude': - print "ScalarMode is wrong..." + print("ScalarMode is wrong...") error=error+1 # Scalar bar Position @@ -76,23 +76,23 @@ bar.Title = 'Pression, Pa' bar.ComponentTitle = "Comp." if bar.Title != 'Pression, Pa': - print "Title is wrong..." + print("Title is wrong...") error=error+1 if bar.ComponentTitle!= 'Comp.': - print "Component title is wrong..." + print("Component title is wrong...") error=error+1 # Scaling smondefshape.LookupTable.UseLogScale = 0 if smondefshape.LookupTable.UseLogScale != 0: - print "Error!!! Scaling is wrong" + print("Error!!! Scaling is wrong") error=error+1 # Bar orientation bar.Orientation = 'Horizontal' if bar.Orientation != 'Horizontal': - print "ERROR!!! Scalar Bar orientation is wrong..." + print("ERROR!!! Scalar Bar orientation is wrong...") error=error+1 # Scale factor @@ -101,4 +101,4 @@ error = error + compare_lists([smondefshape.Input.ScaleFactor], [0.15]) if error > 0: - raise RuntimeError, "There is(are) some error(s) was(were) found... For more info see ERRORs above..." + raise RuntimeError("There is(are) some error(s) was(were) found... For more info see ERRORs above...") diff --git a/test/demo0.py b/test/demo0.py index 357a3a8a..b001781a 100755 --- a/test/demo0.py +++ b/test/demo0.py @@ -27,8 +27,8 @@ if not ('servermanager' in dir()): import time, sys, os, inspect def render(ss, v, title, nframes): - print '============================================================' - print title + print('============================================================') + print(title) res = [] res.append(title) for phires in (500, 1000): @@ -45,9 +45,9 @@ def render(ss, v, title, nframes): sys.stdout.write("\n") tpr = (time.time() - c1)/nframes ncells = ss.GetDataInformation().GetNumberOfCells() - print tpr, " secs/frame" - print ncells, " polys" - print ncells/tpr, " polys/sec" + print(tpr, " secs/frame") + print(ncells, " polys") + print(ncells/tpr, " polys/sec") res.append((ncells, ncells/tpr)) @@ -146,9 +146,9 @@ def run(filesour, impth, nframes): f = open(filesour, "w") else: f = sys.stdout - print >>f, 'configuration, %d, %d' % (results[0][1][0], results[0][2][0]) + print('configuration, %d, %d' % (results[0][1][0], results[0][2][0]), file=f) for i in results: - print >>f, '"%s", %g, %g' % (i[0], i[1][1], i[2][1]) + print('"%s", %g, %g' % (i[0], i[1][1], i[2][1]), file=f) diff --git a/test/demo1.py b/test/demo1.py index 425e96bc..36eb2962 100755 --- a/test/demo1.py +++ b/test/demo1.py @@ -58,8 +58,8 @@ def demo1(impth): PointData = app.GetDataInformation().GetNumberOfPoints() CellData = app.GetDataInformation().GetNumberOfCells() - print PointData, " Points" - print CellData, " Cells" + print(PointData, " Points") + print(CellData, " Cells") # Render the default view. Render() diff --git a/test/demo2.py b/test/demo2.py index 799c1bf9..e4d34826 100755 --- a/test/demo2.py +++ b/test/demo2.py @@ -41,7 +41,7 @@ def demo2(fname, impth): # Get the list of point arrays. avail = reader.PointVariables.Available - print avail + print(avail) # Select all arrays reader.PointVariables = avail @@ -64,15 +64,15 @@ def demo2(fname, impth): pdi = reader[0].PointData # This prints a list of all read point data arrays as well as their value ranges. - print 'Number of point arrays:', len(pdi) + print('Number of point arrays:', len(pdi)) for i in range(len(pdi)): ai = pdi[i] - print "----------------" - print "Array:", i, " ", ai.Name, ":" + print("----------------") + print("Array:", i, " ", ai.Name, ":") numComps = ai.GetNumberOfComponents() - print "Number of components:", numComps + print("Number of components:", numComps) for j in range(numComps): - print "Range:", ai.GetRange(j) + print("Range:", ai.GetRange(j)) # White is boring. Let's color the geometry using a variable. First create a lookup table. This object controls how scalar values are mapped to colors. SetDisplayProperties(LookupTable = MakeBlueToRedLT(0.00678, 0.0288)) diff --git a/test/demo3.py b/test/demo3.py index 8f6305e4..fb6574c0 100755 --- a/test/demo3.py +++ b/test/demo3.py @@ -42,8 +42,8 @@ def demo3(impth): UpdatePipeline() di = src.GetDataInformation() - print "Data type:", di.GetPrettyDataTypeString() - print "Extent:", di.GetExtent() + print("Data type:", di.GetPrettyDataTypeString()) + print("Extent:", di.GetExtent()) ##src.Representation = 3 # outline Show(src, view=v) @@ -78,7 +78,7 @@ def demo3(impth): # that spans the dataset bounds = di.GetBounds() - print "Bounds: ", bounds + print("Bounds: ", bounds) line.Point1 = bounds[0:6:2] line.Point2 = bounds[1:6:2] diff --git a/test/demo_14_med.py b/test/demo_14_med.py index 1cd6c9ff..a47e167a 100755 --- a/test/demo_14_med.py +++ b/test/demo_14_med.py @@ -31,7 +31,7 @@ import time import inspect def medread (path, impth): - print '============================================================' + print('============================================================') if os.path.exists(path): filelist = os.listdir(path) @@ -59,7 +59,7 @@ def medread (path, impth): Render() time.sleep(10) WriteImage(filename = (impth + "medFile_" + str(i+1) + ".png"), view=v, Magnification=2) - print str(i+1), "Shown file is: ", fname + print(str(i+1), "Shown file is: ", fname) Delete(v) v1 = CreateRenderView() diff --git a/test/standalone/simple/Container_init_python.cxx b/test/standalone/simple/Container_init_python.cxx index d952d2ee..9f32e130 100644 --- a/test/standalone/simple/Container_init_python.cxx +++ b/test/standalone/simple/Container_init_python.cxx @@ -50,10 +50,15 @@ void KERNEL_PYTHON::init_python(int argc, char **argv) // set stdout to line buffering (aka C++ std::cout) setvbuf(stdout, (char *)NULL, _IOLBF, BUFSIZ); char* salome_python=getenv("SALOME_PYTHON"); + size_t size_salome_python = sizeof(salome_python) / sizeof(salome_python[0]); if(salome_python != 0) - Py_SetProgramName(salome_python); + Py_SetProgramName(Py_DecodeLocale(salome_python, NULL)); + Py_Initialize(); // Initialize the interpreter - PySys_SetArgv(argc, argv); + wchar_t **w_argv = new wchar_t*[argc]; + for (int i = 0; i < argc; i++) + w_argv[i] = Py_DecodeLocale(argv[i], NULL); + PySys_SetArgv(argc, w_argv); PyRun_SimpleString("import threading\n"); PyEval_InitThreads(); // Create (and acquire) the interpreter lock PyThreadState *pts = PyGILState_GetThisThreadState(); diff --git a/test/standalone/simple/Container_init_python.hxx b/test/standalone/simple/Container_init_python.hxx index 2a564135..b1de3e41 100644 --- a/test/standalone/simple/Container_init_python.hxx +++ b/test/standalone/simple/Container_init_python.hxx @@ -42,6 +42,18 @@ #endif #include +#if PY_VERSION_HEX < 0x03050000 +static char* +Py_EncodeLocale(const wchar_t *arg, size_t *size) +{ + return _Py_wchar2char(arg, size); +} +static wchar_t* +Py_DecodeLocale(const char *arg, size_t *size) +{ + return _Py_char2wchar(arg, size); +} +#endif // next two MACRO must be used together only once inside a block // ------------------------------------------------------------- -- 2.39.2