From: pascale.noyret Date: Wed, 24 Feb 2021 09:52:25 +0000 (+0100) Subject: synchronisation machine Eric X-Git-Tag: V210224_osthus~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=93f769d43b4ada1507cd2369b481bbbcb1688ad5;p=tools%2Feficas.git synchronisation machine Eric --- diff --git a/UiQT5/desWidget4a6RadioButton.ui b/UiQT5/desWidget4a6RadioButton.ui index f9a8b15a..8a0f4d8b 100644 --- a/UiQT5/desWidget4a6RadioButton.ui +++ b/UiQT5/desWidget4a6RadioButton.ui @@ -25,7 +25,7 @@ 16777215 - 16777215 + 160 diff --git a/Vimmp/cata_CSAndCPS_v15.py b/Vimmp/cata_CSAndCPS_v15.py index a97dc0b0..05863eb9 100644 --- a/Vimmp/cata_CSAndCPS_v15.py +++ b/Vimmp/cata_CSAndCPS_v15.py @@ -891,14 +891,17 @@ def prepareBlocOrigine(condition): ), ), ) -# ___________________________________________________________________________ -def prepareBlocInitialisation( condition, ajoutPossible=None, particle=False): -# ___________________________________________________________________________ +# __________________________________________________________________ +def prepareBlocInitialisation(condition,ajoutPossible=None,particle=False): +# __________________________________________________________________ monIntoType = ['ByValue', 'ByFile', 'ByInteraction'] + dicoParticle = {} + if particle : dicoParticle['ParticleIdentifier']=SIMP(statut='o', typ = userParticle) if ajoutPossible != None : monIntoType.append(ajoutPossible) return BLOC(condition = condition, Initialisation = FACT(statut ='o', + **dicoParticle, InitialisationType = SIMP(statut='o', into = monIntoType, typ ='TXM', defaut='ByValue'), blocByFile = creeBlocPourLesFichiers('InitialisationType == "ByFile"', '', ListeFormats = listeFormatGenerique, FieldName='FieldName'), blocByInteraction = BLOC(condition = 'InitialisationType == "ByInteraction"', @@ -915,6 +918,11 @@ def prepareBlocInitialisation( condition, ajoutPossible=None, particle=False): def prepareBlocInitialisationParticle(condition, termeSource=True): monIntoType = ['ByValue', 'ByFile', 'ByInteraction','Not needed' ] + dicoTermeSource = {} + if termeSource : + dicoTermeSource['SourceTerm'] = SIMP(typ=bool, statut='o', defaut=False), + dicoTermeSource['blocSourceTerm'] = prepareTermeSourceDynVar('SourceTerm==True') + if termeSource : return BLOC(condition = condition, Initialisation = FACT(statut ='o', @@ -1398,6 +1406,7 @@ Interpolator = OPER (nom= 'Interpolator',sd_prod=interpolator, blocMedCoupling= BLOC(condition="InterpolatorType == 'Med Coupling'", TargetMeshIdentifier = SIMP(statut ='o', typ = meshIdentifier,), InterpolationType = SIMP(statut ='o', typ='TXM', into=['P0P0','P0P1','P1P1','P1P0'],), + DefaultValueForUnmatchedMeshTargetEntity = SIMP(statut='o', typ ='R', defaut=-1), ), ) Converter = OPER (nom= 'Converter',sd_prod=converter) diff --git a/Vimmp/cata_CSAndCPS_v15_test_driver_1.comm b/Vimmp/cata_CSAndCPS_v15_test_driver_1.comm new file mode 100644 index 00000000..7243fbcf --- /dev/null +++ b/Vimmp/cata_CSAndCPS_v15_test_driver_1.comm @@ -0,0 +1,281 @@ +Pressure=dynamicVariable() +Temperature=scalar() +Time1=simulatedTime() +CS_Num1=modeleNumDuCompo() +CS_Num2=modeleNumDuCompo() +Group_From_Mesh1=meshGroup() +Group_From_Mesh2=meshGroup() +Average_Velocity=dynamicVariable() +Epsilon=scalar() +outlet=meshGroup() +symmetry=meshGroup() +wall=meshGroup() +inlet1=meshGroup() +inlet2=meshGroup() +fluidfile=fileId() +CS_Num1__CS_Num2_Velocity=interaction() +CS_Num1__CS_Num2_Epsilon=interaction() +CS_Num1__CS_Num2_Pressure=interaction() +Time2=simulatedTime() +half_pipe_21_60=meshIdentifier() +half_pipe_15_40=meshIdentifier() +Interpolated_Pressure_File=fileId() +Interpolated_Rij_File=fileId() +Interpolated_Epsilon_File=fileId() +interpolated_Velocity_File=fileId() +Position=dynamicVariable() +Velocity=dynamicVariable() +Rij=scalar() +Colloids=userDiscrete() +Diameter=dynamicVariable() +Mass=dynamicVariable() +WallReboundCondition=wallInteractionId() +FluidSeenVelocity=dynamicVariable() +CS_Num1__CS_Num2_Rij=interaction() + +EnvironementAspects(WorkflowName='Inria', + WorkingDirectory='/tmp',); + +SpatialAspects(SpatialDiscretization=(_F(MeshId=half_pipe_21_60, + MeshName='half_pipe_generation_2inlet', + MeshFileFormat='Med', + MeshFileName=\ + '/home/eric/VIMMP/vimmptraining/app/fluide+mapper+particule/datafiles/half_pipe_21_60_2inlet.med', + GroupIdentifier=(inlet1,inlet2,outlet,symmetry,wall,Group_From_Mesh1,),), + _F(MeshId=half_pipe_15_40, + MeshName='half_pipe_generation_2inlet', + MeshFileFormat='Med', + MeshFileName=\ + '/home/eric/VIMMP/vimmptraining/app/fluide+mapper+particule/datafiles/half_pipe_15_40_2inlet.med', + GroupIdentifier=(inlet1,inlet2,outlet,symmetry,wall,Group_From_Mesh2,),),),); + +TemporalAspects(Simulated_Time_Laps=(_F(name=Time1, + initialTime=0.0, + finalTime=10.0, + timeDiscretization='Constant Time Step', + constantTimeStep=0.1,), + _F(name=Time2, + initialTime=10.0, + finalTime=15.0, + timeDiscretization='Constant Time Step', + constantTimeStep=0.01,),),); + +FluidComponent=Component(SystemType='Continuum system', + PhysicalDescription=_F(ComplexFluid=False, + FlowNature='Turbulent', + DensityInitialisation=_F(DensityValueType='Value', + Density=1.17862,), + ViscosityInitialisation=_F(ViscosityValueType='Value', + Viscosity=0.0183,), + TurbulenceForFlowDynamics=_F(TurbulenceModellingType='One-point moment', + RANSModel='Reynolds Stress Model (RSM)', + RSMChoice='Rotta',), + DynamicalVariables=_F(VariablesSimulation=True, + PressureDefinition=_F(Pressure=Pressure, + Initialisation=_F(InitialisationType=\ + 'ByValue', + Value=0.0,), + SourceTerm=False,), + VelocityDefinition=_F(AverageVelocity=Average_Velocity, + Initialisation=_F(InitialisationType=\ + 'ByValue', + Value=0.0,), + SourceTerm=False,), + EpsilonDefinition=_F(Name=Epsilon, + Initialisation=_F(InitialisationType=\ + 'ByValue', + Value=1.3e-06,), + SourceTerm=False,), + RijDefinition=_F(Name=Rij, + Initialisation=_F(InitialisationType=\ + 'ByValue', + Value=0.0004,), + SourceTerm=False,),), + Thermal=_F(ThermalEffects='Non thermal', + ReferenceTemperature=293.15,), + Scalars=_F(withScalars=False,),), + NumericalModel=_F(Identifier=CS_Num1, + SimulatedTimeLapse=Time1, + ChoiceOfApproach='Field_based', + NumericalMethod='FV', + Solver='Code_Saturne', + MeshIdentifiers=(half_pipe_21_60,),), + BoundaryConditions=_F(BoundaryCondition=(_F(TypeOfBoundaryCondition='Inlet', + ApplyOnGroups=(inlet1,inlet2,), + ApplyOnStateVariable=(Average_Velocity,), + FormulationOfBoundary='Dirichlet', + Consigne=\ + 'Choose between InletProfile,IntegratedValue,IntegratedVectorValue ', + IntegratedVectorValue=_F(U=1.0, + V=0.0, + W=0.0,),), + _F(TypeOfBoundaryCondition='Outlet', + ApplyOnGroups=(outlet,),), + _F(TypeOfBoundaryCondition='Wall', + ApplyOnGroups=(wall,), + VelocityAtBoundary=_F(SlipVelocity=0.0, + WallMotion=_F(U=0.0, + V=0.0, + W=0.0,),), + LevelOfDescription=_F(WallFunction='2-scale model (Log law)',),), + _F(TypeOfBoundaryCondition='Symmetry', + ApplyOnGroups=(symmetry,), + ApplyOnStateVariable=(Pressure,Average_Velocity,Epsilon,Rij,),),),),); + +PartComponent=Component(SystemType='Classical particle system', + PhysicalDescription=_F(Particles=_F(ParticleNature='Discrete Particle', + ParticleName=Colloids, + InitialNumberOfParticles=0, + TypeOfDiscreteParticle='Solid', + PrimaryOrAggregate='Primary Particle', + Properties=_F(Geometry='Sphere', + ReferenceParticleRadius=1e-05, + Weight=_F(Density=1000.0,), + Mechanical='Rigid',),), + AmbiantMediaInteraction=_F(MomentumExchange=_F(withMomentumExchange=True, + MomentumFieldType=('Hydrodynamic',), + DefineForceOnParticle=_F( + TypeOfHydroDynamicForce=('Drag',), + FieldAppliesOnAllSpecies=True, + NatureOfFluidForce=_F( + NatureOfFlow='Turbulent', + TurbulenceModellingType='One-point moment', + RANSModel='Turbulent-Viscosity Model (TVM)', + TurbulenceModelDispersion='Langevin', + InitialisationType='ByInteraction', + Consigne='Create and choose suitable interaction', + InteractionNameForPressure=CS_Num1__CS_Num2_Pressure, + InteractionNameForVelocity=CS_Num1__CS_Num2_Velocity, + InteractionNameForEpsilon=CS_Num1__CS_Num2_Epsilon, + InteractionNameForRij=CS_Num1__CS_Num2_Rij,),),), + MassExchange=_F(withMassExchange=False,), + EnergyExchange=_F(withEnergyExchange=False,), + AmbientInducedProcesses=_F(withAmbientInducedProcesses=\ + False,), + AdditionalSamplingOfAmbientMedia=_F( + withAdditionalSamplingOfAmbientMedia=False,),), + ParticleParticleInteraction=_F(BondedInteractions=_F(BondedParticles=False,), + ActionsAtDistance=_F(withActionsAtDistance=False,), + ContactPhenomena=_F(withContactPhenomena=False,),), + ParticleWallInteraction=_F(withParticleWallInteraction=True, + ParticleWallInteractionId=WallReboundCondition, + TypeOfWall=_F(Dynamics='Fixed position', + LevelOfDescription='Continuum', + SurfaceTexture='Smooth',), + ActionsAtDistance=_F(withActionsAtDistance=False,), + ContactPhenomena=_F(withContactPhenomena=True, + LevelOfDescription='Macroscopic', + OutcomeOfContact='Elastic collision',),), + ConstraintsAndReducedStatisticalDescription=_F(Constraint=_F(TypeOfConstraint= + ('Time-marching_non-equilibrium', + ),),), + StateVector=_F(ParticleDiameter=_F(Diameter=Diameter, + ToSimulate=False,), + ParticleMass=_F(Mass=Mass, + ToSimulate=False,), + ParticlePosition=_F(Position=Position, + ToSimulate=True, + Initialisation=_F(InitialisationType='Not needed',),), + ParticleVelocity=_F(Velocity=Velocity, + ToSimulate=True, + Initialisation=_F(InitialisationType='Not needed', + SourceTerm=False,),), + FluidVelocitySeenByParticles=_F(FluidSeenVelocity=FluidSeenVelocity, + ToSimulate=True, + Initialisation=_F(InitialisationType=\ + 'Not needed', + SourceTerm=False,),),),), + NumericalModel=_F(Identifier=CS_Num2, + SimulatedTimeLapse=Time2, + ChoiceOfApproach='Particle_based', + NumericalMethod='CFD_Discrete_Particle_based', + Solver='Code_Saturne', + MeshIdentifiers=(half_pipe_15_40,),), + BoundaryConditions=_F(BoundaryCondition=(_F(TypeOfBoundaryCondition='Inlet', + ApplyOnGroups=(inlet2,), + NumberOfParticleInjected=100, + InjectionEveryNTimeSteps=1, + DiameterOfParticleInjected=1e-05, + MassOfParticleInjected=4.2e-12, + PositionOfParticleInjected=_F(InitialisationMode='ByFormula',), + ParticleVelocity=_F(InitialisationMode='ByFormula',), + FluidVelocitySeenByParticles=_F(InitialisationMode='ByFormula',),), + _F(TypeOfBoundaryCondition='Outlet', + ApplyOnGroups=(outlet,inlet1,),), + _F(TypeOfBoundaryCondition='Symmetry', + ApplyOnGroups=(symmetry,), + ApplyOnStateVariable= + + (Position,Velocity, + Diameter,Mass, + FluidSeenVelocity,),), + _F(TypeOfBoundaryCondition='Wall', + ApplyOnGroups=(wall,), + ApplyOnStateVariable=(Position,Velocity,FluidSeenVelocity,), + ChoiceOfParticleWallInteraction=WallReboundCondition,),),),); + +MedCouplingComponent=Interpolator(InterpolatorType='Med Coupling', + TargetMeshIdentifier=half_pipe_15_40, + InterpolationType='P0P0', + DefaultValueForUnmatchedMeshTargetEntity=-1.0,); + +Interactions(IOAspects=_F(FileTransfer=(_F(TransferId=fluidfile, + FileFormat='Med', + FileName='results_Fluid_domain.med',), + _F(TransferId=interpolated_Velocity_File, + FileFormat='Med', + FileName='results_Fluid_Interpolated_Velocity.med',), + _F(TransferId=Interpolated_Rij_File, + FileFormat='Med', + FileName='results_Fluid_Interpolated_Rij.med',), + _F(TransferId=Interpolated_Epsilon_File, + FileFormat='Med', + FileName='results_Fluid_Interpolated_Epsilon.med',), + _F(TransferId=Interpolated_Pressure_File, + FileFormat='Med', + FileName='results_Fluid_Interpolated_Pressure.med',),),), + Interaction=(_F(InteractionName=CS_Num1__CS_Num2_Velocity, + From=CS_Num1, + To=CS_Num2, + InvolvedStateVariable=Average_Velocity, + InteractionConfiguration=_F(OutputId=fluidfile, + FieldName='Velocity', + CouplingMode='DataProcessing', + DataProcessingNode=_F(Tool=MedCouplingComponent, + OutputId=interpolated_Velocity_File, + FieldName='Velocity', + FieldNature='IntensiveMaximum',),),), + _F(InteractionName=CS_Num1__CS_Num2_Epsilon, + From=CS_Num1, + To=CS_Num2, + InvolvedStateVariable=Epsilon, + InteractionConfiguration=_F(OutputId=fluidfile, + FieldName='epsilon', + CouplingMode='DataProcessing', + DataProcessingNode=_F(Tool=MedCouplingComponent, + OutputId=Interpolated_Epsilon_File, + FieldName='epsilon', + FieldNature='IntensiveMaximum',),),), + _F(InteractionName=CS_Num1__CS_Num2_Pressure, + From=CS_Num1, + To=CS_Num2, + InvolvedStateVariable=Pressure, + InteractionConfiguration=_F(OutputId=fluidfile, + FieldName='Pressure', + CouplingMode='DataProcessing', + DataProcessingNode=_F(Tool=MedCouplingComponent, + OutputId=Interpolated_Pressure_File, + FieldName='Pressure', + FieldNature='IntensiveMaximum',),),), + _F(InteractionName=CS_Num1__CS_Num2_Rij, + From=CS_Num1, + To=CS_Num2, + InvolvedStateVariable=Rij, + InteractionConfiguration=_F(OutputId=fluidfile, + FieldName='Rij', + CouplingMode='DataProcessing', + DataProcessingNode=_F(Tool=MedCouplingComponent, + OutputId=Interpolated_Rij_File, + FieldName='Rij', + FieldNature='IntensiveMaximum',),),),),); +#CHECKSUM:e5f0a89820583811aab53201d988431a -:FIN CHECKSUM \ No newline at end of file