From 5fcb38cb124fb9e21c95ae83ab74e8b6f9a16b38 Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Mon, 22 Jun 2020 18:39:41 +0200 Subject: [PATCH] suite --- Vimmp/cata_CSAndCPS.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Vimmp/cata_CSAndCPS.py b/Vimmp/cata_CSAndCPS.py index 713d532f..11611aec 100755 --- a/Vimmp/cata_CSAndCPS.py +++ b/Vimmp/cata_CSAndCPS.py @@ -157,6 +157,7 @@ def FactTurbulence(statut): ),# fin bloc_N_particle ), # fin bloc_no_model )# fin du bloc return de la fonction factTurbulence + def Particle(cardinalite) : return FACT (statut='o', max=cardinalite, ParticleNature = SIMP( statut='o', typ='TXM', into=['Atoms', 'Molecules', 'Dissipative', 'Fluid Particle', 'Discrete Particle']), @@ -170,7 +171,7 @@ def Particle(cardinalite) : Size = SIMP( statut='f', typ='R'), # relevant ? ), ), - b_Molecule = BLOC( condition='ParticleNature == "Molecule"', + b_Molecule = BLOC( condition='ParticleNature == "Molecules"', MoleculeName = SIMP( statut='o', typ=(userParticle,'createObject'),), ChemicalSpecie = FACT ( max='**', statut='o', ChemicalSpecieName = SIMP( statut='o', typ=userAtom), -- 2.39.2