From 244ded35edc8fe6475c3c316912fde7ac9eb7207 Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Thu, 20 Jan 2011 09:47:24 +0000 Subject: [PATCH] *** empty log message *** --- generator/generator_map.py | 4 ++-- generator/generator_s_polymers_st_1.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generator/generator_map.py b/generator/generator_map.py index 1a7bfbac..a690c2b9 100644 --- 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 dcd70849..f89bfd09 100644 --- 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): -- 2.39.2