[svn-r13064]

Fix several bugs

1) the parsing of subsetting was using atoi to convert the parameter to an int, which caused problems for numbers greater that int. Substitute with atof

2) the printing of indices in the subsetting case was not being done. Solution: calculate the element position at the start of the subsetting using the algorythm 

Given an index I(z,y,x) its position from the beginning of an array   of sizes A(size_z, size_y,size_x) is given by
Position of I(z,y,x) = index_z * size_y * size_x 
                              + index_y * size_x
                              + index_x

And pass that position to the function that dumps data, h5tools_dump_simple_data. 

3) several index counters were declared as int, use hsize_t instead

4) modified the test generation program so that it includes test cases for subsetting of 1d, 2d, 3d, and 4d arrays and add these tests to the shell script

1 files changed, 112 insertions, 120 deletions

diff --git a/tools/testfiles/tindicesno.ddl b/tools/testfiles/tindicesno.ddl
index fdafcea..d58f719 100644
--- a/tools/testfiles/tindicesno.ddl
+++ b/tools/testfiles/tindicesno.ddl
@@ -17,88 +17,90 @@ GROUP "/" {
    }
    DATASET "2d" {
       DATATYPE  H5T_STD_I32LE
-      DATASPACE  SIMPLE { ( 2, 100 ) / ( 2, 100 ) }
+      DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
       DATA {
-         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-         20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
-         38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
-         56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
-         74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
-         92, 93, 94, 95, 96, 97, 98, 99,
-         100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
-         114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-         128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
-         142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155,
-         156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
-         170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
-         184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
-         198, 199
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+         20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+         30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+         40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+         50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+         60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+         70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+         80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+         90, 91, 92, 93, 94, 95, 96, 97, 98, 99
       }
    }
    DATASET "3d" {
       DATATYPE  H5T_STD_I32LE
-      DATASPACE  SIMPLE { ( 2, 2, 100 ) / ( 2, 2, 100 ) }
+      DATASPACE  SIMPLE { ( 2, 10, 10 ) / ( 2, 10, 10 ) }
       DATA {
-         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-         20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
-         38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
-         56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
-         74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
-         92, 93, 94, 95, 96, 97, 98, 99,
-         100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
-         114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
-         128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
-         142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155,
-         156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
-         170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,
-         184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,
-         198, 199,
-         200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
-         214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
-         228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241,
-         242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
-         256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
-         270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283,
-         284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
-         298, 299,
-         300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313,
-         314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327,
-         328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341,
-         342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355,
-         356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369,
-         370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383,
-         384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397,
-         398, 399
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+         20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+         30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+         40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+         50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+         60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+         70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+         80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+         90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+         100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+         110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+         120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+         130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+         140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+         150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+         160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+         170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+         180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+         190, 191, 192, 193, 194, 195, 196, 197, 198, 199
       }
    }
    DATASET "4d" {
       DATATYPE  H5T_STD_I32LE
-      DATASPACE  SIMPLE { ( 2, 3, 4, 5 ) / ( 2, 3, 4, 5 ) }
+      DATASPACE  SIMPLE { ( 2, 2, 10, 10 ) / ( 2, 2, 10, 10 ) }
       DATA {
-         0, 1, 2, 3, 4,
-         5, 6, 7, 8, 9,
-         10, 11, 12, 13, 14,
-         15, 16, 17, 18, 19,
-         20, 21, 22, 23, 24,
-         25, 26, 27, 28, 29,
-         30, 31, 32, 33, 34,
-         35, 36, 37, 38, 39,
-         40, 41, 42, 43, 44,
-         45, 46, 47, 48, 49,
-         50, 51, 52, 53, 54,
-         55, 56, 57, 58, 59,
-         60, 61, 62, 63, 64,
-         65, 66, 67, 68, 69,
-         70, 71, 72, 73, 74,
-         75, 76, 77, 78, 79,
-         80, 81, 82, 83, 84,
-         85, 86, 87, 88, 89,
-         90, 91, 92, 93, 94,
-         95, 96, 97, 98, 99,
-         100, 101, 102, 103, 104,
-         105, 106, 107, 108, 109,
-         110, 111, 112, 113, 114,
-         115, 116, 117, 118, 119
+         0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+         10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+         20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+         30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+         40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+         50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+         60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+         70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+         80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+         90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+         100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+         110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+         120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+         130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
+         140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+         150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
+         160, 161, 162, 163, 164, 165, 166, 167, 168, 169,
+         170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+         180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
+         190, 191, 192, 193, 194, 195, 196, 197, 198, 199,
+         200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+         210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+         220, 221, 222, 223, 224, 225, 226, 227, 228, 229,
+         230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+         240, 241, 242, 243, 244, 245, 246, 247, 248, 249,
+         250, 251, 252, 253, 254, 255, 256, 257, 258, 259,
+         260, 261, 262, 263, 264, 265, 266, 267, 268, 269,
+         270, 271, 272, 273, 274, 275, 276, 277, 278, 279,
+         280, 281, 282, 283, 284, 285, 286, 287, 288, 289,
+         290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+         300, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+         310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
+         320, 321, 322, 323, 324, 325, 326, 327, 328, 329,
+         330, 331, 332, 333, 334, 335, 336, 337, 338, 339,
+         340, 341, 342, 343, 344, 345, 346, 347, 348, 349,
+         350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
+         360, 361, 362, 363, 364, 365, 366, 367, 368, 369,
+         370, 371, 372, 373, 374, 375, 376, 377, 378, 379,
+         380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
+         390, 391, 392, 393, 394, 395, 396, 397, 398, 399
       }
    }
    GROUP "g1" {
@@ -123,16 +125,34 @@ GROUP "/" {
                      }
                      DATASET "2d" {
                         DATATYPE  H5T_STD_I32LE
-                        DATASPACE  SIMPLE { ( 2, 100 ) / ( 2, 100 ) }
+                        DATASPACE  SIMPLE { ( 10, 10 ) / ( 10, 10 ) }
                         DATA {
-                           0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                           16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
-                           29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
-                           42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
-                           55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
-                           68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
-                           81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
-                           94, 95, 96, 97, 98, 99,
+                           0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+                           10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+                           20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+                           30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+                           40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+                           50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+                           60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+                           70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+                           80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+                           90, 91, 92, 93, 94, 95, 96, 97, 98, 99
+                        }
+                     }
+                     DATASET "3d" {
+                        DATATYPE  H5T_STD_I32LE
+                        DATASPACE  SIMPLE { ( 2, 10, 10 ) / ( 2, 10, 10 ) }
+                        DATA {
+                           0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+                           10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+                           20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+                           30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+                           40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+                           50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+                           60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+                           70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+                           80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+                           90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
                            100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
                            110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
                            120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
@@ -145,18 +165,20 @@ GROUP "/" {
                            190, 191, 192, 193, 194, 195, 196, 197, 198, 199
                         }
                      }
-                     DATASET "3d" {
+                     DATASET "4d" {
                         DATATYPE  H5T_STD_I32LE
-                        DATASPACE  SIMPLE { ( 2, 2, 100 ) / ( 2, 2, 100 ) }
+                        DATASPACE  SIMPLE { ( 2, 2, 10, 10 ) / ( 2, 2, 10, 10 ) }
                         DATA {
-                           0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-                           16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
-                           29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
-                           42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
-                           55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
-                           68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
-                           81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
-                           94, 95, 96, 97, 98, 99,
+                           0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+                           10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+                           20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+                           30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+                           40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+                           50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+                           60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+                           70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+                           80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+                           90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
                            100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
                            110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
                            120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
@@ -189,36 +211,6 @@ GROUP "/" {
                            390, 391, 392, 393, 394, 395, 396, 397, 398, 399
                         }
                      }
-                     DATASET "4d" {
-                        DATATYPE  H5T_STD_I32LE
-                        DATASPACE  SIMPLE { ( 2, 3, 4, 5 ) / ( 2, 3, 4, 5 ) }
-                        DATA {
-                           0, 1, 2, 3, 4,
-                           5, 6, 7, 8, 9,
-                           10, 11, 12, 13, 14,
-                           15, 16, 17, 18, 19,
-                           20, 21, 22, 23, 24,
-                           25, 26, 27, 28, 29,
-                           30, 31, 32, 33, 34,
-                           35, 36, 37, 38, 39,
-                           40, 41, 42, 43, 44,
-                           45, 46, 47, 48, 49,
-                           50, 51, 52, 53, 54,
-                           55, 56, 57, 58, 59,
-                           60, 61, 62, 63, 64,
-                           65, 66, 67, 68, 69,
-                           70, 71, 72, 73, 74,
-                           75, 76, 77, 78, 79,
-                           80, 81, 82, 83, 84,
-                           85, 86, 87, 88, 89,
-                           90, 91, 92, 93, 94,
-                           95, 96, 97, 98, 99,
-                           100, 101, 102, 103, 104,
-                           105, 106, 107, 108, 109,
-                           110, 111, 112, 113, 114,
-                           115, 116, 117, 118, 119
-                        }
-                     }
                   }
                }
             }