]> SALOME platform Git repositories - modules/paravis.git/commitdiff
Salome HOME
Feedback of users. Generate vectors do not modify arrays but append arrays with suffi... agy/feedbackads140304
authorgeay <anthony.geay@cea.fr>
Tue, 1 Apr 2014 06:25:19 +0000 (08:25 +0200)
committergeay <anthony.geay@cea.fr>
Tue, 1 Apr 2014 06:25:19 +0000 (08:25 +0200)
src/Plugins/MEDReader/IO/vtkGenerateVectors.cxx
src/Plugins/MEDReader/IO/vtkGenerateVectors.h
src/Plugins/MEDReader/Test/CMakeLists.txt
src/Plugins/MEDReader/Test/testMEDReader10.py [new file with mode: 0644]

index c8fa9ca1f5dbb50dc533c0cff16e697aae44b93a..32930ecbdac1f3fe1fe2b8832e32d7a283ea091d 100644 (file)
 #include "vtkInformation.h"
 #include "vtkQuadratureSchemeDefinition.h"
 #include "MEDUtilities.hxx"
-#define protected public
 #include "vtkFieldData.h"
 
+#include <sstream>
+
+const char vtkGenerateVectors::VECTOR_SUFFIX[]="_Vector";
+
+std::string vtkGenerateVectors::SuffixFieldName(const std::string& name)
+{
+  std::ostringstream oss; oss << name << VECTOR_SUFFIX;
+  return oss.str();
+}
+
 void vtkGenerateVectors::Operate(vtkFieldData *fd)
 {
   if(!fd)
     return ;
   const int nbOfArrs(fd->GetNumberOfArrays());
+  std::vector<vtkDoubleArray *> daToAppend;
   for(int i=0;i<nbOfArrs;i++)
     {
       vtkDataArray *arr(fd->GetArray(i));
@@ -43,9 +53,17 @@ void vtkGenerateVectors::Operate(vtkFieldData *fd)
       if(nbOfCompo<=1 || nbOfCompo==3)
         continue;
       if(nbOfCompo==2)
-        fd->SetArray(i,Operate2Compo(arrc));
+        daToAppend.push_back(Operate2Compo(arrc));
       else
-        fd->SetArray(i,OperateMoreThan3Compo(arrc));
+        daToAppend.push_back(OperateMoreThan3Compo(arrc));
+    }
+  for(std::vector<vtkDoubleArray *>::const_iterator it=daToAppend.begin();it!=daToAppend.end();it++)
+    {
+      vtkDoubleArray *elt(*it);
+      if(!elt)
+       continue;
+      fd->AddArray(elt);
+      elt->Delete();
     }
 }
 
@@ -63,7 +81,8 @@ vtkDoubleArray *vtkGenerateVectors::Operate2Compo(vtkDoubleArray *oldArr)
       pt[3*i+2]=0.;
     }
   ret->SetNumberOfComponents(3);
-  ret->SetName(oldArr->GetName());
+  std::string newName(SuffixFieldName(oldArr->GetName()));
+  ret->SetName(newName.c_str());
   ret->SetComponentName(0,oldArr->GetComponentName(0));
   ret->SetComponentName(1,oldArr->GetComponentName(1));
   ret->SetArray(pt,3*nbOfTuples,0,VTK_DATA_ARRAY_FREE);
@@ -86,7 +105,8 @@ vtkDoubleArray *vtkGenerateVectors::OperateMoreThan3Compo(vtkDoubleArray *oldArr
       pt[3*i+2]=inPt[nbOfCompo*i+2];
     }
   ret->SetNumberOfComponents(3);
-  ret->SetName(oldArr->GetName());
+  std::string newName(SuffixFieldName(oldArr->GetName()));
+  ret->SetName(newName.c_str());
   ret->SetComponentName(0,oldArr->GetComponentName(0));
   ret->SetComponentName(1,oldArr->GetComponentName(1));
   ret->SetComponentName(2,oldArr->GetComponentName(2));
index c35dd0f10a6b2255cbe960ac092b2a666ee19f85..6f0d479395ce7838291acd709dfd3e84fc87d687 100644 (file)
@@ -32,6 +32,9 @@ public:
   static void Operate(vtkFieldData *fd);
   static vtkDoubleArray *Operate2Compo(vtkDoubleArray *oldArr);
   static vtkDoubleArray *OperateMoreThan3Compo(vtkDoubleArray *oldArr);
