PR: dump new init mode

This commit is contained in:
prascle 2013-02-19 11:27:45 +00:00
parent 20c126bc22
commit 7f3c1cde92
2 changed files with 9 additions and 9 deletions

View File

@ -227,7 +227,7 @@
output ="EDGE" output ="EDGE"
dim ="1"> dim ="1">
<python-wrap> <python-wrap>
<algo>CompositeSegment_1D=Segment(algo=smesh.COMPOSITE)</algo> <algo>CompositeSegment_1D=Segment(algo=smeshDC.COMPOSITE)</algo>
<hypo>LocalLength=LocalLength(SetLength(), ,SetPrecision())</hypo> <hypo>LocalLength=LocalLength(SetLength(), ,SetPrecision())</hypo>
<hypo>MaxLength=MaxSize(SetLength())</hypo> <hypo>MaxLength=MaxSize(SetLength())</hypo>
<hypo>Arithmetic1D=Arithmetic1D(SetStartLength(),SetEndLength(),SetReversedEdges())</hypo> <hypo>Arithmetic1D=Arithmetic1D(SetStartLength(),SetEndLength(),SetReversedEdges())</hypo>
@ -244,7 +244,7 @@
output="EDGE" output="EDGE"
dim="1"> dim="1">
<python-wrap> <python-wrap>
<algo>Python_1D=Segment(algo=smesh.PYTHON)</algo> <algo>Python_1D=Segment(algo=smeshDC.PYTHON)</algo>
<hypo>PythonSplit1D=PythonSplit1D(SetNumberOfSegments(),SetPythonLog10RatioFunction())</hypo> <hypo>PythonSplit1D=PythonSplit1D(SetNumberOfSegments(),SetPythonLog10RatioFunction())</hypo>
</python-wrap> </python-wrap>
</algorithm> </algorithm>
@ -258,7 +258,7 @@
output ="TRIA" output ="TRIA"
dim ="2"> dim ="2">
<python-wrap> <python-wrap>
<algo>MEFISTO_2D=Triangle(algo=smesh.MEFISTO)</algo> <algo>MEFISTO_2D=Triangle(algo=smeshDC.MEFISTO)</algo>
<hypo>LengthFromEdges=LengthFromEdges()</hypo> <hypo>LengthFromEdges=LengthFromEdges()</hypo>
<hypo>MaxElementArea=MaxElementArea(SetMaxElementArea())</hypo> <hypo>MaxElementArea=MaxElementArea(SetMaxElementArea())</hypo>
<hypo>ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreEdges())</hypo> <hypo>ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreEdges())</hypo>
@ -274,7 +274,7 @@
output ="QUAD" output ="QUAD"
dim ="2"> dim ="2">
<python-wrap> <python-wrap>
<algo>Quadrangle_2D=Quadrangle(algo=smesh.QUADRANGLE)</algo> <algo>Quadrangle_2D=Quadrangle(algo=smeshDC.QUADRANGLE)</algo>
<hypo>QuadrangleParams=QuadrangleParameters(SetQuadType(),SetTriaVertex())</hypo> <hypo>QuadrangleParams=QuadrangleParameters(SetQuadType(),SetTriaVertex())</hypo>
<hypo>ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreEdges())</hypo> <hypo>ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreEdges())</hypo>
</python-wrap> </python-wrap>
@ -288,7 +288,7 @@
opt-hypos="ViscousLayers" opt-hypos="ViscousLayers"
dim ="3"> dim ="3">
<python-wrap> <python-wrap>
<algo>Hexa_3D=Hexahedron(algo=smesh.Hexa)</algo> <algo>Hexa_3D=Hexahedron(algo=smeshDC.Hexa)</algo>
<hypo>ViscousLayers=ViscousLayers(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreFaces())</hypo> <hypo>ViscousLayers=ViscousLayers(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreFaces())</hypo>
</python-wrap> </python-wrap>
</algorithm> </algorithm>
@ -419,7 +419,7 @@
output ="QUAD,TRIA" output ="QUAD,TRIA"
dim ="2"> dim ="2">
<python-wrap> <python-wrap>
<algo>RadialQuadrangle_1D2D=Quadrangle(algo=smesh.RADIAL_QUAD)</algo> <algo>RadialQuadrangle_1D2D=Quadrangle(algo=smeshDC.RADIAL_QUAD)</algo>
<hypo>NumberOfLayers2D=NumberOfLayers(SetNumberOfLayers())</hypo> <hypo>NumberOfLayers2D=NumberOfLayers(SetNumberOfLayers())</hypo>
</python-wrap> </python-wrap>
</algorithm> </algorithm>

View File

@ -831,9 +831,9 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl
aScript += helper + "aFilterManager = " + aSMESHGen + ".CreateFilterManager()\n\t"; aScript += helper + "aFilterManager = " + aSMESHGen + ".CreateFilterManager()\n\t";
aScript += helper + "aMeasurements = " + aSMESHGen + ".CreateMeasurements()\n\t"; aScript += helper + "aMeasurements = " + aSMESHGen + ".CreateMeasurements()\n\t";
if ( isPublished ) if ( isPublished )
aScript += aSMESHGen + ".SetCurrentStudy(theStudy)"; aScript += aSMESHGen + " = smeshDC.smeshInstance(theStudy)";
else else
aScript += aSMESHGen + ".SetCurrentStudy(None)"; aScript += aSMESHGen + " = smeshDC.smeshInstance(None)";
// import python files corresponding to plugins // import python files corresponding to plugins
set<string> moduleNameSet; set<string> moduleNameSet;
@ -963,7 +963,7 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl
TCollection_AsciiString initPart = "import "; TCollection_AsciiString initPart = "import ";
if ( isMultiFile ) if ( isMultiFile )
initPart += helper + "salome, "; initPart += helper + "salome, ";
initPart += aSmeshpy + ", SMESH, SALOMEDS\n"; initPart += " smeshDC, SMESH, SALOMEDS\n";
if ( importGeom && isMultiFile ) if ( importGeom && isMultiFile )
{ {
initPart += ("\n## import GEOM dump file ## \n" initPart += ("\n## import GEOM dump file ## \n"