Merge branch 'development'

VERSION

@@ -1 +1 @@
-v2.0.0-7-g2296929
+v2.0.0-12-ge933820

code/DAMASK_spectral.f90

@@ -329,7 +329,7 @@ program DAMASK_spectral
              errorID = 838_pInt                                                                     ! no rotation is allowed by stress BC
      write(6,'(2x,a)') 'stress / GPa:'
      do i = 1_pInt, 3_pInt; do j = 1_pInt, 3_pInt
-       if(loadCases(currentLoadCase)%deformation%maskLogical(i,j)) then
+       if(loadCases(currentLoadCase)%P%maskLogical(i,j)) then
          write(6,'(2x,f12.7)',advance='no') loadCases(currentLoadCase)%P%values(i,j)*1e-9_pReal
        else
          write(6,'(2x,12a)',advance='no') '    *       '

code/IO.f90

@@ -1237,8 +1237,7 @@ character(len=300) pure function IO_extractValue(pair,key)
  IO_extractValue = ''
 
  myChunk = scan(pair,SEP)
- if (myChunk > 0 .and. pair(:myChunk-1) == key(:myChunk-1)) &                                         
+ if (myChunk > 0 .and. pair(:myChunk-1) == key) IO_extractValue = pair(myChunk+1:)                  ! extract value if key matches
-   IO_extractValue = pair(myChunk+1:)                                                               ! extract value if key matches
 
 end function IO_extractValue
 

processing/post/addGrainID.py

@@ -110,7 +110,7 @@ for name in filenames:
   remarks = []
   
   if table.label_dimension(options.coords) != 3:       errors.append('coordinates {} are not a vector.'.format(options.coords))
-  if not np.all(table.label_dimension(label) == dim):  errors.append('input {} has wrong dimension {}.'.format(label,dim))
+  if not np.all(table.label_dimension(label) == dim):  errors.append('input {} does not have dimension {}.'.format(label,dim))
   else:  column = table.label_index(label)
 
   if remarks != []: damask.util.croak(remarks)

processing/post/addIPFcolor.py

@@ -99,7 +99,7 @@ for name in filenames:
 # ------------------------------------------ sanity checks ----------------------------------------
 
   if not np.all(table.label_dimension(label) == dim):
-    damask.util.croak('input {} has wrong dimension {}.'.format(label,dim))
+    damask.util.croak('input {} does not have dimension {}.'.format(label,dim))
     table.close(dismiss = True)                                                                     # close ASCIItable and remove empty file
     continue
 

processing/post/addOrientations.py

@@ -113,7 +113,7 @@ for name in filenames:
   errors  = []
   remarks = []
   
-  if not np.all(table.label_dimension(label) == dim):  errors.append('input {} has wrong dimension {}.'.format(label,dim))
+  if not np.all(table.label_dimension(label) == dim):  errors.append('input {} does not have dimension {}.'.format(label,dim))
   else:  column = table.label_index(label)
 
   if remarks != []: damask.util.croak(remarks)

processing/post/addPole.py

@@ -101,7 +101,7 @@ for name in filenames:
   errors  = []
   remarks = []
   
-  if not np.all(table.label_dimension(label) == dim):  errors.append('input {} has wrong dimension {}.'.format(label,dim))
+  if not np.all(table.label_dimension(label) == dim):  errors.append('input {} does not have dimension {}.'.format(label,dim))
   else:  column = table.label_index(label)
 
   if remarks != []: damask.util.croak(remarks)

processing/post/imageDataRGB.py

@@ -98,7 +98,7 @@ for name in filenames:
     errors.append('column{} {} not found'.format('s' if len(missing_labels) > 1 else '',
                                                  ', '.join(missing_labels)))
   if table.label_dimension(options.label) != 3:
-    errors.append('column {} has wrong dimension'.format(options.label))
+    errors.append('column {} does not have dimension'.format(options.label))
 
   if errors != []:
     damask.util.croak(errors)