Salome HOME
projects
/
modules
/
hydrosolver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
00a1379
)
correction generate interpolz.py
author
Paul RASCLE
<paul.rascle@edf.fr>
Sat, 25 Mar 2017 22:38:17 +0000
(23:38 +0100)
committer
Paul RASCLE
<paul.rascle@edf.fr>
Sat, 25 Mar 2017 22:38:17 +0000
(23:38 +0100)
src/salome_hydro/interpolz_gui.py
patch
|
blob
|
history
diff --git
a/src/salome_hydro/interpolz_gui.py
b/src/salome_hydro/interpolz_gui.py
index 22510d5a5d32b4bf47e0a62dae7b6a6cac7379c4..978c1f13bd8ced35675f51fa2de68326471d2bda 100644
(file)
--- a/
src/salome_hydro/interpolz_gui.py
+++ b/
src/salome_hydro/interpolz_gui.py
@@
-8,7
+8,11
@@
hydro_solver_root = os.path.join(os.environ['HYDROSOLVER_ROOT_DIR'], 'lib', 'pyt
import salome
salome.salome_init()
import salome
salome.salome_init()
-import MEDLoader
+import SMESH
+from salome.smesh import smeshBuilder
+smesh = smeshBuilder.New(salome.myStudy)
+
+#import MEDLoader
import HYDROPy
from PyQt5.QtWidgets import QDialog, QFileDialog, QTableWidgetItem, QComboBox, QMessageBox
import HYDROPy
from PyQt5.QtWidgets import QDialog, QFileDialog, QTableWidgetItem, QComboBox, QMessageBox
@@
-23,7
+27,8
@@
from generate_interpolz import generate
def get_med_groups( file_path ):
#print "get_med_groups", file_path
try:
def get_med_groups( file_path ):
#print "get_med_groups", file_path
try:
- meshes = MEDLoader.GetMeshNames(file_path)
+ #meshes = MEDLoader.GetMeshNames(file_path)
+ (meshes, status) = smesh.CreateMeshesFromMED(file_path)
except:
print 'No meshes found'
return []
except:
print 'No meshes found'
return []
@@
-33,7
+38,13
@@
def get_med_groups( file_path ):
mesh1 = meshes[0]
print 'Found mesh:', mesh1
try:
mesh1 = meshes[0]
print 'Found mesh:', mesh1
try:
- groups = list(MEDLoader.GetMeshGroupsNames(file_path, mesh1))
+ #groups = list(MEDLoader.GetMeshGroupsNames(file_path, mesh1))
+ grps = mesh1.GetGroups()
+ groups = [grp.GetName() for grp in grps if grp.GetType() == SMESH.NODE]
+ if len(groups) == 0:
+ print "Problem! There are no groups of nodes in the mesh!"
+ print "Please create at least the groups of nodes corresponding to each region of the HYDRO case"
+ return []
print 'Found groups:', groups
except:
print 'No groups found'
print 'Found groups:', groups
except:
print 'No groups found'
@@
-51,10
+62,10
@@
def get_hydro_regions( calc_case_name ):
rname = r.GetName()
regions_names.append( str(rname) )
rname = r.GetName()
regions_names.append( str(rname) )
- shape_groups = case.GetGeometryGroups()
- for sg in shape_groups:
- sgname = sg.GetName()
- regions_names.append( sgname )
+
#
shape_groups = case.GetGeometryGroups()
+
#
for sg in shape_groups:
+
#
sgname = sg.GetName()
+
#
regions_names.append( sgname )
return regions_names
else:
return regions_names
else:
@@
-86,6
+97,7
@@
class InterpolzDlg( QDialog ):
self.UndefZ.setRange( -100000, 100000 )
self.UndefZ.setValue( -9999 )
self.InterpMethod.addItem( "Interpolation at the nearest point" )
self.UndefZ.setRange( -100000, 100000 )
self.UndefZ.setValue( -9999 )
self.InterpMethod.addItem( "Interpolation at the nearest point" )
+ self.InterpMethod.addItem( "Linear interpolation on a cloud triangulation" )
self.ApplyClose.clicked.connect(self.onApplyClose)
self.Apply.clicked.connect(self.onApply)
self.Close.clicked.connect(self.onClose)
self.ApplyClose.clicked.connect(self.onApplyClose)
self.Apply.clicked.connect(self.onApply)
self.Close.clicked.connect(self.onClose)
@@
-126,6
+138,7
@@
class InterpolzDlg( QDialog ):
self.Groups.item( i, 0 ).setText( self.med_groups[i] )
cb = QComboBox( self.Groups )
self.Groups.item( i, 0 ).setText( self.med_groups[i] )
cb = QComboBox( self.Groups )
+ cb.addItem( 'None' )
for r in self.regions:
cb.addItem( r )
self.Groups.setCellWidget( i, 1, cb )
for r in self.regions:
cb.addItem( r )
self.Groups.setCellWidget( i, 1, cb )
@@
-142,7
+155,7
@@
class InterpolzDlg( QDialog ):
for i in range( 0, self.Groups.rowCount() ):
med_group = str( self.Groups.item( i, 0 ).text() )
hydro_reg = str( self.Groups.cellWidget( i, 1 ).currentText() )
for i in range( 0, self.Groups.rowCount() ):
med_group = str( self.Groups.item( i, 0 ).text() )
hydro_reg = str( self.Groups.cellWidget( i, 1 ).currentText() )
- if len(med_group)>0 and len(hydro_reg)>0:
+ if len(med_group)>0 and len(hydro_reg)>0
and hydro_reg != 'None'
:
med_groups_regions[med_group] = hydro_reg
z_undef = self.UndefZ.value()
interp = str(self.InterpMethod.currentText())
med_groups_regions[med_group] = hydro_reg
z_undef = self.UndefZ.value()
interp = str(self.InterpMethod.currentText())
@@
-161,7
+174,10
@@
class InterpolzDlg( QDialog ):
result = False
if len(msg)==0:
result = False
if len(msg)==0:
- generate( path, calc_case, med_file, med_groups_regions, z_undef, interp )
+ iinterp = 0
+ if 'Linear' in interp:
+ iinterp = 1
+ generate( path, calc_case, med_file, med_groups_regions, z_undef, iinterp )
msg = "InterpolZ script is successfully generated"
result = True
msg = "InterpolZ script is successfully generated"
result = True