debug of aster option befoire Manchester meeting

diff --git a/MAP/Templates/s_polymers_st_1/benhur_template.txt b/MAP/Templates/s_polymers_st_1/benhur_template.txt
index a9cb8691231d642d77f5a2aa1576248bcb147973..994efe5cb65fe021050c58792ec8877ed15fe424 100644 (file)
--- a/MAP/Templates/s_polymers_st_1/benhur_template.txt
+++ b/MAP/Templates/s_polymers_st_1/benhur_template.txt
@@ -16,7 +16,7 @@ I - Morphologie (MESSALA)
  
 II - Maillage (BENHUR)
 1) fichier entree décrivant le maillage support (entree)
-%_PATH_BENHUR%/bin/regular_mesh_3D_%_MESH_SIZE%.msh
+%_PATH_BENHUR%/lib/regular_mesh_3D_%_MESH_SIZE%.msh
 2) fichier sortie du maillage  (sortie)
 %_PATH_STUDY%/%_NAME_SCHEME%_benhur_%_MESH_SIZE%.msh
 3) fichier commentaire sur les statistiques décrivant le maillage (sortie)

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 2e1bbc4f17cf9d5ba6d4bf5531073f9488198176..2ce57487c020d570479649672a290daa986ce7c6 100644 (file)
--- 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
@@ -79,7 +79,7 @@ import os
 #sys.path.append(os.path.join(os.getenv('EFICAS_ROOT'),'MAP/Templates/s_polymers_st_1'))
 from s_polymers_st_1_YACS_nodes import *
 
-lambda_x=component_fdvgrid(lambda_I, lambda_M, rve_size, file_inclusions, finesse)
+lambda_x=component_fdvgrid(lambda_I, lambda_M, rve_size, file_inclusions, finesse, study_path)
 ]]></code></script>
       <inport name="file_inclusions" type="string"/>
       <inport name="rve_size" type="double"/>
@@ -156,24 +156,24 @@ component_gmsh_post(result_gmsh)
    </inline>
    <control> <fromnode>pygmee_v2</fromnode> <tonode>benhur</tonode> </control>
    <control> <fromnode>pygmee_v2</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>fdvgrid</tonode> </control>
+   <control> <fromnode>init</fromnode> <tonode>aster_s_polymers_st_1</tonode> </control>
    <control> <fromnode>init</fromnode> <tonode>pygmee_v2</tonode> </control>
+   <control> <fromnode>init</fromnode> <tonode>fdvgrid</tonode> </control>
    <control> <fromnode>benhur</fromnode> <tonode>aster_s_polymers_st_1</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>fdvgrid</tonode> </control>
+   <control> <fromnode>env</fromnode> <tonode>aster_s_polymers_st_1</tonode> </control>
    <control> <fromnode>env</fromnode> <tonode>pygmee_v2</tonode> </control>
+   <control> <fromnode>env</fromnode> <tonode>fdvgrid</tonode> </control>
    <control> <fromnode>env</fromnode> <tonode>init</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>
-      <tonode>fdvgrid</tonode> <toport>file_inclusions</toport>
+      <tonode>benhur</tonode> <toport>file_inclusions</toport>
    </datalink>
    <datalink control="false">
       <fromnode>pygmee_v2</fromnode> <fromport>result_inclusions</fromport>
-      <tonode>benhur</tonode> <toport>file_inclusions</toport>
+      <tonode>fdvgrid</tonode> <toport>file_inclusions</toport>
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>phase_number</fromport>
@@ -209,39 +209,39 @@ component_gmsh_post(result_gmsh)
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>rve_size</fromport>
-      <tonode>fdvgrid</tonode> <toport>rve_size</toport>
+      <tonode>benhur</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>finesse</fromport>
-      <tonode>aster_s_polymers_st_1</tonode> <toport>finesse</toport>
+      <tonode>fdvgrid</tonode> <toport>finesse</toport>
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>finesse</fromport>
-      <tonode>benhur</tonode> <toport>finesse</toport>
+      <tonode>aster_s_polymers_st_1</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>lambda_I</fromport>
-      <tonode>aster_s_polymers_st_1</tonode> <toport>lambda_I</toport>
+      <tonode>fdvgrid</tonode> <toport>lambda_I</toport>
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>lambda_I</fromport>
-      <tonode>fdvgrid</tonode> <toport>lambda_I</toport>
+      <tonode>aster_s_polymers_st_1</tonode> <toport>lambda_I</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>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>benhur</fromnode> <fromport>result_mesh</fromport>
@@ -249,19 +249,19 @@ component_gmsh_post(result_gmsh)
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>study_name</fromport>
-      <tonode>pygmee_v2</tonode> <toport>study_name</toport>
+      <tonode>init</tonode> <toport>study_name</toport>
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>study_name</fromport>
-      <tonode>fdvgrid</tonode> <toport>study_name</toport>
+      <tonode>pygmee_v2</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>init</tonode> <toport>study_name</toport>
+      <tonode>benhur</tonode> <toport>study_name</toport>
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>study_name</fromport>
@@ -273,7 +273,7 @@ component_gmsh_post(result_gmsh)
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>study_path</fromport>
-      <tonode>pygmee_v2</tonode> <toport>study_path</toport>
+      <tonode>aster_s_polymers_st_1</tonode> <toport>study_path</toport>
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>study_path</fromport>
@@ -281,11 +281,11 @@ component_gmsh_post(result_gmsh)
    </datalink>
    <datalink control="false">
       <fromnode>env</fromnode> <fromport>study_path</fromport>
