il : ajout modif sur macro Etape a version de lille du 23 oct 2012

diff --git a/generator/generator_CARMEL3D.py b/generator/generator_CARMEL3D.py
index 0406dafbffa1b5b7df6677b3b3a0f87df2cdb7c3..d5ca886abf33dfaa8ec84db4b1151e1060dcf742 100644 (file)
--- a/generator/generator_CARMEL3D.py
+++ b/generator/generator_CARMEL3D.py
@@ -193,6 +193,22 @@ class CARMEL3DGenerator(PythonGenerator):
         s=PythonGenerator.generETAPE(self,obj)
         return s
 
+#----------------------------------------------------------------------------------------
+   def generMACRO_ETAPE(self,obj):
+        dico={}
+        self.dicoEtapeCourant=dico
+        self.dicoCourant=self.dicoEtapeCourant
+        import generator
+        monGenerateur=generator.plugins["CARMEL3D"]()
+        jdc_aux_texte=monGenerateur.gener(obj.jdc_aux)
+        print "__________________________________________________"
+        print monGenerateur.texteCarmel3D
+        print monGenerateur.dictMaterConductor
+        # self.dictMaterConductor += monGenerateur.dictMaterConductor
+        print "__________________________________________________"
+        s=PythonGenerator.generETAPE(self,obj)
+        return s
+
 #----------------------------------------------------------------------------------------
 #----------------------------------------------------------------------------------------
    def generMESHGROUP(self,obj):