Modifs. cata 16

diff --git a/Vimmp/cata_CSAndCPS_v16.py b/Vimmp/cata_CSAndCPS_v16.py
index 867fa86cabd855802907749724582df7ad6df083..1fb59bc163a35293ac9deb655d1d5fda814baaca 100644 (file)
--- a/Vimmp/cata_CSAndCPS_v16.py
+++ b/Vimmp/cata_CSAndCPS_v16.py
@@ -649,9 +649,10 @@ def prepareParticles():
              ReferenceParticleRadius = SIMP(statut='o', typ ='R', val_min = 0),
           ),
           Weight = FACT(statut = 'o',
-             Consigne = SIMP(statut="o", homo="information", typ="TXM", defaut='Choose between Mass or Density'),          
-             Mass = SIMP(statut='f', typ ='R', val_min = 0),
-             Density = SIMP(statut='f', typ ='R', val_min = 0),
+             regles   = (UN_PARMI('Mass','Density'),),
+             Consigne = SIMP(statut="o", homo="information", typ="TXM", defaut='Choose between Mass or Density (supress current choice to change)'),
+             Mass     = SIMP(statut='f', typ ='R', val_min = 0),
+             Density  = SIMP(statut='f', typ ='R', val_min = 0),
           ),
           Mechanical = SIMP(statut='o', typ='TXM', into=['Rigid', 'Flexible', 'Deformable']),
           b_SolidAggregate = BLOC(condition='TypeOfSolid == "Assemblage / Aggregate"',
@@ -723,7 +724,7 @@ def prepareActionsAtDistance():
                blocMagnetic = BLOC(condition = 'Magnetic == True',
                    Permeability = SIMP(statut='o', typ='R'),
                ), # bloc_magnetic
-               Consigne = SIMP(statut="o", homo="information", typ="TXM", defaut='Enter ElectricCharge for Particle'),
+               Consigne = SIMP(statut="o", homo="information", typ="TXM", defaut="Don't forget to add Electromagnetic Property to each Particle class."),
                # Creation PN activation ElectricCharge
            ),# fin bloc_elec