Mise en correspondance des versions des tests avec les versions des catalogues

diff --git a/Vimmp/cata_CSAndCPS_V2_test_driver_1.comm b/Vimmp/cata_CSAndCPS_V2_test_driver_1.comm
new file mode 100644 (file)
index 0000000..2946f69
--- /dev/null
+++ b/Vimmp/cata_CSAndCPS_V2_test_driver_1.comm
@@ -0,0 +1,71 @@
+P1=userDiscrete()
+CS_num_FV=modeleNumDuCompo()
+CS_num_CFD_Discrete_Particles=modeleNumDuCompo()
+half_pipe=meshIdentifier()
+inlet=meshGroup()
+outlet=meshGroup()
+wall=meshGroup()
+symetry=meshGroup()
+SD_11=meshGroup()
+inlet1=meshGroup()
+half_pipe2=meshIdentifier()
+
+Spatial_Aspects(Spatial_Discretization=(_F(Mesh_Name=half_pipe,
+                                           FileFormat='med',
+                                           FileName='/home/eric/VIMMP/vimmptraining/app/fluide+particule/datafiles/half_pipe.med',
+                                           GroupIdentifier=(inlet,outlet,wall,symetry,SD_11,),),
+                                        _F(Mesh_Name=half_pipe2,
+                                           FileFormat='med',
+                                           FileName='/home/eric/VIMMP/vimmptraining/app/fluide+particule/datafiles/half_pipe.med',
+                                           GroupIdentifier=(inlet1,),),),);
+
+FluidComponent=Component(SystemType='Continuum system',
+                         PhysicalDescription=_F(FluidComplexe=False,
+                                                FlowNature='Turbulent',
+                                                TurbulenceForFlowDynamics=_F(TurbulenceModellingType='One-point moment',
+                                                                             RANSModel='Turbulent-Viscosity Model(TVM)',
+                                                                             TVMChoice='k-epsilon',),
+                                                Thermal=_F(ThermalEffects='Non thermal',
+                                                           DensityEquationOfState='Constant density',),),
+                         NumericalModel=_F(Identifier=CS_num_FV,
+                                           ModelType='Fields',
+                                           Mesh_Identifiers=None,
+                                           NumericalMethod='FV',
+                                           Solver='Code_Saturne',),);
+
+PartComponent=Component(SystemType='Classical particle system',
+                        PhysicalDescription=_F(Particle=_F(ParticleNature='Discrete Particle',
+                                                           DiscreteParticleName=P1,
+                                                           TypeOfDiscreteParticle='Solid',
+                                                           TypeOfSolid='Primary Particle',
+                                                           Properties=_F(Geometry='Sphere',
+                                                                         ParticleRadius=99.0,
+                                                                         Weight=_F(Mass=99.0,
+                                                                                   Density=99.0,),
+                                                                         Mechanical='Rigid',),
+                                                           List_Of_Interactions=_F(Bonded_Interactions=_F(
+                                                                                                  Type_Of_Bonded_Interaction='No',),
+                                                                                   Unbonded_Interactions=_F(
+                                                                                                Type_Of_Unbonded_Interaction='No',),
+                                                                                   External_Field_Interaction=_F(
+                                                                                  Type_Of_Interaction_With_An_External_Field='No',),),),),
+                        NumericalModel=_F(Identifier=CS_num_CFD_Discrete_Particles,
+                                          ModelType='Particles',
+                                          NumericalMethod='CFD_Discrete_Particles',
+                                          Solver='Code_Saturne',),);
+
+Interactions(InteractionComposant=_F(origine=CS_num_FV,
+                                     destination=CS_num_CFD_Discrete_Particles,
+                                     termeLE='Fluid_Velocity_Field',),);
+
+sansnom=Component(SystemType='Continuum system',
+                  PhysicalDescription=_F(FluidComplexe=False,
+                                         FlowNature=None,
+                                         Thermal=_F(ThermalEffects='Non thermal',
+                                                    DensityEquationOfState='Constant density',),),
+                  NumericalModel=_F(Identifier=None,
+                                    ModelType='Fields',
+                                    Mesh_Identifiers=(half_pipe,),
+                                    NumericalMethod='FV',
+                                    Solver=None,),);
+#CHECKSUM:cfeb01a69d022d11f6ec99fd0baf183e  -:FIN CHECKSUM
\ No newline at end of file

