BOUNDARY... dans Telemac2D

diff --git a/convert/convert_TELEMAC.py b/convert/convert_TELEMAC.py
index 07a8521b2237b07c66d48ecd2b2aa3622b4e1fa0..f833c8db1448f6cc061a84ecc83ae8d9e23790cb 100644 (file)
--- a/convert/convert_TELEMAC.py
+++ b/convert/convert_TELEMAC.py
@@ -239,7 +239,7 @@ class TELEMACParser(PythonParser):
 
       dicoParMC={}
       for simp in self.dictSimp:
-          if simp in TELEMACParser.__dict__ : TELEMACParser.__dict__[simp],(self,)
+          if simp in TELEMACParser.__dict__ : TELEMACParser.__dict__[simp](self,)
 
       for simp in self.dictSimp:
           if simp in ListeSupprimeCasToEficas: continue
@@ -286,6 +286,7 @@ class TELEMACParser(PythonParser):
           commentaire="COMMENTAIRE("+repr(dicoComment['fin'])+")\n"
           self.textePy=self.textePy+commentaire
 
+      #print (self.textePy)
       return self.textePy
 
 
@@ -317,8 +318,9 @@ class TELEMACParser(PythonParser):
 
 
    def convertFACT(self,obj,nom,valeur):
+       # traitement LIQUID_BOUNDARIES
        if nom in TELEMACParser.__dict__ : 
-          TELEMACParser.__dict__[nom],(self,)
+          TELEMACParser.__dict__[nom](self,)
           return
        self.textePy +=  nom + "=_F( "
        self.traiteMC(valeur)
@@ -456,8 +458,8 @@ class TELEMACParser(PythonParser):
           listeOut.insert(i,k)
       return listeOut
 
-   def LIQUID_BOUNDARIES(self):
-       texte_Boundaries="LIQUID_BOUNDARIES=( "
+   def BOUNDARY_CONDITIONS(self):
+       texte_Boundaries="BOUNDARY_CONDITIONS=_F(LIQUID_BOUNDARIES=( "
        if 'PRESCRIBED_ELEVATIONS' in self.dictSimp: 
               valeursPE=self.dictSimp["PRESCRIBED_ELEVATIONS"]
               if not type(valeursPE)==list : valeursPE = (valeursPE,)
@@ -508,6 +510,6 @@ class TELEMACParser(PythonParser):
                 continue
           print ("pb texte_Boundaries avec la valeur numero ", e)
 
-       texte_Boundaries +="),\n"
+       texte_Boundaries +="),),"
        self.textePy += texte_Boundaries
       

diff --git a/generator/generator_TELEMAC.py b/generator/generator_TELEMAC.py
index afd14f1f2815d0c0bf1540d3002c99f3b96afbdb..aa24677303d30857490878d912f8e400d8fce503 100644 (file)
--- a/generator/generator_TELEMAC.py
+++ b/generator/generator_TELEMAC.py
@@ -236,12 +236,13 @@ class TELEMACGenerator(PythonGenerator):
       """
       """
       s=PythonGenerator.generMCFACT(self,obj)
-      if obj.nom in TELEMACGenerator.__dict__ : TELEMACGenerator.__dict__[obj.nom],(self,obj)
+      if obj.nom in TELEMACGenerator.__dict__ : TELEMACGenerator.__dict__[obj.nom](self,obj)
  
       return s
 
   
    def LIQUID_BOUNDARIES(self,obj):
+      print ('jkljklj')
       if 'BOUNDARY_TYPE' in  obj.liste_mc_presents() :
           objForme=obj.get_child('BOUNDARY_TYPE')
           valForme=objForme.valeur

diff --git a/generator/generator_python.py b/generator/generator_python.py
index 024d58fbc281923ca19c084c7d4d6588e2026662..b40e6589b7100c98a5849da4699e948ea0e8054b 100644 (file)
--- a/generator/generator_python.py
+++ b/generator/generator_python.py
@@ -355,6 +355,7 @@ class PythonGenerator(object):
           sdname=''
         else:
           sdname= self.generator(obj.sd)+'='
+        if  sdname.find('SD_') != -1: sdname=''
       except:
         sdname='sansnom='
       l=[]