From: Charles Toulemonde <charles.toulemonde@edf.fr>
Date: Wed, 10 Nov 2010 10:39:43 +0000 (+0000)
Subject: s_polymers_st_1 debug
X-Git-Tag: V2_1_1_beta~21
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1175b1e1955abdf51dc49bd186da0e5e59b589f0;p=modules%2Feficas.git

s_polymers_st_1 debug
---

diff --git a/MAP/Templates/s_polymers_st_1/s_polymers_st_1_aster_template.comm b/MAP/Templates/s_polymers_st_1/s_polymers_st_1_aster_template.comm
index f343fdc5..948a787e 100644
--- a/MAP/Templates/s_polymers_st_1/s_polymers_st_1_aster_template.comm
+++ b/MAP/Templates/s_polymers_st_1/s_polymers_st_1_aster_template.comm
@@ -10,10 +10,6 @@
 
 # nbre de classes (de 0% a 100% d'inclusions)
 nb_classes=11
-# specifier le repertoire dans lequel on trouve "entree_schema.dat", "entree_cl.dat" et dans lequel on ecrit "sortie_resultats.dat"
-racine="%_PATH_MODULE%/s_poly_st_1/"
-# nb_classes lignes de float : les lambda donnes par le schema pour la fraction d'incl de chaque classe (de 0% incl a 100% incl tous les N% selon nb_classes)
-fic_entree_schema   =racine+"s_poly_st_1_aster.mat"
 
 # cote cube
 L=%_RVE_SIZE%
@@ -30,7 +26,7 @@ nb_classes=11
 lambda_t = [0.0]*nb_classes
 print("'\n")
 for i in range(0,nb_classes):
-	alpha=float((i-1)/(nb_classes-1))
+	alpha=float((i)/(nb_classes-1))
 	lambda_t[i]=(1-alpha)*%_CONDUCTIVITE_M%+(alpha)*%_CONDUCTIVITE_I%
 
 DEBUT(PAR_LOT='OUI',); # 'OUI' evite l'alarme
diff --git a/MAP/prefs_MAP.py b/MAP/prefs_MAP.py
index 6602c33d..fab9bebf 100644
--- a/MAP/prefs_MAP.py
+++ b/MAP/prefs_MAP.py
@@ -31,7 +31,8 @@ initialdir=REPINI
 
 # INSTALLDIR sert à localiser l'installation d'Eficas
 INSTALLDIR=os.path.join(REPINI,'..')
-PATH_MAP="/local/noyret/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"
diff --git a/generator/generator_s_polymers_st_1.py b/generator/generator_s_polymers_st_1.py
index d8600040..7017ec20 100644
--- a/generator/generator_s_polymers_st_1.py
+++ b/generator/generator_s_polymers_st_1.py
@@ -184,6 +184,7 @@ class s_poly_st_1Generator(MapGenerator):
             commande+= "echo "+str(self.contrast)+" > "+"contrast.input"+";\n"         
             commande+= "./fdvgrid 3D 1.0 0.0 0.0 v t "+str(finesse)+" cross 1e-6 "+";\n"
             commande+= "echo 'fin execution de FDVGRID';\n"
+            print "commande issue du generator :", commande
             
          if (choix=="FEM+mesh") :
             print "option Code_Aster"
@@ -211,7 +212,7 @@ class s_poly_st_1Generator(MapGenerator):
             f.close()
             # launch of BENHUR on the previous file
             commande=commande + "cd "+self.config.PATH_BENHUR+"/bin;\n"
-            #commande=commande + "./benhur -i "+monFichierOutput+";\n"
+            commande=commande + "./benhur -i "+monFichierOutput+";\n"
             commande=commande + "echo 'fin execution de BENHUR';\n"
        
             commande+= "echo 'execution de CODE_ASTER';\n"
@@ -255,16 +256,17 @@ class s_poly_st_1Generator(MapGenerator):
             f.close()
 
             # launch of CODE_ASTER on the study
-            commande="cd "+self.config.PATH_STUDY+";"
+            commande=commande + "cd "+self.config.PATH_STUDY+";"
             commande=commande + self.config.PATH_ASTER + "/as_run "+monFichierExportOutput +";\n"
             commande=commande + "echo 'fin execution de CODE_ASTER';\n"
+       
+            commande+= "echo 'execution de GMSH';\n"
+            commande+= "gmsh "+self.config.PATH_STUDY+"/s_polymers_st_1_aster.resu.msh;\n"
+            commande+= "echo 'fin execution de GMSH';\n"
             
             print commande
             
-            return commande
-
-            
-      print "METHODE Ok"
+      print "METHODE Ok - 20101105"
       print "_____________________\n"
       return commande