Names of fields are changed.

diff --git a/test/VisuPrs/3D_viewer/A2.py b/test/VisuPrs/3D_viewer/A2.py
index 6fb1a7525a836a1fe82ffd0f5de9eb2165432ae0..447cda5aa5b4185b1cd31096003d1c225e85fecb 100644 (file)
--- a/test/VisuPrs/3D_viewer/A2.py
+++ b/test/VisuPrs/3D_viewer/A2.py
@@ -62,7 +62,7 @@ opacities = [1.0, 0.5, 0.0]
 linewidths = [1.0, 3.0, 10.0]
 compare_prec = 0.00001
 
-field_name = 'vectoriel_field'
+field_name = 'vectoriel field'
 
 print "\nCreating Vectors.......",
 vectors = VectorsOnField(proxy, EntityType.CELL, field_name, 1,

diff --git a/test/VisuPrs/3D_viewer/A3.py b/test/VisuPrs/3D_viewer/A3.py
index 8a3bfb4f7b51443c22d04e69d7b2c7a4c01d113d..1dbceb50b135bc61ae96a6086c2a27ae6b9a34df 100644 (file)
--- a/test/VisuPrs/3D_viewer/A3.py
+++ b/test/VisuPrs/3D_viewer/A3.py
@@ -62,7 +62,7 @@ opacities = [1.0, 0.5, 0.0]
 linewidths = [1.0, 3.0, 10.0]
 compare_prec = 0.00001
 
-field_name = 'vectoriel_field'
+field_name = 'vectoriel field'
 
 print "\nCreating stream_lines......."
 stream_lines = StreamLinesOnField(proxy, EntityType.CELL,

diff --git a/test/VisuPrs/3D_viewer/A7.py b/test/VisuPrs/3D_viewer/A7.py
index e916b807dabf7a70152b966a2819f1b6fe66e52f..59fe120b31a042bb8e64c6254dc3bfc42f0b1082 100644 (file)
--- a/test/VisuPrs/3D_viewer/A7.py
+++ b/test/VisuPrs/3D_viewer/A7.py
@@ -61,7 +61,7 @@ opacities = [1.0, 0.5, 0.0]
 linewidths = [1.0, 3.0, 10.0]
 compare_prec = 0.00001
 
-field_name = 'scalar_field'
+field_name = 'scalar field'
 
 print "\nCreating cut planes.......",
 cut_planes = CutPlanesOnField(proxy, EntityType.CELL, field_name, 1,

diff --git a/test/VisuPrs/3D_viewer/A8.py b/test/VisuPrs/3D_viewer/A8.py
index c24d2b840344a67d5e63fb691460611efebf7739..a6e19b9f9550fd4c734b2cbc39fd43ef590d0a07 100644 (file)
--- a/test/VisuPrs/3D_viewer/A8.py
+++ b/test/VisuPrs/3D_viewer/A8.py
@@ -61,7 +61,7 @@ opacities = [1.0, 0.5, 0.0]
 linewidths = [1.0, 3.0, 10.0]
 compare_prec = 0.00001
 
-field_name = 'scalar_field'
+field_name = 'scalar field'
 
 print "\nCreating cut lines.......",
 cut_lines = CutLinesOnField(proxy, EntityType.CELL, field_name, 1,

diff --git a/test/VisuPrs/DeformedShape/B3.py b/test/VisuPrs/DeformedShape/B3.py
index 508a766ee4a9fd8409f9957ec4874d5e8c13fa62..03a0bd5709bfb99a1a3af477c5306f5932b93121 100755 (executable)
--- a/test/VisuPrs/DeformedShape/B3.py
+++ b/test/VisuPrs/DeformedShape/B3.py
@@ -47,7 +47,7 @@ print "**** Stage2: Creating Deformed Shape"
 print "Creating Deformed Shape...............",
 
 cell_entity = EntityType.CELL
-field_name = 'vectoriel_field'
+field_name = 'vectoriel field'
 defshape = DeformedShapeOnField(med_reader, cell_entity, field_name, 1)
 pvsimple.ResetCamera()
 

diff --git a/test/VisuPrs/DeformedShape/B4.py b/test/VisuPrs/DeformedShape/B4.py
index 13b74f673ee334291ba8265430b91318aa848af8..8bd72b857c7df34c837025471f3a37bcd8a4efb8 100644 (file)
--- a/test/VisuPrs/DeformedShape/B4.py
+++ b/test/VisuPrs/DeformedShape/B4.py
@@ -47,7 +47,7 @@ print "**** Stage2: Creating Deformed Shape"
 print "Creating Deformed Shape...............",
 
 cell_entity = EntityType.CELL
-field_name = 'vectoriel_field'
+field_name = 'vectoriel field'
 defshape = DeformedShapeOnField(med_reader, cell_entity, field_name, 1)
 pvsimple.ResetCamera()
 

diff --git a/test/VisuPrs/SWIG_scripts/A1.py b/test/VisuPrs/SWIG_scripts/A1.py
index b20cae3b846288d3548a92a5b218102309838b65..0d4de63cde505fdc7f50ed3c14427845e5a6d421 100644 (file)
--- a/test/VisuPrs/SWIG_scripts/A1.py
+++ b/test/VisuPrs/SWIG_scripts/A1.py
@@ -135,7 +135,7 @@ else:
 print "**** Stage4: Displaying scalar field"
 
 print "Creating Scalar Map.......",
-scalarmap1 = ScalarMapOnField(med_reader1, cell_entity, 'scalar_field', 1)
+scalarmap1 = ScalarMapOnField(med_reader1, cell_entity, 'scalar field', 1)
 if scalarmap1 is None:
     print "FAILED"
 else:
@@ -145,7 +145,7 @@ else:
 view.ResetCamera()
 
 print "Creating Iso Surfaces.....",
-isosurfaces1 = IsoSurfacesOnField(med_reader1, cell_entity, 'scalar_field', 1)
+isosurfaces1 = IsoSurfacesOnField(med_reader1, cell_entity, 'scalar field', 1)
 if isosurfaces1 is None:
     print "FAILED"
 else:
@@ -153,7 +153,7 @@ else:
     print "OK"
 
 print "Creating Cut Planes.......",
-cutplanes1 = CutPlanesOnField(med_reader1, cell_entity, 'scalar_field', 1,
+cutplanes1 = CutPlanesOnField(med_reader1, cell_entity, 'scalar field', 1,
                               orientation=Orientation.YZ)
 if cutplanes1 is None:
     print "FAILED"
@@ -167,7 +167,7 @@ display_only(cutplanes1, view)
 print "Creating Scalar Map On Deformed Shape.......",
 scalarmapondefshape1 = DeformedShapeAndScalarMapOnField(med_reader1,
                                                         cell_entity,
-                                                        'vectoriel_field', 1)
+                                                        'vectoriel field', 1)
 if scalarmapondefshape1 is None:
     print "FAILED"
 else:

diff --git a/test/VisuPrs/bugs/C6.py b/test/VisuPrs/bugs/C6.py
index 4dcc37485749aef4306a041cbf2d4435a866fce8..6c0e811a109c19828c0cf40c2f7e7e9e3a8c0332 100644 (file)
--- a/test/VisuPrs/bugs/C6.py
+++ b/test/VisuPrs/bugs/C6.py
@@ -44,7 +44,7 @@ else:
 
 # 2. Creation of GaussPoints presentations
 mesh_name = "Maillage"
-field_name = "Result_EQUI_ELGA_SIGM"
+field_name = "Result__EQUI_ELGA_SIGM__________"
 timestamp_list = range(1, 5)
 
 for timestamp in timestamp_list:

diff --git a/test/VisuPrs/bugs/D1.py b/test/VisuPrs/bugs/D1.py
index 6ef39bf8ec0b261fcda5ecd5473a90fc28d83736..9521a5c3986f647b27dda305de478af162dea2ae 100644 (file)
--- a/test/VisuPrs/bugs/D1.py
+++ b/test/VisuPrs/bugs/D1.py
@@ -42,7 +42,7 @@ errors=0
 sizes=[]
 
 for i in range(1,11):
-    presentation = DeformedShapeAndScalarMapOnField(med_reader1, EntityType.NODE, "MODES_DEPL", i)
+    presentation = DeformedShapeAndScalarMapOnField(med_reader1, EntityType.NODE, "MODES___DEPL____________________", i)
     if presentation is None : 
         raise RuntimeError, "Presentation is None!!!"
 
@@ -70,7 +70,7 @@ errors = 0
 sizes=[]
 
 for i in range(1,11):
-    presentation = DeformedShapeAndScalarMapOnField(med_reader2, EntityType.NODE, "MODES_DEPL", 11-i)
+    presentation = DeformedShapeAndScalarMapOnField(med_reader2, EntityType.NODE, "MODES___DEPL____________________", 11-i)
     if presentation is None : 
         raise RuntimeError, "Presentation is None!!!"
 

diff --git a/test/VisuPrs/bugs/D3.py b/test/VisuPrs/bugs/D3.py
index 598efa02e0651b4edf0aed9a04814ef9393664d4..1b5e33bb6ef914ca0ceafb837cd8fc9cac475ff8 100644 (file)
--- a/test/VisuPrs/bugs/D3.py
+++ b/test/VisuPrs/bugs/D3.py
@@ -36,7 +36,7 @@ if med_reader is None:
 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)
+presentation = DeformedShapeOnField(med_reader, EntityType.NODE, 'RESU____DEPL____________________', 1, is_colored=True)
 if presentation is None : 
     raise RuntimeError, "DeformedShapeOnField Presentation is None!!!"
 
@@ -44,7 +44,7 @@ display_only(presentation, view)
 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)
+presentation = VectorsOnField(med_reader, EntityType.NODE, 'RESU____DEPL____________________', 1, is_colored=True)
 if presentation is None : 
     raise RuntimeError, "Vectors Presentation is None!!!"
 
@@ -52,7 +52,7 @@ display_only(presentation, view)
 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)
+presentation = DeformedShapeAndScalarMapOnField(med_reader, EntityType.NODE, 'RESU____DEPL____________________', 1)
 if presentation is None : 
     raise RuntimeError, "DeformedShapeAndScalarMap Presentation is None!!!"
 
@@ -60,7 +60,7 @@ display_only(presentation, view)
 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)
