Include dans carmel

diff --git a/Carmel3D/opsCarmel.py b/Carmel3D/opsCarmel.py
index b2365bea0e2b06fbbdc0f9db72aa5386452ca4b0..ad1c7c049fe7c16473b19decf1f2edbeacdade8f 100644 (file)
--- a/Carmel3D/opsCarmel.py
+++ b/Carmel3D/opsCarmel.py
@@ -26,13 +26,14 @@ def INCLUDE(self,FileName,**args):
        delattr(self,'change_fichier')
        delattr(self,'fichier_ini')
 
-   self.make_include(fichier=FileName)
+   self.make_include3(fichier=FileName)
 
 def INCLUDE_context(self,d):
    """ 
        Fonction op_init pour macro INCLUDE
    """
    for k,v in self.g_context.items():
+      print k,v
       d[k]=v
 
 

diff --git a/Ihm/I_MACRO_ETAPE.py b/Ihm/I_MACRO_ETAPE.py
index 31356d942c913e2017e6118824d3b7044a3b6ede..112639d56baaff91c62fb5d0dd3300e6b5088da8 100644 (file)
--- a/Ihm/I_MACRO_ETAPE.py
+++ b/Ihm/I_MACRO_ETAPE.py
@@ -754,7 +754,10 @@ class MACRO_ETAPE(I_ETAPE.ETAPE):
 
 
   def make_include3(self,fichier=None):
-  # Pour Map
+      self.make_includeCarmel(fichier)
+
+  def make_includeCarmel(self,fichier=None):
+  # Pour Carmel
       unite=999
       if hasattr(self,'fichier_ini') : return
       reevalue=0