diff --git a/Vimmp/cata_CSAndCPS_test_driver_2.comm b/Vimmp/cata_CSAndCPS_test_driver_2.comm
deleted file mode 100644 (file)
index d27516d..0000000
--- a/Vimmp/cata_CSAndCPS_test_driver_2.comm
+++ /dev/null
@@ -1,78 +0,0 @@
-P1=userDiscrete()
-CS_num_FV=modeleNumDuCompo()
-CS_num_CFD_Discrete_Particles=modeleNumDuCompo()
-half_pipe=meshIdentifier()
-inlet=meshGroup()
-outlet=meshGroup()
-wall=meshGroup()
-symetry=meshGroup()
-SD_11=meshGroup()
-inlet1=meshGroup()
-half_pipe2=meshIdentifier()
-
-Simulated_Time_Lapse(Initial_Time=None,
-                     Duration=None,);
-
-Spatial_Aspects(System_Geometry=_F(Shape=_F(Shape_Nature='Typical Geometry',
-                                            Box='Cube',
-                                            Size_Of_Bounding_Box=None,
-                                            ShapeIdentifier=None,),),
-                Spatial_Discretization=(_F(Mesh_Name=half_pipe,
-                                           FileFormat='med',
-                                           FileName='/home/eric/VIMMP/vimmptraining/app/fluide+particule/datafiles/half_pipe.med',
-                                           GroupIdentifier=(inlet,outlet,wall,symetry,SD_11,),),
-                                        _F(Mesh_Name=half_pipe2,
-                                           FileFormat='med',
-                                           FileName='/home/eric/VIMMP/vimmptraining/app/fluide+particule/datafiles/half_pipe.med',
-                                           GroupIdentifier=(inlet1,),),),);
-
-FluidComponent=Component(SystemType='Continuum system',
-                         PhysicalDescription=_F(FluidComplexe=False,
-                                                FlowNature='Turbulent',
-                                                TurbulenceForFlowDynamics=_F(TurbulenceModellingType='One-point moment',
-                                                                             RANSModel='Turbulent-Viscosity Model(TVM)',
-                                                                             TVMChoice='k-epsilon',),
-                                                Thermal=_F(ThermalEffects='Non thermal',
-                                                           DensityEquationOfState='Constant density',),
-                                                AdditionalScalars=_F(Scalar=(_F(Name=None,
-                                                                                ScalarFluxModel=_F(TurbulenceModellingType=\
-                                                                                                                 'No Model (DNS)',
-                                                                                                   ChoiceOfApproach=None,),),
-                                                                             _F(Name=None,),),),
-                                                ScalarTurbulenceModelling=_F(TurbulenceModellingType=None,),),
-                         NumericalModel=_F(Identifier=CS_num_FV,
-                                           ModelType='Fields',
-                                           NumericalMethod='FV',
-                                           Solver='Code_Saturne',
-                                           Mesh_Identifiers=(half_pipe,),),);
-
-PartComponent=Component(SystemType='Classical particle system',
-                        PhysicalDescription=_F(Particle=_F(ParticleNature='Discrete Particle',
-                                                           DiscreteParticleName=P1,
-                                                           TypeOfDiscreteParticle='Solid',
-                                                           TypeOfSolid='Primary Particle',
-                                                           Properties=_F(Geometry='Sphere',
-                                                                         ParticleRadius=99.0,
-                                                                         Weight=_F(Mass=99.0,
-                                                                                   Density=99.0,),
-                                                                         Mechanical='Rigid',),
-                                                           List_Of_Interactions=_F(Bonded_Interactions=_F(
-                                                                                                  Type_Of_Bonded_Interaction='No',),
-                                                                                   Unbonded_Interactions=_F(
-                                                                                                Type_Of_Unbonded_Interaction='No',),
-                                                                                   External_Field_Interaction=_F(
-                                                                                  Type_Of_Interaction_With_An_External_Field='No',),),),),
-                        NumericalModel=_F(Identifier=CS_num_CFD_Discrete_Particles,
-                                          ModelType='Particles',
-                                          NumericalMethod='CFD_Discrete_Particles',
-                                          Solver='OpenFOAM',),);
-
-Interactions(Interaction=_F(origine=CS_num_FV,
-                            destination=CS_num_CFD_Discrete_Particles,
-                            termeLE='Fluid_Velocity_Field',
-                            fieldNameInOrigine=None,
-                            fieldNameInDetgination=None,
-                            transferType='File',
-                            Format='Use converter',
-                            converter='gmsh',),);
-#CHECKSUM:5346559f3e67b54f3c07a0ea4d7a176b  -:FIN CHECKSUM
\ No newline at end of file

