From efd653fb00aca57a22c92503e6ca5404d4229aa6 Mon Sep 17 00:00:00 2001
From: Martin	Diehl <m.diehl@mpie.de>
Date: Fri, 9 Mar 2012 16:30:42 +0000
Subject: [PATCH] removed old *.output* and *.spectralOut as they are not
 updated anyway from reference. introduced a numbering scheme for variants
 calculated new reference results due to slight changes

---
 code/core_modules.f90   | 41 +++++++++++++++++++++++++++++------------
 lib/damask/test/test.py |  4 ++--
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/code/core_modules.f90 b/code/core_modules.f90
index cfddb9d34..f91c5dc88 100644
--- a/code/core_modules.f90
+++ b/code/core_modules.f90
@@ -20,34 +20,51 @@
 !* $Id$
 !##############################################################
 
-MODULE prec
+module prec
+
  implicit none 
 !    *** Precision of real and integer variables for python interfacing***
  integer, parameter :: pReal = 8
  integer, parameter :: pInt  = 4
  real(pReal), parameter :: DAMASK_NaN = real(Z'7FF0000000000001',pReal)
  real(pReal), parameter :: tol_math_check = 1.0e-8_pReal
-END MODULE prec
+ 
+end module prec
+
+
+module debug
 
-MODULE debug
  use prec, only: pInt
+ 
  implicit none
- integer(pInt), parameter :: debug_verbosity = 1_pInt
-END MODULE debug
+ integer(pInt), parameter, public :: &
+   debug_levelBasic = 2_pInt**1_pInt, &
+   debug_math       = 2_pInt
+ integer(pInt), dimension(11+2),  public :: &
+   debug_what                    = debug_levelBasic
+   
+end module debug
+
+
+module numerics
 
-MODULE numerics
  use prec, only: pInt, pReal
+ 
  implicit none
- real(pReal), parameter :: fftw_timelimit = -1.0_pReal
+ real(pReal), parameter   :: fftw_timelimit    = -1.0_pReal
  integer(pInt), parameter :: fftw_planner_flag = 32_pInt
- integer(pInt), parameter :: fixedSeed = 1_pInt
-END MODULE numerics
+ integer(pInt), parameter :: fixedSeed         = 1_pInt
+ 
+end module numerics
 
-MODULE IO
- CONTAINS
+
+module IO
+ contains
+ 
  subroutine IO_error(error_ID,e,i,g,ext_msg)
 
  use prec, only: pInt
+ 
  implicit none
  integer(pInt), intent(in) :: error_ID
  integer(pInt), optional, intent(in) :: e,i,g
@@ -60,4 +77,4 @@ MODULE IO
  end select
  end subroutine IO_error
 
-END MODULE IO
+end module IO
diff --git a/lib/damask/test/test.py b/lib/damask/test/test.py
index e2c590e7b..bc66889c0 100644
--- a/lib/damask/test/test.py
+++ b/lib/damask/test/test.py
@@ -162,8 +162,8 @@ class Test():
     table = damask.ASCIItable(refFile)
     table.head_read()
     refFile.close()
-    refArray = numpy.genfromtxt(refName,missing_values='n/a',skip_header = table.headerLen)
-    curArray = numpy.genfromtxt(curName,missing_values='n/a',skip_header = table.headerLen)
+    refArray = numpy.genfromtxt(refName,missing_values='n/a',skip_header = len(table.info)+1)
+    curArray = numpy.genfromtxt(curName,missing_values='n/a',skip_header = len(table.info)+1)
     err = abs((refArray/curArray)-1.)                                     # relative tolerance
     refNaN=len(numpy.isnan(refArray))
     curNaN=len(numpy.isnan(curArray))