6th step : Remove the additional MEDLoader level from MEDLoader.

[tools/medcoupling.git] / src / MEDLoader / Swig / MEDLoaderTest4.py

diff --git a/src/MEDLoader/Swig/MEDLoaderTest4.py b/src/MEDLoader/Swig/MEDLoaderTest4.py
index 58932a087aa2ed67d47f272ec3428bd52719f945..b3f28e31650b5f3ddb2129350960b2c671abcfdf 100644 (file)
--- a/src/MEDLoader/Swig/MEDLoaderTest4.py
+++ b/src/MEDLoader/Swig/MEDLoaderTest4.py
@@ -2649,30 +2649,30 @@ class MEDLoaderTest4(unittest.TestCase):
         f.setArray(DataArrayDouble([3.,5.,7.,6.,2.,3.,11.,8.]))
         f.setName(fieldName1)
         f.checkCoherency()
-        MEDLoader.WriteField(fname,f,True)
+        WriteField(fname,f,True)
         f2=MEDCouplingFieldDouble(ON_CELLS) ; f2.setTime(*t) ; f2.setMesh(m)
         f2.setArray(DataArrayDouble([7.,11.],2,1))
         f2.setName(fieldName2)
-        MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f2)
+        WriteFieldUsingAlreadyWrittenMesh(fname,f2)
         f3=MEDCouplingFieldDouble(ON_NODES) ; f3.setTime(*t) ; f3.setMesh(m)
         f3.setArray(DataArrayDouble([1.,2.,4.,1.,2.,4.],6,1))
         f3.setName(fieldName3)
-        MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f3)
+        WriteFieldUsingAlreadyWrittenMesh(fname,f3)
         #
         t=(2.1,1,-1)
         f=MEDCouplingFieldDouble(ON_GAUSS_NE) ; f.setTime(*t) ; f.setMesh(m)
         f.setArray(DataArrayDouble([7.,6.,3.,5.,11.,8.,2.,3.]))
         f.setName(fieldName1)
         f.checkCoherency()
-        MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f)
+        WriteFieldUsingAlreadyWrittenMesh(fname,f)
         f2=MEDCouplingFieldDouble(ON_CELLS) ; f2.setTime(*t) ; f2.setMesh(m)
         f2.setArray(DataArrayDouble([11.,7.],2,1))
         f2.setName(fieldName2)
-        MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f2)
+        WriteFieldUsingAlreadyWrittenMesh(fname,f2)
         f3=MEDCouplingFieldDouble(ON_NODES) ; f3.setTime(*t) ; f3.setMesh(m)
         f3.setArray(DataArrayDouble([4.,2.,1.,4.,2.,1.],6,1))
         f3.setName(fieldName3)
-        MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f3)
+        WriteFieldUsingAlreadyWrittenMesh(fname,f3)
         ########## GO for reading in MEDReader,by not loading all. Mesh is fully loaded but not fields values
         ms=MEDFileMeshes(fname) ; ms.cartesianizeMe()
         fields=MEDFileFields(fname,False)
@@ -2764,15 +2764,15 @@ class MEDLoaderTest4(unittest.TestCase):
         f.setArray(DataArrayDouble([3.,5.,4.,6.])) ; f.getArray().setInfoOnComponents(["Smth"])
         f.setName(fieldName1)
         f.checkCoherency()
-        MEDLoader.WriteField(fname,f,True)
+        WriteField(fname,f,True)
         f2=MEDCouplingFieldDouble(ON_CELLS) ; f2.setTime(*t) ; f2.setMesh(m)
         f2.setArray(DataArrayDouble([7.,11.],2,1))
         f2.setName(fieldName2)
-        MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f2)
+        WriteFieldUsingAlreadyWrittenMesh(fname,f2)
         f3=MEDCouplingFieldDouble(ON_NODES) ; f3.setTime(*t) ; f3.setMesh(m)
         f3.setArray(DataArrayDouble([1.,2.,4.,1.,2.,4.],6,1))
         f3.setName(fieldName3)
-        MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f3)
+        WriteFieldUsingAlreadyWrittenMesh(fname,f3)
         #
         t=(2.1,1,-1)
         f=MEDCouplingFieldDouble(ON_GAUSS_PT) ; f.setTime(*t) ; f.setMesh(m)
@@ -2780,15 +2780,15 @@ class MEDLoaderTest4(unittest.TestCase):
         f.setArray(DataArrayDouble([5.,3.,6.,4.])) ; f.getArray().setInfoOnComponents(["Smth"])
         f.setName(fieldName1)
         f.checkCoherency()
-        MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f)
+        WriteFieldUsingAlreadyWrittenMesh(fname,f)
         f2=MEDCouplingFieldDouble(ON_CELLS) ; f2.setTime(*t) ; f2.setMesh(m)
         f2.setArray(DataArrayDouble([11.,7.],2,1))
         f2.setName(fieldName2)
-        MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f2)
+        WriteFieldUsingAlreadyWrittenMesh(fname,f2)
         f3=MEDCouplingFieldDouble(ON_NODES) ; f3.setTime(*t) ; f3.setMesh(m)
         f3.setArray(DataArrayDouble([4.,2.,1.,4.,2.,1.],6,1))
         f3.setName(fieldName3)
-        MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f3)
+        WriteFieldUsingAlreadyWrittenMesh(fname,f3)
         ########## GO for reading in MEDReader,by not loading all. Mesh is fully loaded but not fields values
         ms=MEDFileMeshes(fname) ; ms.cartesianizeMe()
         fields=MEDFileFields(fname,False)
@@ -4276,7 +4276,7 @@ class MEDLoaderTest4(unittest.TestCase):
         fCell=MEDCouplingFieldDouble(ON_CELLS) ; fCell.setName("fCell")
         arrCell=DataArrayDouble([7.]) ; arrCell.setInfoOnComponent(0,"smth") ; fCell.setArray(arrCell)
         fCell.setMesh(m)