diff --git a/Vimmp/cata_CSAndCPS_v3_test_driver_1.comm b/Vimmp/cata_CSAndCPS_v3_test_driver_1.comm
new file mode 100644 (file)
index 0000000..d27516d
--- /dev/null
+++ b/Vimmp/cata_CSAndCPS_v3_test_driver_1.comm
@@ -0,0 +1,78 @@
+P1=userDiscrete()
+CS_num_FV=modeleNumDuCompo()
+CS_num_CFD_Discrete_Particles=modeleNumDuCompo()
+half_pipe=meshIdentifier()
+inlet=meshGroup()
+outlet=meshGroup()
+wall=meshGroup()
+symetry=meshGroup()
+SD_11=meshGroup()
+inlet1=meshGroup()
+half_pipe2=meshIdentifier()
+
+Simulated_Time_Lapse(Initial_Time=None,
+                     Duration=None,);
+
+Spatial_Aspects(System_Geometry=_F(Shape=_F(Shape_Nature='Typical Geometry',
+                                            Box='Cube',
+                                            Size_Of_Bounding_Box=None,
+                                            ShapeIdentifier=None,),),
+                Spatial_Discretization=(_F(Mesh_Name=half_pipe,
+                                           FileFormat='med',
+                                           FileName='/home/eric/VIMMP/vimmptraining/app/fluide+particule/datafiles/half_pipe.med',
+                                           GroupIdentifier=(inlet,outlet,wall,symetry,SD_11,),),
+                                        _F(Mesh_Name=half_pipe2,
+                                           FileFormat='med',
+                                           FileName='/home/eric/VIMMP/vimmptraining/app/fluide+particule/datafiles/half_pipe.med',
+                                           GroupIdentifier=(inlet1,),),),);
+
+FluidComponent=Component(SystemType='Continuum system',
+                         PhysicalDescription=_F(FluidComplexe=False,
+                                                FlowNature='Turbulent',
+                                                TurbulenceForFlowDynamics=_F(TurbulenceModellingType='One-point moment',
+                                                                             RANSModel='Turbulent-Viscosity Model(TVM)',
+                                                                             TVMChoice='k-epsilon',),
+                                                Thermal=_F(ThermalEffects='Non thermal',
+                                                           DensityEquationOfState='Constant density',),
+                                                AdditionalScalars=_F(Scalar=(_F(Name=None,
+                                                                                ScalarFluxModel=_F(TurbulenceModellingType=\
+                                                                                                                 'No Model (DNS)',
+                                                                                                   ChoiceOfApproach=None,),),
+                                                                             _F(Name=None,),),),
+                                                ScalarTurbulenceModelling=_F(TurbulenceModellingType=None,),),
+                         NumericalModel=_F(Identifier=CS_num_FV,
+                                           ModelType='Fields',
+                                           NumericalMethod='FV',
+                                           Solver='Code_Saturne',
+                                           Mesh_Identifiers=(half_pipe,),),);
+
+PartComponent=Component(SystemType='Classical particle system',
+                        PhysicalDescription=_F(Particle=_F(ParticleNature='Discrete Particle',
+                                                           DiscreteParticleName=P1,
+                                                           TypeOfDiscreteParticle='Solid',
+                                                           TypeOfSolid='Primary Particle',
+                                                           Properties=_F(Geometry='Sphere',
+                                                                         ParticleRadius=99.0,
+                                                                         Weight=_F(Mass=99.0,
+                                                                                   Density=99.0,),
+                                                                         Mechanical='Rigid',),
+                                                           List_Of_Interactions=_F(Bonded_Interactions=_F(
+                                                                                                  Type_Of_Bonded_Interaction='No',),
+                                                                                   Unbonded_Interactions=_F(
+                                                                                                Type_Of_Unbonded_Interaction='No',),
+                                                                                   External_Field_Interaction=_F(
+                                                                                  Type_Of_Interaction_With_An_External_Field='No',),),),),
+                        NumericalModel=_F(Identifier=CS_num_CFD_Discrete_Particles,
+                                          ModelType='Particles',
+                                          NumericalMethod='CFD_Discrete_Particles',
+                                          Solver='OpenFOAM',),);
+
+Interactions(Interaction=_F(origine=CS_num_FV,
+                            destination=CS_num_CFD_Discrete_Particles,
+                            termeLE='Fluid_Velocity_Field',
+                            fieldNameInOrigine=None,
+                            fieldNameInDetgination=None,
+                            transferType='File',
+                            Format='Use converter',
+                            converter='gmsh',),);
+#CHECKSUM:5346559f3e67b54f3c07a0ea4d7a176b  -:FIN CHECKSUM
\ No newline at end of file

