From b31eac61ceb5a78f93d299d10177859655eaccd3 Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Thu, 6 Dec 2007 09:43:15 +0000 Subject: [PATCH] PN pour distinguer la version Salome de la version d exploitation --- Aster/Tests/err2.comm | 7 +++--- Aster/Tests/j0.comm | 7 ++++-- Aster/Tests/p0.comm | 1 - Aster/editeur.ini.pn | 19 +++++----------- Aster/editeur_salome.ini | 48 ++++++++++++++++++++++++++++++++++++++++ Aster/lance_test.sh | 6 ++--- Aster/sdist.py | 1 + Aster/test_eficas.py | 4 ++-- 8 files changed, 68 insertions(+), 25 deletions(-) create mode 100644 Aster/editeur_salome.ini diff --git a/Aster/Tests/err2.comm b/Aster/Tests/err2.comm index 1f14ec0e..485c0f77 100644 --- a/Aster/Tests/err2.comm +++ b/Aster/Tests/err2.comm @@ -1,5 +1,4 @@ - DEBUT(); MA=LIRE_MAILLAGE(); @@ -10,10 +9,10 @@ kk=DEFI_MATERIAU(ELAS=_F(E=56.24, uu=DEFI_MATERIAU(ELAS=_F(E=56.24, NU=0.3,),); -sansnom=DEFI_MATERIAU(ELAS=_F(E=56.24, - NU=0.3,),); +zezea=DEFI_MATERIAU(ELAS=_F(E=56.24, + NU=0.3,),); -sansnom=DEFI_MATERIAU(ELAS=_F(E=56.24, +SD_5=DEFI_MATERIAU(ELAS=_F(E=56.24, NU=0.3,),); FIN(); diff --git a/Aster/Tests/j0.comm b/Aster/Tests/j0.comm index 1b55b9f8..7aa78c2f 100644 --- a/Aster/Tests/j0.comm +++ b/Aster/Tests/j0.comm @@ -1,3 +1,6 @@ -DEBUT(); -INCLUDE(UNITE=11) + +DEBUT(PAR_LOT='OUI',); + +INCLUDE(UNITE=11,); + FIN(); diff --git a/Aster/Tests/p0.comm b/Aster/Tests/p0.comm index cf00cf86..35190d65 100644 --- a/Aster/Tests/p0.comm +++ b/Aster/Tests/p0.comm @@ -1,3 +1,2 @@ POURSUITE() -INCLUDE(UNITE=11) FIN() diff --git a/Aster/editeur.ini.pn b/Aster/editeur.ini.pn index ea7a0f7f..ba90991e 100644 --- a/Aster/editeur.ini.pn +++ b/Aster/editeur.ini.pn @@ -20,15 +20,14 @@ import os -import prefs +from Aster import prefs rep_cata = os.path.join(prefs.REPINI,'Cata') -rep_homard = os.path.join(prefs.REPINI,'../Homard') rep_Pmw = os.path.join(prefs.REPINI,'../Pmw') # Accès à la documentation Aster path_doc = os.path.join(rep_cata,'..','Doc') -exec_acrobat = "/usr/bin/acroread" +exec_acrobat = "acroread" # Utilisateur/Développeur isdeveloppeur = "NON" path_cata_dev = "/tmp/cata" @@ -38,17 +37,11 @@ rep_travail = "/tmp" initialdir=os.curdir # Choix des catalogues -rep_mat="//home/noyret/Install_Eficas/materiau" +rep_mat=os.path.join(rep_cata,'..','materiau') catalogues = ( - #('ASTER','v5',os.path.join(rep_cata,'cataSTA5'),'asterv5'), - #('ASTER','v6',os.path.join(rep_cata,'cataSTA6'),'python6'), - #('ASTER','v73',os.path.join(rep_cata,'cataSTA73'),'python','defaut'), - #('ASTER','v74',os.path.join(rep_cata,'cataSTA74'),'python'), - ('ASTER','v7.6',os.path.join(rep_cata,'cataSTA76'),'python'), - #('ASTER','v8',os.path.join(rep_cata,'cataSTA8'),'python','defaut'), - ('ASTER','v8.3',os.path.join(rep_cata,'cataSTA8'),'python','defaut'), - #('ASTER','v75',os.path.join(rep_cata,'cataSTA75'),'python','defaut'), - ('HOMARD','v1',os.path.join(rep_homard,'homard_cata_V73.py'),'homard'), +# ('ASTER','v7.8',os.path.join(rep_cata,'cataSTA7'),'python'), +# ('ASTER','v8.5',os.path.join(rep_cata,'cataSTA8'),'python'), + ('ASTER','v9.1',os.path.join(rep_cata,'cataSTA9'),'python','defaut'), ) diff --git a/Aster/editeur_salome.ini b/Aster/editeur_salome.ini new file mode 100644 index 00000000..d0881d54 --- /dev/null +++ b/Aster/editeur_salome.ini @@ -0,0 +1,48 @@ +# CONFIGURATION MANAGEMENT OF EDF VERSION +# ====================================================================== +# COPYRIGHT (C) 1991 - 2002 EDF R&D WWW.CODE-ASTER.ORG +# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY +# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY +# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR +# (AT YOUR OPTION) ANY LATER VERSION. +# +# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT +# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF +# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU +# GENERAL PUBLIC LICENSE FOR MORE DETAILS. +# +# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE +# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER, +# 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE. +# +# +# ====================================================================== + +import os + +from Aster import prefs + +rep_cata = os.path.join(prefs.REPINI,'Cata') +rep_Pmw = os.path.join(prefs.REPINI,'../Pmw') + +# Accès à la documentation Aster +path_doc = os.path.join(rep_cata,'..','Doc') +exec_acrobat = "acroread" +# Utilisateur/Développeur +isdeveloppeur = "NON" +path_cata_dev = "/tmp/cata" +# Répertoire temporaire +rep_travail = "/tmp" +# Répertoire initial +initialdir=os.curdir + +# Choix des catalogues +rep_mat_v85=os.path.join(rep_cata,'cataSTA8','materiau') +rep_mat_v91=os.path.join(rep_cata,'cataSTA9','materiau') + +catalogues = ( + ('ASTER','v7.8',os.path.join(rep_cata,'cataSTA7'),'python'), + ('ASTER','v8.5',os.path.join(rep_cata,'cataSTA8'),'python'), + ('ASTER','v9.1',os.path.join(rep_cata,'cataSTA9'),'python','defaut'), + ) + diff --git a/Aster/lance_test.sh b/Aster/lance_test.sh index 5eb25ff9..743c70be 100755 --- a/Aster/lance_test.sh +++ b/Aster/lance_test.sh @@ -1,14 +1,14 @@ #unalias do #set -x -version=NEW82 -passe=2 +version=NEW9 +passe=1 rm -rf ./Batch/${version}/ok_${passe} rm -rf ./Batch/${version}/bad_${passe} rm -rf ./Batch/${version}/badfile_${passe} rm -rf ./Batch/${version}/nt_${passe} for file in `cat ./Batch/${version}/aTester` do - #echo $file + echo $file grep "VISU_EFICAS='NON'" $file > /dev/null 2>/dev/null rc=$? if [ "$rc" != "0" ] diff --git a/Aster/sdist.py b/Aster/sdist.py index 23f0c0b7..fde2f45a 100644 --- a/Aster/sdist.py +++ b/Aster/sdist.py @@ -51,6 +51,7 @@ def main(): # Code_Aster copyfiles('../Aster',os.path.join(path_distrib,'Aster'),['prefs.py', 'editeur.ini', + 'editeur_salome.ini', 'eficas_aster.py', 'test_eficas.py', 'style.py', diff --git a/Aster/test_eficas.py b/Aster/test_eficas.py index 5529fe6a..4576e99d 100755 --- a/Aster/test_eficas.py +++ b/Aster/test_eficas.py @@ -38,8 +38,8 @@ if hasattr(prefs,'encoding'): sys.path[:0]=[prefs.INSTALLDIR] -import Editeur -from Editeur import eficas_test +import InterfaceTK +from InterfaceTK import eficas_test if len(sys.argv) > 1 : # on veut ouvrir un fichier directement au lancement d'Eficas -- 2.39.2