mise en place de la fonction run avec le nom du fichier comm

diff --git a/MapIdentification/mesScripts_MAPIDENTIFICATION.py b/MapIdentification/mesScripts_MAPIDENTIFICATION.py
index 50e490d9f6f7ed9a26069e3e7899c82eace09323..104d50e45424c40882d75a26e7638d30e8ce245e 100644 (file)
--- a/MapIdentification/mesScripts_MAPIDENTIFICATION.py
+++ b/MapIdentification/mesScripts_MAPIDENTIFICATION.py
@@ -18,14 +18,13 @@ def comm2MAPinput(input_filename):
 
     string = "[c_solver_constitutive_law0d]\n"
     for line in lines:
-        for key in KEYS:
+        for key in MAP_KEYS:
             if key + "=" in line:
                 string += key + "=" + line.split("'")[1] + "\n"
 
     output_filename = os.path.splitext(input_filename)[0] + ".input"
     with open(output_filename, "w") as new_file:
         new_file.write(string)
-    print ('je convertis le fichier comm en input de MAP')
 
     return output_filename
 
@@ -42,19 +41,12 @@ def writeMAPinput(dictValeur):
     with open("toto.input",'w') as f_out :
         config.write(f_out)
 
-def run(editor):
-    print ('je rentre dans run')
-    print editor.fichier
-    command_file = "/home/C41270/MAPinput_test.comm" # TODO: nom en dur
-
+def run(listeParam):
+    command_file=listeParam[0].fichier
     command_file = comm2MAPinput(command_file)
-    os.system("map -r sappli run -n C_solver_constitutive_law0d -i " + command_file)
+    command = "map -r sappli run -n C_solver_constitutive_law0d -i " + command_file
+    os.system(command)
     print "calcul fini, youpi !"
- #+def run(listeParam):
- #+    print ('je rentre dans run')
- #+    editor=listeParam[0]
- #+    print (editor)
- #+    print (dir(editor))
 
 
 # le dictionnaire des commandes a la structure suivante :

diff --git a/generator/generator_MapIdentification.py b/generator/generator_MapIdentification.py
index 7df772799ee333aa4e999aa28a19392b7924bd29..4baaf1bacad8e5d7fec34838b893b5445f5317aa 100644 (file)
--- a/generator/generator_MapIdentification.py
+++ b/generator/generator_MapIdentification.py
@@ -74,7 +74,7 @@ class MapIdentificationGenerator(PythonGenerator):
 
       config.add_section("c_solver_constitutive_law0d")
       for key, value in self.dictValeur.iteritems():
-          if key in KEYS:
+          if key in MAP_KEYS:
               config.set("c_solver_constitutive_law0d", key, value)
 
       input_filname = os.path.splitext(fn)[0] + ".input"