*** empty log message ***

diff --git a/generator/generator_map.py b/generator/generator_map.py
index 1a7bfbac18044e56db2695edf5bdf89eeda6e508..a690c2b9b787f2b8188be07b8dcfbb68daba9bf4 100644 (file)
--- a/generator/generator_map.py
+++ b/generator/generator_map.py
@@ -72,10 +72,10 @@ class MapGenerator(PythonGenerator):
       self.ssCode=self.config.appli.ssCode
       self.INSTALLDIR=self.config.appli.INSTALLDIR
       self.ssCodeDir=os.path.join(self.INSTALLDIR,'MAP/Templates',self.ssCode)
-      print self.ssCodeDir
+      self.fichierYacs=self.ssCode+"YACS_nodes"
       self.texteExecution="import os,sys\n"
       self.texteExecution+="sys.path.append('"+self.ssCodeDir+"')\n"
-      self.texteExecution+="from s_polymers_st_1_YACS_nodes import *\n"
+      self.texteExecution+="from " + self.fichierYacs +" import *\n"
 
    def gener(self,obj,format='brut',config=None):
       self.initialise(config)

diff --git a/generator/generator_s_polymers_st_1.py b/generator/generator_s_polymers_st_1.py
index dcd70849f131ae6a4730d597f0bff040e6b09f55..f89bfd098bf3cca5e7e03bd2faa6fec51473f585 100644 (file)
--- a/generator/generator_s_polymers_st_1.py
+++ b/generator/generator_s_polymers_st_1.py
@@ -193,7 +193,7 @@ class s_poly_st_1Generator(MapGenerator):
       return commande
 
    def FDVGRID(self):
-      commande="lambda_x=component_fdvgrid("+str(self.lambda_I)+","+str(self.lambda_M)+","+str(self.rve_size)+",'"+str(self.inclusion_name)+"',"+str(self.finesse)+")\n"
+      commande="lambda_x=component_fdvgrid("+str(self.lambda_I)+","+str(self.lambda_M)+","+str(self.rve_size)+",'"+str(self.inclusion_name)+"',"+str(self.finesse)+",'"+str(self.study_path)+"')\n"
       return commande
 
    def BENHUR(self):