From: Pascale Noyret Date: Mon, 7 Jul 2008 11:49:30 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: V1_14QT4v1~16 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f1b6f19ac0aea69c78c18c22382ce75f1afbe279;p=tools%2Feficas.git *** empty log message *** --- diff --git a/Traducteur/dictErreurs.py b/Traducteur/dictErreurs.py index b5970abb..f6d1d0c7 100644 --- a/Traducteur/dictErreurs.py +++ b/Traducteur/dictErreurs.py @@ -6,6 +6,7 @@ import sets jdcSet=sets.Set() dict_erreurs={ +#STA8.4 "DIST_LIGN_3D": "la commande DIST_LIGN_3D a ete supprimee", "DEFI_THER_JOULE": "la commande DIST_LIGN_3D a ete supprimee", "DIST_LIGN_3D": "la commande DIST_LIGN_3D a ete supprimee", @@ -62,6 +63,18 @@ dict_erreurs={ "COMB_CHAM_ELEM":"COMB_CHAM_ELEM est remplace par CREA_CHAMP", "IMPR_OAR":"IMPR_OAR demande un traitement manuel", "IMPR_FICO_HOMARD":"IMPR_FICO_HOMARD a ete integre dans MACR_ADPA_MAIL", +# STA9.2 + "POST_RCCM_SITUATION_NUME_PASSAGE":"Utilisation de NUME_PASSAGE pour le type TUYAUTERIE impossible en 9.2. On ne traite pour le moment que les chemins de passage simples.", + "DEFI_MATERIAU_BAZANT_FD" : "le materiau BAZANT_FD a ete supprime", + "DEFI_MATERIAU_APPUI_ELAS" : "le materiau APPUI_ELAS a ete supprime", + "DEFI_MATERIAU_PORO_JOINT" : "le materiau PORO_JOINT a ete supprime", + "DEFI_MATERIAU_ZIRC_CYRA2" : "le materiau ZIRC_CYRA2 a ete supprime", + "DEFI_MATERIAU_ZIRC_EPRI" : "le materiau ZIRC_EPRI a ete supprime", + "IMPR_MATRICE_MATR_ELEM_FORMAT=RESULTAT" : "IMPR_MATRICE au format RESULTAT a ete supprime", + "IMPR_MATRICE_MATR_ASSE_FORMAT=RESULTAT" : "IMPR_MATRICE au format RESULTAT a ete supprime", + "CALC_G_OPTION=G_LAGR" : "l'OPTION G_LAGR de CALC_G a ete supprimee", + "CALC_G_OPTION=G_LAGR_GLOB" : "l'OPTION G_LAGR_GLOB de CALC_G a ete supprimee", + "CALC_MATR_ELEM_THETA" : "l'OPTION RIGI_MECA_LAGR de CALC_MATR_ELEM a ete supprimee", } def EcritErreur(listeGena,ligne=None) : diff --git a/Traducteur/traduitV8V9.py b/Traducteur/traduitV8V9.py index 9bc0e044..80d2ede4 100644 --- a/Traducteur/traduitV8V9.py +++ b/Traducteur/traduitV8V9.py @@ -23,7 +23,7 @@ from dictErreurs import GenereErreurPourCommande import calcG -atraiter=( "DEFI_MAILLAGE",) +atraiter=( "DEFI_MAILLAGE","CALC_VECT_ELEM","DYNA_NON_LINE","STAT_NON_LINE","FACT_LDLT","FACT_GRAD","RESO_LDLT","RESO_GRAD","DYNA_TRAN_MODAL","NORM_MODE","MACRO_MODE_MECA","POST_RCCM","THER_NON_LINE","THER_LINEAIRE","THER_NON_LINE_MO","DEFI_CABLE_BP","GENE_VARI_ALEA","DEFI_MATERIAU","IMPR_MATRICE","CALC_G","CALC_MATR_ELEM") def traduc(infile,outfile,flog=None): @@ -35,14 +35,131 @@ def traduc(infile,outfile,flog=None): parseKeywords(root) ####################### traitement erreurs ######################## - #GenereErreurPourCommande(jdc,("POST_RCCM","DIST_LIGN_3D","IMPR_OAR","COMB_CHAM_NO","COMB_CHAM_ELEM")) - GenereErreurPourCommande(jdc,()) + GenereErreurPourCommande(jdc,("POST_RCCM")) - ####################### traitement CALC_META ####################### + ####################### traitement Sous-Structuration ####################### renameMotCleInFact(jdc,"DEFI_MAILLAGE","DEFI_SUPER_MAILLE","MACR_ELEM_STAT","MACR_ELEM") + renameMotCleInFact(jdc,"DYNA_NON_LINE","SOUS_STRUC","MAILLE","SUPER_MAILLE") + renameMotCleInFact(jdc,"STAT_NON_LINE","SOUS_STRUC","MAILLE","SUPER_MAILLE") + renameMotCleInFact(jdc,"CALC_VECT_ELEM","SOUS_STRUC","MAILLE","SUPER_MAILLE") + ######################################################################### + + ####################### traitement Resolution lineaire ###################### + renameMotCle(jdc,"RESO_LDLT","MATR_FACT","MATR") + renameMotCle(jdc,"RESO_GRAD","MATR_ASSE","MATR") + renameMotCle(jdc,"RESO_GRAD","MATR_FACT","MATR_FACT") + renameOper(jdc,"RESO_LDLT","RESOUDRE") + renameOper(jdc,"RESO_GRAD","RESOUDRE") + renameOper(jdc,"FACT_LDLT","FACTORISER") + renameOper(jdc,"FACT_GRAD","FACTORISER") + ######################################################################### + + ####################### traitement DYNA_TRAN_MODAL ###################### + removeMotCle(jdc,"DYNA_TRAN_MODAL","NB_MODE_DIAG") + ######################################################################### + + ####################### traitement MASS_INER dans NORM_MODE ########## + removeMotCle(jdc,"NORM_MODE","MASSE_INER") + removeMotCleInFact(jdc,"MACRO_MODE_MECA","NORM_MODE","MASSE_INER") + ######################################################################### + + ####################### traitement POST_RCCM ############################ + removeMotCleInFactSiRegleAvecErreur(jdc,"POST_RCCM","SITUATION","NUME_PASSAGE",((("TYPE_RESU_MECA","TUYAUTERIE",jdc),"MCaPourValeur"),)) + ######################################################################### + + ####################### traitement THER_NON_LINE ############################ + renameMotCleInFact(jdc,"THER_NON_LINE","TEMP_INIT","NUME_INIT","NUME_ORDRE") + renameMotCle(jdc,"THER_NON_LINE","TEMP_INIT","ETAT_INIT",) + renameMotCleInFact(jdc,"THER_NON_LINE","INCREMENT","NUME_INIT","NUME_INST_INIT") + renameMotCleInFact(jdc,"THER_NON_LINE","INCREMENT","NUME_FIN","NUME_INST_FIN") + ######################################################################### + + ####################### traitement THER_LINEAIRE ############################ + renameMotCleInFact(jdc,"THER_LINEAIRE","TEMP_INIT","NUME_INIT","NUME_ORDRE") + renameMotCle(jdc,"THER_LINEAIRE","TEMP_INIT","ETAT_INIT",) + renameMotCleInFact(jdc,"THER_LINEAIRE","INCREMENT","NUME_INIT","NUME_INST_INIT") + renameMotCleInFact(jdc,"THER_LINEAIRE","INCREMENT","NUME_FIN","NUME_INST_FIN") + ######################################################################### + + ####################### traitement THER_NON_LINE ############################ + renameMotCleInFact(jdc,"THER_NON_LINE","TEMP_INIT","NUME_INIT","NUME_ORDRE") + renameMotCle(jdc,"THER_NON_LINE","TEMP_INIT","ETAT_INIT",) + ######################################################################### + ####################### traitement DEFI_CABLE_BP ###################### + removeMotCle(jdc,"DEFI_CABLE_BP","MAILLAGE") ######################################################################### + ####################### traitement GENE_VARI_ALEA ###################### + removeMotCleSiRegle(jdc,"GENE_VARI_ALEA","COEF_VAR",((("TYPE","EXPONENTIELLE",jdc),"MCaPourValeur"),)) + ######################################################################### + + ####################### traitement DEFI_MATERIAU ###################### + removeMotCleAvecErreur(jdc,"DEFI_MATERIAU","BAZANT_FD") + removeMotCleAvecErreur(jdc,"DEFI_MATERIAU","PORO_JOINT") + removeMotCleAvecErreur(jdc,"DEFI_MATERIAU","APPUI_ELAS") + removeMotCleAvecErreur(jdc,"DEFI_MATERIAU","ZIRC_EPRI") + removeMotCleAvecErreur(jdc,"DEFI_MATERIAU","ZIRC_CYRA2") + ######################################################################### + + ####################### traitement IMPR_MATRICE ###################### + removeCommandeSiRegleAvecErreur(jdc,"IMPR_MATRICE",((("MATR_ELEM","FORMAT","RESULTAT",jdc),"MCsousMCFaPourValeur"),)) + removeCommandeSiRegleAvecErreur(jdc,"IMPR_MATRICE",((("MATR_ASSE","FORMAT","RESULTAT",jdc),"MCsousMCFaPourValeur"),)) + ######################################################################### + + + ####################### traitement CALC_G ###################### + removeMotCleSiRegleAvecErreur(jdc,"CALC_G","OPTION",((("OPTION","G_LAGR",jdc),"MCaPourValeur"),)) + removeMotCleSiRegleAvecErreur(jdc,"CALC_G","OPTION",((("OPTION","G_LAGR_GLOB",jdc),"MCaPourValeur"),)) + removeMotCle(jdc,"CALC_G","PROPAGATION") + removeMotCle(jdc,"CALC_G","THETA_LAGR") + removeMotCle(jdc,"CALC_G","DIRE_THETA_LAGR") + ######################################################################### + + ####################### traitement CALC_MATR_ELEM ###################### + removeMotCleSiRegle(jdc,"CALC_MATR_ELEM","OPTION",((("OPTION","RIGI_MECA_LAGR",jdc),"MCaPourValeur"),)) + removeMotCleAvecErreur(jdc,"CALC_MATR_ELEM","PROPAGATION") + removeMotCle(jdc,"CALC_MATR_ELEM","THETA") + ######################################################################### + + ####################### traitement CONTACT ###################### + removeMotCleInFact(jdc,"DEFI_MATERIAU","DIS_CONTACT","KT_ULTM") + removeMotCleInFact(jdc,"DEFI_MATERIAU","DIS_CONTACT","EFFO_N_INIT") + removeMotCleInFact(jdc,"DEFI_MATERIAU","DIS_CONTACT","RIGI_N_IRRA") + removeMotCleInFact(jdc,"DEFI_MATERIAU","DIS_CONTACT","RIGI_N_FO") + removeMotCleInFact(jdc,"DEFI_MATERIAU","DIS_CONTACT","RIGI_MZ") + removeMotCleInFact(jdc,"DEFI_MATERIAU","DIS_CONTACT","ANGLE_1") + removeMotCleInFact(jdc,"DEFI_MATERIAU","DIS_CONTACT","ANGLE_2") + removeMotCleInFact(jdc,"DEFI_MATERIAU","DIS_CONTACT","ANGLE_3") + removeMotCleInFact(jdc,"DEFI_MATERIAU","DIS_CONTACT","ANGLE_4") + removeMotCleInFact(jdc,"DEFI_MATERIAU","DIS_CONTACT","MOMENT_1") + removeMotCleInFact(jdc,"DEFI_MATERIAU","DIS_CONTACT","MOMENT_2") + removeMotCleInFact(jdc,"DEFI_MATERIAU","DIS_CONTACT","MOMENT_3") + removeMotCleInFact(jdc,"DEFI_MATERIAU","DIS_CONTACT","MOMENT_4") + removeMotCleInFact(jdc,"DEFI_MATERIAU","DIS_CONTACT","C_PRAGER_MZ") + dDis_Choc={"DIS_CONTACT":"DIS_CHOC"} + ChangementValeurDsMCF(jdc,"STAT_NON_LINE","COMP_INCR","RELATION",dDis_Choc) + ChangementValeurDsMCF(jdc,"DYNA_NON_LINE","COMP_INCR","RELATION",dDis_Choc) + renameMotCleInFact(jdc,"STAT_NON_LINE","COMP_INCR","DIS_CONTACT","DIS_CHOC") + renameMotCleInFact(jdc,"DYNA_NON_LINE","COMP_INCR","DIS_CONTACT","DIS_CHOC") + dGrilles={"DIS_GRICRA":"GRILLE_CRAYONS"} + ChangementValeurDsMCF(jdc,"STAT_NON_LINE","COMP_INCR","RELATION",dGrilles) + ChangementValeurDsMCF(jdc,"DYNA_NON_LINE","COMP_INCR","RELATION",dGrilles) + + removeMotCleInFact(jdc,"AFFE_CHAR_MECA","CONTACT","RECHERCHE") + removeMotCleInFact(jdc,"AFFE_CHAR_MECA","CONTACT","VECT_Y") + removeMotCleInFact(jdc,"AFFE_CHAR_MECA","CONTACT","VECT_ORIE_POU") + + renameCommandeSiRegle(jdc,"AFFE_CHAR_MECA_F","AFFE_CHAR_MECA",((("CONTACT",),"existeMCFParmi"),)) + ######################################################################### + + ####################### traitement CAM_CLAY ###################### + AjouteMotClefDansFacteur(jdc,"DEFI_MATERIAU","CAM_CLAY","MU=xxx",) + ######################################################################### + + ####################### traitement GLRC ###################### + renameCommandeSiRegle(jdc,"DEFI_MATERIAU","DEFI_GLRC", ((("GLRC_DAMAGE","GLRC_ACIER",),"existeMCFParmi"),)) + ######################################################################### f=open(outfile,'w') f.write(jdc.getSource())