PN pour distinguer la version Salome de la version d exploitation

diff --git a/Aster/Tests/err2.comm b/Aster/Tests/err2.comm
index 1f14ec0e345ab0febde2878ce8244d512c9f6964..485c0f7726ca590f9bd7149e7552a76da50108e9 100644 (file)
--- 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 1b55b9f8e8b23afb0c925c3a411faae851b738e4..7aa78c2f5547a5c01157d93e8bc592915101c517 100644 (file)
--- 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 cf00cf86ea841bd26de8215622a4ec9b01d2bd37..35190d6514e61af8ca87e1588b12954459b53063 100644 (file)
--- 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 ea7a0f7fd715311411f8a27ff7067400a6f9ed17..ba90991e7ef167c8d44e580622510abba964d5e2 100644 (file)
--- 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 (file)
index 0000000..d0881d5
--- /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 5eb25ff93f6fd8c9e99b1432875006f9fcd491cb..743c70beb936b22adc56571184f127e4549bbd8c 100755 (executable)
--- 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 23f0c0b7edfccf92149c0a46960d128869601bcd..fde2f45a79af3a8634361121b5662382074542f8 100644 (file)
--- 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 5529fe6a764337197f44000d2bcab0b4f3b2ad75..4576e99d95b4f1c00eefc455ca0e4d408cde96e9 100755 (executable)
--- 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