diff --git a/resources/StdMeshers.xml b/resources/StdMeshers.xml index 59f620421..2375a485b 100644 --- a/resources/StdMeshers.xml +++ b/resources/StdMeshers.xml @@ -227,7 +227,7 @@ output ="EDGE" dim ="1"> - CompositeSegment_1D=Segment(algo=smesh.COMPOSITE) + CompositeSegment_1D=Segment(algo=smeshDC.COMPOSITE) LocalLength=LocalLength(SetLength(), ,SetPrecision()) MaxLength=MaxSize(SetLength()) Arithmetic1D=Arithmetic1D(SetStartLength(),SetEndLength(),SetReversedEdges()) @@ -244,7 +244,7 @@ output="EDGE" dim="1"> - Python_1D=Segment(algo=smesh.PYTHON) + Python_1D=Segment(algo=smeshDC.PYTHON) PythonSplit1D=PythonSplit1D(SetNumberOfSegments(),SetPythonLog10RatioFunction()) @@ -258,7 +258,7 @@ output ="TRIA" dim ="2"> - MEFISTO_2D=Triangle(algo=smesh.MEFISTO) + MEFISTO_2D=Triangle(algo=smeshDC.MEFISTO) LengthFromEdges=LengthFromEdges() MaxElementArea=MaxElementArea(SetMaxElementArea()) ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreEdges()) @@ -274,7 +274,7 @@ output ="QUAD" dim ="2"> - Quadrangle_2D=Quadrangle(algo=smesh.QUADRANGLE) + Quadrangle_2D=Quadrangle(algo=smeshDC.QUADRANGLE) QuadrangleParams=QuadrangleParameters(SetQuadType(),SetTriaVertex()) ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreEdges()) @@ -288,7 +288,7 @@ opt-hypos="ViscousLayers" dim ="3"> - Hexa_3D=Hexahedron(algo=smesh.Hexa) + Hexa_3D=Hexahedron(algo=smeshDC.Hexa) ViscousLayers=ViscousLayers(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreFaces()) @@ -419,7 +419,7 @@ output ="QUAD,TRIA" dim ="2"> - RadialQuadrangle_1D2D=Quadrangle(algo=smesh.RADIAL_QUAD) + RadialQuadrangle_1D2D=Quadrangle(algo=smeshDC.RADIAL_QUAD) NumberOfLayers2D=NumberOfLayers(SetNumberOfLayers()) diff --git a/src/SMESH_I/SMESH_DumpPython.cxx b/src/SMESH_I/SMESH_DumpPython.cxx index b609c5750..200ed9ec3 100644 --- a/src/SMESH_I/SMESH_DumpPython.cxx +++ b/src/SMESH_I/SMESH_DumpPython.cxx @@ -831,9 +831,9 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl aScript += helper + "aFilterManager = " + aSMESHGen + ".CreateFilterManager()\n\t"; aScript += helper + "aMeasurements = " + aSMESHGen + ".CreateMeasurements()\n\t"; if ( isPublished ) - aScript += aSMESHGen + ".SetCurrentStudy(theStudy)"; + aScript += aSMESHGen + " = smeshDC.smeshInstance(theStudy)"; else - aScript += aSMESHGen + ".SetCurrentStudy(None)"; + aScript += aSMESHGen + " = smeshDC.smeshInstance(None)"; // import python files corresponding to plugins set moduleNameSet; @@ -963,7 +963,7 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl TCollection_AsciiString initPart = "import "; if ( isMultiFile ) initPart += helper + "salome, "; - initPart += aSmeshpy + ", SMESH, SALOMEDS\n"; + initPart += " smeshDC, SMESH, SALOMEDS\n"; if ( importGeom && isMultiFile ) { initPart += ("\n## import GEOM dump file ## \n"