From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Mon, 29 Nov 2010 11:02:48 +0000 (+0000)
Subject: Pour souci avec salome5
X-Git-Tag: LOGILAB~375
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4bcade7ea0442f59d75c624d4860024be4f3fde7;p=tools%2Feficas.git

Pour souci avec salome5
---

diff --git a/Aster/Cata/cataSTA9/Numeric.py b/Aster/Cata/cataSTA9/Numeric.py
new file mode 100644
index 00000000..185019ed
--- /dev/null
+++ b/Aster/Cata/cataSTA9/Numeric.py
@@ -0,0 +1 @@
+from numpy.oldnumeric import *
diff --git a/MAP/Templates/s_polymers_st_1/cata_s_polymers_st_1.xml b/MAP/Templates/s_polymers_st_1/cata_s_polymers_st_1.xml
index 96466521..07b47c21 100644
--- a/MAP/Templates/s_polymers_st_1/cata_s_polymers_st_1.xml
+++ b/MAP/Templates/s_polymers_st_1/cata_s_polymers_st_1.xml
@@ -22,7 +22,11 @@
       <script><code><![CDATA[import sys
 import os
 
+<<<<<<< cata_s_polymers_st_1.xml
+sys.path.append(os.path.join('/local/noyret/Install_Eficas/EficasV1/MAP/Templates/s_polymers_st_1'))
+=======
 sys.path.append(os.path.join(os.getenv('EFICAS_ROOT'),'MAP/Templates/s_polymers_st_1'))
+>>>>>>> 1.1.2.5
 
 print sys.path
 from s_polymers_st_1_YACS_nodes import *
@@ -48,6 +52,10 @@ result_rve = file_result_rve
    <inline name="init">
       <script><code><![CDATA[phase_number=1
 rve_size=50.0
+<<<<<<< cata_s_polymers_st_1.xml
+study_path="/local/noyret/MAP/studies/demonstrateur_s_polymers_st_1/"
+=======
+>>>>>>> 1.1.2.5
 sieve_curve_in=study_path+"inclusion_size_distribution.txt"
 sieve_curve_out=study_path+"pygmee_v2_test_YACS.sieve_out"
 repulsion_distance=0.1
@@ -56,6 +64,10 @@ file_result_rve=study_path+"rve.txt"
 finesse=10
 lambda_I=100.
 lambda_M=1.
+<<<<<<< cata_s_polymers_st_1.xml
+benhur_template="/local/noyret/EficasV1/MAP/templates/s_polymers_st_1/benhur_template.txt"
+=======
+>>>>>>> 1.1.2.5
 ]]></code></script>
       <inport name="study_name" type="string"/>
       <inport name="study_path" type="string"/>
@@ -74,7 +86,11 @@ lambda_M=1.
       <script><code><![CDATA[import sys
 import os
 
+<<<<<<< cata_s_polymers_st_1.xml
+sys.path.append(os.path.join('/local/noyret/Install_Eficas/EficasV1/MAP/Templates/s_polymers_st_1'))
+=======
 sys.path.append(os.path.join(os.getenv('EFICAS_ROOT'),'MAP/Templates/s_polymers_st_1'))
+>>>>>>> 1.1.2.5
 
 from s_polymers_st_1_YACS_nodes import *
 
diff --git a/MAP/Templates/s_polymers_st_1/s_polymers_st_1_YACS_nodes.py b/MAP/Templates/s_polymers_st_1/s_polymers_st_1_YACS_nodes.py
index abd910b4..bf027ca5 100644
--- a/MAP/Templates/s_polymers_st_1/s_polymers_st_1_YACS_nodes.py
+++ b/MAP/Templates/s_polymers_st_1/s_polymers_st_1_YACS_nodes.py
@@ -26,7 +26,7 @@ def component_pygmee_v2(rve_size, phase_number, sieve_curve_in, sieve_curve_out,
     commande=parameter.write_for_shell(pygmee_v2_input)
     os.system(commande)
 
-    commande= "cd /local00/bin/MAP/components/pygmee_v2/src;"
+    commande= "cd /local/noyret/MAP/components/pygmee_v2/src;"
     commande+= "python pygmee_v2.py -i "+pygmee_v2_input+";\n"
     os.system(commande)
 
@@ -52,7 +52,7 @@ def component_fdvgrid(lambda_I, lambda_M, rve_size, file_inclusions, finesse):
         
     if (finesse < 32): finesse=32
 
-    fdvgrid_path="/local00/bin/MAP/components/fdvgrid/bin"
+    fdvgrid_path="/local/noyret/MAP/components/fdvgrid/bin"
     commande= "cd "+fdvgrid_path+";\n"
     commande+= "echo "+ str(rve_size)+" > "+"rve.input"+";\n"
     commande+= "cp " + file_inclusions+" "+"inclusions.input"+";\n"
diff --git a/MAP/cata_s_polymers_st_1.xml b/MAP/cata_s_polymers_st_1.xml
index ec4ec1ff..7318e687 100644
--- a/MAP/cata_s_polymers_st_1.xml
+++ b/MAP/cata_s_polymers_st_1.xml
@@ -38,12 +38,12 @@ parameter.add_parameter(composant, 'study_name', study_name)
 parameter.add_parameter(composant, 'file_result_inclusions', file_result_inclusions)
 parameter.add_parameter(composant, 'file_result_rve', file_result_rve)
 
-pygmee_v2_input = "/local00/bin/MAP/studies/demonstrateur_s_polymers_st_1/pygmee_v2_for_YACS_20101116.input"
+pygmee_v2_input = "/local/noyret/MAP/studies/demonstrateur_s_polymers_st_1/pygmee_v2_for_YACS_20101116.input"
 
 commande=parameter.write_for_shell(pygmee_v2_input)
 os.system(commande)
 
-commande= "cd /local00/bin/MAP/components/pygmee_v2/src;"
+commande= "cd /local/noyret/MAP/components/pygmee_v2/src;"
 commande+= "python pygmee_v2.py -i "+pygmee_v2_input+";\n"
 os.system(commande)
 
diff --git a/MAP/prefs_MAP.py b/MAP/prefs_MAP.py
index fab9bebf..7bfab5cc 100644
--- a/MAP/prefs_MAP.py
+++ b/MAP/prefs_MAP.py
@@ -31,13 +31,13 @@ initialdir=REPINI
 
 # INSTALLDIR sert à localiser l'installation d'Eficas
 INSTALLDIR=os.path.join(REPINI,'..')
-#PATH_MAP="/local/noyret/MAP/"
-PATH_MAP="/local00/bin/MAP/"
+PATH_MAP="/local/noyret/MAP/"
+#PATH_MAP="/local00/bin/MAP/"
 PATH_PYGMEE=PATH_MAP+"/components/pygmee_v2"
 PATH_BENHUR=PATH_MAP+"/components/benhur"
 PATH_FDVGRID=PATH_MAP+"components/fdvgrid/ther2d/bin"
-PATH_MODULE=PATH_MAP+"/modules/polymers"
 PATH_STUDY=PATH_MAP+"/studies/demonstrateur_s_polymers_st_1"
+PATH_MODULE=PATH_MAP+"/module"
 #PATH_ASTER="/local/noyret/bin/Aster10/bin"
 PATH_ASTER="/local00/aster"
 PATH_GMSH="/usr/bin"
diff --git a/MAP/s_polymers_st_1_V1.py b/MAP/s_polymers_st_1_V1.py
index 0b4e9e51..7cd5c436 100644
--- a/MAP/s_polymers_st_1_V1.py
+++ b/MAP/s_polymers_st_1_V1.py
@@ -1,14 +1,27 @@
-## -*- coding: utf-8 -*-
+#)# -*- coding: utf-8 -*-
 #
 ## --------------------------------------------------
 ## debut entete
 ## --------------------------------------------------
 #
 from Accas import *
+import os
+import sys
+
 from prefs_MAP import PATH_MODULE
 from prefs_MAP import PATH_STUDY
 from prefs_MAP import PATH_PYGMEE
 
+try :
+   fichUtilisateur=os.path.join(os.environ['HOME'],'.Eficas_MAP/prefs_MAP.py')
+   f=open(fichUtilisateur)
+   txt=f.read()
+   f.close()
+   exec txt in locals()
+except :
+   pass
+
+
 class Tuple:
   def __init__(self,ntuple):
     self.ntuple=ntuple
@@ -36,8 +49,8 @@ JdC = JDC_CATA ( code = 'MAP',
 
 ETUDE= PROC(nom="ETUDE",op=None,
               fr="determination du nom et du repertoire de l'etude)",
-              study_name=SIMP(statut = "f",fr="", typ='TXM',defaut="s_polymers_st_1_for_YACS"),
-              study_path=SIMP(statut = "f",fr="", typ='TXM',defaut=PATH_STUDY),
+              study_name=SIMP(statut = "o",fr="", typ='TXM',defaut="s_polymers_st_1_for_YACS"),
+              study_path=SIMP(statut = "o",fr="", typ='TXM',defaut=PATH_STUDY),
               )
 
 METHODE= PROC(nom="METHODE",op=None,