X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=Aster%2FCata%2FcataSTA9%2FMacro%2Fmacr_cara_poutre_ops.py;h=9415a2e9fe5fb04d2f564ed549b286fa52513c5c;hb=69ed0ccae7884aee37bbe54cb1af2983cb51492d;hp=89195496e4e33a7bfe6cb77ac8cb9c7841bcb7dd;hpb=2446a0c7137fa3418368ec577194a6d00e54ed65;p=tools%2Feficas.git

diff --git a/Aster/Cata/cataSTA9/Macro/macr_cara_poutre_ops.py b/Aster/Cata/cataSTA9/Macro/macr_cara_poutre_ops.py
index 89195496..9415a2e9 100644
--- a/Aster/Cata/cataSTA9/Macro/macr_cara_poutre_ops.py
+++ b/Aster/Cata/cataSTA9/Macro/macr_cara_poutre_ops.py
@@ -1,4 +1,4 @@
-#@ MODIF macr_cara_poutre_ops Macro  DATE 27/02/2006   AUTEUR DURAND C.DURAND 
+#@ MODIF macr_cara_poutre_ops Macro  DATE 16/10/2007   AUTEUR REZETTE C.REZETTE 
 # -*- coding: iso-8859-1 -*-
 #            CONFIGURATION MANAGEMENT OF EDF VERSION
 # ======================================================================
@@ -24,9 +24,10 @@ def macr_cara_poutre_ops(self,UNITE_MAILLAGE,SYME_X,SYME_Y,GROUP_MA_BORD,
   """
      Ecriture de la macro MACR_CARA_POUTRE
   """
-  import types
+  import types,string
   from Accas import _F
-  from Utilitai.Utmess     import UTMESS
+  import aster
+  from Utilitai.Utmess     import  UTMESS
   ier=0
   # On importe les definitions des commandes a utiliser dans la macro
   # Le nom de la variable doit etre obligatoirement le nom de la commande
@@ -61,7 +62,6 @@ def macr_cara_poutre_ops(self,UNITE_MAILLAGE,SYME_X,SYME_Y,GROUP_MA_BORD,
 
 #  if GROUP_MA_BORD and GROUP_MA:
 #     if not LIAISON:
-#        UTMESS('F', "MACR_CARA_POUTRE", "Avec GROUP_MA, il faut obligatoirement preciser LIAISON, LONGUEUR ET MATERIAU")
 #
   __nomlma=LIRE_MAILLAGE(UNITE=UNITE_MAILLAGE,)
 
@@ -242,8 +242,17 @@ def macr_cara_poutre_ops(self,UNITE_MAILLAGE,SYME_X,SYME_Y,GROUP_MA_BORD,
 
 
      motscles={}
-     if args.has_key('NOEUD'):
-        motscles['TEMP_IMPO']=(_F(NOEUD=args['NOEUD'],TEMP=__fnsec0))
+     if args['NOEUD']!=None:
+        nthno = args['NOEUD']
+        if type(nthno)!=types.StringType : UTMESS('F','POUTRE0_3')
+        motscles['TEMP_IMPO']=(_F(NOEUD=nthno,TEMP=__fnsec0))
+     if args['GROUP_NO']!=None:
+        collgrno=aster.getcolljev(string.ljust(__nomapi.nom,8)+'.GROUPENO')
+        nomnoe  =aster.getvectjev(string.ljust(__nomapi.nom,8)+'.NOMNOE')
+        l_no=collgrno[string.ljust(args['GROUP_NO'],8)]
+        if len(l_no)!=1 : UTMESS('F','POUTRE0_3')
+        nthno=nomnoe[l_no[0]-1]
+        motscles['TEMP_IMPO']=(_F(NOEUD=nthno,TEMP=__fnsec0))
      __chart2=AFFE_CHAR_THER_F(MODELE=__nomoth,
                                SOURCE=_F(TOUT='OUI',
                                          SOUR=__fnsec1,),
@@ -275,8 +284,16 @@ def macr_cara_poutre_ops(self,UNITE_MAILLAGE,SYME_X,SYME_Y,GROUP_MA_BORD,
 #     --------------------------------------------------
 
      motscles={}
-     if args.has_key('NOEUD'):
-        motscles['TEMP_IMPO']=_F(NOEUD=args['NOEUD'],TEMP=__fnsec0)
+     if args['NOEUD']!=None:
+        nthno = args['NOEUD']
+        motscles['TEMP_IMPO']=_F(NOEUD=nthno,TEMP=__fnsec0)
+     if args['GROUP_NO']!=None:
+        collgrno=aster.getcolljev(string.ljust(__nomapi.nom,8)+'.GROUPENO')
+        nomnoe  =aster.getvectjev(string.ljust(__nomapi.nom,8)+'.NOMNOE')
+        l_no=collgrno[string.ljust(args['GROUP_NO'],8)]
+        if len(l_no)!=1 : UTMESS('F','POUTRE0_3')
+        nthno=nomnoe[l_no[0]-1]
+        motscles['TEMP_IMPO']=_F(NOEUD=nthno,TEMP=__fnsec0)
      __chart3=AFFE_CHAR_THER_F(MODELE=__nomoth,
                                SOURCE=_F(TOUT='OUI',
                                          SOUR=__fnsec2,),
@@ -573,16 +590,30 @@ def macr_cara_poutre_ops(self,UNITE_MAILLAGE,SYME_X,SYME_Y,GROUP_MA_BORD,
      else:
         l_group_ma= GROUP_MA
 
-     if args.has_key('NOEUD'):
+     l_noeud=None
+
+     if args['NOEUD']!=None:
        if type(args['NOEUD'])==types.StringType :
           l_noeud=[args['NOEUD'],]
        else:
           l_noeud= args['NOEUD']
 
+     if args['GROUP_NO']!=None:
+       collgrno=aster.getcolljev(string.ljust(__nomlma.nom,8)+'.GROUPENO')
+       nomnoe  =aster.getvectjev(string.ljust(__nomlma.nom,8)+'.NOMNOE')
+       l_nu_no =[]
+       if type(args['GROUP_NO'])==types.StringType :
+          l_gr_no=[args['GROUP_NO'],]
+       else:
+          l_gr_no= args['GROUP_NO']
+       for grno in l_gr_no:
+          l_nu_no =l_nu_no+list(collgrno[string.ljust(grno,8)])
+       l_noeud =[nomnoe[no_i-1] for no_i in l_nu_no]
+
      if len(l_group_ma)!=len(l_group_ma_bord):
-        UTMESS('F', "MACR_CARA_POUTRE", "GROUP_MA et GROUP_MA_BORD incoherents")
-     if args.has_key('NOEUD') and (len(l_group_ma)!=len(l_noeud)):
-        UTMESS('F', "MACR_CARA_POUTRE", "GROUP_MA et NOEUD incoherents")
+        UTMESS('F','POUTRE0_1')
+     if l_noeud!=None and (len(l_group_ma)!=len(l_noeud)):
+        UTMESS('F','POUTRE0_2')
 
      __catp2=__cageo
      for i in range(0,len(l_group_ma_bord)):