+presentation = CutPlanesOnField(med_reader, EntityType.NODE, 'RESU____DEPL____________________', 1)
 if presentation is None : 
     raise RuntimeError, "CutPlanes Presentation is None!!!"
 

diff --git a/test/VisuPrs/bugs/D7.py b/test/VisuPrs/bugs/D7.py
index cb00a40ecb211c63bed1b688e66f373cd92d1205..7d6a3e93db7e6c3647da6facd91de55b73fce9f5 100644 (file)
--- a/test/VisuPrs/bugs/D7.py
+++ b/test/VisuPrs/bugs/D7.py
@@ -49,7 +49,7 @@ else:
 # 2. Displaying scalar field
 print "Creating Scalar Map.......",
 
-scalarmap = ScalarMapOnField(med_reader, EntityType.CELL, 'scalar_field', 1)
+scalarmap = ScalarMapOnField(med_reader, EntityType.CELL, 'scalar field', 1)
 if scalarmap is None:
     print "FAILED"
 else:

diff --git a/test/VisuPrs/imps/A1.py b/test/VisuPrs/imps/A1.py
index 0c4bf3529ebe08a1903fcd39ccc34bb934ccbdb5..be1f0b8ea7c6880fdf7c51969e531fb2dfff2161 100644 (file)
--- a/test/VisuPrs/imps/A1.py
+++ b/test/VisuPrs/imps/A1.py
@@ -27,10 +27,8 @@ import paravis
 import pvsimple
 
 my_paravis = paravis.myParavis
