partage du merveilleux catalogue avec les interactions 2

diff --git a/Vimmp/cata_CSAndCPS_v3.py b/Vimmp/cata_CSAndCPS_v3.py
index 762851d66afb2b054ce3134640c6213018113bb0..e7555241a675568567e1e82801a9ec27d716c6df 100644 (file)
--- a/Vimmp/cata_CSAndCPS_v3.py
+++ b/Vimmp/cata_CSAndCPS_v3.py
@@ -587,18 +587,18 @@ Interactions = PROC(nom='Interactions',
          couplingMode =  SIMP(typ='TXM', statut='o', into =['direct', 'scaling','use converter']),
          monBlocDirect = TousSelonLeTypeDeFormatDisponible( "couplingMode=='direct'" ),
          monBlocIn =  BLOC ( condition = "couplingMode=='scaling'",
-         OutConversion = FACT( statut='o',
+         OutFromComponent = FACT( statut='o',
                    monBlocFormat = TousSelonLeTypeDeFormatDisponible( "1", labelName = 'outFromMapperFileName' ),
              ),
          ),
          monBlocMapper =  BLOC ( condition = "couplingMode=='scaling'",
                  ConversionNode  =  FACT( min=1, max='**', statut ='o',
-                   MapperInformation = FACT (statut ='o',
+                   #MapperInformation = FACT (statut ='o',
                      myMapper  =  SIMP(typ=mapper, statut ='o'),
                      mesParametres = FACT (statut ='o', monParametreQuiDependDeTermeLESiCelaExiste= SIMP(statut='o', typ='I')),
-                   ),
+                   #),
                    #couplingMode =  SIMP(typ='TXM', statut='o', into =['direct', 'scaling','use converter']),
-                   OutNode = FACT (statut ='o',
+                   OutFromMapper = FACT (statut ='o',
                    monBlocFormat = TousSelonLeTypeDeFormatDisponible( "1", labelName = 'outFromMapperFileName' ),
                        ),
                    ),