From 6e7904a49595e906bc59b6e0196569476546562e Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Wed, 23 Jun 2021 16:13:39 +0200 Subject: [PATCH] [EDF23711] : tests of contactreader (*.rco) after implementation of time management --- src/CTestTestfileInstall.cmake.in | 1 + src/ContactReader/CMakeLists.txt | 4 ++ src/ContactReader/Test/23711_with_time.py | 46 +++++++++++++ src/ContactReader/Test/23711_with_time.rco | 67 +++++++++++++++++++ src/ContactReader/Test/23711_without_time.py | 22 ++++++ src/ContactReader/Test/23711_without_time.rco | 67 +++++++++++++++++++ src/ContactReader/Test/CMakeLists.txt | 35 ++++++++++ .../Test/CTestTestfileInstall.cmake | 32 +++++++++ .../ContactReaderModule/vtkContactReader.cxx | 1 - 9 files changed, 274 insertions(+), 1 deletion(-) create mode 100644 src/ContactReader/Test/23711_with_time.py create mode 100644 src/ContactReader/Test/23711_with_time.rco create mode 100644 src/ContactReader/Test/23711_without_time.py create mode 100644 src/ContactReader/Test/23711_without_time.rco create mode 100644 src/ContactReader/Test/CMakeLists.txt create mode 100644 src/ContactReader/Test/CTestTestfileInstall.cmake diff --git a/src/CTestTestfileInstall.cmake.in b/src/CTestTestfileInstall.cmake.in index 0c82b08..f7ceff2 100644 --- a/src/CTestTestfileInstall.cmake.in +++ b/src/CTestTestfileInstall.cmake.in @@ -25,3 +25,4 @@ SUBDIRS(ElectromagnetismFluxDisc) SUBDIRS(ElectromagnetismRotation) SUBDIRS(ElectromagnetismStreamTraceur) SUBDIRS(ElectromagnetismVecteur) +SUBDIRS(ContactReader) diff --git a/src/ContactReader/CMakeLists.txt b/src/ContactReader/CMakeLists.txt index 11dbaf6..673a29d 100644 --- a/src/ContactReader/CMakeLists.txt +++ b/src/ContactReader/CMakeLists.txt @@ -21,6 +21,10 @@ cmake_minimum_required(VERSION 3.8) project(ContactReader) find_package(ParaView REQUIRED) +IF(PARAVISADDONS_COMMON_BUILD_TESTS) + ADD_SUBDIRECTORY(Test) +ENDIF(PARAVISADDONS_COMMON_BUILD_TESTS) + include(GNUInstallDirs) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}") diff --git a/src/ContactReader/Test/23711_with_time.py b/src/ContactReader/Test/23711_with_time.py new file mode 100644 index 0000000..31aa739 --- /dev/null +++ b/src/ContactReader/Test/23711_with_time.py @@ -0,0 +1,46 @@ +from paraview.simple import * +from vtk.util import numpy_support +import numpy as np + +def MyAssert(b): + if not b: + raise RuntimeError("Oooops : Assertion failed !") +NB_OF_LINES_FOR_1TS = 22 +cr = ContactReader(registrationName='TEST.rco', FileName='23711_with_time.rco') +cr.UpdatePipelineInformation() +anim = GetAnimationScene() +tk = anim.TimeKeeper +times = tk.TimestepValues +MyAssert(times==[0.0,1.0,2.0]) +Show(cr) +meshViewer = GetActiveView() +# time step 0 +meshViewer.ViewTime = times[0] +meshViewer.Representations[0].UpdatePipeline() +Render() +cr.UpdatePipeline() +ds0 = servermanager.Fetch(cr) +MyAssert([ds0.GetPointData().GetArrayName(i) for i in range(ds0.GetPointData().GetNumberOfArrays())]==["Resultante"]) +MyAssert(ds0.GetNumberOfPoints()%NB_OF_LINES_FOR_1TS == 0) +step = int(ds0.GetNumberOfPoints()/NB_OF_LINES_FOR_1TS) +ts0 = numpy_support.vtk_to_numpy(ds0.GetPointData().GetAbstractArray(0))[::step] +MyAssert(ts0.shape == (NB_OF_LINES_FOR_1TS,3)) + +# time step 1 +meshViewer.ViewTime = times[1] +meshViewer.Representations[0].UpdatePipeline() +Render() +cr.UpdatePipeline() +ds0 = servermanager.Fetch(cr) +ts1 = numpy_support.vtk_to_numpy(ds0.GetPointData().GetAbstractArray(0))[::step] +MyAssert(not np.all(ts0==ts1)) +MyAssert(ts1.shape == (NB_OF_LINES_FOR_1TS,3)) + +# time step 2 +meshViewer.ViewTime = times[2] +meshViewer.Representations[0].UpdatePipeline() +Render() +cr.UpdatePipeline() +ds0 = servermanager.Fetch(cr) +ts2 = numpy_support.vtk_to_numpy(ds0.GetPointData().GetAbstractArray(0))[::step] +MyAssert(ts2.shape == (NB_OF_LINES_FOR_1TS-1,3)) # ???? for TS == 2.0 Plot AS is missing !? diff --git a/src/ContactReader/Test/23711_with_time.rco b/src/ContactReader/Test/23711_with_time.rco new file mode 100644 index 0000000..464080c --- /dev/null +++ b/src/ContactReader/Test/23711_with_time.rco @@ -0,0 +1,67 @@ +PLOT X Y Z DX DY DZ INST +PLOT_A 6.99380E+01 -9.92860E+01 2.47510E+02 6.56111E+05 -3.39807E+05 1.74164E+06 0.0 +PLOT_AB 5.89892E+01 -9.41141E+01 2.43945E+02 6.53939E+05 -4.57484E+05 3.50621E+06 0.0 +PLOT_BC 4.94006E+01 -8.83328E+01 2.41013E+02 1.37210E+06 -1.25944E+06 5.63036E+06 0.0 +PLOT_CD 4.05306E+01 -8.18223E+01 2.37012E+02 1.46467E+06 -1.85495E+06 1.05854E+07 0.0 +PLOT_DE 3.21359E+01 -7.45872E+01 2.31851E+02 2.86251E+06 -4.08686E+06 1.03118E+07 0.0 +PLOT_EF 2.43053E+01 -6.67373E+01 2.25916E+02 3.02623E+05 -1.58892E+06 2.82855E+07 0.0 +PLOT_FG 1.69305E+01 -5.83075E+01 2.20191E+02 -1.00466E+06 5.50721E+05 3.75766E+07 0.0 +PLOT_GH 1.00718E+01 -4.91424E+01 2.12987E+02 -1.49009E+06 1.56193E+06 4.47665E+07 0.0 +PLOT_HI 4.20367E+00 -3.91701E+01 2.02641E+02 -5.72981E+06 1.35115E+07 7.22708E+07 0.0 +PLOT_IJ -2.23839E+00 -2.92321E+01 1.93039E+02 -4.36652E+06 2.55757E+07 8.79372E+07 0.0 +PLOT_JK -7.58248E+00 -1.81314E+01 1.89248E+02 3.27526E+06 1.50134E+07 8.64063E+07 0.0 +PLOT_KL -1.03040E+01 -6.14203E+00 1.90248E+02 1.00192E+07 1.60503E+07 1.05800E+08 0.0 +PLOT_LM -1.03047E+01 6.14213E+00 1.91376E+02 8.12918E+06 1.45291E+07 5.32809E+07 0.0 +PLOT_MN -7.58064E+00 1.81305E+01 1.92882E+02 5.17649E+06 -6.62867E+06 6.01791E+07 0.0 +PLOT_NO -2.25230E+00 2.92447E+01 1.95264E+02 -1.32209E+06 -1.66618E+07 6.76480E+07 0.0 +PLOT_OP 4.91497E+00 3.90358E+01 2.00085E+02 -9.37412E+06 -2.51776E+07 6.12329E+07 0.0 +PLOT_PQ 1.12662E+01 4.85991E+01 2.06748E+02 -1.08372E+07 -2.13947E+07 6.28174E+07 0.0 +PLOT_QR 1.78531E+01 5.76811E+01 2.13458E+02 -8.22407E+06 -1.46953E+07 4.98353E+07 0.0 +PLOT_RS 2.56587E+01 6.68139E+01 2.20117E+02 -5.01649E+06 -6.42648E+06 4.06876E+07 0.0 +PLOT_ST 3.43732E+01 7.59344E+01 2.28900E+02 9.78767E+06 1.03617E+07 3.17879E+07 0.0 +PLOT_TU 4.39848E+01 8.45035E+01 2.39018E+02 1.95294E+06 2.09474E+06 5.28992E+06 0.0 +PLOT_U 5.49398E+01 9.19596E+01 2.46487E+02 1.71246E+06 1.32286E+06 2.94370E+06 0.0 +PLOT_A 6.99380E+01 -9.92860E+01 2.47510E+02 -7.47621E+05 -1.51230E+05 2.01597E+06 1.0 +PLOT_AB 5.89892E+01 -9.41141E+01 2.43945E+02 -2.77589E+06 -2.86363E+05 4.41941E+06 1.0 +PLOT_BC 4.94006E+01 -8.83328E+01 2.41013E+02 -7.96012E+06 8.94701E+05 8.12094E+06 1.0 +PLOT_CD 4.05306E+01 -8.18223E+01 2.37012E+02 -1.83739E+07 4.86989E+06 1.47950E+07 1.0 +PLOT_DE 3.21359E+01 -7.45872E+01 2.31851E+02 -3.75079E+07 1.58018E+07 2.05218E+07 1.0 +PLOT_EF 2.43053E+01 -6.67373E+01 2.25916E+02 -6.07074E+07 3.68657E+07 4.97525E+07 1.0 +PLOT_FG 1.69305E+01 -5.83075E+01 2.20191E+02 -8.16827E+07 5.90113E+07 6.44651E+07 1.0 +PLOT_GH 1.00718E+01 -4.91424E+01 2.12987E+02 -1.34522E+08 1.05184E+08 9.14587E+07 1.0 +PLOT_HI 4.20367E+00 -3.91701E+01 2.02641E+02 -1.85987E+08 1.43259E+08 1.54163E+08 1.0 +PLOT_IJ -2.23839E+00 -2.92321E+01 1.93039E+02 -1.09972E+08 8.64431E+07 1.33254E+08 1.0 +PLOT_JK -7.58248E+00 -1.81314E+01 1.89248E+02 -7.48479E+07 2.81345E+07 6.47697E+07 1.0 +PLOT_KL -1.03040E+01 -6.14203E+00 1.90248E+02 -1.10970E+08 1.38944E+07 5.38868E+07 1.0 +PLOT_LM -1.03047E+01 6.14213E+00 1.91376E+02 -7.14549E+07 -6.12421E+06 2.81089E+07 1.0 +PLOT_MN -7.58064E+00 1.81305E+01 1.92882E+02 -8.04582E+07 -3.03584E+07 4.80517E+07 1.0 +PLOT_NO -2.25230E+00 2.92447E+01 1.95264E+02 -8.67192E+07 -5.23599E+07 7.64010E+07 1.0 +PLOT_OP 4.91497E+00 3.90358E+01 2.00085E+02 -1.42744E+08 -1.00024E+08 1.13565E+08 1.0 +PLOT_PQ 1.12662E+01 4.85991E+01 2.06748E+02 -1.31362E+08 -8.21281E+07 1.03646E+08 1.0 +PLOT_QR 1.78531E+01 5.76811E+01 2.13458E+02 -1.22814E+08 -6.85135E+07 8.37043E+07 1.0 +PLOT_RS 2.56587E+01 6.68139E+01 2.20117E+02 -8.97086E+07 -4.15678E+07 6.26951E+07 1.0 +PLOT_ST 3.43732E+01 7.59344E+01 2.28900E+02 -8.16684E+07 -3.37124E+07 5.06435E+07 1.0 +PLOT_TU 4.39848E+01 8.45035E+01 2.39018E+02 -3.22778E+07 -1.73477E+07 1.18434E+07 1.0 +PLOT_U 5.49398E+01 9.19596E+01 2.46487E+02 -1.23834E+07 -7.20863E+06 4.80753E+06 1.0 +PLOT_A 6.99380E+01 -9.92860E+01 2.47510E+02 -1.67984E+05 3.83097E+04 1.89946E+06 2.0 +PLOT_BC 4.94006E+01 -8.83328E+01 2.41013E+02 -4.61945E+06 1.34497E+06 7.45506E+06 2.0 +PLOT_CD 4.05306E+01 -8.18223E+01 2.37012E+02 -1.25766E+07 4.65404E+06 1.39023E+07 2.0 +PLOT_DE 3.21359E+01 -7.45872E+01 2.31851E+02 -2.80918E+07 1.31561E+07 1.85816E+07 2.0 +PLOT_EF 2.43053E+01 -6.67373E+01 2.25916E+02 -4.90755E+07 3.08626E+07 4.54204E+07 2.0 +PLOT_FG 1.69305E+01 -5.83075E+01 2.20191E+02 -6.89489E+07 5.03526E+07 5.93163E+07 2.0 +PLOT_GH 1.00718E+01 -4.91424E+01 2.12987E+02 -1.18588E+08 9.13718E+07 8.36961E+07 2.0 +PLOT_HI 4.20367E+00 -3.91701E+01 2.02641E+02 -1.72757E+08 1.27741E+08 1.44071E+08 2.0 +PLOT_IJ -2.23839E+00 -2.92321E+01 1.93039E+02 -1.08926E+08 7.84815E+07 1.29090E+08 2.0 +PLOT_JK -7.58248E+00 -1.81314E+01 1.89248E+02 -7.53309E+07 2.52026E+07 6.82438E+07 2.0 +PLOT_KL -1.03040E+01 -6.14203E+00 1.90248E+02 -1.09040E+08 1.28199E+07 6.11951E+07 2.0 +PLOT_LM -1.03047E+01 6.14213E+00 1.91376E+02 -7.08210E+07 -4.68283E+06 3.28528E+07 2.0 +PLOT_MN -7.58064E+00 1.81305E+01 1.92882E+02 -7.91315E+07 -2.79333E+07 5.14887E+07 2.0 +PLOT_NO -2.25230E+00 2.92447E+01 1.95264E+02 -8.43512E+07 -4.72746E+07 7.72473E+07 2.0 +PLOT_OP 4.91497E+00 3.90358E+01 2.00085E+02 -1.33757E+08 -9.07542E+07 1.08528E+08 2.0 +PLOT_PQ 1.12662E+01 4.85991E+01 2.06748E+02 -1.19356E+08 -7.40137E+07 9.88518E+07 2.0 +PLOT_QR 1.78531E+01 5.76811E+01 2.13458E+02 -1.08273E+08 -6.08984E+07 7.87878E+07 2.0 +PLOT_RS 2.56587E+01 6.68139E+01 2.20117E+02 -7.61887E+07 -3.55826E+07 5.85281E+07 2.0 +PLOT_ST 3.43732E+01 7.59344E+01 2.28900E+02 -6.31480E+07 -2.68384E+07 4.57944E+07 2.0 +PLOT_TU 4.39848E+01 8.45035E+01 2.39018E+02 -2.27135E+07 -1.44842E+07 9.88362E+06 2.0 +PLOT_U 5.49398E+01 9.19596E+01 2.46487E+02 -8.13067E+06 -5.49369E+06 4.15094E+06 2.0 + diff --git a/src/ContactReader/Test/23711_without_time.py b/src/ContactReader/Test/23711_without_time.py new file mode 100644 index 0000000..0974b5d --- /dev/null +++ b/src/ContactReader/Test/23711_without_time.py @@ -0,0 +1,22 @@ +from paraview.simple import * +from vtk.util import numpy_support +import numpy as np + +def MyAssert(b): + if not b: + raise RuntimeError("Oooops : Assertion failed !") +NB_OF_LINES_FOR_1TS = 65 # not 66 because AB is not for inst == 2.0 !? +cr = ContactReader(registrationName='TEST.rco', FileName='23711_without_time.rco') +cr.UpdatePipelineInformation() +anim = GetAnimationScene() +tk = anim.TimeKeeper +times = tk.TimestepValues +MyAssert(times==[]) +# time step 0 +cr.UpdatePipeline() +ds0 = servermanager.Fetch(cr) +MyAssert([ds0.GetPointData().GetArrayName(i) for i in range(ds0.GetPointData().GetNumberOfArrays())]==["Resultante"]) +MyAssert(ds0.GetNumberOfPoints()%NB_OF_LINES_FOR_1TS == 0) +step = int(ds0.GetNumberOfPoints()/NB_OF_LINES_FOR_1TS) +ts0 = numpy_support.vtk_to_numpy(ds0.GetPointData().GetAbstractArray(0))[::step] +MyAssert(ts0.shape == (NB_OF_LINES_FOR_1TS,3)) diff --git a/src/ContactReader/Test/23711_without_time.rco b/src/ContactReader/Test/23711_without_time.rco new file mode 100644 index 0000000..2de6a97 --- /dev/null +++ b/src/ContactReader/Test/23711_without_time.rco @@ -0,0 +1,67 @@ +PLOT X Y Z DX DY DZ INTT +PLOT_A 6.99380E+01 -9.92860E+01 2.47510E+02 6.56111E+05 -3.39807E+05 1.74164E+06 0.0 +PLOT_AB 5.89892E+01 -9.41141E+01 2.43945E+02 6.53939E+05 -4.57484E+05 3.50621E+06 0.0 +PLOT_BC 4.94006E+01 -8.83328E+01 2.41013E+02 1.37210E+06 -1.25944E+06 5.63036E+06 0.0 +PLOT_CD 4.05306E+01 -8.18223E+01 2.37012E+02 1.46467E+06 -1.85495E+06 1.05854E+07 0.0 +PLOT_DE 3.21359E+01 -7.45872E+01 2.31851E+02 2.86251E+06 -4.08686E+06 1.03118E+07 0.0 +PLOT_EF 2.43053E+01 -6.67373E+01 2.25916E+02 3.02623E+05 -1.58892E+06 2.82855E+07 0.0 +PLOT_FG 1.69305E+01 -5.83075E+01 2.20191E+02 -1.00466E+06 5.50721E+05 3.75766E+07 0.0 +PLOT_GH 1.00718E+01 -4.91424E+01 2.12987E+02 -1.49009E+06 1.56193E+06 4.47665E+07 0.0 +PLOT_HI 4.20367E+00 -3.91701E+01 2.02641E+02 -5.72981E+06 1.35115E+07 7.22708E+07 0.0 +PLOT_IJ -2.23839E+00 -2.92321E+01 1.93039E+02 -4.36652E+06 2.55757E+07 8.79372E+07 0.0 +PLOT_JK -7.58248E+00 -1.81314E+01 1.89248E+02 3.27526E+06 1.50134E+07 8.64063E+07 0.0 +PLOT_KL -1.03040E+01 -6.14203E+00 1.90248E+02 1.00192E+07 1.60503E+07 1.05800E+08 0.0 +PLOT_LM -1.03047E+01 6.14213E+00 1.91376E+02 8.12918E+06 1.45291E+07 5.32809E+07 0.0 +PLOT_MN -7.58064E+00 1.81305E+01 1.92882E+02 5.17649E+06 -6.62867E+06 6.01791E+07 0.0 +PLOT_NO -2.25230E+00 2.92447E+01 1.95264E+02 -1.32209E+06 -1.66618E+07 6.76480E+07 0.0 +PLOT_OP 4.91497E+00 3.90358E+01 2.00085E+02 -9.37412E+06 -2.51776E+07 6.12329E+07 0.0 +PLOT_PQ 1.12662E+01 4.85991E+01 2.06748E+02 -1.08372E+07 -2.13947E+07 6.28174E+07 0.0 +PLOT_QR 1.78531E+01 5.76811E+01 2.13458E+02 -8.22407E+06 -1.46953E+07 4.98353E+07 0.0 +PLOT_RS 2.56587E+01 6.68139E+01 2.20117E+02 -5.01649E+06 -6.42648E+06 4.06876E+07 0.0 +PLOT_ST 3.43732E+01 7.59344E+01 2.28900E+02 9.78767E+06 1.03617E+07 3.17879E+07 0.0 +PLOT_TU 4.39848E+01 8.45035E+01 2.39018E+02 1.95294E+06 2.09474E+06 5.28992E+06 0.0 +PLOT_U 5.49398E+01 9.19596E+01 2.46487E+02 1.71246E+06 1.32286E+06 2.94370E+06 0.0 +PLOT_A 6.99380E+01 -9.92860E+01 2.47510E+02 -7.47621E+05 -1.51230E+05 2.01597E+06 1.0 +PLOT_AB 5.89892E+01 -9.41141E+01 2.43945E+02 -2.77589E+06 -2.86363E+05 4.41941E+06 1.0 +PLOT_BC 4.94006E+01 -8.83328E+01 2.41013E+02 -7.96012E+06 8.94701E+05 8.12094E+06 1.0 +PLOT_CD 4.05306E+01 -8.18223E+01 2.37012E+02 -1.83739E+07 4.86989E+06 1.47950E+07 1.0 +PLOT_DE 3.21359E+01 -7.45872E+01 2.31851E+02 -3.75079E+07 1.58018E+07 2.05218E+07 1.0 +PLOT_EF 2.43053E+01 -6.67373E+01 2.25916E+02 -6.07074E+07 3.68657E+07 4.97525E+07 1.0 +PLOT_FG 1.69305E+01 -5.83075E+01 2.20191E+02 -8.16827E+07 5.90113E+07 6.44651E+07 1.0 +PLOT_GH 1.00718E+01 -4.91424E+01 2.12987E+02 -1.34522E+08 1.05184E+08 9.14587E+07 1.0 +PLOT_HI 4.20367E+00 -3.91701E+01 2.02641E+02 -1.85987E+08 1.43259E+08 1.54163E+08 1.0 +PLOT_IJ -2.23839E+00 -2.92321E+01 1.93039E+02 -1.09972E+08 8.64431E+07 1.33254E+08 1.0 +PLOT_JK -7.58248E+00 -1.81314E+01 1.89248E+02 -7.48479E+07 2.81345E+07 6.47697E+07 1.0 +PLOT_KL -1.03040E+01 -6.14203E+00 1.90248E+02 -1.10970E+08 1.38944E+07 5.38868E+07 1.0 +PLOT_LM -1.03047E+01 6.14213E+00 1.91376E+02 -7.14549E+07 -6.12421E+06 2.81089E+07 1.0 +PLOT_MN -7.58064E+00 1.81305E+01 1.92882E+02 -8.04582E+07 -3.03584E+07 4.80517E+07 1.0 +PLOT_NO -2.25230E+00 2.92447E+01 1.95264E+02 -8.67192E+07 -5.23599E+07 7.64010E+07 1.0 +PLOT_OP 4.91497E+00 3.90358E+01 2.00085E+02 -1.42744E+08 -1.00024E+08 1.13565E+08 1.0 +PLOT_PQ 1.12662E+01 4.85991E+01 2.06748E+02 -1.31362E+08 -8.21281E+07 1.03646E+08 1.0 +PLOT_QR 1.78531E+01 5.76811E+01 2.13458E+02 -1.22814E+08 -6.85135E+07 8.37043E+07 1.0 +PLOT_RS 2.56587E+01 6.68139E+01 2.20117E+02 -8.97086E+07 -4.15678E+07 6.26951E+07 1.0 +PLOT_ST 3.43732E+01 7.59344E+01 2.28900E+02 -8.16684E+07 -3.37124E+07 5.06435E+07 1.0 +PLOT_TU 4.39848E+01 8.45035E+01 2.39018E+02 -3.22778E+07 -1.73477E+07 1.18434E+07 1.0 +PLOT_U 5.49398E+01 9.19596E+01 2.46487E+02 -1.23834E+07 -7.20863E+06 4.80753E+06 1.0 +PLOT_A 6.99380E+01 -9.92860E+01 2.47510E+02 -1.67984E+05 3.83097E+04 1.89946E+06 2.0 +PLOT_BC 4.94006E+01 -8.83328E+01 2.41013E+02 -4.61945E+06 1.34497E+06 7.45506E+06 2.0 +PLOT_CD 4.05306E+01 -8.18223E+01 2.37012E+02 -1.25766E+07 4.65404E+06 1.39023E+07 2.0 +PLOT_DE 3.21359E+01 -7.45872E+01 2.31851E+02 -2.80918E+07 1.31561E+07 1.85816E+07 2.0 +PLOT_EF 2.43053E+01 -6.67373E+01 2.25916E+02 -4.90755E+07 3.08626E+07 4.54204E+07 2.0 +PLOT_FG 1.69305E+01 -5.83075E+01 2.20191E+02 -6.89489E+07 5.03526E+07 5.93163E+07 2.0 +PLOT_GH 1.00718E+01 -4.91424E+01 2.12987E+02 -1.18588E+08 9.13718E+07 8.36961E+07 2.0 +PLOT_HI 4.20367E+00 -3.91701E+01 2.02641E+02 -1.72757E+08 1.27741E+08 1.44071E+08 2.0 +PLOT_IJ -2.23839E+00 -2.92321E+01 1.93039E+02 -1.08926E+08 7.84815E+07 1.29090E+08 2.0 +PLOT_JK -7.58248E+00 -1.81314E+01 1.89248E+02 -7.53309E+07 2.52026E+07 6.82438E+07 2.0 +PLOT_KL -1.03040E+01 -6.14203E+00 1.90248E+02 -1.09040E+08 1.28199E+07 6.11951E+07 2.0 +PLOT_LM -1.03047E+01 6.14213E+00 1.91376E+02 -7.08210E+07 -4.68283E+06 3.28528E+07 2.0 +PLOT_MN -7.58064E+00 1.81305E+01 1.92882E+02 -7.91315E+07 -2.79333E+07 5.14887E+07 2.0 +PLOT_NO -2.25230E+00 2.92447E+01 1.95264E+02 -8.43512E+07 -4.72746E+07 7.72473E+07 2.0 +PLOT_OP 4.91497E+00 3.90358E+01 2.00085E+02 -1.33757E+08 -9.07542E+07 1.08528E+08 2.0 +PLOT_PQ 1.12662E+01 4.85991E+01 2.06748E+02 -1.19356E+08 -7.40137E+07 9.88518E+07 2.0 +PLOT_QR 1.78531E+01 5.76811E+01 2.13458E+02 -1.08273E+08 -6.08984E+07 7.87878E+07 2.0 +PLOT_RS 2.56587E+01 6.68139E+01 2.20117E+02 -7.61887E+07 -3.55826E+07 5.85281E+07 2.0 +PLOT_ST 3.43732E+01 7.59344E+01 2.28900E+02 -6.31480E+07 -2.68384E+07 4.57944E+07 2.0 +PLOT_TU 4.39848E+01 8.45035E+01 2.39018E+02 -2.27135E+07 -1.44842E+07 9.88362E+06 2.0 +PLOT_U 5.49398E+01 9.19596E+01 2.46487E+02 -8.13067E+06 -5.49369E+06 4.15094E+06 2.0 + diff --git a/src/ContactReader/Test/CMakeLists.txt b/src/ContactReader/Test/CMakeLists.txt new file mode 100644 index 0000000..2182635 --- /dev/null +++ b/src/ContactReader/Test/CMakeLists.txt @@ -0,0 +1,35 @@ +# Copyright (C) 2012-2020 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# Author : Yoann Audouin (EDF) + +SET(test_contactreader_0 + 23711_with_time.py + 23711_with_time.rco + 23711_without_time.py + 23711_without_time.rco + ) + +# Application tests + +SET(TEST_INSTALL_DIRECTORY ${PARAVISADDONS_COMMON_INSTALL_TESTS}/ContactReader) +INSTALL(FILES ${test_contactreader_0} DESTINATION ${TEST_INSTALL_DIRECTORY}) + +INSTALL(FILES CTestTestfileInstall.cmake + DESTINATION ${TEST_INSTALL_DIRECTORY} + RENAME CTestTestfile.cmake) diff --git a/src/ContactReader/Test/CTestTestfileInstall.cmake b/src/ContactReader/Test/CTestTestfileInstall.cmake new file mode 100644 index 0000000..a39ba53 --- /dev/null +++ b/src/ContactReader/Test/CTestTestfileInstall.cmake @@ -0,0 +1,32 @@ +# Copyright (C) 2015-2020 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SET(TEST_NAMES +#23711_with_time +23711_without_time +) + +FOREACH(tfile ${TEST_NAMES}) + SET(TEST_NAME ${COMPONENT_NAME}_${tfile}) + ADD_TEST(${TEST_NAME} python ${tfile}.py) + SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES + LABELS "${COMPONENT_NAME}" + TIMEOUT ${TIMEOUT} + ) +ENDFOREACH() diff --git a/src/ContactReader/plugin/ContactReaderModule/vtkContactReader.cxx b/src/ContactReader/plugin/ContactReaderModule/vtkContactReader.cxx index fc4c0ff..58df668 100644 --- a/src/ContactReader/plugin/ContactReaderModule/vtkContactReader.cxx +++ b/src/ContactReader/plugin/ContactReaderModule/vtkContactReader.cxx @@ -192,7 +192,6 @@ int vtkContactReader::RequestInformation(vtkInformation *vtkNotUsed(request), timeRange[1]=allInstsV.back(); outInfo->Set(vtkStreamingDemandDrivenPipeline::TIME_STEPS(),allInstsV.data(),(int)allInstsV.size()); outInfo->Set(vtkStreamingDemandDrivenPipeline::TIME_RANGE(),timeRange,2); - std::for_each(colNames.begin(),colNames.end(),[](const std::string& elt) { std::cerr << elt << " ";}); return 1; } -- 2.39.2