+  static std::string SuffixFieldName(const std::string& name);
+public:
+  static const char VECTOR_SUFFIX[];
 protected:
   static void UpdateInformationOfArray(vtkDoubleArray *oldArr, vtkDoubleArray *arr);
 };
index a4cd1886c20df81f29619240b93fdb3a7c2d5b1c..252156048ae123a176f4d50498b82a14e1e08c5d 100644 (file)
@@ -27,3 +27,4 @@ ADD_TEST(testMEDReader6 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMED
 ADD_TEST(testMEDReader7 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader7.py)
 ADD_TEST(testMEDReader8 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader8.py)
 ADD_TEST(testMEDReader9 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader9.py)
+ADD_TEST(testMEDReader10 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader10.py)
diff --git a/src/Plugins/MEDReader/Test/testMEDReader10.py b/src/Plugins/MEDReader/Test/testMEDReader10.py
new file mode 100644 (file)
index 0000000..1fb42ff
--- /dev/null
@@ -0,0 +1,112 @@
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2014  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.
+#
+# 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 : Anthony Geay
+
+from MEDLoader import *
+
+""" This test focuses on GenerateVector part.
+"""
+
+fname="testMEDReader10.med"
+outImgName="testMEDReader10.png"
+##############
+coo=DataArrayDouble([(0.,0.,0.),(1.,0.,0.),(2.,0.,0.),(3.,0.,0.),(0.,1.,0.),(1.,1.,0.),(2.,1.,0.),(3.,1.,0.),(0.,0.,1.),(1.,0.,1.),(2.,0.,1.),(3.,0.,1.),(0.,1.,1.),(1.,1.,1.),(2.,1.,1.),(3.,1.,1.)])
+m=MEDCouplingUMesh("myMesh",3) ; m.setCoords(coo)
+m.allocateCells()
+m.insertNextCell(NORM_HEXA8,[0,4,5,1,8,12,13,9]) ; m.insertNextCell(NORM_HEXA8,[1,5,6,2,9,13,14,10]) ; m.insertNextCell(NORM_HEXA8,[2,6,7,3,10,14,15,11])
+f0=MEDCouplingFieldDouble(ON_NODES) ; f0.setName("f0NbComp1") ; f0.setMesh(m) ;
+arr=DataArrayDouble(8) ; arr.iota() ; arr=DataArrayDouble.Aggregate(arr,arr+8) ; arr.setInfoOnComponents(["1st"])
+f0.setArray(arr)
+f1=MEDCouplingFieldDouble(ON_NODES) ; f1.setName("f1NbComp2") ; f1.setMesh(m) ;
+arr=DataArrayDouble([(-1.,-1.),(0.,0.5),(0.,0.5),(1.,-1.),(-1.,1.),(0.,-0.5),(0.,-0.5),(1.,1.)]) ; arr=DataArrayDouble.Aggregate(arr,arr) ; arr.setInfoOnComponents(["1st","2nd"])
+f1.setArray(arr)
+f2=MEDCouplingFieldDouble(ON_NODES) ; f2.setName("f2NbComp3") ; f2.setMesh(m) ;
+arr=DataArrayDouble([(-1.,-1.,-1.),(0.,0.5,0.),(0.,0.5,0.),(1.,-1.,-1.),(-1.,1.,-1.),(0.,-0.5,0.),(0.,-0.5,0.),(1.,1.,-1)]) ; arr2=arr[:] ; arr2[[0,3,4,7],2]=1.
+arr=DataArrayDouble.Aggregate(arr,arr2) ; arr.setInfoOnComponents(["1st","2nd","3rd"])
+f2.setArray(arr)
+f3=MEDCouplingFieldDouble(ON_NODES) ; f3.setName("f3NbComp4") ; f3.setMesh(m) ;
+arr=DataArrayDouble([(-1.,-1.,-1.),(0.,0.5,0.),(0.,0.5,0.),(1.,-1.,-1.),(-1.,1.,-1.),(0.,-0.5,0.),(0.,-0.5,0.),(1.,1.,-1)]) ; arr2=arr[:] ; arr2[[0,3,4,7],2]=1.
+arr=DataArrayDouble.Aggregate(arr,arr2) ; arr3=DataArrayDouble(16) ; arr3.iota() ; arr=DataArrayDouble.Meld([arr,arr3])
+arr.setInfoOnComponents(["1st","2nd","3rd","4th"])
+f3.setArray(arr)
+#
+MEDLoader.WriteMesh(fname,m,True)
+MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f0)
+MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f1)
+MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f2)
+MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f3)
+################### MED write is done -> Go to MEDReader
+from paraview.simple import *
+
+myMedReader=MEDReader(FileName=fname)
+keys=myMedReader.GetProperty("FieldsTreeInfo")[::2]
+# list all the names of arrays that can be seen (including their spatial discretization)
+arr_name_with_dis=[elt.split("/")[-1] for elt in keys]
+# list all the names of arrays (Equal to those in the MED File)
+arr_name=[elt.split(myMedReader.GetProperty("Separator").GetData())[0] for elt in arr_name_with_dis]
+myMedReader.AllArrays=keys
+myMedReader.GenerateVectors=1
+
+RenderView1=GetRenderView()
+DataRepresentation1 = Show()
+DataRepresentation1.EdgeColor = [0.0, 0.0, 0.5]
+DataRepresentation1.SelectionPointFieldDataArrayName='f0NbComp1'
+DataRepresentation1.ScalarOpacityUnitDistance = 2.299619191183727
+#DataRepresentation1.ExtractedBlockIndex = 1
+DataRepresentation1.ScaleFactor = 0.3
+RenderView1.CenterOfRotation = [1.5, 0.5, 0.5]
+RenderView1.CameraPosition = [1.5, 0.5, 6.907227082229696]
+RenderView1.CameraFocalPoint = [1.5, 0.5, 0.5]
+RenderView1.CameraClippingRange = [5.348154811407399, 7.755835488463141]
+RenderView1.CameraParallelScale = 1.6583123951777
+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'])
+#
+DataRepresentation2 = Show()
+DataRepresentation2.EdgeColor = [0.0, 0.0, 0.5000076295109483]
+DataRepresentation2.SelectionPointFieldDataArrayName = 'f0NbComp1'
+DataRepresentation2.SelectionCellFieldDataArrayName = 'FamilyIdCell'
+DataRepresentation2.ScalarOpacityUnitDistance = 4.546673931685981
+#DataRepresentation2.ExtractedBlockIndex = 1
+DataRepresentation2.ScaleFactor = 0.5
+DataRepresentation1.Visibility = 0
+RenderView1.CameraClippingRange = [3.358154811407399, 10.26083548846314]
+DataRepresentation1.ColorArrayName = ('POINT_DATA', '')
+DataRepresentation1.Visibility = 1
+RenderView1.CameraClippingRange = [5.149154811407399, 8.00633548846314]
+a4_f3NbComp4_PVLookupTable = GetLookupTableForArray( "f3NbComp4", 4, RGBPoints=[1.118033988749895, 0.23, 0.299, 0.754, 8.108851429645696, 0.865, 0.865, 0.865, 15.0996688705415, 0.706, 0.016, 0.15], VectorMode='Magnitude', NanColor=[0.25, 0.0, 0.0], ColorSpace='Diverging', ScalarRangeInitialized=1.0 )
+a4_f3NbComp4_PiecewiseFunction = CreatePiecewiseFunction( Points=[1.118033988749895, 0.0, 0.5, 0.0, 15.0996688705415, 1.0, 0.5, 0.0] )
+DataRepresentation1.ScalarOpacityFunction = a4_f3NbComp4_PiecewiseFunction
+DataRepresentation1.LookupTable = a4_f3NbComp4_PVLookupTable
+a4_f3NbComp4_PVLookupTable.ScalarOpacityFunction = a4_f3NbComp4_PiecewiseFunction
+DataRepresentation2.ScalarOpacityFunction = a4_f3NbComp4_PiecewiseFunction
+DataRepresentation2.ColorArrayName = ('POINT_DATA', 'f3NbComp4')
+DataRepresentation2.LookupTable = a4_f3NbComp4_PVLookupTable
+RenderView1.CameraViewUp = [0.32310237626907823, -0.28721735329781684, -0.901726702728644]
+RenderView1.CameraPosition = [0.17151044563787257, 6.31903262423349, -1.8294921560963984]
+RenderView1.CameraClippingRange = [4.164482329590951, 9.24583527085017]
+RenderView1.CameraFocalPoint = [1.4999999999999996, 0.49999999999999944, 0.4999999999999996]
+#
+RenderView1.ViewSize =[300,300]
+WriteImage(outImgName)