CCAR : mise a niveau version M Courtois 1.12

diff --git a/Aster/Cata/__init__.py b/Aster/Cata/__init__.py
index 6def514bc3c3ebfc4ce14e521ee047ae03e19c21..16f0545468dc3e66eb1fcda7ebe8a9ce89b4d803 100644 (file)
--- a/Aster/Cata/__init__.py
+++ b/Aster/Cata/__init__.py
@@ -1,5 +1,5 @@
-# -*- coding: utf-8 -*-
-#@ MODIF __init__ Cata  DATE 27/03/2002   AUTEUR DURAND C.DURAND 
+#@ MODIF __init__ Cata  DATE 20/09/2004   AUTEUR DURAND C.DURAND
+# -*- coding: iso-8859-1 -*-
 #            CONFIGURATION MANAGEMENT OF EDF VERSION
 # ======================================================================
 # COPYRIGHT (C) 1991 - 2001  EDF R&D                  WWW.CODE-ASTER.ORG
@@ -17,4 +17,3 @@
 # ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,       
 #    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.      
 # ======================================================================
-#

diff --git a/Aster/Cata/cataSTA8c_clefs_docu b/Aster/Cata/cataSTA8c_clefs_docu
index 71b8d057fb871e98f74e3faa834b6919009e4938..355eb0dd5e5d02ae4a3e8f231b433d5a80a1af62 100644 (file)
--- a/Aster/Cata/cataSTA8c_clefs_docu
+++ b/Aster/Cata/cataSTA8c_clefs_docu
@@ -23,7 +23,7 @@ CALC_CHAR_CINE:U4.61.03-h1
 CALC_CHAR_SEISME:U4.63.01-h
 CALC_ELEM:U4.81.01-i
 CALC_FATIGUE:U4.83.02-f
-CALC_FLUI_STRU:U4.66.02-g1
+CALC_FLUI_STRU:U4.66.02-g
 CALC_FONCTION:U4.32.04-i
 CALC_FONC_INTERP:U4.32.01-g
 CALC_FORC_AJOU:U4.66.03-c
@@ -33,7 +33,7 @@ CALC_G_THETA_T:U4.82.03-g
 CALC_INTE_SPEC:U4.36.03-h
 CALC_MATR_AJOU:U4.66.01-f
 CALC_MATR_ELEM:U4.61.01-h
-CALC_META:U4.85.01-d1
+CALC_META:U4.85.01-d
 CALC_NO:U4.81.02-h
 CALC_PRECONT:U4.42.05-a
 CALC_TABLE:U4.33.03-a
@@ -43,13 +43,13 @@ COMB_CHAM_ELEM:U4.72.03-g
 COMB_CHAM_NO:U4.72.02-h
 COMB_FOURIER:U4.83.31-f
 COMB_MATR_ASSE:U4.72.01-i
-COMB_SISM_MODAL:U4.84.01-f
+COMB_SISM_MODAL:U4.84.01-g
 COMP_INCR:U4.51.11-b
 CREA_CHAMP:U4.72.04-d1
 CREA_MAILLAGE:U4.23.02-f1
 CREA_RESU:U4.44.12-g
 CREA_TABLE:U4.33.02-b
-DEBUT:U4.11.01-i2
+DEBUT:U4.11.01-h
 DEFI_ CONSTANTE:U4.31.01-i
 DEFI_BASE_MODALE:U4.64.02-h1
 DEFI_CABLE_BP:U4.42.04-d
@@ -58,7 +58,7 @@ DEFI_CONSTANTE:U4.31.01-h
 DEFI_COQU_MULT:U4.42.03-h
 DEFI_FICHIER:U4.12.03-b
 DEFI_FISS_XFEM:U4.82.08-b
-DEFI_FLUI_STRU:U4.25.01-g1
+DEFI_FLUI_STRU:U4.25.01-g
 DEFI_FONCTION:U4.31.02-i1
 DEFI_FONC_ELEC:U4.mk.10-h
 DEFI_FONC_FLUI:U4.35.01-f
@@ -85,10 +85,10 @@ DETRUIRE:U4.14.01-g
 DIST_LIGN_3D:U4.mk.30-f
 DYNA_ALEA_MODAL:U4.53.22-h
 DYNA_LINE_HARM:U4.53.11-h
-DYNA_LINE_TRAN:U4.53.02-h
+DYNA_LINE_TRAN:U4.53.02-i
 DYNA_NON_LINE:U4.53.01-h
 DYNA_SPEC_MODAL:U4.53.23-f
