echange 2

diff --git a/Vimmp/cata_CSAndCPS_v2.py b/Vimmp/cata_CSAndCPS_v2.py
index fbd9c8b23f4cfbb9566f195f5c96d6f9c3e51d09..7e7b170a0e2ef62b399350e1234055eddd9e4c9b 100644 (file)
--- a/Vimmp/cata_CSAndCPS_v2.py
+++ b/Vimmp/cata_CSAndCPS_v2.py
@@ -498,6 +498,12 @@ Species = PROC(nom='Species',
         )
 )
 
+def monBlocInteractionTypeChamp ():
+    return BLOC (condition = '1 == 1'  , # a distinguer selon les cas
+           fieldNameInOrigine = SIMP(typ='TXM', statut='o'),
+           fieldNameInDetgination = SIMP(typ='TXM', statut='o'),
+    )
+
 Interactions = PROC(nom='Interactions',
    Interaction = FACT( max = '**',
       origine     = SIMP(typ=modeleNumDuCompo, statut='o'),
@@ -506,12 +512,18 @@ Interactions = PROC(nom='Interactions',
       monBloc_FFDP = BLOC ( 
         condition = 'getEficasAttribut(origine,"ModelType") == "Fields" and getEficasAttribut(destination,"ModelType") == "Particles"' ,
         termeLE = SIMP(typ='TXM', statut='o', into = dictTermeLE['Fields','Particles'],fenetreIhm='menuDeroulant'),
+        monBloc_Champ = monBlocInteractionTypeChamp(),
           ),
       monBloc_DPFF = BLOC ( 
         condition = 'getEficasAttribut(origine,"ModelType") == "Particles" and getEficasAttribut(destination,"ModelType") == "Fields"' ,
         termeLE = SIMP(typ='TXM', statut='o', into = dictTermeLE['Particles','Fields'],fenetreIhm='menuDeroulant'),
+        monBloc_Champ = monBlocInteractionTypeChamp(),
           ),
       transferType = SIMP(typ='TXM', statut='o', into =['File', 'Memory', 'CorbaObject']),
+      monBloc_Saturne_Saturne = BLOC ( 
+        condition = 'transferType == "File" and getEficasAttribut(origine,"Solver") == "Code_Saturne" and getEficasAttribut(destination,"Solver") == "Code_Saturne"' ,
+        Format = SIMP(typ='TXM', statut='o', into = calculCommun( "Code_Saturne", "Fluent",dictCodeFormat) ),
+          ),
       monBloc_Saturne_Fluent = BLOC ( 
         condition = 'transferType == "File" and getEficasAttribut(origine,"Solver") == "Code_Saturne" and getEficasAttribut(destination,"Solver") == "Fluent"' ,
         Format = SIMP(typ='TXM', statut='o', into = calculCommun( "Code_Saturne", "Fluent",dictCodeFormat) ),