From b81063f6bb2731f1456e710a3a9879dfa4a6c832 Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Mon, 6 Dec 2010 13:14:57 +0000 Subject: [PATCH] *** empty log message *** --- Aster/Cata/cataSTA10/Macro/propa_fiss_ops.py | 17 ++++++++--------- Aster/Cata/cataSTA8/cata.py | 2 +- Aster/Cata/cataSTA9/cata.py | 4 ++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Aster/Cata/cataSTA10/Macro/propa_fiss_ops.py b/Aster/Cata/cataSTA10/Macro/propa_fiss_ops.py index 6bf3a96b..04b333fb 100644 --- a/Aster/Cata/cataSTA10/Macro/propa_fiss_ops.py +++ b/Aster/Cata/cataSTA10/Macro/propa_fiss_ops.py @@ -21,16 +21,9 @@ from math import atan, atan2, cos, sin import numpy as NP -import aster -import string -import copy from Accas import _F -from Utilitai.Utmess import UTMESS from types import ListType, TupleType -from Utilitai.Table import Table, merge -from Utilitai.partition import MAIL_PY -from SD.sd_mater import sd_compor1 -from Cata.cata import table_sdaster,fiss_xfem,modele_sdaster + def InterpolationLineaire(x0, points) : """ @@ -149,7 +142,12 @@ def propa_fiss_ops(self,METHODE_PROPA,INFO,**args): ou par projection sur un maillage """ - + import aster + import string + from Accas import _F + from Utilitai.Utmess import UTMESS + from Utilitai.partition import MAIL_PY + from SD.sd_mater import sd_compor1 EnumTypes = (ListType, TupleType) @@ -262,6 +260,7 @@ def propa_fiss_ops(self,METHODE_PROPA,INFO,**args): __Mod = [None]*StepTot mcsimp['TOLERANCE'] = args['TOLERANCE'] fiss = FissAct[0] + import aster iret,ibid,mod_fiss = aster.dismoi('F','NOM_MODELE',fiss.nom,'FISS_XFEM') mod_fiss=mod_fiss.strip() MOD_FISS = self.get_concept(mod_fiss) diff --git a/Aster/Cata/cataSTA8/cata.py b/Aster/Cata/cataSTA8/cata.py index c79c6c2e..e1cd239b 100755 --- a/Aster/Cata/cataSTA8/cata.py +++ b/Aster/Cata/cataSTA8/cata.py @@ -34,7 +34,7 @@ try: except: pass -__version__="$Name: $" +__version__="$Name: V2_1_1_beta $" EnumTypes = (ListType, TupleType) diff --git a/Aster/Cata/cataSTA9/cata.py b/Aster/Cata/cataSTA9/cata.py index d832641c..0b371a7b 100644 --- a/Aster/Cata/cataSTA9/cata.py +++ b/Aster/Cata/cataSTA9/cata.py @@ -22,8 +22,8 @@ # faire que la division soit toujours réelle from __future__ import division -__version__ = "$Name: $" -__Id__ = "$Id: cata_aster_v6.py,v 1.12 2001/01/16 15:55:05 iliade Exp $" +__version__ = "$Name: V2_1_1_beta $" +__Id__ = "$Id: cata.py,v 1.8.4.2 2010-11-29 09:55:15 pnoyret Exp $" import Accas from Accas import * -- 2.39.2