-DYNA_TRAN_EXPLI:U4.53.03-b1
+DYNA_TRAN_EXPLI:U4.53.03-b
 DYNA_TRAN_MODAL:U4.53.21-h
 ENGENDRE_TEST:U4.92.11-d
 EXEC_LOGICIEL:U7.00.01-d
@@ -107,8 +107,8 @@ IMPR_CLASSI:U7.04.21-d
 IMPR_CO:U4.91.11-i
 IMPR_FICO_HOMA:U7.04.01-c
 IMPR_FONCTION:U4.33.01-g
-IMPR_GENE:U4.91.02-f1
-IMPR_JEVEUX:U4.91.21-h
+IMPR_GENE:U4.91.02-f
+IMPR_JEVEUX:U4.91.21-i
 IMPR_MACR_ELEM:U7.04.33-g
 IMPR_MATRICE:U7.04.32-f
 IMPR_MISS3D:U7.04.11-f
@@ -177,7 +177,7 @@ NUME_DDL_GENE:U4.65.03-g
 POST_CHAM_XFEM:U4.82.22-a
 POST_DYNA_ALEA:U4.84.04-g
 POST_DYNA_MODA_T:U4.84.02-g
-POST_ELEM:U4.81.22-g1
+POST_ELEM:U4.81.22-g
 POST_FATIGUE:U4.83.01-f
 POST_FATI_ALEA:U4.84.03-f
 POST_GP:U4.82.31-a
@@ -189,15 +189,15 @@ POST_RCCM:U4.83.11-f
 POST_RELEVE_T:U4.81.21-g1
 POST_USURE:U4.84.05-f
 POST_ZAC:U4.83.21-e
-POURSUITE:U4.11.03-i2
+POURSUITE:U4.11.03-i
 PRE_GIBI:U7.01.11-h
 PRE_GMSH:U7.01.31-c
 PRE_IDEAS:U7.01.01-i
 PROD_MATR_CHAM:U4.72.06-e
-PROJ_CHAMP:U4.72.05-f
+PROJ_CHAMP:U4.72.05-g
 PROJ_MATR_BASE:U4.63.12-h
 PROJ_MESU_MODAL:U4.73.01-d
-PROJ_SPEC_BASE:U4.63.14-e
+PROJ_SPEC_BASE:U4.63.14-f
 PROJ_VECT_BASE:U4.63.13-h
 PROPA_XFEM:U4.82.11-a
 RECA_WEIBULL:U4.82.06-d
@@ -214,8 +214,8 @@ STANLEY:U4.81.31-c
 STAT_NON_LINE:U4.51.03-h
 TEST_FICHIER:U4.92.04-b
 TEST_FONCTION:U4.92.02-h
-TEST_RESU:U4.92.01-i1
+TEST_RESU:U4.92.01-i
 TEST_TABLE:U4.92.03-e1
 THER_LINEAIRE:U4.54.01-i
 THER_NON_LINE:U4.54.02-g
-THER_NON_LINE_MO:U4.54.03-e
+THER_NON_LINE_MO:U4.54.03-e
\ No newline at end of file

diff --git a/Aster/editeur.ini b/Aster/editeur.ini
index efb378fb9a6aa2e4524e443293ef9dd45964b02e..de8d11dd443a25695a29912942483d12eaa85402 100644 (file)
--- a/Aster/editeur.ini
+++ b/Aster/editeur.ini
@@ -40,11 +40,8 @@ initialdir=os.curdir
 rep_mat=os.path.join(rep_cata,'..','materiau')
 
 catalogues = (
-#               ('ASTER','v5.9',os.path.join(rep_cata,'cataSTA5'),'asterv5'),
-#               ('ASTER','v6.8',os.path.join(rep_cata,'cataSTA6'),'python6'),
-               ('ASTER','v7.8',os.path.join(rep_cata,'cataSTA7'),'python'),
-#              ('ASTER','v8.4',os.path.join(rep_cata,'cataSTA8'),'python'),
-              ('ASTER','v8.4',os.path.join(rep_cata,'cataSTA8'),'python'),
+              ('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/properties.py b/Aster/properties.py
index 4a66b6b9da442d6baeb3856d1e78afb8c7d47fd8..582b24270f58844d3037ba8aa654009e6c83ce45 100644 (file)
--- a/Aster/properties.py
+++ b/Aster/properties.py
@@ -20,6 +20,6 @@
 #     IDENTIFICATION DU GESTIONNAIRE DE COMMANDE ACCAS A PARTIR
 #     DE LA VERSION DU CODE_ASTER ASSOCIE
 #----------------------------------------------------------------------
-version = "9.0.16"
-date = "04/04/2007"
+version = "9.0.30"
+date = "08/06/2007"
 exploit = False