From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Fri, 16 Jul 2010 14:51:38 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V2_0~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f099df6433506d8b13944c970280ce483f447298;p=modules%2Feficas.git

*** empty log message ***
---

diff --git a/convert/convert_s_poly_st_1.py b/convert/convert_s_poly_st_1.py
deleted file mode 100644
index 22d39ba4..00000000
--- a/convert/convert_s_poly_st_1.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-#            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 parseur_python
-from convert_python import *
-
-def entryPoint():
-   """
-       Retourne les informations nécessaires pour le chargeur de plugins
-       Ces informations sont retournées dans un dictionnaire
-   """
-   return {
-        # Le nom du plugin
-          'name' : 's_poly_st_1',
-        # La factory pour créer une instance du plugin
-          'factory' : PythonParser,
-          }
-
-
diff --git a/convert/convert_s_scc_st_2.py b/convert/convert_s_scc_st_2.py
deleted file mode 100644
index 8b634a56..00000000
--- a/convert/convert_s_scc_st_2.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-#            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 parseur_python
-from convert_python import *
-
-def entryPoint():
-   """
-       Retourne les informations nécessaires pour le chargeur de plugins
-       Ces informations sont retournées dans un dictionnaire
-   """
-   return {
-        # Le nom du plugin
-          'name' : 's_scc_st_2',
-        # La factory pour créer une instance du plugin
-          'factory' : PythonParser,
-          }
-
-
diff --git a/generator/generator_s_poly_st_1.py b/generator/generator_s_poly_st_1.py
index 2b829677..93ce30bf 100644
--- a/generator/generator_s_poly_st_1.py
+++ b/generator/generator_s_poly_st_1.py
@@ -78,8 +78,8 @@ class s_poly_st_1Generator(MapGenerator):
        dicoPygmee=self.dictMCVal["PYGMEE"]
        self.taillePYGMEE=dicoPygmee['_PYGMEE_TAILLE']
 
-       monFichierOutput=self.config.PATH_PYGMEE+"/pygmee_input.txt"
        monFichierInput=self.config.INSTALLDIR+"/MAP/Templates/"+self.ssRepertoire+"/pygmee_input_template.txt"
+       monFichierOutput=self.nom_racine+"/pygmee_input.txt"
 
        f = file(monFichierInput,"r")
        chaine = f.read()  
@@ -101,7 +101,7 @@ class s_poly_st_1Generator(MapGenerator):
        if ('_PYGMEE_LANCEMENT' in dicoPygmee.keys()) and  dicoPygmee['_PYGMEE_LANCEMENT'] == 'oui':
            commande="echo '__________________';\n"
            commande=commande + "echo 'execution de PYGMEE';\n"
-           commande=commande + "cd "+self.config.PATH_PYGMEE+";\n"
+           commande=commande + "cd "+self.nom_racine+";\n"
            commande=commande + "python "+self.config.PATH_PYGMEE+"/pygmee_v1.py;\n"
            commande=commande + "echo 'fin execution de PYGMEE';\n"
            commande=commande + "echo '_____________________';\n\n\n"
@@ -176,10 +176,8 @@ class s_poly_st_1Generator(MapGenerator):
       except :
          print "Necessite de definir BENHUR"
 
-      nom_racine=self.config.PATH_STUDY+"/"+self.config.NAME_SCHEME+"/"
-      print nom_racine
-      monFichierCommOutput=nom_racine+"s_poly_st_1_aster.comm"
-      monFichierExportOutput=nom_racine+"s_poly_st_1_aster.export"
+      monFichierCommOutput=self.nom_racine+"s_poly_st_1_aster.comm"
+      monFichierExportOutput=self.nom_racine+"s_poly_st_1_aster.export"
 
       monFichierCommInput=self.config.INSTALLDIR+"/MAP/Templates/"+self.ssRepertoire+"/s_poly_st_1_aster_template.comm"
       monFichierExportInput=self.config.INSTALLDIR+"/MAP/Templates/"+self.ssRepertoire+"/s_poly_st_1_aster_template.export"