-os.environ["PARAVIS_TEST_PICS"] = sys.argv[1]
 picturedir = get_picture_dir("imps/A1")
 
-
 def set_prs_colored(prs, proxy, entity, field_name, vector_mode, timestamp_nb):
     # Get time value
     time_value = get_time(proxy, timestamp_nb)
@@ -72,7 +70,7 @@ 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....'
-cutplanes = CutPlanesOnField(med_reader, EntityType.CELL, "scalar_field", 1)
+cutplanes = CutPlanesOnField(med_reader, EntityType.CELL, "scalar field", 1)
 if cutplanes is None : 
     raise RuntimeError, "Presentation is None!!!"
 else:
@@ -80,21 +78,21 @@ else:
 
 print "Setting of deformation:"
 warp_vector = pvsimple.WarpByVector(cutplanes.Input)
-warp_vector.Vectors = ["vectoriel_field"]
+warp_vector.Vectors = ["scalar field"]
 warp_vector.ScaleFactor = 5.0
 
 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)
+set_prs_colored(presentation, med_reader, EntityType.CELL, "scalar field", 'Magnitude', 1)
 
 pic_path = os.path.join(picturedir, "deformed_cut_planes_scalar" + "." + pictureext)
 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....'
-cutplanes = CutPlanesOnField(med_reader, EntityType.CELL, "vectoriel_field", 1)
+cutplanes = CutPlanesOnField(med_reader, EntityType.CELL, "vectoriel field", 1)
 
 if cutplanes is None : 
     raise RuntimeError, "Presentation is None!!!"
