From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Wed, 8 Dec 2010 11:15:36 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: start_V6_main
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a854666b30209648cc18cda608ed2e12077b3f21;p=tools%2Feficas.git

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

diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py
index 6ca7ec88..2c80c260 100644
--- a/InterfaceQT4/editor.py
+++ b/InterfaceQT4/editor.py
@@ -547,11 +547,11 @@ class JDCEditor(QSplitter):
         path=self.CONFIGURATION.savedir
         fn = QFileDialog.getSaveFileName( self,
              self.trUtf8("sauvegarde"), path,
-             self.trUtf8("JDC (*.sh);;" "All Files (*)"),None,
+             self.trUtf8("Run (*.py);;" "All Files (*)"),None,
              QFileDialog.DontConfirmOverwrite)
         if fn.isNull(): return 
         ext = QFileInfo(fn).suffix()
-        if ext.isEmpty(): fn.append(".xml")
+        if ext.isEmpty(): fn.append(".py")
 
         if QFileInfo(fn).exists():
                 abort = QMessageBox.warning(self,
@@ -570,7 +570,7 @@ class JDCEditor(QSplitter):
         path=self.CONFIGURATION.savedir
         fn = QFileDialog.getSaveFileName( self,
              self.trUtf8("sauvegarde"), path,
-             self.trUtf8("JDC (*.xml);;" "All Files (*)"),None,
+             self.trUtf8("Schema YACS (*.xml);;" "All Files (*)"),None,
              QFileDialog.DontConfirmOverwrite)
         if fn.isNull(): return 
         ext = QFileInfo(fn).suffix()
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 8b0c7b1d..373d97bb 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
@@ -20,10 +20,10 @@
    </container>
    <inline name="pygmee_v2">
       <script><code><![CDATA[import sys
-import os
+#import os
 
-sys.path.append(os.path.join(os.getenv('EFICAS_ROOT'),'MAP/Templates/s_polymers_st_1'))
-print sys.path
+#sys.path.append(os.path.join(os.getenv('EFICAS_ROOT'),'MAP/Templates/s_polymers_st_1'))
+#print sys.path
 from s_polymers_st_1_YACS_nodes import *
 
 volume_fraction=component_pygmee_v2(rve_size, phase_number, sieve_curve_in, sieve_curve_out, repulsion_distance, study_name, study_path, file_result_inclusions, file_result_rve)
@@ -156,16 +156,16 @@ component_gmsh_post(result_gmsh)
    </inline>
    <control> <fromnode>pygmee_v2</fromnode> <tonode>fdvgrid</tonode> </control>
    <control> <fromnode>pygmee_v2</fromnode> <tonode>benhur</tonode> </control>
+   <control> <fromnode>init</fromnode> <tonode>pygmee_v2</tonode> </control>
    <control> <fromnode>init</fromnode> <tonode>fdvgrid</tonode> </control>
-   <control> <fromnode>init</fromnode> <tonode>aster_s_polymers_st_1</tonode> </control>
    <control> <fromnode>init</fromnode> <tonode>benhur</tonode> </control>
-   <control> <fromnode>init</fromnode> <tonode>pygmee_v2</tonode> </control>
+   <control> <fromnode>init</fromnode> <tonode>aster_s_polymers_st_1</tonode> </control>
    <control> <fromnode>benhur</fromnode> <tonode>aster_s_polymers_st_1</tonode> </control>
+   <control> <fromnode>env</fromnode> <tonode>pygmee_v2</tonode> </control>
+   <control> <fromnode>env</fromnode> <tonode>init</tonode> </control>
    <control> <fromnode>env</fromnode> <tonode>fdvgrid</tonode> </control>
-   <control> <fromnode>env</fromnode> <tonode>aster_s_polymers_st_1</tonode> </control>
    <control> <fromnode>env</fromnode> <tonode>benhur</tonode> </control>
-   <control> <fromnode>env</fromnode> <tonode>init</tonode> </control>
-   <control> <fromnode>env</fromnode> <tonode>pygmee_v2</tonode> </control>
+   <control> <fromnode>env</fromnode> <tonode>aster_s_polymers_st_1</tonode> </control>
    <control> <fromnode>aster_s_polymers_st_1</fromnode> <tonode>gmsh_post</tonode> </control>
    <datalink control="false">
       <fromnode>pygmee_v2</fromnode> <fromport>result_inclusions</fromport>
@@ -201,15 +201,15 @@ component_gmsh_post(result_gmsh)
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>rve_size</fromport>
-      <tonode>fdvgrid</tonode> <toport>rve_size</toport>
+      <tonode>pygmee_v2</tonode> <toport>rve_size</toport>
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>rve_size</fromport>
-      <tonode>benhur</tonode> <toport>rve_size</toport>
+      <tonode>fdvgrid</tonode> <toport>rve_size</toport>
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>rve_size</fromport>
-      <tonode>pygmee_v2</tonode> <toport>rve_size</toport>
+      <tonode>benhur</tonode> <toport>rve_size</toport>
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>rve_size</fromport>
@@ -217,11 +217,11 @@ component_gmsh_post(result_gmsh)
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>finesse</fromport>
-      <tonode>benhur</tonode> <toport>finesse</toport>
+      <tonode>fdvgrid</tonode> <toport>finesse</toport>
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>finesse</fromport>
-      <tonode>fdvgrid</tonode> <toport>finesse</toport>
+      <tonode>benhur</tonode> <toport>finesse</toport>
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>finesse</fromport>
@@ -237,11 +237,11 @@ component_gmsh_post(result_gmsh)
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>lambda_M</fromport>
-      <tonode>aster_s_polymers_st_1</tonode> <toport>lambda_M</toport>
+      <tonode>fdvgrid</tonode> <toport>lambda_M</toport>
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>lambda_M</fromport>
-      <tonode>fdvgrid</tonode> <toport>lambda_M</toport>
+      <tonode>aster_s_polymers_st_1</tonode> <toport>lambda_M</toport>
    </datalink>
    <datalink control="false">
       <fromnode>benhur</fromnode> <fromport>result_mesh</fromport>
@@ -253,39 +253,39 @@ component_gmsh_post(result_gmsh)
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>study_name</fromport>
-      <tonode>fdvgrid</tonode> <toport>study_name</toport>
+      <tonode>init</tonode> <toport>study_name</toport>
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>study_name</fromport>
-      <tonode>benhur</tonode> <toport>study_name</toport>
+      <tonode>fdvgrid</tonode> <toport>study_name</toport>
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>study_name</fromport>
-      <tonode>aster_s_polymers_st_1</tonode> <toport>study_name</toport>
+      <tonode>benhur</tonode> <toport>study_name</toport>
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>study_name</fromport>
-      <tonode>init</tonode> <toport>study_name</toport>
+      <tonode>aster_s_polymers_st_1</tonode> <toport>study_name</toport>
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>study_path</fromport>
-      <tonode>benhur</tonode> <toport>study_path</toport>
+      <tonode>init</tonode> <toport>study_path</toport>
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>study_path</fromport>
-      <tonode>aster_s_polymers_st_1</tonode> <toport>study_path</toport>
+      <tonode>pygmee_v2</tonode> <toport>study_path</toport>
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>study_path</fromport>
-      <tonode>init</tonode> <toport>study_path</toport>
+      <tonode>fdvgrid</tonode> <toport>study_path</toport>
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>study_path</fromport>
-      <tonode>pygmee_v2</tonode> <toport>study_path</toport>
+      <tonode>benhur</tonode> <toport>study_path</toport>
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>study_path</fromport>
-      <tonode>fdvgrid</tonode> <toport>study_path</toport>
+      <tonode>aster_s_polymers_st_1</tonode> <toport>study_path</toport>
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>aster_path</fromport>
@@ -299,12 +299,12 @@ component_gmsh_post(result_gmsh)
       <tonode>benhur</tonode><toport>file_inclusions</toport>
       <value><string></string></value>
    </parameter>
-   <presentation name="fdvgrid" x="869" y="80.25" width="227.5" height="284"/>
-   <presentation name="aster_s_polymers_st_1" x="1133" y="271.75" width="227.5" height="313"/>
-   <presentation name="env" x="9" y="301.25" width="227.5" height="168"/>
-   <presentation name="benhur" x="869" y="510.25" width="227.5" height="226"/>
-   <presentation name="init" x="273" y="199.75" width="273.5" height="371"/>
-   <presentation name="gmsh_post" x="1397.25" y="373.25" width="223" height="110"/>
-   <presentation name="pygmee_v2" x="583" y="470.25" width="249.5" height="342"/>
-   <presentation name="__ROOT__" x="0" y="0" width="1629.75" height="821.25"/>
+   <presentation name="pygmee_v2" x="583" y="470.25" width="158" height="279" expanded="1" expx="0" expy="0" expWidth="158" expHeight="279" shownState="0"/>
+   <presentation name="init" x="273" y="199.75" width="158" height="306" expanded="1" expx="0" expy="0" expWidth="158" expHeight="306" shownState="0"/>
+   <presentation name="fdvgrid" x="869" y="80.25" width="158" height="225" expanded="1" expx="0" expy="0" expWidth="158" expHeight="225" shownState="0"/>
+   <presentation name="benhur" x="869" y="510.25" width="158" height="171" expanded="1" expx="0" expy="0" expWidth="158" expHeight="171" shownState="0"/>
+   <presentation name="env" x="9" y="301.25" width="158" height="117" expanded="1" expx="0" expy="0" expWidth="158" expHeight="117" shownState="0"/>
+   <presentation name="aster_s_polymers_st_1" x="1133" y="271.75" width="158" height="252" expanded="1" expx="0" expy="0" expWidth="158" expHeight="252" shownState="0"/>
+   <presentation name="gmsh_post" x="1397.25" y="373.25" width="158" height="63" expanded="1" expx="0" expy="0" expWidth="158" expHeight="63" shownState="0"/>
+   <presentation name="__ROOT__" x="0" y="0" width="1559.25" height="753.25" expanded="1" expx="0" expy="0" expWidth="1559.25" expHeight="753.25" shownState="0"/>
 </proc>
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 6ec36daa..82a7c10f 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
@@ -134,7 +134,7 @@ class component_aster_s_polymers_st_1 (component_template):
                  path_study, aster_path):
     #------------------------------------------------------------------------------
        print "aster_s_polymers_st_1 for YACS - BEGIN"
-       aster_version="STA10"
+       aster_version="STA10.1"
        template_path=os.path.join(os.getenv('EFICAS_ROOT'), 'MAP/Templates/s_polymers_st_1/')
 
        # Gestion du .comm
diff --git a/generator/generator_s_polymers_st_1.py b/generator/generator_s_polymers_st_1.py
index 0d7afbb7..dcd70849 100644
--- a/generator/generator_s_polymers_st_1.py
+++ b/generator/generator_s_polymers_st_1.py
@@ -176,14 +176,12 @@ class s_poly_st_1Generator(MapGenerator):
 
    def METHODE(self) :
       commande=self.PYGMEE()
-      #if (self.CHOIX=="FD+grid") :
-      #    print "option fdvgrid"
-      #    commande+= self.FDVGRID()
-      #elif (self.CHOIX=="FEM+mesh") :
-      #    print "option Code_Aster"
-      #    commande+= self.BENHUR()
-      #    commande+= self.ASTER_s_polymers_st_1()
-      #    commande+= self.GMSH()
+      if (self.CHOIX=="FD+grid") :
+          commande+= self.FDVGRID()
+      elif (self.CHOIX=="FEM+mesh") :
+          commande+= self.BENHUR()
+          commande+= self.ASTER_s_polymers_st_1()
+          commande+= self.GMSH()
       return commande
 
 #_________________________________
@@ -195,28 +193,18 @@ class s_poly_st_1Generator(MapGenerator):
       return commande
 
    def FDVGRID(self):
-      return " "
-      commande_python+="lambda_x=component_fdvgrid("+str(self.lambda_I)+","+str(self.lambda_M)+","+str(self.rve_size)+",'"+str(self.inclusion_name)+"',"+str(self.finesse)+")\n"
-      return 'python -c "'+commande_python+'"\n'
+      commande="lambda_x=component_fdvgrid("+str(self.lambda_I)+","+str(self.lambda_M)+","+str(self.rve_size)+",'"+str(self.inclusion_name)+"',"+str(self.finesse)+")\n"
+      return commande
 
    def BENHUR(self):
-      return " "
-      commande_python+="component_benhur("+str(self.finesse)+","+str(self.rve_size)+",'"+str(self.inclusion_name)+"','"+str(self.study_name)+"','"+str(self.study_path)+"');\n"
-      return 'python -c "'+commande_python+'"\n'
+      commande="component_benhur("+str(self.finesse)+","+str(self.rve_size)+",'"+str(self.inclusion_name)+"','"+str(self.study_name)+"','"+str(self.study_path)+"');\n"
+      return commande
 
    def ASTER_s_polymers_st_1(self) :
-      return " "
-      commande_python="import os,sys;\n"
-      commande_python+="sys.path.append(os.path.join(os.getenv('EFICAS_ROOT'), 'MAP/Templates/s_polymers_st_1/'));\n"
-      commande_python+="from s_polymers_st_1_YACS_nodes import *;\n"
-      commande_python+="component_aster_s_polymers_st_1("+str(self.rve_size)+","+str(self.finesse)+","+str(self.lambda_I)+","+str(self.lambda_M)+",'"+str(self.study_name)+"','"+str(self.study_path)+"','"+self.config.PATH_ASTER+"');\n"
-      return 'python -c "'+commande_python+'"\n'
+      commande="component_aster_s_polymers_st_1("+str(self.rve_size)+","+str(self.finesse)+","+str(self.lambda_I)+","+str(self.lambda_M)+",'"+str(self.study_name)+"','"+str(self.study_path)+"','"+self.config.PATH_ASTER+"');\n"
+      return commande
 
    def GMSH(self) :
-      return " "
-      commande_python="import os,sys;\n"
-      commande_python+="sys.path.append(os.path.join(os.getenv('EFICAS_ROOT'), 'MAP/Templates/s_polymers_st_1/'));\n"
-      commande_python+="from s_polymers_st_1_YACS_nodes import *;\n"
-      commande_python+="component_gmsh_post('"+str(self.study_path+"/s_polymers_st_1_aster.resu.msh")+"');\n"
-      return 'python -c "'+commande_python+'"\n'
+      commande="component_gmsh_post('"+str(self.study_path+"/s_polymers_st_1_aster.resu.msh")+"');\n"
+      return commande