diff --git a/Vimmp/cata_CSAndCPS_v4_test_driver_1.comm b/Vimmp/cata_CSAndCPS_v4_test_driver_1.comm
new file mode 100644 (file)
index 0000000..c81b462
--- /dev/null
+++ b/Vimmp/cata_CSAndCPS_v4_test_driver_1.comm
@@ -0,0 +1,76 @@
+P1=userDiscrete()
+CS_num_FV=modeleNumDuCompo()
+CS_num_CFD_Discrete_Particles=modeleNumDuCompo()
+half_pipe=meshIdentifier()
+inlet=meshGroup()
+outlet=meshGroup()
+wall=meshGroup()
+symetry=meshGroup()
+SD_11=meshGroup()
+inlet1=meshGroup()
+half_pipe2=meshIdentifier()
+
+
+Spatial_Aspects(System_Geometry=_F(Shape=_F(Shape_Nature='Typical Geometry',
+                                            Box='Cube',
+                                            Size_Of_Bounding_Box=None,
+                                            ShapeIdentifier=None,),),
+                Spatial_Discretization=(_F(Mesh_Name=half_pipe,
+                                           FileFormat='med',
+                                           FileName='/home/eric/VIMMP/vimmptraining/app/fluide+particule/datafiles/half_pipe.med',
+                                           GroupIdentifier=(inlet,outlet,wall,symetry,SD_11,),),
+                                        _F(Mesh_Name=half_pipe2,
+                                           FileFormat='med',
+                                           FileName='/home/eric/VIMMP/vimmptraining/app/fluide+particule/datafiles/half_pipe.med',
+                                           GroupIdentifier=(inlet1,),),),);
+
+FluidComponent=Component(SystemType='Continuum system',
+                         PhysicalDescription=_F(FluidComplexe=False,
+                                                FlowNature='Turbulent',
+                                                TurbulenceForFlowDynamics=_F(TurbulenceModellingType='One-point moment',
+                                                                             RANSModel='Turbulent-Viscosity Model(TVM)',
+                                                                             TVMChoice='k-epsilon',),
+                                                Thermal=_F(ThermalEffects='Non thermal',
+                                                           DensityEquationOfState='Constant density',),
+                                                AdditionalScalars=_F(Scalar=(_F(Name=None,
+                                                                                ScalarFluxModel=_F(TurbulenceModellingType=\
+                                                                                                                 'No Model (DNS)',
+                                                                                                   ChoiceOfApproach=None,),),
+                                                                             _F(Name=None,),),),
+                                                ScalarTurbulenceModelling=_F(TurbulenceModellingType=None,),),
+                         NumericalModel=_F(Identifier=CS_num_FV,
+                                           ModelType='Fields',
+                                           NumericalMethod='FV',
+                                           Solver='Code_Saturne',
+                                           Mesh_Identifiers=(half_pipe,),),);
+
+PartComponent=Component(SystemType='Classical particle system',
+                        PhysicalDescription=_F(Particle=_F(ParticleNature='Discrete Particle',
+                                                           DiscreteParticleName=P1,
+                                                           TypeOfDiscreteParticle='Solid',
+                                                           TypeOfSolid='Primary Particle',
+                                                           Properties=_F(Geometry='Sphere',
+                                                                         ParticleRadius=99.0,
+                                                                         Weight=_F(Mass=99.0,
+                                                                                   Density=99.0,),
+                                                                         Mechanical='Rigid',),
+                                                           List_Of_Interactions=_F(Bonded_Interactions=_F(
+                                                                                                  Type_Of_Bonded_Interaction='No',),
+                                                                                   Unbonded_Interactions=_F(
+                                                                                                Type_Of_Unbonded_Interaction='No',),
+                                                                                   External_Field_Interaction=_F(
+                                                                                  Type_Of_Interaction_With_An_External_Field='No',),),),),
+                        NumericalModel=_F(Identifier=CS_num_CFD_Discrete_Particles,
+                                          ModelType='Particles',
+                                          NumericalMethod='CFD_Discrete_Particles',
+                                          Solver='OpenFOAM',),);
+
+Interactions(Interaction=_F(origine=CS_num_FV,
+                            destination=CS_num_CFD_Discrete_Particles,
+                            termeLE='Fluid_Velocity_Field',
+                            fieldNameInOrigine=None,
+                            fieldNameInDetgination=None,
+                            transferType='File',
+                            Format='Use converter',
+                            converter='gmsh',),);
+#CHECKSUM:5346559f3e67b54f3c07a0ea4d7a176b  -:FIN CHECKSUM