#1422 Replace hardcoded expected results by a symbolic link.

MoReFEM.xcodeproj/project.pbxproj

@@ -2632,9 +2632,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		0206138E22C26DAF00E899BD /* cylinderOK.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cylinderOK.lua; sourceTree = "<group>"; };
 		0222DAA022B8D51F00B3886C /* bench_2.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bench_2.lua; sourceTree = "<group>"; };
-		022441F722C21E7C0024E744 /* IOformat.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = IOformat.lua; sourceTree = "<group>"; };
 		022EA64722C1248300EFD26B /* bench_3.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bench_3.lua; sourceTree = "<group>"; };
 		02A5344022B28ECD00D4D943 /* demo.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demo.lua; sourceTree = "<group>"; };
 		02E9DED722D3A249002810E4 /* OutputFormat.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = OutputFormat.hpp; sourceTree = "<group>"; };
@@ -4029,6 +4027,8 @@
 		BE7ABCD522DCADAD00238C51 /* WritePrepartitionedData.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WritePrepartitionedData.cpp; path = Advanced/WritePrepartitionedData.cpp; sourceTree = "<group>"; };
 		BE7ABCD722DCADAD00238C51 /* WritePrepartitionedData.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = WritePrepartitionedData.hpp; path = Advanced/WritePrepartitionedData.hpp; sourceTree = "<group>"; };
 		BE7ABCDC22DCC16400238C51 /* WritePrepartitionedData.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = WritePrepartitionedData.hxx; path = Advanced/WritePrepartitionedData.hxx; sourceTree = "<group>"; };
+		BE7ABCE822DCDF0100238C51 /* demo_input_elasticity_3d_binary.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demo_input_elasticity_3d_binary.lua; sourceTree = "<group>"; };
+		BE7ABCE922DCDF0100238C51 /* demo_input_elasticity_binary.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demo_input_elasticity_binary.lua; sourceTree = "<group>"; };
 		BE7C1D0B1F4F2C8C000403E7 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
 		BE7C1D0D1F4F2E8B000403E7 /* demo_input_parameter_movemesh.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = demo_input_parameter_movemesh.lua; sourceTree = "<group>"; };
 		BE7C942C1F5FE614003D2C52 /* InputData.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = InputData.hpp; sourceTree = "<group>"; };
@@ -8115,12 +8115,12 @@
 		BE63B4911A31C20E003A6523 /* Elasticity */ = {
 			isa = PBXGroup;
 			children = (
-				0206138E22C26DAF00E899BD /* cylinderOK.lua */,
-				022441F722C21E7C0024E744 /* IOformat.lua */,
 				BE964C7D206E8E3B00B9ED1E /* CMakeLists.txt */,
 				BEB0C6161EC304EF00D62905 /* README */,
 				BE6EA61E1EC32FFB0085E651 /* demo_input_elasticity_3d.lua */,
 				BE6EA61F1EC32FFB0085E651 /* demo_input_elasticity.lua */,
+				BE7ABCE822DCDF0100238C51 /* demo_input_elasticity_3d_binary.lua */,
+				BE7ABCE922DCDF0100238C51 /* demo_input_elasticity_binary.lua */,
 				BE4478861AA740F800665010 /* main.cpp */,
 				BE3B35FB1D91792500DB81A3 /* main_ensight_output.cpp */,
 				BE8E21C8207E9D3000E24E6D /* test_results.cpp */,

Sources/ModelInstances/Elasticity/CMakeLists.txt

@@ -85,57 +85,57 @@ add_test(ElasticityModel2DEnsightOutput-mpi
          -e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Ascii)
 
 add_test(ElasticityModel3D-bin
-MoReFEM4Elasticity
--e MOREFEM_ROOT=${MOREFEM_ROOT}
--i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity_3d_binary.lua
--e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq/Binary)
+         MoReFEM4Elasticity
+         -e MOREFEM_ROOT=${MOREFEM_ROOT}
+         -i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity_3d_binary.lua
+     -e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq/Binary)
 
 add_test(ElasticityModel3D-mpi-bin
-${OPEN_MPI_INCL_DIR}/../bin/mpirun
---oversubscribe
--np 4 MoReFEM4Elasticity
--e MOREFEM_ROOT=${MOREFEM_ROOT}
--i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity_3d_binary.lua
--e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Binary)
+         ${OPEN_MPI_INCL_DIR}/../bin/mpirun
+         --oversubscribe
+         -np 4 MoReFEM4Elasticity
+         -e MOREFEM_ROOT=${MOREFEM_ROOT}
+         -i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity_3d_binary.lua
+         -e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Binary)
 
 add_test(ElasticityModel2D-bin
-MoReFEM4Elasticity
--e MOREFEM_ROOT=${MOREFEM_ROOT}
--i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity_binary.lua
--e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq/Binary)
+         MoReFEM4Elasticity
+         -e MOREFEM_ROOT=${MOREFEM_ROOT}
+         -i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity_binary.lua
+         -e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq/Binary)
 
 add_test(ElasticityModel2D-mpi-bin
-${OPEN_MPI_INCL_DIR}/../bin/mpirun
---oversubscribe
--np 4 MoReFEM4Elasticity
--e MOREFEM_ROOT=${MOREFEM_ROOT}
--i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity_binary.lua
--e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Binary)
+         ${OPEN_MPI_INCL_DIR}/../bin/mpirun
+         --oversubscribe
+         -np 4 MoReFEM4Elasticity
+         -e MOREFEM_ROOT=${MOREFEM_ROOT}
+         -i ${MOREFEM_ROOT}/Sources/ModelInstances/Elasticity/demo_input_elasticity_binary.lua
+         -e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Binary)
 
 
 add_test(ElasticityModel3DEnsightOutput-bin
-MoReFEM4ElasticityEnsightOutput
--e MOREFEM_ROOT=${MOREFEM_ROOT}
--i ${MOREFEM_TEST_OUTPUT_DIR}/Seq/Binary/Elasticity/3D/input_data.lua
--e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq/Binary)
+         MoReFEM4ElasticityEnsightOutput
+         -e MOREFEM_ROOT=${MOREFEM_ROOT}
+         -i ${MOREFEM_TEST_OUTPUT_DIR}/Seq/Binary/Elasticity/3D/input_data.lua
+         -e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq/Binary)
 
 add_test(ElasticityModel3DEnsightOutput-mpi-bin
-MoReFEM4ElasticityEnsightOutput
--e MOREFEM_ROOT=${MOREFEM_ROOT}
--i ${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Binary/Elasticity/3D/input_data.lua
--e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Binary)
+         MoReFEM4ElasticityEnsightOutput
+         -e MOREFEM_ROOT=${MOREFEM_ROOT}
+         -i ${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Binary/Elasticity/3D/input_data.lua
+         -e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Binary)
 
 add_test(ElasticityModel2DEnsightOutput-bin
-MoReFEM4ElasticityEnsightOutput
--e MOREFEM_ROOT=${MOREFEM_ROOT}
--i ${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Binary/Elasticity/2D/input_data.lua
--e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq/Binary)
+         MoReFEM4ElasticityEnsightOutput
+         -e MOREFEM_ROOT=${MOREFEM_ROOT}
+         -i ${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Binary/Elasticity/2D/input_data.lua
+         -e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Seq/Binary)
 
 add_test(ElasticityModel2DEnsightOutput-mpi-bin
-MoReFEM4ElasticityEnsightOutput
--e MOREFEM_ROOT=${MOREFEM_ROOT}
--i ${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Binary/Elasticity/2D/input_data.lua
--e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Binary)
+         MoReFEM4ElasticityEnsightOutput
+         -e MOREFEM_ROOT=${MOREFEM_ROOT}
+         -i ${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Binary/Elasticity/2D/input_data.lua
+         -e MOREFEM_RESULT_DIR=${MOREFEM_TEST_OUTPUT_DIR}/Mpi4/Binary)
 
 morefem_install(MoReFEM4ElasticityEnsightOutput)
 

Sources/ModelInstances/Elasticity/ExpectedResults/Binary/2D/Mesh_1/Ensight6

+../../../Ascii/2D/Mesh_1/Ensight6
\ No newline at end of file

Sources/ModelInstances/Elasticity/ExpectedResults/Binary/2D/Mesh_1/Ensight6/problem.case

-FORMAT
-type: ensight
-GEOMETRY
-model: 1 mesh.geo
-VARIABLE
-vector per node: 1 solid_displacement solid_displacement.*****.scl
-TIME
-time set: 1
-number of steps: 6
-filename numbers: 0 1 2 3 4
-5 
-time values: 0 0.1 0.2 0.3 0.4
-0.5 

Sources/ModelInstances/Elasticity/ExpectedResults/Binary/3D/Mesh_1/Ensight6

+../../../Ascii/3D/Mesh_1/Ensight6
\ No newline at end of file

Sources/ModelInstances/Elasticity/ExpectedResults/Binary/3D/Mesh_1/Ensight6/problem.case

-FORMAT
-type: ensight
-GEOMETRY
-model: 1 mesh.geo
-VARIABLE
-vector per node: 1 solid_displacement solid_displacement.*****.scl
-TIME
-time set: 1
-number of steps: 6
-filename numbers: 0 1 2 3 4
-5 
-time values: 0 0.1 0.2 0.3 0.4
-0.5