-      <tonode>benhur</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>aster_s_polymers_st_1</tonode> <toport>study_path</toport>
+      <tonode>benhur</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="aster_s_polymers_st_1" x="1132" y="271.75" width="158" height="252" expanded="1" expx="1132" expy="271.75" expWidth="158" expHeight="252" 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="fdvgrid" x="869" y="80.25" width="158" height="225" expanded="1" expx="0" expy="0" expWidth="158" expHeight="225" 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="env" x="9" y="301.25" width="158" height="117" expanded="1" expx="0" expy="0" expWidth="158" expHeight="117" shownState="0"/>
-   <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="__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"/>
+   <presentation name="benhur" x="869" y="510.25" width="227.5" height="226"/>
+   <presentation name="aster_s_polymers_st_1" x="1132" y="271.75" width="227.5" height="313"/>
+   <presentation name="pygmee_v2" x="583" y="470.25" width="249.5" height="342"/>
+   <presentation name="gmsh_post" x="1397.25" y="373.25" width="223" height="110"/>
+   <presentation name="fdvgrid" x="869" y="80.25" width="227.5" height="284"/>
+   <presentation name="init" x="273" y="199.75" width="273.5" height="371"/>
+   <presentation name="env" x="9" y="301.25" width="227.5" height="168"/>
+   <presentation name="__ROOT__" x="0" y="0" width="1559.25" height="753.25"/>
 </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 aa3dafaca66c605b6ef5c11e86f34b8c8c431c43..e5973e3ff83b79f08c1912a1f6a6ae713ff64219 100644 (file)
--- 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
@@ -74,7 +74,7 @@ class component_pygmee_v2:
 class component_fdvgrid:
 #-----------------------
 
-   def  __init__(self,lambda_I, lambda_M, rve_size, file_inclusions, finesse):
+   def  __init__(self,lambda_I, lambda_M, rve_size, file_inclusions, finesse, path_study):
       print "fdvgrid for YACS - BEGIN"
     
       contrast=lambda_I/lambda_M
@@ -82,33 +82,25 @@ class component_fdvgrid:
 
       fdvgrid_path=os.path.join(os.getenv('MAP_DIRECTORY'),'components/fdvgrid/bin')
 
-      lambda_output='/local00/bin/MAP/studies/demonstrateur_s_polymers_st_1/lambda_x.output'
+      lambda_output=path_study+'/lambda_x.output'
       string='[fdvgrid]\n'
-      file_inclusions='/local00/bin/MAP/studies/demonstrateur_s_polymers_st_1/pygmee_v2_test_1.inclusions'
+      file_inclusions
       string+='        microstructure_file="'+file_inclusions+'";\n'
       string+='        rve_size='+str(rve_size)+';\n'
       string+='        grid_size='+str(finesse)+';\n'
       string+='        contrast='+str(contrast)+';\n'
       string+='        method_type="v";\n'
       string+='        BC_type="t";\n'
-      string+='        lambda_output="'+lambda_output+'"\n'
-      print "***********************"
-      print "MAP_parameters input"
-      print string
-      print "***********************"                                      
+      string+='        lambda_output="'+lambda_output+'"\n'                                  
 
 
-      fdvgrid_input='/local00/bin/MAP/studies/demonstrateur_s_polymers_st_1/fdvgrid.input'
+      fdvgrid_input=path_study+'/fdvgrid.input'
       fd = open(fdvgrid_input, 'w')
       fd.write(string)
       fd.close()
-    
-      fdvgrid_path="/local00/bin/MAP/components/fdvgrid/bin"
 
-      print "***********************"
       commande= "cd "+fdvgrid_path+";\n"
       commande+= "./fdvgrid "+fdvgrid_input
-      print "commande=", commande
       
       os.system(commande)
 
@@ -160,7 +152,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.1"
+       aster_version="STA10"
        template_path=os.path.join(os.getenv('EFICAS_ROOT'), 'MAP/Templates/s_polymers_st_1/')
 
        # Gestion du .comm