From 8f77843b0f207ecf731d0f79e730cb4573c4ec99 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Sat, 30 Nov 2019 09:01:37 +0100
Subject: [PATCH] improved naming

- clearer variable names
- no '-' in attributes
- single source of truth
---
 python/damask/dadf5.py | 17 +++++++++++------
 src/results.f90        |  7 +++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/python/damask/dadf5.py b/python/damask/dadf5.py
index 7dddabfd4..d03617752 100644
--- a/python/damask/dadf5.py
+++ b/python/damask/dadf5.py
@@ -30,9 +30,14 @@ class DADF5():
     """
     with h5py.File(filename,'r') as f:
       
-      self.DADF5-major = f.attrs['DADF5-major']
-      self.DADF5-minor = f.attrs['DADF5-minor']
-      if self.DADF5-major != 0 or not 2 <= self.DADF5-minor <= 4:
+      try:
+        self.version_major = f.attrs['DADF5_version_major']
+        self.version_minor = f.attrs['DADF5_version_minor']
+      except KeyError:
+        self.version_major = f.attrs['DADF5-major']
+        self.version_minor = f.attrs['DADF5-minor']
+
+      if self.version_major != 0 or not 2 <= self.version_minor <= 4:
         raise TypeError('Unsupported DADF5 version {} '.format(f.attrs['DADF5-version']))
     
       self.structured = 'grid' in f['geometry'].attrs.keys()
@@ -168,7 +173,7 @@ class DADF5():
       end increment (included)
 
     """
-    if self.DADF5-minor >= 4:
+    if self.version_minor >= 4:
       self.__manage_visible([    'inc{}'.format(i) for i in range(start,end+1)],'increments','set')
     else:
       self.__manage_visible(['inc{:05d}'.format(i) for i in range(start,end+1)],'increments','set')
@@ -186,7 +191,7 @@ class DADF5():
       end increment (included)
 
     """
-    if self.DADF5-minor >= 4:
+    if self.version_minor >= 4:
       self.__manage_visible([    'inc{}'.format(i) for i in range(start,end+1)],'increments','add')
     else:
       self.__manage_visible(['inc{:05d}'.format(i) for i in range(start,end+1)],'increments','add')
@@ -204,7 +209,7 @@ class DADF5():
       end increment (included)
 
     """
-    if self.DADF5-minor >= 4:
+    if self.version_minor >= 4:
       self.__manage_visible([    'inc{}'.format(i) for i in range(start,end+1)],'increments','del')
     else:
       self.__manage_visible(['inc{:05d}'.format(i) for i in range(start,end+1)],'increments','del')
diff --git a/src/results.f90 b/src/results.f90
index e77600d82..a6b01790d 100644
--- a/src/results.f90
+++ b/src/results.f90
@@ -68,10 +68,9 @@ subroutine results_init
   write(6,'(a)')   ' https://doi.org/10.1007/s40192-017-0084-5'
 
   resultsFile = HDF5_openFile(trim(getSolverJobName())//'.hdf5','w',.true.)
-  call HDF5_addAttribute(resultsFile,'DADF5-version',0.4_pReal)
-  call HDF5_addAttribute(resultsFile,'DADF5-major',0)
-  call HDF5_addAttribute(resultsFile,'DADF5-minor',4)
-  call HDF5_addAttribute(resultsFile,'DAMASK',DAMASKVERSION)
+  call HDF5_addAttribute(resultsFile,'DADF5_version_major',0)
+  call HDF5_addAttribute(resultsFile,'DADF5_version_minor',4)
+  call HDF5_addAttribute(resultsFile,'DAMASK_version',DAMASKVERSION)
   call get_command(commandLine)
   call HDF5_addAttribute(resultsFile,'call',trim(commandLine))
   call HDF5_closeGroup(results_addGroup('mapping'))