X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCouplingCorba_Swig%2FMEDCouplingCorbaSwigTest.py;h=9cd68919ae1ac9bb39a4c33a4af6e1f768a15041;hb=c933321e259af4968b2469c1d4f6b7ac5178e294;hp=f0e861a319c5309b0bfc14902dbea993d9a96e17;hpb=9417feb74e73698b9e10c557b3e3c463637a56a6;p=modules%2Fmed.git diff --git a/src/MEDCouplingCorba_Swig/MEDCouplingCorbaSwigTest.py b/src/MEDCouplingCorba_Swig/MEDCouplingCorbaSwigTest.py index f0e861a31..9cd68919a 100644 --- a/src/MEDCouplingCorba_Swig/MEDCouplingCorbaSwigTest.py +++ b/src/MEDCouplingCorba_Swig/MEDCouplingCorbaSwigTest.py @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2014 CEA/DEN, EDF R&D +# Copyright (C) 2007-2024 CEA, EDF # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -18,7 +18,7 @@ # # Author : Anthony Geay (CEA/DEN) -from MEDCoupling import * +from medcoupling import * import math import os @@ -78,7 +78,7 @@ class MEDCouplingCorbaServBasicsTest: targetMesh.setName("MyMesh3D"); targetMesh.setDescription("build3DMesh"); targetMesh.allocateCells(12); - for i in xrange(8): + for i in range(8): targetMesh.insertNextCell(NORM_HEXA8,8,targetConn[8*i:8*(i+1)]); pass targetMesh.finishInsertingCells(); @@ -115,7 +115,7 @@ class MEDCouplingCorbaServBasicsTest: targetMesh=MEDCouplingUMesh.New(); targetMesh.setMeshDimension(0); targetMesh.allocateCells(8); - targetMesh.setName("Wonderfull 0D mesh"); + targetMesh.setName("Wonderful 0D mesh"); targetMesh.setDescription("build0DMesh"); targetConn=[] targetMesh.insertNextCell(NORM_POINT1,1,[0]); @@ -133,13 +133,13 @@ class MEDCouplingCorbaServBasicsTest: myCoords.setInfoOnComponent(0,"X [m]"); myCoords.setInfoOnComponent(1,"YY [Pm]"); myCoords.setInfoOnComponent(2,"ZZZ [m]"); - targetMesh.checkCoherency(); + targetMesh.checkConsistencyLight(); return targetMesh; def buildM1DMesh(self): - meshM1D=MEDCouplingUMesh.New("wonderfull -1 D mesh",-1); + meshM1D=MEDCouplingUMesh.New("wonderful -1 D mesh",-1); meshM1D.setDescription("buildM1DMesh"); - meshM1D.checkCoherency(); + meshM1D.checkConsistencyLight(); return meshM1D; def buildExtrudedMesh(self): @@ -147,7 +147,7 @@ class MEDCouplingCorbaServBasicsTest: m2D.changeSpaceDimension(3); m1D=self.build1DMesh(); retu=m2D.buildExtrudedMesh(m1D,0); - ret=MEDCouplingExtrudedMesh.New(retu,m2D,2); + ret=MEDCouplingMappedExtrudedMesh.New(retu,m2D,2); ret.setName("ExtrudedTestForCorbaTest"); ret.setDescription("buildExtrudedMesh"); return ret; @@ -171,22 +171,37 @@ class MEDCouplingCorbaServBasicsTest: targetMesh.setCoordsAt(1,a2); # # - targetMesh.checkCoherency(); + targetMesh.checkConsistencyLight(); # return targetMesh; + def buildIMesh(self): + targetMesh=MEDCouplingIMesh.New(); + targetMesh.setTime(2.3,4,5); + targetMesh.setTimeUnit("us"); + targetMesh.setName("Example of IMesh"); + targetMesh.setDescription("buildIMesh"); + # + targetMesh.setSpaceDimension(3); + targetMesh.setNodeStruct([6,7,8]); + targetMesh.setOrigin([4.25,3.75,-6.125]); + targetMesh.setDXYZ([0.5,0.375,0.75]); + targetMesh.setAxisUnit("mm"); + # + return targetMesh + def buildCLMesh(self): targetMesh=MEDCouplingCurveLinearMesh(); targetMesh.setTime(2.3,4,5); targetMesh.setTimeUnit("us"); - targetMesh.setName("Example of Cuve linear mesh"); + targetMesh.setName("Example of Curve linear mesh"); targetMesh.setDescription("buildCLMesh"); a1=DataArrayDouble(3*20,1); a1.iota(7.) ; a1.rearrange(3); targetMesh.setCoords(a1); targetMesh.setNodeGridStructure([4,5]); # - targetMesh.checkCoherency(); + targetMesh.checkConsistencyLight(); # return targetMesh; @@ -201,7 +216,7 @@ class MEDCouplingCorbaServBasicsTest: a2=DataArrayInt([6,0,3,5,3,0,1,4,1,2,7,4,8,7,2,9],4*4,1) targetMesh.setNodalConnectivity(a2) # - targetMesh.checkCoherency(); + targetMesh.checkConsistencyLight(); # return targetMesh; @@ -217,7 +232,7 @@ class MEDCouplingCorbaServBasicsTest: a3=DataArrayInt([0,4,8,12,15],5,1) targetMesh.setNodalConnectivity(a2,a3) # - targetMesh.checkCoherency(); + targetMesh.checkConsistencyLight(); # return targetMesh; @@ -231,7 +246,7 @@ class MEDCouplingCorbaServBasicsTest: tmp=mesh.getNumberOfCells()*6*[7.] array.setValues(tmp,mesh.getNumberOfCells(),6); fieldOnCells.setArray(array) - fieldOnCells.checkCoherency(); + fieldOnCells.checkConsistencyLight(); return fieldOnCells; def buildFieldNodeScalarOn2DNT(self): @@ -245,13 +260,13 @@ class MEDCouplingCorbaServBasicsTest: tmp=mesh.getNumberOfNodes()*5*[7.1234] array.setValues(tmp,mesh.getNumberOfNodes(),5); fieldOnNodes.setArray(array); - fieldOnNodes.checkCoherency(); + fieldOnNodes.checkConsistencyLight(); return fieldOnNodes; def buildFieldScalarOn3DNT(self): mesh=self.build3DMesh(); fieldOnCells=MEDCouplingFieldDouble.New(ON_CELLS,NO_TIME); - fieldOnCells.setNature(ConservativeVolumic); + fieldOnCells.setNature(IntensiveMaximum); fieldOnCells.setName("toto"); fieldOnCells.setDescription("my wonderful 3D field toto2"); fieldOnCells.setMesh(mesh); @@ -259,7 +274,7 @@ class MEDCouplingCorbaServBasicsTest: tmp=mesh.getNumberOfCells()*6*[7.] array.setValues(tmp,mesh.getNumberOfCells(),6); fieldOnCells.setArray(array); - fieldOnCells.checkCoherency(); + fieldOnCells.checkConsistencyLight(); return fieldOnCells; def buildFieldScalarOn3DSurfWT(self): @@ -275,7 +290,7 @@ class MEDCouplingCorbaServBasicsTest: array.setInfoOnComponents(["aaa","bbbb","ccccc"]) fieldOnCells.setArray(array); fieldOnCells.setTime(6.7,1,4); - fieldOnCells.checkCoherency(); + fieldOnCells.checkConsistencyLight(); return fieldOnCells; def buildFieldScalarOn3DSurfCOTI(self): @@ -291,7 +306,7 @@ class MEDCouplingCorbaServBasicsTest: fieldOnCells.setArray(array); fieldOnCells.setStartTime(6.7,1,4); fieldOnCells.setEndTime(7.2,2,8); - fieldOnCells.checkCoherency(); + fieldOnCells.checkConsistencyLight(); return fieldOnCells; def buildFieldScalarOn2DLT(self): @@ -311,7 +326,7 @@ class MEDCouplingCorbaServBasicsTest: fieldOnCells.setEndArray(array) fieldOnCells.setStartTime(6.7,25,26); fieldOnCells.setEndTime(17.2,125,126); - fieldOnCells.checkCoherency(); + fieldOnCells.checkConsistencyLight(); return fieldOnCells; def buildFieldGaussPt2DWT(self): @@ -338,7 +353,7 @@ class MEDCouplingCorbaServBasicsTest: f.setGaussLocalizationOnType(NORM_QUAD4,_refCoo2,_gsCoo1,_wg1); array=DataArrayDouble.New(); ptr=18*2*[None] - for i in xrange(18*2): + for i in range(18*2): ptr[i]=float(i+1); pass array.setValues(ptr,18,2); @@ -348,7 +363,7 @@ class MEDCouplingCorbaServBasicsTest: f.setName("MyFirstFieldOnGaussPoint"); f.setTimeUnit("ms"); f.setDescription("mmmmmmmmmmmm"); - f.checkCoherency(); + f.checkConsistencyLight(); return f; def buildFieldGaussPtNE2DWT(self): @@ -361,14 +376,14 @@ class MEDCouplingCorbaServBasicsTest: f.setDescription("MyDescriptionNE"); array=DataArrayDouble.New(); ptr=18*2*[None] - for i in xrange(18*2): + for i in range(18*2): ptr[i]=float(i+7) array.setValues(ptr,18,2); array.setInfoOnComponent(0,"Power [MW]"); array.setInfoOnComponent(1,"Density [kg/m^3]"); f.setArray(array); # - f.checkCoherency(); + f.checkConsistencyLight(); return f; def buildFieldVectorOnExtrudedWT(self): @@ -390,7 +405,7 @@ class MEDCouplingCorbaServBasicsTest: array.setInfoOnComponent(1,"Density [kg/m^3]"); f.setArray(array); # - f.checkCoherency(); + f.checkConsistencyLight(); return f def buildFieldVectorOnCMeshWT(self): @@ -412,7 +427,7 @@ class MEDCouplingCorbaServBasicsTest: array.setInfoOnComponent(1,"Density [kg/m^3]"); f.setArray(array); # - f.checkCoherency(); + f.checkConsistencyLight(); return f def buildFieldTemplateCellOn2D(self): @@ -424,19 +439,19 @@ class MEDCouplingCorbaServBasicsTest: def buildFieldTemplateNodeOn2D(self): f1=self.buildFieldNodeScalarOn2DNT(); f2=MEDCouplingFieldTemplate.New(f1); - f2.setNature(ConservativeVolumic); + f2.setNature(IntensiveMaximum); return f2 def buildFieldTemplateGaussPtOn2D(self): f1=self.buildFieldGaussPt2DWT(); f2=MEDCouplingFieldTemplate.New(f1); - f2.setNature(Integral); + f2.setNature(ExtensiveMaximum); return f2 def buildFieldTemplateGaussNEOn2D(self): f1=self.buildFieldGaussPtNE2DWT(); f2=MEDCouplingFieldTemplate.New(f1); - f2.setNature(IntegralGlobConstraint); + f2.setNature(ExtensiveConservation); return f2 def buildMultiFields1(self): @@ -596,7 +611,7 @@ class MEDCouplingCorbaServBasicsTest: f4.setName("f4"); f4.setTime(2.7,25,26); ret=MEDCouplingFieldOverTime.New([f0,f1,f2,f3,f4]); - ret.checkCoherency(); + ret.checkConsistencyLight(); return ret; def buildFileNameForIOR(self): @@ -633,7 +648,7 @@ def testMesh(): myCoords=DataArrayDouble.New() myCoords.setValues(coords,nbOfNodes,3); mesh.setCoords(myCoords); - mesh.checkCoherency(); + mesh.checkConsistencyLight(); myFalseConn=DataArrayInt.New() myFalseConn.setValues(tab4,6,4) return mesh @@ -644,7 +659,7 @@ def testField(): nbOfCells=mesh.getNumberOfCells() field=MEDCouplingFieldDouble.New(ON_CELLS) field.setMesh(mesh) - field.setNature(Integral) + field.setNature(ExtensiveMaximum) myCoords=DataArrayDouble.New() sampleTab=[] for i in range(nbOfCells*9):