From b933359f178bcc14de75b5fe95dfbe71e25ad4dc Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Wed, 9 Mar 2016 12:28:36 -0500 Subject: [PATCH 1/4] clarified text of error message complaining about wrong input dimension --- processing/post/addGrainID.py | 2 +- processing/post/addIPFcolor.py | 2 +- processing/post/addOrientations.py | 2 +- processing/post/addPole.py | 2 +- processing/post/imageDataRGB.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/processing/post/addGrainID.py b/processing/post/addGrainID.py index 5443d1c70..7eb48f286 100755 --- a/processing/post/addGrainID.py +++ b/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) diff --git a/processing/post/addIPFcolor.py b/processing/post/addIPFcolor.py index 24aeb3fa0..2a1a3581a 100755 --- a/processing/post/addIPFcolor.py +++ b/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 diff --git a/processing/post/addOrientations.py b/processing/post/addOrientations.py index b806a56a0..f7519d92c 100755 --- a/processing/post/addOrientations.py +++ b/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) diff --git a/processing/post/addPole.py b/processing/post/addPole.py index c8e3991ee..a57fef9eb 100755 --- a/processing/post/addPole.py +++ b/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) diff --git a/processing/post/imageDataRGB.py b/processing/post/imageDataRGB.py index ac51746ca..f706cb100 100755 --- a/processing/post/imageDataRGB.py +++ b/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) From 6b0db40faf7bda9f717c50a5f6e26bc974589468 Mon Sep 17 00:00:00 2001 From: Test User Date: Thu, 10 Mar 2016 04:20:21 +0100 Subject: [PATCH 2/4] updated version information after successful test of v2.0.0-12-ge933820 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2bc4b2cfc..f81643793 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.0-3-g618e352 +v2.0.0-12-ge933820 From 5249054d34fa6cf6eca7e63e2109f78aad0471ee Mon Sep 17 00:00:00 2001 From: Test User Date: Thu, 10 Mar 2016 16:13:09 +0100 Subject: [PATCH 3/4] updated version information after successful test of v2.0.0-13-g6b0db40 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index f81643793..65ea5b27b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.0-12-ge933820 +v2.0.0-13-g6b0db40 From 3898fb29a83ef2d4b9cae6a3b6dd908808c9d147 Mon Sep 17 00:00:00 2001 From: Test User Date: Fri, 11 Mar 2016 04:12:53 +0100 Subject: [PATCH 4/4] updated version information after successful test of v2.0.0-14-g5249054 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 65ea5b27b..d1397a0d1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.0-13-g6b0db40 +v2.0.0-14-g5249054