Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Padder : fix RmaxRmin's variable name and update default values for NbIter and RmaxRmin
[modules/smesh.git]
/
src
/
Tools
/
padder
/
unittests
/
usecase_meshJobManager.py
diff --git
a/src/Tools/padder/unittests/usecase_meshJobManager.py
b/src/Tools/padder/unittests/usecase_meshJobManager.py
index 127f321196eecfbace3176b1362a611ef41761cf..3f705458f0dd146fa52c530edd53da1250a1ed96 100644
(file)
--- a/
src/Tools/padder/unittests/usecase_meshJobManager.py
+++ b/
src/Tools/padder/unittests/usecase_meshJobManager.py
@@
-83,7
+83,7
@@
PADDERTESTDIR = getPadderTestDir(defaultConfig)
# padder.cfg).
#
def test00_parameters():
# padder.cfg).
#
def test00_parameters():
- """Test using a concrete mesh and a single steelbar mesh"""
+ """Test using a concrete mesh and a single steelbar mesh"""
file_concrete=os.path.join(spadder.getTestDataDir(),"concrete.med")
file_steelbar=os.path.join(spadder.getTestDataDir(),"ferraill.med")
file_concrete=os.path.join(spadder.getTestDataDir(),"concrete.med")
file_steelbar=os.path.join(spadder.getTestDataDir(),"ferraill.med")
@@
-109,7
+109,7
@@
def test01_parameters():
file_type=MESHJOB.MED_CONCRETE,
group_name="concrete")
meshJobFileList.append(param)
file_type=MESHJOB.MED_CONCRETE,
group_name="concrete")
meshJobFileList.append(param)
-
+
medfile = os.path.join(datadir,"ferraill.med")
param = MESHJOB.MeshJobFile(file_name=medfile,
file_type=MESHJOB.MED_STEELBAR,
medfile = os.path.join(datadir,"ferraill.med")
param = MESHJOB.MeshJobFile(file_name=medfile,
file_type=MESHJOB.MED_STEELBAR,
@@
-121,7
+121,7
@@
def test01_parameters():
file_type=MESHJOB.MED_STEELBAR,
group_name="ferrtran")
meshJobFileList.append(param)
file_type=MESHJOB.MED_STEELBAR,
group_name="ferrtran")
meshJobFileList.append(param)
-
+
return meshJobFileList
def test02_parameters():
return meshJobFileList
def test02_parameters():
@@
-160,15
+160,21
@@
def test03_parameters():
#meshJobFileList = test02_parameters()
meshJobFileList = test03_parameters()
#meshJobFileList = test02_parameters()
meshJobFileList = test03_parameters()
+meshJobParameterList = []
+param = MESHJOB.MeshJobParameter(name="RmaxRmin",value="1.5")
+meshJobParameterList.append(param)
+param = MESHJOB.MeshJobParameter(name="NbIteration",value="3")
+meshJobParameterList.append(param)
+
#
# Prepare, start and follow-up the job
#
#
# Prepare, start and follow-up the job
#
-jobid = component.initialize(meshJobFileList, configId)
+jobid = component.initialize(meshJobFileList,
meshJobParameterList,
configId)
if jobid<0:
msg = component.getLastErrorMessage()
print "ERR: %s"%msg
sys.exit(1)
if jobid<0:
msg = component.getLastErrorMessage()
print "ERR: %s"%msg
sys.exit(1)
-
+
created = False
nbiter = 0
while not created:
created = False
nbiter = 0
while not created:
@@
-211,11
+217,11
@@
while not ended:
ended=True
time.sleep(0.5)
nbiter+=1
ended=True
time.sleep(0.5)
nbiter+=1
-
+
if state not in end_states:
print "ERR: jobid = "+str(jobid)+" ended abnormally with state="+str(state)
msg = component.getLastErrorMessage()
if state not in end_states:
print "ERR: jobid = "+str(jobid)+" ended abnormally with state="+str(state)
msg = component.getLastErrorMessage()
- print "ERR: %s"%msg
+ print "ERR: %s"%msg
else:
print "OK: jobid = "+str(jobid)+" ended with state="+str(state)
meshJobResults = component.finalize(jobid)
else:
print "OK: jobid = "+str(jobid)+" ended with state="+str(state)
meshJobResults = component.finalize(jobid)