X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2Fpadder%2Funittests%2Fusecase_meshJobManager.py;h=393840239d54ca1bcbdeb9df9881f6bd41ff8021;hp=3d86f4e6ed931986f0716fba39830952fbfdc3a6;hb=5260bd00bd51567f6137d5ea7ae0564464c4290a;hpb=7a65c9fad427b1ccba6b9ccae612296e5092a324

diff --git a/src/Tools/padder/unittests/usecase_meshJobManager.py b/src/Tools/padder/unittests/usecase_meshJobManager.py
index 3d86f4e6e..393840239 100644
--- a/src/Tools/padder/unittests/usecase_meshJobManager.py
+++ b/src/Tools/padder/unittests/usecase_meshJobManager.py
@@ -1,5 +1,5 @@
 # -*- coding: iso-8859-1 -*-
-# Copyright (C) 2011-2015  EDF R&D
+# Copyright (C) 2011-2016  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -87,66 +87,66 @@ def test00_parameters():
     file_concrete=os.path.join(spadder.getTestDataDir(),"concrete.med")
     file_steelbar=os.path.join(spadder.getTestDataDir(),"ferraill.med")
 
-    meshJobParameterList = []
-    param = MESHJOB.MeshJobParameter(file_name=file_concrete,
+    meshJobFileList = []
+    param = MESHJOB.MeshJobFile(file_name=file_concrete,
                                      file_type=MESHJOB.MED_CONCRETE,
                                      group_name="concrete")
-    meshJobParameterList.append(param)
+    meshJobFileList.append(param)
 
-    param = MESHJOB.MeshJobParameter(file_name=file_steelbar,
+    param = MESHJOB.MeshJobFile(file_name=file_steelbar,
                                      file_type=MESHJOB.MED_STEELBAR,
                                      group_name="steelbar")
-    meshJobParameterList.append(param)
-    return meshJobParameterList
+    meshJobFileList.append(param)
+    return meshJobFileList
 
 def test01_parameters():
     """One concrete mesh and two steelbar meshes"""
     datadir = os.path.join(PADDERTESTDIR,"test01")
-    meshJobParameterList = []
+    meshJobFileList = []
 
     medfile = os.path.join(datadir,"concrete.med")
-    param = MESHJOB.MeshJobParameter(file_name=medfile,
+    param = MESHJOB.MeshJobFile(file_name=medfile,
                                      file_type=MESHJOB.MED_CONCRETE,
                                      group_name="concrete")
-    meshJobParameterList.append(param)
+    meshJobFileList.append(param)
     
     medfile = os.path.join(datadir,"ferraill.med")
-    param = MESHJOB.MeshJobParameter(file_name=medfile,
+    param = MESHJOB.MeshJobFile(file_name=medfile,
                                      file_type=MESHJOB.MED_STEELBAR,
                                      group_name="ferraill")
-    meshJobParameterList.append(param)
+    meshJobFileList.append(param)
 
     medfile = os.path.join(datadir,"ferrtran.med")
-    param = MESHJOB.MeshJobParameter(file_name=medfile,
+    param = MESHJOB.MeshJobFile(file_name=medfile,
                                      file_type=MESHJOB.MED_STEELBAR,
                                      group_name="ferrtran")
-    meshJobParameterList.append(param)
+    meshJobFileList.append(param)
     
-    return meshJobParameterList
+    return meshJobFileList
 
 def test02_parameters():
     """One steelbar mesh only, without a concrete mesh"""
     datadir = os.path.join(PADDERTESTDIR,"test02")
-    meshJobParameterList = []
+    meshJobFileList = []
 
     medfile = os.path.join(datadir,"cadreef.med")
-    param = MESHJOB.MeshJobParameter(file_name=medfile,
+    param = MESHJOB.MeshJobFile(file_name=medfile,
                                      file_type=MESHJOB.MED_STEELBAR,
                                      group_name="cadre")
-    meshJobParameterList.append(param)
-    return meshJobParameterList
+    meshJobFileList.append(param)
+    return meshJobFileList
 
 def test03_parameters():
     """One concrete mesh only, without a steelbar mesh"""
     datadir = os.path.join(PADDERTESTDIR,"test03")
-    meshJobParameterList = []
+    meshJobFileList = []
 
     medfile = os.path.join(datadir,"concrete.med")
-    param = MESHJOB.MeshJobParameter(file_name=medfile,
+    param = MESHJOB.MeshJobFile(file_name=medfile,
                                      file_type=MESHJOB.MED_CONCRETE,
                                      group_name="concrete")
-    meshJobParameterList.append(param)
-    return meshJobParameterList
+    meshJobFileList.append(param)
+    return meshJobFileList
 
 #
 # =======================================================================
@@ -155,25 +155,31 @@ def test03_parameters():
 #
 
 # Choose here the use case
-#meshJobParameterList = test00_parameters()
-#meshJobParameterList = test01_parameters()
-#meshJobParameterList = test02_parameters()
-meshJobParameterList = test03_parameters()
+#meshJobFileList = test00_parameters()
+#meshJobFileList = test01_parameters()
+#meshJobFileList = test02_parameters()
+meshJobFileList = test03_parameters()
+
+meshJobParameterList = []
+param = MESHJOB.MeshJobParameter(name="RminRmax",value="1.5")
+meshJobParameterList.append(param)
+param = MESHJOB.MeshJobParameter(name="NbIteration",value="3")
+meshJobParameterList.append(param)
 
 #
 # Prepare, start and follow-up the job
 #
-jobid = component.initialize(meshJobParameterList, configId)
+jobid = component.initialize(meshJobFileList, meshJobParameterList, configId)
 if jobid<0:
     msg = component.getLastErrorMessage()
-    print "ERR: %s"%msg
+    print("ERR: %s"%msg)
     sys.exit(1)
     
 created = False
 nbiter  = 0
 while not created:
     state = component.getState(jobid)
-    print "MeshJobManager ["+str(nbiter)+"] : state = "+str(state)
+    print("MeshJobManager ["+str(nbiter)+"] : state = "+str(state))
     if state == "CREATED":
         created = True
     time.sleep(0.5)
@@ -190,10 +196,10 @@ while not created:
 ok=component.start(jobid)
 if not ok:
     msg = component.getLastErrorMessage()
-    print "ERR: %s"%msg
+    print("ERR: %s"%msg)
     sys.exit(1)
 
-print "job started: %s"%ok
+print("job started: %s"%ok)
 
 #
 # This part illustrates how you can follow the execution of the job.
@@ -206,20 +212,20 @@ ended  = False
 nbiter = 0
 while not ended:
     state = component.getState(jobid)
-    print "MeshJobManager ["+str(nbiter)+"] : state = "+str(state)
+    print("MeshJobManager ["+str(nbiter)+"] : state = "+str(state))
     if state not in run_states:
         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)
+    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)
+    print("OK:  jobid = "+str(jobid)+" ended with state="+str(state))
     meshJobResults = component.finalize(jobid)
-    print meshJobResults
+    print(meshJobResults)
     if meshJobResults.status is not True:
-        print "ERR: the results are not OK: %s"%component.getLastErrorMessage()
-        print "ERR: see log files in %s"%meshJobResults.results_dirname
+        print("ERR: the results are not OK: %s"%component.getLastErrorMessage())
+        print("ERR: see log files in %s"%meshJobResults.results_dirname)