Correction cata_Vimmp.py

diff --git a/Vimmp/cata_Vimmp.py b/Vimmp/cata_Vimmp.py
index 852c3fd3818f32423b8a12b8dafb2ac3686727f0..dfc68ca631ea14b33b2f5265343a435c47328768 100644 (file)
--- a/Vimmp/cata_Vimmp.py
+++ b/Vimmp/cata_Vimmp.py
@@ -15,19 +15,6 @@ class Specie(UserASSD) : pass
 class BondedParticle(UserASSD) : pass
 
 
-#def creeSpecie(MC) :
-#   MC.creeObjetClasse(Specie)
-#   return
-
-
-#def creeBondedParticle(MC) :
-#   MC.creeObjetClasse(BondedParticle)
-#   return
-
-#def creeSurfaceElementaire(MC) :
-#   MC.creeObjetClasse(Elementary_Surface)
-#   return
-
 #  ------------------------------------------------- Definition fonction du catalogue ou macro
 
 def champ(nomDelaContante, labels ,nbReels ) :
@@ -115,12 +102,7 @@ CDM = OPER(nom = 'CDM', sd_prod = CDM_SD,
        ), # fin b_Shape
 #
        b_CAO = BlocPourLesFichiers( "Shape == 'CAD or Mesh'",'Domain_File', ['txt','med','I-deas', 'Gmsh', 'top',]),
-
-    #Surface=SIMP( statut='o', typ='TXM',max='**', siValide=creeSurfaceElementaire),
-          #Surface=FACT( statut='o', max='**',
-             SurfaceName=SIMP( statut='o',typ=( Elementary_Surface, 'createObject'),max='**'),
-             #Surface=SIMP( statut='o',typ='TXM',max='**'),
-          #),
+       Surface=SIMP( statut='o',typ=( Elementary_Surface, 'createObject'),max='**',),
   ), # fin Geometric_Domain
 
 
@@ -140,7 +122,6 @@ CDM = OPER(nom = 'CDM', sd_prod = CDM_SD,
            # ------------------------------#
                Number_Of_Species  = SIMP( statut='o', typ='I', defaut=1, position='global_jdc'),
                Specie             = FACT( statut='o', max ="**",
-                  #Name_Of_Specie     = SIMP( statut='o', typ='TXM', siValide=creeSpecie),
                   Name_Of_Specie     = SIMP( statut='o', typ=(Specie, 'createObject'),),
                   Mass_Molaire       = SIMP( statut='o', typ='R',),
                   Mass_Fraction      = SIMP( statut='f', typ='R',), 
@@ -154,7 +135,6 @@ CDM = OPER(nom = 'CDM', sd_prod = CDM_SD,
             List_Of_Bonded_Particles = FACT( statut='f', 
             # -------------------------------------------#
                Bonded_Particles = FACT( statut='o', max = "**",
-                  #Name_Of_Bonded_Particles   = SIMP( statut='o', typ='TXM',siValide=creeBondedParticle ),
                   Name_Of_Bonded_Particles   = SIMP( statut='o', typ=(BondedParticle,'createObject' ),),
                   Species_in_Particle        = SIMP( statut='o', min=2, typ=Specie , max = "**"),
                                  ), # Bonded_Particles
@@ -303,7 +283,6 @@ CDM = OPER(nom = 'CDM', sd_prod = CDM_SD,
                 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'), 
                 ),
           ), # b_Physique_statstique_equilibre