@@ -103,14 +101,14 @@ else:
 
 print "Setting of deformation:"
 warp_vector = pvsimple.WarpByVector(cutplanes.Input)
-warp_vector.Vectors = ["vectoriel_field"]
+warp_vector.Vectors = ["vectoriel field"]
 warp_vector.ScaleFactor = 5.0
 
 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)
+set_prs_colored(presentation, med_reader, EntityType.CELL, "vectoriel field", 'Magnitude', 1)
 
 pic_path = os.path.join(picturedir, "deformed_cut_planes_vectorial" + "." + pictureext)
 process_prs_for_test(presentation, view, pic_path)

diff --git a/test/VisuPrs/united/A1.py b/test/VisuPrs/united/A1.py
index a9b1bf398f2ee4d4dff6277adc9ac2a3e8e76e75..6c89329485e2b818d20eb3d77c200afbb921621b 100644 (file)
--- a/test/VisuPrs/united/A1.py
+++ b/test/VisuPrs/united/A1.py
@@ -120,7 +120,7 @@ else:
 print "**** Step4: Displaying scalar field"
 
 print "Creating Scalar Map.......",
-scalarmap1 = ScalarMapOnField(med_reader1, cell_entity, 'scalar_field', 1)
+scalarmap1 = ScalarMapOnField(med_reader1, cell_entity, 'scalar field', 1)
 if scalarmap1 is None:
     print "FAILED"
 else:
@@ -130,7 +130,7 @@ else:
 reset_view(view)
 
 print "Creating Iso Surfaces.....",
-isosurfaces1 = IsoSurfacesOnField(med_reader1, cell_entity, 'scalar_field', 1)
+isosurfaces1 = IsoSurfacesOnField(med_reader1, cell_entity, 'scalar field', 1)
 if isosurfaces1 is None:
     print "FAILED"
 else:
@@ -138,7 +138,7 @@ else:
     print "OK"
 
 print "Creating Cut Planes.......",
-cutplanes1 = CutPlanesOnField(med_reader1, cell_entity, 'scalar_field', 1,
+cutplanes1 = CutPlanesOnField(med_reader1, cell_entity, 'scalar field', 1,
                               orientation=Orientation.YZ)
 if cutplanes1 is None:
     print "FAILED"

diff --git a/test/VisuPrs/united/A4.py b/test/VisuPrs/united/A4.py
index cf369ab46b79c9807a540b683c4178d551dd7ae6..5a32a6654107b0ce31807d9311bfe824bf58d7c2 100644 (file)
--- a/test/VisuPrs/united/A4.py
+++ b/test/VisuPrs/united/A4.py
@@ -43,8 +43,8 @@ else:
     print "OK"
 
 mesh_name1 = 'Maillage_MED_HEXA8'
-scalar_field = 'scalar_field'
-vectoriel_field = 'vectoriel_field'
+scalar_field = 'scalar field'
+vectoriel_field = 'vectoriel field'
 view = pvsimple.GetRenderView()
 
 print "Creating Scalar Map...................",