From ee6b1eb22c9f26fd020314aa72c7db276360950b Mon Sep 17 00:00:00 2001
From: Martin	Diehl <m.diehl@mpie.de>
Date: Fri, 24 Feb 2012 14:34:44 +0000
Subject: [PATCH] elastic phenopowerlaw for hex crystals is working, results
 are close to analytic ones but there is a small "elastic hardening" and the
 values are a little bit higher than the ones calculated with mtex

---
 lib/damask/config/material.py | 4 ++--
 lib/damask/test/test.py       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/damask/config/material.py b/lib/damask/config/material.py
index bb9046a55..3a91cb0cb 100644
--- a/lib/damask/config/material.py
+++ b/lib/damask/config/material.py
@@ -61,7 +61,7 @@ class Texture(Section):
   def add_component(self,theType,properties):
     
     if 'scatter' not in map(str.lower,properties.keys()):
-          scatter = 1.0
+          scatter = 0.0
     else: scatter = properties['scatter']
     if 'fraction' not in map(str.lower,properties.keys()):
           fraction = 1.0
@@ -183,7 +183,7 @@ class Material():
 
     print('Writing material data to file %s'%saveFile)
     f=open(saveFile,'w')
-    f.write(str(self))
+    f.write(str(self)+'\n')                                          #newline at end
     f.close()
     return saveFile
 
diff --git a/lib/damask/test/test.py b/lib/damask/test/test.py
index 170173637..e2c590e7b 100644
--- a/lib/damask/test/test.py
+++ b/lib/damask/test/test.py
@@ -139,14 +139,14 @@ class Test():
       try:
         shutil.copy2(self.fileInReference(file),self.fileInCurrent(file))  
       except:
-        print 'Unable to copy file ', file
+        print 'Reference2Current: Unable to copy file ', file
 
   def copy_Current2Current(self,files=[]):
     for file in files:
       try:
         shutil.copy2(self.fileInCurrent(file[0]),self.fileInCurrent(file[1]))  
       except:
-        print 'Unable to copy file ', file
+        print 'Current2Current: Unable to copy file ', file
 
   def execute_inCurrentDir(self,cmd):
     os.chdir(self.dirCurrent())
@@ -178,4 +178,4 @@ class Test():
       print '%s passed.'%({False: 'The test',
                          True: 'All %i tests'%(len(self.variants))}[len(self.variants) > 1])
     else:
-     print 'Test %i failed...'%(culprit+1)
+     print ' ********\n * Test %i failed...\n ********'%(culprit+1)