-- Quelques corrections

diff --git a/Vimmp/cata_CSAndCPS.py b/Vimmp/cata_CSAndCPS.py
index d658187ac7400d4e21c8bc6cf03481043bca7454..b0eccea5a8b9e145f2d39745989ffa0f5efc1708 100755 (executable)
--- a/Vimmp/cata_CSAndCPS.py
+++ b/Vimmp/cata_CSAndCPS.py
@@ -29,6 +29,7 @@ dictTypModNumModNum = {
 dictCodeModeleNumerique = { 
     
     'Code_Saturne' : ('Lagrangian one-fluid-particle pdf', 'FV', 'CFD_Discrete_Particles',),
+    'Fluent'       : ('FV',),
     'Culgi Package': (),
     'DEM_SD'       : ('Lagrangian one-fluid-particle pdf', 'FV', 'CFD_Discrete_Particles',),
     'DFTB+'        : ('density functional tight binding method',),
@@ -573,8 +574,8 @@ Interactions = PROC(nom='Interactions',
         termeLE = SIMP(typ='TXM', statut='o', into = dictTermeLE['Particles','Fields'],fenetreIhm='menuDeroulant'),
           ),
       monBloc_Saturne_Fluent = BLOC ( 
-        condition = 'getEficasAttribut(origine,"Solver") == "Saturne" and getEficasAttribut(destination,"Solver") == "Fluent"' ,
-        Format = SIMP(typ='TXM', statut='o', into = calculCommun( "Saturne", "Fluent",dictCodeFormat) ),
+        condition = 'getEficasAttribut(origine,"Solver") == "Code_Saturne" and getEficasAttribut(destination,"Solver") == "Fluent"' ,
+        Format = SIMP(typ='TXM', statut='o', into = calculCommun( "Code_Saturne", "Fluent",dictCodeFormat) ),
           ),
       monBloc_Saturne_OpenFoam = BLOC ( 
         condition = 'getEficasAttribut(origine,"Solver") == "Code_Saturne" and getEficasAttribut(destination,"Solver") == "OpenFOAM"' ,
@@ -585,6 +586,7 @@ Interactions = PROC(nom='Interactions',
           ),
       ),
 )
+
 dict_condition={'NumericalMethod' : ('Interactions', 'Component'),
 #                'TypeOfSolid' : ('Component',)
 }