From 1644252d91b712b984bb52e5e4b1db97741a7449 Mon Sep 17 00:00:00 2001
From: Charles Toulemonde <charles.toulemonde@edf.fr>
Date: Tue, 23 Nov 2010 10:48:54 +0000
Subject: [PATCH] volume_fraction_ouput for pygmvee_v2

---
 .../s_polymers_st_1/cata_s_polymers_st_1.xml  | 24 +++++++++----------
 .../s_polymers_st_1_YACS_nodes.py             |  9 ++++++-
 generator/generator_s_polymers_st_1.py        |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

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 3df24892..f02b4072 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
@@ -27,7 +27,7 @@ sys.path.append(os.path.join(os.getenv('MAP_DIRECTORY'),'../EficasV1/MAP/Templat
 print sys.path
 from s_polymers_st_1_YACS_nodes import *
 
-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)
+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)
 
 result_inclusions = file_result_inclusions
 result_rve = file_result_rve
@@ -106,18 +106,18 @@ print "benhur for YACS - END"
       <inport name="study_path" type="string"/>
       <inport name="benhur_template" type="string"/>
    </inline>
-   <control> <fromnode>pygmee_v2</fromnode> <tonode>benhur</tonode> </control>
    <control> <fromnode>pygmee_v2</fromnode> <tonode>fdvgrid</tonode> </control>
-   <control> <fromnode>init</fromnode> <tonode>benhur</tonode> </control>
-   <control> <fromnode>init</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>benhur</tonode> </control>
    <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>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>init</fromnode> <fromport>phase_number</fromport>
@@ -173,11 +173,11 @@ print "benhur for YACS - END"
    </datalink>
    <datalink control="false">
       <fromnode>init</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>init</fromnode> <fromport>study_name</fromport>
-      <tonode>pygmee_v2</tonode> <toport>study_name</toport>
+      <tonode>fdvgrid</tonode> <toport>study_name</toport>
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>study_name</fromport>
@@ -185,7 +185,7 @@ print "benhur for YACS - END"
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>study_path</fromport>
-      <tonode>fdvgrid</tonode> <toport>study_path</toport>
+      <tonode>benhur</tonode> <toport>study_path</toport>
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>study_path</fromport>
@@ -193,7 +193,7 @@ print "benhur for YACS - END"
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>study_path</fromport>
-      <tonode>benhur</tonode> <toport>study_path</toport>
+      <tonode>fdvgrid</tonode> <toport>study_path</toport>
    </datalink>
    <datalink control="false">
       <fromnode>init</fromnode> <fromport>benhur_template</fromport>
@@ -203,9 +203,9 @@ print "benhur for YACS - END"
       <tonode>benhur</tonode><toport>file_inclusions</toport>
       <value><string></string></value>
    </parameter>
+   <presentation name="pygmee_v2" x="415.186" y="179.5" width="249.5" height="342"/>
+   <presentation name="fdvgrid" x="888.902" y="551.141" width="227.5" height="284"/>
    <presentation name="init" x="9" y="328" width="273.5" height="458"/>
    <presentation name="benhur" x="848.961" y="95.838" width="223" height="255"/>
-   <presentation name="fdvgrid" x="888.902" y="551.141" width="227.5" height="284"/>
-   <presentation name="pygmee_v2" x="415.186" y="179.5" width="249.5" height="342"/>
    <presentation name="__ROOT__" x="0" y="0" width="1125.9" height="844.141"/>
 </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 e8409277..0158c55b 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
@@ -30,8 +30,15 @@ def component_pygmee_v2(rve_size, phase_number, sieve_curve_in, sieve_curve_out,
     commande+= "python pygmee_v2.py -i "+pygmee_v2_input+";\n"
     os.system(commande)
 
+    fd = open(file_result_rve, 'r')
+    line=fd.readline()
+    line=fd.readline()
+    volume_fraction=float(line)
+    print "volume_fraction =", volume_fraction
+    fd.close()    
+
     print "pygmee_v2 for YACS - END"
-    return
+    return volume_fraction
 
 def component_fdvgrid(lambda_I, lambda_M, rve_size, file_inclusions, finesse):
     print "fdvgrid for YACS - BEGIN"
diff --git a/generator/generator_s_polymers_st_1.py b/generator/generator_s_polymers_st_1.py
index a6eb0fb4..39de0bf1 100644
--- a/generator/generator_s_polymers_st_1.py
+++ b/generator/generator_s_polymers_st_1.py
@@ -166,7 +166,7 @@ class s_poly_st_1Generator(MapGenerator):
       commande_python="import os,sys;\n"
       commande_python+="sys.path.append(os.path.join(os.getenv('MAP_DIRECTORY'), '../EficasV1/MAP/Templates/s_polymers_st_1'));\n"
       commande_python+="from s_polymers_st_1_YACS_nodes import *;\n"
-      commande_python+="component_pygmee_v2("+str(self.rve_size)+",1,"+str(self.sieve_curve_in)+","+str(self.sieve_curve_out)+","+str(self.repulsion_distance)+","+str(self.study_name)+","+str(self.study_path)+","+str(self.inclusion_name)+","+str(self.rve_name)+");\n"
+      commande_python+="volume_fraction=component_pygmee_v2("+str(self.rve_size)+",1,"+str(self.sieve_curve_in)+","+str(self.sieve_curve_out)+","+str(self.repulsion_distance)+","+str(self.study_name)+","+str(self.study_path)+","+str(self.inclusion_name)+","+str(self.rve_name)+");\n"
       return 'python -c "'+commande_python+'"\n'
 
    def FDVGRID(self):
-- 
2.39.2