From 75087b9cc0ee185655fbd83d818193e7182b1597 Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Thu, 9 Oct 2014 11:15:33 +0000 Subject: [PATCH] Pour 7.5 de Carmel --- generator/generator_CARMELCND.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/generator/generator_CARMELCND.py b/generator/generator_CARMELCND.py index f7d5e9ce..0d9098b5 100644 --- a/generator/generator_CARMELCND.py +++ b/generator/generator_CARMELCND.py @@ -176,7 +176,7 @@ class CARMELCNDGenerator(PythonGenerator): listeSource.sort() for source in listeSource: debutKey=source+"______SOURCE__" - texteSource=self.dictMCVal[debutKey+"NomDomaine"]+"\n" + texteSource=self.dictMCVal[debutKey+"EnveloppeConnexeInducteur"]+"\n" texteSource+="2\n" for val in self.dictMCVal[debutKey+"VecteurDirecteur"] : texteSource+=str(val)+" " @@ -184,7 +184,7 @@ class CARMELCNDGenerator(PythonGenerator): for val in self.dictMCVal[debutKey+"Centre"] : texteSource+=str(val)+" " texteSource+="\n" - texteSource+=str(self.dictMCVal[debutKey+"SectionDomaine"])+"\n" + texteSource+=str(self.dictMCVal[debutKey+"SectionBobine"])+"\n" self.texteIngendof+=texteSource self.texteSourcePhys+=" [STRANDED_INDUCTOR\n" self.texteSourcePhys+=" NAME "+source+"\n" @@ -222,7 +222,7 @@ class CARMELCNDGenerator(PythonGenerator): self.textePhys+=str(self.dictMCVal[c+"______CONDUCTEUR__Conductivite"]) self.textePhys+=texteConducto2 self.textePhys+=" VALUE COMPLEX " - self.textePhys+=str(self.dictMCVal[c+"______CONDUCTEUR__Permeabilite"]) + self.textePhys+=str(self.dictMCVal[c+"______CONDUCTEUR__PermeabiliteRelative"]) self.textePhys+=" 0.0000000000000000E+00\n ]\n ]\n" for c in listeNoCond: @@ -230,7 +230,7 @@ class CARMELCNDGenerator(PythonGenerator): self.textePhys +=" NAME "+c+"\n" self.textePhys += texteNoCond self.textePhys+=" VALUE COMPLEX " - self.textePhys+=str(self.dictMCVal[c+"______NOCOND__Permeabilite"]) + self.textePhys+=str(self.dictMCVal[c+"______NOCOND__PermeabiliteRelative"]) self.textePhys+=" 0.0000000000000000E+00\n ]\n ]\n" self.textePhys+="]\n" @@ -240,7 +240,7 @@ class CARMELCNDGenerator(PythonGenerator): # Creation du fichier Param #---------------------------------------------------------------------------------------- def traiteParam(self): - self.texteParam +="[FREQUENCY\n SINGLE "+str(self.dictMCVal["__PARAMETRES__Frequence_en_Hz"])+"\n]\n" + self.texteParam +="[FREQUENCY\n SINGLE "+str(self.dictMCVal["__PARAMETRES__Frequence"])+"\n]\n" self.texteParam +="[SOLVER\n NAME BICGCR\n" self.texteParam +=" [ITERATIVE_PARAM\n" self.texteParam +=" NITERMAX "+str(self.dictMCVal["__PARAMETRES__Nb_Max_Iterations"])+"\n" -- 2.39.2