-        MEDLoader.WriteField(fname,fCell,True)
+        WriteField(fname,fCell,True)
         refCoo=[-1.,-1.,-1.,-1.,1.,-1.,1.,1.,-1.,1.,-1.,-1.,-1.,-1.,1.,-1.,1.,1.,1.,1.,1.,1.,-1.,1.,-1.,0.,-1.,0.,1.,-1.,1.,0.,-1.,0.,-1.,-1.,-1.,0.,1.,0.,1.,1.,1.,0.,1.,0.,-1.,1.,-1.,-1.,0.,-1.,1.,0.,1.,1.,0.,1.,-1.,0.,0.,0.,-1.,-1.,0.,0.,0.,1.,0.,1.,0.,0.,0.,-1.,0.,0.,0.,1.,0.,0.,0.]
         weights=[0.1714677640603571,0.27434842249657115,0.1714677640603571,0.27434842249657115,0.43895747599451346,0.27434842249657115,0.1714677640603571,0.27434842249657115,0.1714677640603571,0.27434842249657115,0.43895747599451346,0.27434842249657115,0.43895747599451346,0.7023319615912209,0.43895747599451346,0.27434842249657115,0.43895747599451346,0.27434842249657115,0.1714677640603571,0.27434842249657115,0.1714677640603571,0.27434842249657115,0.43895747599451346,0.27434842249657115,0.1714677640603571,0.27434842249657115,0.1714677640603571]
         gCoords=[-0.774596669241483,-0.774596669241483,-0.774596669241483,-0.774596669241483,-0.774596669241483,0.0,-0.774596669241483,-0.774596669241483,0.774596669241483,-0.774596669241483,0.0,-0.774596669241483,-0.774596669241483,0.0,0.0,-0.774596669241483,0.0,0.774596669241483,-0.774596669241483,0.774596669241483,-0.774596669241483,-0.774596669241483,0.774596669241483,0.0,-0.774596669241483,0.774596669241483,0.774596669241483,0.0,-0.774596669241483,-0.774596669241483,0.0,-0.774596669241483,0.0,0.0,-0.774596669241483,0.774596669241483,0.0,0.0,-0.774596669241483,0.0,0.0,0.0,0.0,0.0,0.774596669241483,0.0,0.774596669241483,-0.774596669241483,0.0,0.774596669241483,0.0,0.0,0.774596669241483,0.774596669241483,0.774596669241483,-0.774596669241483,-0.774596669241483,0.774596669241483,-0.774596669241483,0.0,0.774596669241483,-0.774596669241483,0.774596669241483,0.774596669241483,0.0,-0.774596669241483,0.774596669241483,0.0,0.0,0.774596669241483,0.0,0.774596669241483,0.774596669241483,0.774596669241483,-0.774596669241483,0.774596669241483,0.774596669241483,0.0,0.774596669241483,0.774596669241483,0.774596669241483]
@@ -4285,7 +4285,7 @@ class MEDLoaderTest4(unittest.TestCase):
         fGauss.setGaussLocalizationOnType(NORM_HEXA27,refCoo,gCoords,weights)
         arrGauss=DataArrayDouble(fGauss.getNumberOfTuplesExpected()) ; arrGauss.setInfoOnComponent(0,"gaussc") ; arrGauss.iota()
         fGauss.setArray(arrGauss)
-        MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,fGauss)
+        WriteFieldUsingAlreadyWrittenMesh(fname,fGauss)
         ########## GO for reading in MEDReader,by not loading all. Mesh is fully loaded but not fields values
         ms=MEDFileMeshes(fname) ; ms.cartesianizeMe()
         fields=MEDFileFields(fname,False)
@@ -4706,7 +4706,7 @@ class MEDLoaderTest4(unittest.TestCase):
             arr=DataArrayDouble(m.getNumberOfCells()) ; arr.iota(0) ; arr[i%10]=100.
             fCell0.setArray(arr) ; arr.setInfoOnComponents(["Comp1 [m]"])
             fCell0.checkCoherency()
-            MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,fCell0)
+            WriteFieldUsingAlreadyWrittenMesh(fname,fCell0)
             pass
         ########## GO for reading in MEDReader,by not loading all. Mesh is fully loaded but not fields values
         ms=MEDFileMeshes(fname) ; ms.cartesianizeMe()
@@ -4912,8 +4912,8 @@ class MEDLoaderTest4(unittest.TestCase):
         arrY=DataArrayDouble([0.,1.])
         m=MEDCouplingCMesh() ; m.setCoords(arrX,arrY) ; m=m.buildUnstructured() ; m=m[[0,5,1,4,2,3]] ; m.changeSpaceDimension(3,0.) ; m.setName("Mesh")
         f=MEDCouplingFieldDouble(ON_CELLS) ; f.setMesh(m) ; f.setName("Field") ; f.setArray(DataArrayDouble([(0.1,1.1),(2.1,3.1),(4.1,5.1),(6.1,7.1),(8.1,9.1),(10.1,11.1)])) ; f.getArray().setInfoOnComponents(["aa","bbb"])
-        MEDLoader.WriteUMesh(fname,m,True)
-        MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f)
+        WriteUMesh(fname,m,True)
+        WriteFieldUsingAlreadyWrittenMesh(fname,f)
         ########## GO for reading in MEDReader,by not loading all. Mesh is fully loaded but not fields values
         ms=MEDFileMeshes() # here we reproduce what is done by ParaMEDFileMeshes.ParaNew
         ms.pushMesh(MEDFileUMesh.LoadPartOf(fname,"Mesh",[NORM_QUAD4],[0,2,1],-1,-1));