From d8b6b067a80cbb21ea885d943aca807bd5c9ae46 Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Mon, 6 Dec 2010 12:50:47 +0000 Subject: [PATCH] *** empty log message *** --- Accas/A_MCSIMP.py | 1 + Aster/editeur.ini | 10 ++++++---- Aster/editeur_salome.ini | 16 ++++++++-------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Accas/A_MCSIMP.py b/Accas/A_MCSIMP.py index 68943b98..5588614b 100644 --- a/Accas/A_MCSIMP.py +++ b/Accas/A_MCSIMP.py @@ -26,3 +26,4 @@ class MCSIMP(I_MCSIMP.MCSIMP,N_MCSIMP.MCSIMP,V_MCSIMP.MCSIMP): def __init__(self,val,definition,nom,parent): N_MCSIMP.MCSIMP.__init__(self,val,definition,nom,parent) V_MCSIMP.MCSIMP.__init__(self) + I_MCSIMP.MCSIMP.__init__(self) diff --git a/Aster/editeur.ini b/Aster/editeur.ini index dfcd8d0b..ad81527e 100644 --- a/Aster/editeur.ini +++ b/Aster/editeur.ini @@ -37,10 +37,12 @@ path_cata_dev = "/tmp/cata" rep_travail = "/tmp" # Choix des catalogues -rep_mat_v96=os.path.join(rep_cata,'cataSTA9','materiau') -rep_mat_v10=os.path.join(rep_cata,'cataSTA10','materiau') +rep_mat_STA88=os.path.join(rep_cata,'cataSTA8','materiau') +rep_mat_STA98=os.path.join(rep_cata,'cataSTA9','materiau') +rep_mat_STA103=os.path.join(rep_cata,'cataSTA10','materiau') # catalogues=( -('ASTER','v9.7',os.path.join(rep_cata,'cataSTA9'),'python'), -('ASTER','v10.2',os.path.join(rep_cata,'cataSTA10'),'python','defaut'), +('ASTER','STA8.8',os.path.join(rep_cata,'cataSTA8'),'python'), +('ASTER','STA9.8',os.path.join(rep_cata,'cataSTA9'),'python'), +('ASTER','STA10.3',os.path.join(rep_cata,'cataSTA10'),'python','defaut'), ) diff --git a/Aster/editeur_salome.ini b/Aster/editeur_salome.ini index 25ce39b9..ad81527e 100644 --- a/Aster/editeur_salome.ini +++ b/Aster/editeur_salome.ini @@ -21,9 +21,8 @@ import os # Répertoire initial -#initialdir=os.curdir -from prefs_ASTER import REPINI -initialdir=REPINI +import prefs_ASTER +initialdir=prefs_ASTER.REPINI rep_cata = os.path.join(initialdir,'Cata') rep_Pmw = os.path.join(initialdir,'../Pmw') @@ -38,11 +37,12 @@ path_cata_dev = "/tmp/cata" rep_travail = "/tmp" # Choix des catalogues -rep_mat_v88=os.path.join(rep_cata,'cataSTA8','materiau') -rep_mat_v95=os.path.join(rep_cata,'cataSTA9','materiau') +rep_mat_STA88=os.path.join(rep_cata,'cataSTA8','materiau') +rep_mat_STA98=os.path.join(rep_cata,'cataSTA9','materiau') +rep_mat_STA103=os.path.join(rep_cata,'cataSTA10','materiau') # catalogues=( -#('ASTER','v8.8',os.path.join(rep_cata,'cataSTA8'),'python'), -('ASTER','v9.5',os.path.join(rep_cata,'cataSTA9'),'python'), -('ASTER','v10.0',os.path.join(rep_cata,'cataSTA10'),'python','defaut'), +('ASTER','STA8.8',os.path.join(rep_cata,'cataSTA8'),'python'), +('ASTER','STA9.8',os.path.join(rep_cata,'cataSTA9'),'python'), +('ASTER','STA10.3',os.path.join(rep_cata,'cataSTA10'),'python','defaut'), ) -- 2.39.2