ajout typesolid dans les globaux

diff --git a/Vimmp/cata_CSAndCPS.py b/Vimmp/cata_CSAndCPS.py
index 11611aec08d596ef748be58b87296e27a6846110..eb21fe333930b80771d3a8fb2fc0fc03b3c5ca77 100755 (executable)
--- a/Vimmp/cata_CSAndCPS.py
+++ b/Vimmp/cata_CSAndCPS.py
@@ -189,14 +189,14 @@ def Particle(cardinalite) :
        DiscreteParticleName  = SIMP(statut='o', typ=(userDiscrete,'createObject'),),
        TypeOfDiscreteParticle = SIMP( statut='o', typ='TXM', into=['Solid', 'Droplets', 'Bubbles','Bio Organism'],),
        b_TypeDP_Solid = BLOC( condition ='TypeOfDiscreteParticle == "Solid"',
-         TypeOfSolid   = SIMP( statut='o', typ='TXM', into=['Primary Particle', 'Aggregate'], position = 'global_jdc'),
+         TypeOfSolid   = SIMP( statut='o', typ='TXM', into=['Primary Particle', 'Assemblage / Aggregate'], position = 'global_jdc'),
             b_SolidPrimary  =  BLOC( condition='TypeOfSolid == "Primary Particle"',
             ),
-            b_SolidAggregate = BLOC( condition='TypeOfSolid == "Aggregate"',
+            b_SolidAggregate = BLOC( condition='TypeOfSolid == "Assemblage / Aggregate"',
             ),
        ),
        b_TypeBio_Solid = BLOC( condition='TypeOfDiscreteParticle == "Bio Organism"',
-           TypeOfOrganism = SIMP( statut='o', typ='TXM', into=['Unicellular', 'Multicellar']),
+           TypeOfOrganism = SIMP( statut='o', typ='TXM', into=['Unicellular', 'Multicellular']),
             b_Unicellular = BLOC( condition ='TypeOfOrganism=="Unicellular"',
               Unicellular = SIMP( statut='o', typ='TXM', into=["Bactaria"], defaut='Bacteria')
              ),
@@ -206,12 +206,19 @@ def Particle(cardinalite) :
        ), # b_TypeBio_Solid
        Properties = FACT ( statut ='o',
           Geometry   = SIMP( statut='o', typ='TXM', into=['Sphere', 'Ellopsoids', 'Other Shape']),
+          b_geom_Sphere = BLOC( condition = 'Geometry == "Sphere"',
+             ParticleRadius = SIMP( statut='o', typ ='R', val_min = 0),
+          ),
+          Weight = FACT (statut = 'o',
+             Mass = SIMP( statut='o', typ ='R', val_min = 0),
+             Density = SIMP( statut='o', typ ='R', val_min = 0),
+          ),
           Mechanical = SIMP( statut='o', typ='TXM', into=['Rigid', 'Flexible', 'Deformable']),
-          b_SolidAggregate = BLOC( condition='TypeOfSolid == "Aggregate"',
+          b_SolidAggregate = BLOC( condition='TypeOfSolid == "Assemblage / Aggregate"',
             Morphological = FACT (statut = 'o',
               Consigne = SIMP(statut="o", homo="information", typ="TXM", defaut='Choose optional properties'),
               FractalDimension       = SIMP( statut='f', typ='R'),
-              PrimaryParticlesNumber = SIMP (statut ='f',typ='I'),
+              NumberOfPrimaryParticle = SIMP (statut ='f',typ='I'),
               EquivalentSize         = SIMP( statut='f', typ='R'),
               Porosoty               = SIMP( statut='f', typ='R'),
            ), # Morphological
@@ -398,7 +405,10 @@ Interactions = PROC(nom='Interactions',
           ),
       ),
 )
-dict_condition={'NumericalMethod' : ('Interactions', 'Component') }
+dict_condition={'NumericalMethod' : ('Interactions', 'Component'),
+                'TypeOfSolid' : ('Component',)
+}
+
 Simulated_Time_Lapse = PROC( nom ="Simulated_Time_Lapse",
      Initial_Time = SIMP( statut='o', typ='R'),
      Duration     = SIMP( statut='o', typ='R'),