Modification du catalogue Vimmp

diff --git a/Vimmp/cata_Vimmp.py b/Vimmp/cata_Vimmp.py
index acdeeff78d6d6107525ce1cb8ae5da3a93c6eff9..852c3fd3818f32423b8a12b8dafb2ac3686727f0 100644 (file)
--- a/Vimmp/cata_Vimmp.py
+++ b/Vimmp/cata_Vimmp.py
@@ -118,8 +118,8 @@ CDM = OPER(nom = 'CDM', sd_prod = CDM_SD,
 
     #Surface=SIMP( statut='o', typ='TXM',max='**', siValide=creeSurfaceElementaire),
           #Surface=FACT( statut='o', max='**',
-             #SurfaceName=SIMP( statut='o',typ=( ElementarySurface, 'createObject'),),
-             Surface=SIMP( statut='o',typ='TXM',max='**'),
+             SurfaceName=SIMP( statut='o',typ=( Elementary_Surface, 'createObject'),max='**'),
+             #Surface=SIMP( statut='o',typ='TXM',max='**'),
           #),
   ), # fin Geometric_Domain
 
@@ -302,8 +302,8 @@ CDM = OPER(nom = 'CDM', sd_prod = CDM_SD,
                 Non_Equilibrium_Driving_Force = SIMP( statut='o', typ='TXM', into=[ 'Temperature',],),
                 Imposed_non_isothermal = FACT ( statut = 'o', min=2, max="**",
                      Imposed_Temperature = SIMP( statut='o', typ='R'),
-                     #Applied_On_Surface = SIMP( statut='o', typ= Elementary_Surface), 
-                     Applied_On_Surface = SIMP( statut='o', typ= 'TXM'), 
+                     Applied_On_Surface = SIMP( statut='o', typ= Elementary_Surface), 
+                     #Applied_On_Surface = SIMP( statut='o', typ= 'TXM'), 
                 ),
           ), # b_Physique_statstique_equilibre