From e75d7dbce84626667b8e1b71810e0031a5f29b54 Mon Sep 17 00:00:00 2001 From: Eric F Date: Thu, 15 Oct 2020 12:18:27 +0200 Subject: [PATCH] Modification des Makefiles et adaptation des catalogues avant de tagger une version V0 --- Tests/MappingAccasXsd/Ambiguite/GNUmakefile | 7 +- Tests/MappingAccasXsd/GNUmakefile | 10 ++- .../cata_MemesNoms_test_driver_0.comm | 6 ++ .../cata_UserAssd_test_driver_1.comm | 12 +++ Vimmp/GNUmakefile | 6 +- Vimmp/cata_CSAndCPS.py | 21 +++--- ...ata_CSAndCPS.xsd => cata_CSAndCPS_ref.xsd} | 74 +++++++++++-------- Vimmp/cata_CSAndCPS_test_driver_0.comm | 44 +++++++++++ Vimmp/cata_CSAndCPS_test_driver_0_ref.xml | 70 ++++++++++++++++++ Vimmp/cata_cps.py | 2 +- Vimmp/cata_cps_test_driver_0.comm | 12 +++ Vimmp/cata_gromacs.py | 2 +- Vimmp/fluid+particle.comm | 1 + Vimmp/fluid+particle.xml | 1 + 14 files changed, 215 insertions(+), 53 deletions(-) create mode 100644 Tests/MappingAccasXsd/cata_MemesNoms_test_driver_0.comm create mode 100644 Tests/MappingAccasXsd/cata_UserAssd_test_driver_1.comm rename Vimmp/{cata_CSAndCPS.xsd => cata_CSAndCPS_ref.xsd} (87%) create mode 100644 Vimmp/cata_CSAndCPS_test_driver_0.comm create mode 100644 Vimmp/cata_CSAndCPS_test_driver_0_ref.xml create mode 100644 Vimmp/cata_cps_test_driver_0.comm create mode 120000 Vimmp/fluid+particle.comm create mode 120000 Vimmp/fluid+particle.xml diff --git a/Tests/MappingAccasXsd/Ambiguite/GNUmakefile b/Tests/MappingAccasXsd/Ambiguite/GNUmakefile index 853f7330..36f646ef 100644 --- a/Tests/MappingAccasXsd/Ambiguite/GNUmakefile +++ b/Tests/MappingAccasXsd/Ambiguite/GNUmakefile @@ -54,9 +54,12 @@ cata3Blocs1MCauMilieu_V3.py \ cata3Blocs3MCauMilieu.py \ cata_Ambigu_1_Commun.py \ cata_Ambigu_2_Commun.py \ +cata_Ambigu_UnionType.py \ cata_blocs_En_Cascade.py \ -cataFactMemeNomTypesDifferents.py \ -cataSimpMemeNomTypesDifferents.py +cata_FactIdentique.py \ +cata_AmbiguSousAmbigu.py \ +cataSimpMemeNomTypesDifferents.py \ +cataBlocsAmbigusConsecutifs.py xsd_files = $(cata_files:%.py=%.xsd) driver_files= $(cata_files:%.py=%_driver.py) diff --git a/Tests/MappingAccasXsd/GNUmakefile b/Tests/MappingAccasXsd/GNUmakefile index 54a174d8..a10f53fc 100644 --- a/Tests/MappingAccasXsd/GNUmakefile +++ b/Tests/MappingAccasXsd/GNUmakefile @@ -35,14 +35,14 @@ define cata_dependencies = #cata_1$1 : cata_depend$1 endef -#Définition des dépendances le modèle .py +#Définition des dépendances pour le modèle .py $(eval $(call cata_dependencies,.py)) -#Définition des dépendances le modèle .xsd +#Définition des dépendances pour le modèle .xsd $(eval $(call cata_dependencies,.xsd)) # $(subst .py,.xsd,cata_dependencies) -cata_files= cata_1.py cata_UserAssd.py cata_ASSD.py +cata_files= cata_1.py cata_UserAssd.py cata_ASSD.py cataMemesNoms.py xsd_files = $(cata_files:%.py=%.xsd) driver_files= $(cata_files:%.py=%_driver.py) @@ -74,6 +74,8 @@ driverAll: exec.sh environ.sh qtEficas.sh $(driver_files) check test: testAll +################# REGLES DE TESTS ######################## + #Génération d'un .py de test par .xml de référence #TODO : Améliorer la génération pour ne pas regénérer inutilement les drivers, utilser plus les règles Makefiles... #TODO : Gestion ds un build séparé du srcdir @@ -94,6 +96,8 @@ testAll: testGen exec.sh driverAll # $(wildcard *_test_driver_?.xml) : test_driver.py # do sed -e "s,@module@,${@:%_test_driver=%_driver},g" -e 's,@file@,$@,g' test_driver.py > ${@:%.xml=%.py}; done +################# REGLES DE NETTOYAGE ######################## + clean: rm -f *.pyc *~ qtEficasSlm.sh exec.sh environ.sh rm -rf raw binding.py __pycache__ diff --git a/Tests/MappingAccasXsd/cata_MemesNoms_test_driver_0.comm b/Tests/MappingAccasXsd/cata_MemesNoms_test_driver_0.comm new file mode 100644 index 00000000..26a325c3 --- /dev/null +++ b/Tests/MappingAccasXsd/cata_MemesNoms_test_driver_0.comm @@ -0,0 +1,6 @@ + +MonProc(FInt=_F(monObjet=10,), + FFloat=_F(monObjet=11.0,), + FText=_F(monObjet='12',),); +#VERSION_CATALOGUE:V_0:FIN VERSION_CATALOGUE +#CHECKSUM:c52430ce2be95bcfba1cfc4e6df07615 -:FIN CHECKSUM \ No newline at end of file diff --git a/Tests/MappingAccasXsd/cata_UserAssd_test_driver_1.comm b/Tests/MappingAccasXsd/cata_UserAssd_test_driver_1.comm new file mode 100644 index 00000000..0d4a7bc4 --- /dev/null +++ b/Tests/MappingAccasXsd/cata_UserAssd_test_driver_1.comm @@ -0,0 +1,12 @@ +essai=laClasseUser() +bbb=laClasseUser() + +UtiliseUserAssD(utiliseListeUneListeUserAssd=(essai,bbb,),); + +DefinitionDsSimpDsProc(creeUserAssd=essai,); + +Op1=DefinitionDsSimpDsOper(creeUserAssd=bbb,); + +UtiliseUserAssD(utiliseListeUneListeUserAssd=(essai,essai,bbb,bbb,),); +#VERSION_CATALOGUE:V_0:FIN VERSION_CATALOGUE +#CHECKSUM:1fd75f9f9ce1bc9262b74611e99a4977 -:FIN CHECKSUM \ No newline at end of file diff --git a/Vimmp/GNUmakefile b/Vimmp/GNUmakefile index 71449ac5..15686c72 100644 --- a/Vimmp/GNUmakefile +++ b/Vimmp/GNUmakefile @@ -40,10 +40,10 @@ $(eval $(call cata_dependencies,.xsd)) # $(subst .py,.xsd,cata_dependencies) cata_files= \ -cata_gromacs.py \ +cata_cps.py \ +cata_CSAndCPS.py \ cata_Vimmp.py \ -cata_CSAndCPS.py -#cata_cps.py +cata_gromacs.py xsd_files = $(cata_files:%.py=%.xsd) driver_files= $(cata_files:%.py=%_driver.py) diff --git a/Vimmp/cata_CSAndCPS.py b/Vimmp/cata_CSAndCPS.py index c043affc..710c7783 100755 --- a/Vimmp/cata_CSAndCPS.py +++ b/Vimmp/cata_CSAndCPS.py @@ -1,4 +1,3 @@ - from Accas import * class composant(ASSD):pass @@ -12,7 +11,7 @@ class userDiscrete(userParticle) :pass class userDPD(userParticle) :pass dictSystemTypeModeleNumerique = { 'Quantum system' : (), - 'Classical partical system' : ('MD', 'DPD', 'LBM', 'SDPD','SPH','CFD_Discrete_Particles'), + 'Classical particle system' : ('MD', 'DPD', 'LBM', 'SDPD','SPH','CFD_Discrete_Particles'), 'Continuum system' :('Fluid_Fields','Fluid_Particles', 'SPH','Lagrangian one-particle pdf'), } @@ -20,8 +19,8 @@ dictSystemTypeModeleNumerique = { 'Quantum system' : (), dictTypModNumModNum = { ('Continuum system','Particles') : ('SPH','Lagrangian one-fluid-particle pdf'), ('Continuum system','Fields') : ('FV','FEM', 'Spectral method'), - ('Classical partical system','Particles') : ('MD', 'DPD', 'SDPD','SPH','CFD_Discrete_Particles'), - ('Classical partical system','Fields') : ('LBM',), + ('Classical particle system','Particles') : ('MD', 'DPD', 'SDPD','SPH','CFD_Discrete_Particles'), + ('Classical particle system','Fields') : ('LBM',), ('Quantum system','Particles') : ('Particle method',), ('Quantum system','Fields') : ('Wave',), } @@ -89,7 +88,7 @@ def prepareBlocSystemType(systemType) : setCode = set() for code in dictCodeModeleNumerique.keys(): if modeleNumerique in dictCodeModeleNumerique[code]: setCode.add(code) - Solver = SIMP(statut='o', typ='TXM', into=list(setCode), intoXML=allValueInDict(dictCodeModeleNumerique)) + Solver = SIMP(statut='o', typ='TXM', into=list(setCode), intoXML=list(dictCodeModeleNumerique.keys()) ) monNomBloc='b_ModelName_' + modeleNumerique.replace(' ','_') if setCode !=set(): dicoBloc[monNomBloc]=BLOC(condition=conditionNum, nomXML='b_ModelName',Solver=Solver) dicoArgs['b_modelType'+typeMod] = BLOC(condition=conditionType, NumericalMethod=NumericalMethod,**dicoBloc) @@ -409,8 +408,8 @@ def Particle(cardinalite) : ) def bloc_CPS(): - return BLOC(condition = 'SystemType == "Classical partical system"', - PhysicalDescription = FACT (statut ='o', + return BLOC(condition = 'SystemType == "Classical particle system"', + PhysicalDescription__tmp = FACT (statut ='o', Particle = Particle('**'), ) ) @@ -450,7 +449,7 @@ def bloc_FluideMacro(): # ---------------------- Scalaire additional bloc_scalar_FluidTurbulentandNonComplexe = BLOC(condition = "FluidComplexe == False and FlowNature == 'Turbulent'", - AdditionalScalars = FACT(statut = 'o', + AdditionalScalars__tmp1 = FACT(statut = 'o', Scalar = FACT(statut = 'f', max ='**', Name = SIMP(typ='TXM', statut='o',), ScalarFluxModel = FactTurbulence('f'), @@ -458,7 +457,7 @@ def bloc_FluideMacro(): ),# AdditionalScalars ), # fin FluidTurbulentandNonComplexe bloc_scalar_FluidLaminaireandNonComplexe = BLOC (condition = "FluidComplexe == False and FlowNature == 'Laminar'", - AdditionalScalars = FACT (statut = 'o', + AdditionalScalars__tmp2 = FACT (statut = 'o', Scalar = FACT ( statut = 'f', max ='**', Name = SIMP(typ='TXM', statut='o',), ),# Scalar @@ -477,11 +476,11 @@ JdC = JDC_CATA ( ) Component = OPER(nom='Component', sd_prod=composant, - SystemType = SIMP(typ='TXM', into=['Quantum system', 'Classical partical system', 'Continuum system'], statut='o'), + SystemType = SIMP(typ='TXM', into=['Quantum system', 'Classical particle system', 'Continuum system'], statut='o'), b_FluideMacro = bloc_FluideMacro(), b_bloc_CPS = bloc_CPS(), b_ModeleNumerique_quantum = prepareBlocSystemType('Quantum system'), - b_ModeleNumerique_classical = prepareBlocSystemType('Classical partical system'), + b_ModeleNumerique_classical = prepareBlocSystemType('Classical particle system'), b_ModeleNumerique_continuum = prepareBlocSystemType('Continuum system'), ) diff --git a/Vimmp/cata_CSAndCPS.xsd b/Vimmp/cata_CSAndCPS_ref.xsd similarity index 87% rename from Vimmp/cata_CSAndCPS.xsd rename to Vimmp/cata_CSAndCPS_ref.xsd index f6490ee6..ad9f2096 100644 --- a/Vimmp/cata_CSAndCPS.xsd +++ b/Vimmp/cata_CSAndCPS_ref.xsd @@ -7,7 +7,7 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="0"> - + @@ -527,32 +527,42 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="0"> - + - - - + + + + + + - - - - - + + - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -682,7 +692,7 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="0"> - + @@ -793,24 +803,24 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="0"> - + - + - + - + @@ -825,7 +835,7 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="0"> - + @@ -838,7 +848,7 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="0"> - + @@ -1231,19 +1241,19 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="0"> - + - + - + @@ -1340,7 +1350,7 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="0"> - + @@ -1403,11 +1413,11 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="0"> - + - {'T_NumericalMethod': {'_NumericalMethod_bloc_Field_bloc_no_model_TurbulenceForFlowDynamics_bloc_FlowNature_Turbulent_PhysicalDescriptionFM_b_FluideMacro_Component': 'T_NumericalMethod', '_NumericalMethod_bloc_Field_bloc_no_model_ThermalFluxModel_bloc_scalar_thermal_flux_bloc_ThermalEffects_Thermal_PhysicalDescriptionFM_b_FluideMacro_Component': 'T_NumericalMethod_1', '_NumericalMethod_bloc_Field_bloc_no_model_ScalarFluxModel_Scalar_AdditionalScalars_bloc_scalar_FluidTurbulentandNonComplexe_PhysicalDescriptionFM_b_FluideMacro_Component': 'T_NumericalMethod_2', '_NumericalMethod_bloc_Field_bloc_no_model_ScalarTurbulenceModelling_bloc_FlowNature_Turbulent_For_Scalars_PhysicalDescriptionFM_b_FluideMacro_Component': 'T_NumericalMethod_3', '_NumericalMethod_b_modelTypeParticles_NumericalModel_b_ModeleNumerique_quantum_Component': 'T_NumericalMethod_4'}, 'T_ChoiceOfApproach': {'_ChoiceOfApproach_bloc_one_spatial_TurbulenceForFlowDynamics_bloc_FlowNature_Turbulent_PhysicalDescriptionFM_b_FluideMacro_Component': 'T_ChoiceOfApproach', '_ChoiceOfApproach_bloc_one_spatial_ThermalFluxModel_bloc_scalar_thermal_flux_bloc_ThermalEffects_Thermal_PhysicalDescriptionFM_b_FluideMacro_Component': 'T_ChoiceOfApproach_1', '_ChoiceOfApproach_bloc_one_spatial_ScalarFluxModel_Scalar_AdditionalScalars_bloc_scalar_FluidTurbulentandNonComplexe_PhysicalDescriptionFM_b_FluideMacro_Component': 'T_ChoiceOfApproach_2', '_ChoiceOfApproach_bloc_one_spatial_ScalarTurbulenceModelling_bloc_FlowNature_Turbulent_For_Scalars_PhysicalDescriptionFM_b_FluideMacro_Component': 'T_ChoiceOfApproach_3'}, 'T_File': {'_File_td_txt_b_vdsfich_Electric_Field_b_elect_External_Field_Interaction_List_Of_Interactions_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_File', '_File_td_txt_b_vdsfich_Magnetic_Field_b_magnetic_External_Field_Interaction_List_Of_Interactions_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_File_1', '_File_td_txt_b_vdsfich_Hydrodynamic_Field_b_hydrodynamic_External_Field_Interaction_List_Of_Interactions_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_File_2'}, 'T_b_modelTypeParticles_b_modelTypeFields': {}, 'T_Name': {'_Name_Scalar_AdditionalScalars_bloc_scalar_FluidTurbulentandNonComplexe_PhysicalDescriptionFM_b_FluideMacro_Component': 'T_Name', '_Name_Specie_Species': 'T_Name_1'}, 'T_ChemicalSpecie': {'_ChemicalSpecie_Atom_b_Atom_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_ChemicalSpecie', '_ChemicalSpecie_b_Molecule_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_ChemicalSpecie_1'}, 'T_Shape': {'_Shape_b_Molecule_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_Shape', '_Shape_Geometric_Domain': 'T_Shape_1'}, 'T_BondedParticles': {'_BondedParticles_b_Dissipative_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_BondedParticles', '_BondedParticles_b_SolidAggregateBonded_Properties_b_Discrete_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_BondedParticles_1'}, 'T_b_SolidAggregate': {'_b_SolidAggregate_b_TypeDP_Solid_b_Discrete_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_b_SolidAggregate', '_b_SolidAggregate_Properties_b_Discrete_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_b_SolidAggregate_1'}, 'T_b_uniforme': {'_b_uniforme_Electric_Field_b_elect_External_Field_Interaction_List_Of_Interactions_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_b_uniforme', '_b_uniforme_Magnetic_Field_b_magnetic_External_Field_Interaction_List_Of_Interactions_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_b_uniforme_1', '_b_uniforme_Hydrodynamic_Field_b_hydrodynamic_External_Field_Interaction_List_Of_Interactions_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_b_uniforme_2'}, 'T_b_vdsfich': {'_b_vdsfich_Electric_Field_b_elect_External_Field_Interaction_List_Of_Interactions_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_b_vdsfich', '_b_vdsfich_Magnetic_Field_b_magnetic_External_Field_Interaction_List_Of_Interactions_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_b_vdsfich_1', '_b_vdsfich_Hydrodynamic_Field_b_hydrodynamic_External_Field_Interaction_List_Of_Interactions_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_b_vdsfich_2'}, 'T_Format': {'_Format_b_vdsfich_Electric_Field_b_elect_External_Field_Interaction_List_Of_Interactions_Particle_PhysicalDescription_b_bloc_CPS_Component': 'T_Format', '_Format_monBloc_Saturne_Fluent_InteractionComposant_Interactions': 'T_Format_1'}} + {'T_NumericalMethod': {'_NumericalMethod_bloc_Field_bloc_no_model_ThermalFluxModel_bloc_scalar_thermal_flux_bloc_ThermalEffects_Thermal_PhysicalDescription_b_FluideMacro_Component': 'T_NumericalMethod_3', '_NumericalMethod_bloc_N_particle_bloc_no_model_ThermalFluxModel_bloc_scalar_thermal_flux_bloc_ThermalEffects_Thermal_PhysicalDescription_b_FluideMacro_Component': 'T_NumericalMethod_3', '_NumericalMethod_bloc_Field_bloc_no_model_ScalarFluxModel_Scalar_AdditionalScalars__tmp1_bloc_scalar_FluidTurbulentandNonComplexe_PhysicalDescription_b_FluideMacro_Component': 'T_NumericalMethod_6', '_NumericalMethod_bloc_Field_bloc_no_model_ScalarFluxModel_Scalar_AdditionalScalars__tmp2_bloc_scalar_FluidLaminaireandNonComplexe_PhysicalDescription_b_FluideMacro_Component': 'T_NumericalMethod_6', '_NumericalMethod_bloc_N_particle_bloc_no_model_ScalarFluxModel_Scalar_AdditionalScalars__tmp1_bloc_scalar_FluidTurbulentandNonComplexe_PhysicalDescription_b_FluideMacro_Component': 'T_NumericalMethod_6', '_NumericalMethod_bloc_N_particle_bloc_no_model_ScalarFluxModel_Scalar_AdditionalScalars__tmp2_bloc_scalar_FluidLaminaireandNonComplexe_PhysicalDescription_b_FluideMacro_Component': 'T_NumericalMethod_6', '_NumericalMethod_bloc_Field_bloc_no_model_ScalarTurbulenceModelling_bloc_FlowNature_Turbulent_For_Scalars_PhysicalDescription_b_FluideMacro_Component': 'T_NumericalMethod_9', '_NumericalMethod_bloc_N_particle_bloc_no_model_ScalarTurbulenceModelling_bloc_FlowNature_Turbulent_For_Scalars_PhysicalDescription_b_FluideMacro_Component': 'T_NumericalMethod_9', '_NumericalMethod_b_modelTypeParticles_NumericalModel_b_ModeleNumerique_quantum_Component': 'T_NumericalMethod_12', '_NumericalMethod_b_modelTypeFields_NumericalModel_b_ModeleNumerique_quantum_Component': 'T_NumericalMethod_12', '_NumericalMethod_b_modelTypeParticles_NumericalModel_b_ModeleNumerique_classical_Component': 'T_NumericalMethod_12', '_NumericalMethod_b_modelTypeFields_NumericalModel_b_ModeleNumerique_classical_Component': 'T_NumericalMethod_12', '_NumericalMethod_b_modelTypeParticles_NumericalModel_b_ModeleNumerique_continuum_Component': 'T_NumericalMethod_12', '_NumericalMethod_b_modelTypeFields_NumericalModel_b_ModeleNumerique_continuum_Component': 'T_NumericalMethod_12'}, 'T_ChoiceOfApproach': {'_ChoiceOfApproach_bloc_one_spatial_ThermalFluxModel_bloc_scalar_thermal_flux_bloc_ThermalEffects_Thermal_PhysicalDescription_b_FluideMacro_Component': 'T_ChoiceOfApproach_3', '_ChoiceOfApproach_bloc_one_point_pdf_ThermalFluxModel_bloc_scalar_thermal_flux_bloc_ThermalEffects_Thermal_PhysicalDescription_b_FluideMacro_Component': 'T_ChoiceOfApproach_3', '_ChoiceOfApproach_bloc_no_model_ThermalFluxModel_bloc_scalar_thermal_flux_bloc_ThermalEffects_Thermal_PhysicalDescription_b_FluideMacro_Component': 'T_ChoiceOfApproach_3', '_ChoiceOfApproach_bloc_one_spatial_ScalarFluxModel_Scalar_AdditionalScalars__tmp1_bloc_scalar_FluidTurbulentandNonComplexe_PhysicalDescription_b_FluideMacro_Component': 'T_ChoiceOfApproach_6', '_ChoiceOfApproach_bloc_one_spatial_ScalarFluxModel_Scalar_AdditionalScalars__tmp2_bloc_scalar_FluidLaminaireandNonComplexe_PhysicalDescription_b_FluideMacro_Component': 'T_ChoiceOfApproach_6', '_ChoiceOfApproach_bloc_one_point_pdf_ScalarFluxModel_Scalar_AdditionalScalars__tmp1_bloc_scalar_FluidTurbulentandNonComplexe_PhysicalDescription_b_FluideMacro_Component': 'T_ChoiceOfApproach_6', '_ChoiceOfApproach_bloc_one_point_pdf_ScalarFluxModel_Scalar_AdditionalScalars__tmp2_bloc_scalar_FluidLaminaireandNonComplexe_PhysicalDescription_b_FluideMacro_Component': 'T_ChoiceOfApproach_6', '_ChoiceOfApproach_bloc_no_model_ScalarFluxModel_Scalar_AdditionalScalars__tmp1_bloc_scalar_FluidTurbulentandNonComplexe_PhysicalDescription_b_FluideMacro_Component': 'T_ChoiceOfApproach_6', '_ChoiceOfApproach_bloc_no_model_ScalarFluxModel_Scalar_AdditionalScalars__tmp2_bloc_scalar_FluidLaminaireandNonComplexe_PhysicalDescription_b_FluideMacro_Component': 'T_ChoiceOfApproach_6', '_ChoiceOfApproach_bloc_one_spatial_ScalarTurbulenceModelling_bloc_FlowNature_Turbulent_For_Scalars_PhysicalDescription_b_FluideMacro_Component': 'T_ChoiceOfApproach_9', '_ChoiceOfApproach_bloc_one_point_pdf_ScalarTurbulenceModelling_bloc_FlowNature_Turbulent_For_Scalars_PhysicalDescription_b_FluideMacro_Component': 'T_ChoiceOfApproach_9', '_ChoiceOfApproach_bloc_no_model_ScalarTurbulenceModelling_bloc_FlowNature_Turbulent_For_Scalars_PhysicalDescription_b_FluideMacro_Component': 'T_ChoiceOfApproach_9'}, 'T_File': {'_File_td_txt_b_vdsfich_Magnetic_Field_b_magnetic_External_Field_Interaction_List_Of_Interactions_Particle_PhysicalDescription__tmp_b_bloc_CPS_Component': 'T_File_2', '_File_td_med_1_b_vdsfich_Magnetic_Field_b_magnetic_External_Field_Interaction_List_Of_Interactions_Particle_PhysicalDescription__tmp_b_bloc_CPS_Component': 'T_File_2', '_File_td_txt_b_vdsfich_Hydrodynamic_Field_b_hydrodynamic_External_Field_Interaction_List_Of_Interactions_Particle_PhysicalDescription__tmp_b_bloc_CPS_Component': 'T_File_4', '_File_td_med_1_b_vdsfich_Hydrodynamic_Field_b_hydrodynamic_External_Field_Interaction_List_Of_Interactions_Particle_PhysicalDescription__tmp_b_bloc_CPS_Component': 'T_File_4'}, 'T_Name': {'_Name_Specie_Species': 'T_Name_1'}, 'T_ChemicalSpecie': {'_ChemicalSpecie_b_Molecule_Particle_PhysicalDescription__tmp_b_bloc_CPS_Component': 'T_ChemicalSpecie_1'}, 'T_Shape': {'_Shape_Geometric_Domain': 'T_Shape_1'}, 'T_BondedParticles': {'_BondedParticles_b_SolidAggregateBonded_Properties_b_Discrete_Particle_PhysicalDescription__tmp_b_bloc_CPS_Component': 'T_BondedParticles_1'}, 'T_Format': {'_Format_monBloc_Saturne_Fluent_InteractionComposant_Interactions': 'T_Format_3', '_Format_monBloc_Saturne_OpenFoam_InteractionComposant_Interactions': 'T_Format_3'}} - + \ No newline at end of file diff --git a/Vimmp/cata_CSAndCPS_test_driver_0.comm b/Vimmp/cata_CSAndCPS_test_driver_0.comm new file mode 100644 index 00000000..4a0783e1 --- /dev/null +++ b/Vimmp/cata_CSAndCPS_test_driver_0.comm @@ -0,0 +1,44 @@ +Part=userDiscrete() +P1=userDiscrete() +CS_num_FV=modeleNumDuCompo() +CS_num_CFD_Discrete_Particles=modeleNumDuCompo() + +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__tmp1=_F(),), + NumericalModel=_F(Identifier=CS_num_FV, + ModelType='Fields', + NumericalMethod='FV', + Solver='Code_Saturne',),); + +PartComponent=Component(SystemType='Classical particle system', + PhysicalDescription__tmp=_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',),); +#CHECKSUM:fa207a96edf7681b45eb685631acdaeb -:FIN CHECKSUM \ No newline at end of file diff --git a/Vimmp/cata_CSAndCPS_test_driver_0_ref.xml b/Vimmp/cata_CSAndCPS_test_driver_0_ref.xml new file mode 100644 index 00000000..213b2bb7 --- /dev/null +++ b/Vimmp/cata_CSAndCPS_test_driver_0_ref.xml @@ -0,0 +1,70 @@ + + + + Continuum system + + false + Turbulent + + One-point moment + Turbulent-Viscosity Model(TVM) + k-epsilon + + + Non thermal + Constant density + + + + + CS_num_FV + Fields + FV + Code_Saturne + + + + Classical particle system + + + Discrete Particle + P1 + Solid + Primary Particle + + Sphere + 99.0 + + 99.0 + 99.0 + + Rigid + + + + No + + + No + + + No + + + + + + CS_num_CFD_Discrete_Particles + Particles + CFD_Discrete_Particles + Code_Saturne + + + + + CS_num_FV + CS_num_CFD_Discrete_Particles + Fluid_Velocity_Field + + + diff --git a/Vimmp/cata_cps.py b/Vimmp/cata_cps.py index 4380e758..9af83779 100644 --- a/Vimmp/cata_cps.py +++ b/Vimmp/cata_cps.py @@ -58,7 +58,7 @@ Particle=PROC(nom='Particle', b_TypeBio_Solid = BLOC( condition='TypeOfDiscreteParticle == "Bio Organism"', TypeOfOrganism = SIMP( statut='o', typ='TXM', into=['Unicellular', 'Multicellar']), b_Unicellular = BLOC( condition ='TypeOfOrganism=="Unicellular"', - Unicellular = SIMP( statut='o', typ='TXM', into=["Bactaria"], defaut='Bacteria') + Unicellular = SIMP( statut='o', typ='TXM', into=["Bacteria"], defaut='Bacteria') ), b_Multicellular = BLOC( condition ='TypeOfOrganism=="Multicellular"', Multicellular = SIMP( statut='o', typ='TXM', into=["Animal","Fongus","Plant"]) diff --git a/Vimmp/cata_cps_test_driver_0.comm b/Vimmp/cata_cps_test_driver_0.comm new file mode 100644 index 00000000..82e51860 --- /dev/null +++ b/Vimmp/cata_cps_test_driver_0.comm @@ -0,0 +1,12 @@ + +Particle(ParticleNature='Discrete Particle', + DiscreteParticleName=None, + TypeOfDiscreteParticle='Solid', + TypeOfSolid='Aggregate', + Properties=_F(Geometry='Ellopsoids', + Mechanical='Rigid', + Morphological=_F(FractalDimension=1.0, + PrimaryParticlesNumber=2, + EquivalentSize=3.0, + Porosoty=4.0,),),); +#CHECKSUM:5f2aef18b8c0c582af93015ddcdbd544 -:FIN CHECKSUM \ No newline at end of file diff --git a/Vimmp/cata_gromacs.py b/Vimmp/cata_gromacs.py index 3ebe382d..3a843993 100644 --- a/Vimmp/cata_gromacs.py +++ b/Vimmp/cata_gromacs.py @@ -60,7 +60,7 @@ CodeSpecific=PROC(nom='CodeSpecific', # TC_Group_Param = FACT(statut='o', max ='**', TC_Group_Param = FACT(statut='o', max ='**', Name_Of_Group = SIMP(statut='o', typ ='TXM'), - tau_t = SIMP(statut='o', typ ='R',ang="time constant for coupling (one for each group in tc-grps), -1 means no temperature coupling",nomXML='tau-t'), + tau_t = SIMP(statut='o', typ ='R',ang="time constant for coupling (one for each group in tc-grps), -1 means no temperature coupling",nomXML='tau_t'), #Corriger pour que nomXML='tau-t' soit possible b_tau_t = BLOC(condition = "tau_t != -1", ref_t = SIMP(statut='o', typ ='R',ang="reference temperature for coupling (one for each group in tc-grps)"), ), # b_tau_t diff --git a/Vimmp/fluid+particle.comm b/Vimmp/fluid+particle.comm new file mode 120000 index 00000000..b62f18e9 --- /dev/null +++ b/Vimmp/fluid+particle.comm @@ -0,0 +1 @@ +cata_CSAndCPS_test_driver_0.comm \ No newline at end of file diff --git a/Vimmp/fluid+particle.xml b/Vimmp/fluid+particle.xml new file mode 120000 index 00000000..b58bb32c --- /dev/null +++ b/Vimmp/fluid+particle.xml @@ -0,0 +1 @@ +cata_CSAndCPS_test_driver_0.xml \ No newline at end of file -- 2.39.2