[svn-r15977] merge rev 15866 from 1.8 branch into trunk (diffs for unsigned long long)

tested: windows, linux

5 files changed, 889 insertions, 456 deletions

diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c
index 7d9add7..b713e9f 100644
--- a/tools/h5diff/h5diffgentest.c
+++ b/tools/h5diff/h5diffgentest.c
@@ -259,6 +259,23 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     }
 
 
+#if H5_SIZEOF_LONG_DOUBLE !=0
+    {
+        
+    /*-------------------------------------------------------------------------
+    * H5T_NATIVE_LDOUBLE
+    *-------------------------------------------------------------------------
+    */
+        
+        long double data15[3][2] ={{1,1},{1,1},{1,1}};
+        
+        write_dset(gid1,2,dims2,"ld",H5T_NATIVE_LDOUBLE,data15);
+        
+    }
+#endif
+
+
+
    /*-------------------------------------------------------------------------
     * NaNs in H5T_NATIVE_FLOAT
     *-------------------------------------------------------------------------
diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index d2fd6f8..e541a7c 100755
--- a/tools/h5diff/testh5diff.sh
+++ b/tools/h5diff/testh5diff.sh
@@ -573,6 +573,8 @@ TOOLTEST h5diff_101.txt -v $FILE1 $FILE1 g1/d1  g1/d2
 TESTING $H5DIFF -v  $SRCFILE1 $SRCFILE1  g1/fp1 g1/fp2 
 TOOLTEST h5diff_102.txt -v $FILE1 $FILE1 g1/fp1 g1/fp2 
 
+
+
 # ##############################################################################
 # # END
 # ##############################################################################
diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h
index d12031a..4b1a892 100644
--- a/tools/lib/h5diff.h
+++ b/tools/lib/h5diff.h
@@ -192,17 +192,34 @@ hsize_t diff_float(unsigned char *mem1,
                    int           *ph);
 
 hsize_t diff_double(unsigned char *mem1,
-                   unsigned char *mem2,
-                   hsize_t       nelmts,
-                   hsize_t       hyper_start,
-                   int           rank,
-                   hsize_t       *dims,
-                   hsize_t       *acc,
-                   hsize_t       *pos,
-                   diff_opt_t    *options,
-                   const char    *obj1,
-                   const char    *obj2,
-                   int           *ph);
+                    unsigned char *mem2,
+                    hsize_t       nelmts,
+                    hsize_t       hyper_start,
+                    int           rank,
+                    hsize_t       *dims,
+                    hsize_t       *acc,
+                    hsize_t       *pos,
+                    diff_opt_t    *options,
+                    const char    *obj1,
+                    const char    *obj2,
+                    int           *ph);
+
+#if H5_SIZEOF_LONG_DOUBLE !=0
+
+hsize_t diff_ldouble(unsigned char *mem1,
+                     unsigned char *mem2,
+                     hsize_t       nelmts,
+                     hsize_t       hyper_start,
+                     int           rank,
+                     hsize_t       *dims,
+                     hsize_t       *acc,
+                     hsize_t       *pos,
+                     diff_opt_t    *options,
+                     const char    *obj1,
+                     const char    *obj2,
+                     int           *ph);
+
+#endif
 
 hsize_t diff_schar(unsigned char *mem1,
                    unsigned char *mem2,
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 5250c3c..0629c3e 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -34,6 +34,11 @@
  */
 
 #define F_FORMAT      "%-15g %-15g %-15g\n"
+
+#if H5_SIZEOF_LONG_DOUBLE !=0
+#define LD_FORMAT     "%-15Lf %-15Lf %-15Lf\n"
+#endif
+
 #define I_FORMAT      "%-15d %-15d %-15d\n"
 #define C_FORMAT      "%-16c %-17c\n"
 #define S_FORMAT      "%-16s %-17s\n"
@@ -45,6 +50,11 @@
 
 /* with -p option */
 #define F_FORMAT_P    "%-15.10g %-15.10g %-15.10g %-14.10g\n"
+
+#if H5_SIZEOF_LONG_DOUBLE !=0
+#define LD_FORMAT_P    "%-15.10Lf %-15.10Lf %-15.10Lf %-14.10Lf\n"
+#endif
+
 #define I_FORMAT_P    "%-15d %-15d %-15d %-14f\n"
 #define UI_FORMAT_P   "%-15u %-15u %-15u %-14f\n"
 #define LI_FORMAT_P   "%-15ld %-15ld %-15ld %-14f\n"
@@ -55,6 +65,11 @@
 
 /* not comparable */
 #define F_FORMAT_P_NOTCOMP  "%-15.10g %-15.10g %-15.10g not comparable\n"
+
+#if H5_SIZEOF_LONG_DOUBLE !=0
+#define LD_FORMAT_P_NOTCOMP  "%-15.10Lf %-15.10Lf %-15.10Lf not comparable\n"
+#endif
+
 #define I_FORMAT_P_NOTCOMP  "%-15d %-15d %-15d not comparable\n"
 #define UI_FORMAT_P_NOTCOMP   "%-15u %-15u %-15u not comparable\n"
 #define LI_FORMAT_P_NOTCOMP   "%-15ld %-15ld %-15ld not comparable\n"
@@ -119,7 +134,7 @@ static int   not_comparable;
     is_zero=1;                                       \
 }
 
-#define PDIFF(a,b)      ( (b>a) ? (b-a) : (a-b))
+#   define PDIFF(a,b)		( (b>a) ? (b-a) : (a-b))
 
 /*-------------------------------------------------------------------------
  * local prototypes
@@ -127,12 +142,14 @@ static int   not_comparable;
  */
 static hsize_t diff_region(hid_t obj1_id, hid_t obj2_id,hid_t region1_id, hid_t region2_id, diff_opt_t *options);
 static hbool_t all_zero(const void *_mem, size_t size);
+static int     ull2float(unsigned long_long ull_value, float *f_value);
 static hsize_t character_compare(unsigned char *mem1,unsigned char *mem2,hsize_t i,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph);
 static hsize_t character_compare_opt(unsigned char *mem1,unsigned char *mem2,hsize_t i,int rank,hsize_t *dims,hsize_t *acc,hsize_t *pos,diff_opt_t *options,const char *obj1,const char *obj2,int *ph);
 static hbool_t equal_float(float value, float expected);
 static hbool_t equal_double(double value, double expected);
-static int     ull2float(unsigned long_long ull_value, float *f_value);
-
+#if H5_SIZEOF_LONG_DOUBLE !=0
+static hbool_t equal_ldouble(long double value, long double expected);
+#endif
 
 /*-------------------------------------------------------------------------
  * NaN detection
@@ -323,11 +340,17 @@ hsize_t diff_array( void *_mem1,
         */
 
         case H5T_FLOAT:
-
+            
             if (H5Tequal(m_type, H5T_NATIVE_FLOAT))
                 nfound=diff_float(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
             else if (H5Tequal(m_type, H5T_NATIVE_DOUBLE))
                 nfound=diff_double(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+
+#if H5_SIZEOF_LONG_DOUBLE !=0
+            else if (H5Tequal(m_type, H5T_NATIVE_LDOUBLE))
+                nfound=diff_ldouble(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
+#endif
+            
             break;
 
         case H5T_INTEGER:
@@ -694,6 +717,7 @@ hsize_t diff_datum(void       *_mem1,
         break;
 
 
+
    /*-------------------------------------------------------------------------
     * H5T_REFERENCE
     *-------------------------------------------------------------------------
@@ -2207,6 +2231,181 @@ hsize_t diff_datum(void       *_mem1,
             }
     } /*H5T_NATIVE_DOUBLE*/
 
+#if H5_SIZEOF_LONG_DOUBLE !=0
+
+
+       /*-------------------------------------------------------------------------
+        * H5T_NATIVE_LDOUBLE
+        *-------------------------------------------------------------------------
+        */
+
+        else if (H5Tequal(m_type, H5T_NATIVE_LDOUBLE))
+        {
+            long double temp1_double;
+            long double temp2_double;
+            int         isnan1;
+            int          isnan2;
+
+
+            assert(type_size==sizeof(long double));
+
+            memcpy(&temp1_double, mem1, sizeof(long double));
+            memcpy(&temp2_double, mem2, sizeof(long double));
+
+           /* logic for detecting NaNs is different with options -d, -p and no options */
+
+           /*-------------------------------------------------------------------------
+            * -d and !-p
+            *-------------------------------------------------------------------------
+            */
+            if (options->d && !options->p)
+            {
+
+               /*-------------------------------------------------------------------------
+                * detect NaNs
+                *-------------------------------------------------------------------------
+                */
+                isnan1 = my_isnan(FLT_LDOUBLE,&temp1_double);
+                isnan2 = my_isnan(FLT_LDOUBLE,&temp2_double);
+
+                if ( !isnan1 && !isnan2)
+                {
+
+                    if (ABS(temp1_double-temp2_double) > options->delta)
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(LD_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                        }
+                        nfound++;
+                    }
+
+                } /* NaN */
+            }
+
+           /*-------------------------------------------------------------------------
+            * !-d and -p
+            *-------------------------------------------------------------------------
+            */
+            else if (!options->d && options->p)
+            {
+
+               /*-------------------------------------------------------------------------
+                * detect NaNs
+                *-------------------------------------------------------------------------
+                */
+                isnan1 = my_isnan(FLT_LDOUBLE,&temp1_double);
+                isnan2 = my_isnan(FLT_LDOUBLE,&temp2_double);
+
+                if ( !isnan1 && !isnan2)
+                {
+
+                    PER(temp1_double,temp2_double);
+
+                    if (not_comparable && !both_zero) /* not comparable */
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(LD_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
+                                ABS(temp1_double-temp2_double));
+                        }
+                        options->not_cmp=1;
+                        nfound++;
+                    }
+
+                    else
+
+                        if ( per > options->percent )
+                        {
+                            if ( print_data(options) )
+                            {
+                                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                                parallel_print(SPACES);
+                                parallel_print(LD_FORMAT_P,temp1_double,temp2_double,
+                                    ABS(temp1_double-temp2_double),
+                                    ABS(1-temp2_double/temp1_double));
+                            }
+                            nfound++;
+                        }
+
+                } /* NaN */
+            }
+
+           /*-------------------------------------------------------------------------
+            * -d and -p
+            *-------------------------------------------------------------------------
+            */
+            else if ( options->d && options->p)
+            {
+
+               /*-------------------------------------------------------------------------
+                * detect NaNs
+                *-------------------------------------------------------------------------
+                */
+                isnan1 = my_isnan(FLT_LDOUBLE,&temp1_double);
+                isnan2 = my_isnan(FLT_LDOUBLE,&temp2_double);
+
+                if ( !isnan1 && !isnan2)
+                {
+
+                    PER(temp1_double,temp2_double);
+
+                    if (not_comparable && !both_zero) /* not comparable */
+                    {
+                        if ( print_data(options) )
+                        {
+                            print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                            parallel_print(SPACES);
+                            parallel_print(LD_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
+                                ABS(temp1_double-temp2_double));
+                        }
+                        options->not_cmp=1;
+                        nfound++;
+                    }
+
+                    else
+
+                        if ( per > options->percent &&
+                            ABS(temp1_double-temp2_double) > options->delta )
+                        {
+                            if ( print_data(options) )
+                            {
+                                print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                                parallel_print(SPACES);
+                                parallel_print(LD_FORMAT_P,temp1_double,temp2_double,
+                                    ABS(temp1_double-temp2_double),
+                                    ABS(1-temp2_double/temp1_double));
+                            }
+                            nfound++;
+                        }
+
+                } /* NaN */
+            }
+
+           /*-------------------------------------------------------------------------
+            * no -d and -p
+            *-------------------------------------------------------------------------
+            */
+            else if (equal_ldouble(temp1_double,temp2_double)==FALSE)
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(LD_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                }
+                nfound++;
+            }
+    } /*H5T_NATIVE_DOUBLE*/
+
+
+#endif  /* H5_SIZEOF_LONG_DOUBLE */
+
+
 
     break; /* H5T_FLOAT class */
 
@@ -2861,6 +3060,7 @@ hsize_t diff_float(unsigned char *mem1,
 }
 
 
+
 /*-------------------------------------------------------------------------
  * Function: diff_double
  *
@@ -2890,192 +3090,323 @@ hsize_t diff_double(unsigned char *mem1,
     hsize_t     i;
     double      per;
     int         both_zero;
-    int         isnan1;
-    int         isnan2;
-
 
- /*-------------------------------------------------------------------------
-  * -d and !-p
-  *-------------------------------------------------------------------------
-  */
 
+    /* -d and !-p */
     if (options->d && !options->p)
     {
+
         for ( i = 0; i < nelmts; i++)
         {
             memcpy(&temp1_double, mem1, sizeof(double));
             memcpy(&temp2_double, mem2, sizeof(double));
 
-           /*-------------------------------------------------------------------------
-            * detect NaNs
-            *-------------------------------------------------------------------------
-            */
-            isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
-            isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
-
-            if ( !isnan1 && !isnan2)
+            if (ABS(temp1_double-temp2_double) > options->delta)
             {
-                if (ABS(temp1_double-temp2_double) > options->delta)
+                if ( print_data(options) )
                 {
-                    if ( print_data(options) )
-                    {
-                        print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                        parallel_print(SPACES);
-                        parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
-                    }
-                    nfound++;
+                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
                 }
-            } /* NaN */
+                nfound++;
+            }
             mem1+=sizeof(double);
             mem2+=sizeof(double);
             if (options->n && nfound>=options->count)
                 return nfound;
-        } /* i */
+        }
     }
 
- /*-------------------------------------------------------------------------
-  * !-d and -p
-  *-------------------------------------------------------------------------
-  */
+    /* !-d and -p */
     else if (!options->d && options->p)
     {
+
         for ( i = 0; i < nelmts; i++)
         {
             memcpy(&temp1_double, mem1, sizeof(double));
             memcpy(&temp2_double, mem2, sizeof(double));
 
-           /*-------------------------------------------------------------------------
-            * detect NaNs
-            *-------------------------------------------------------------------------
-            */
-            isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
-            isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
+            PER(temp1_double,temp2_double);
 
-            if ( !isnan1 && !isnan2)
+            if (not_comparable && !both_zero) /* not comparable */
             {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
+                        ABS(temp1_double-temp2_double));
+                }
+                options->not_cmp=1;
+                nfound++;
+            }
 
-                PER(temp1_double,temp2_double);
+            else
 
-                if (not_comparable && !both_zero) /* not comparable */
+                if ( per > options->percent )
                 {
                     if ( print_data(options) )
                     {
                         print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                            ABS(temp1_double-temp2_double));
+                        parallel_print(F_FORMAT_P,temp1_double,temp2_double,
+                            ABS(temp1_double-temp2_double),
+                            ABS(1-temp2_double/temp1_double));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
+                mem1+=sizeof(double);
+                mem2+=sizeof(double);
+                if (options->n && nfound>=options->count)
+                    return nfound;
+        }
+    }
 
-                else
+    /* -d and -p */
+    else if ( options->d && options->p)
+    {
 
-                    if ( per > options->percent )
+        for ( i = 0; i < nelmts; i++)
+        {
+            memcpy(&temp1_double, mem1, sizeof(double));
+            memcpy(&temp2_double, mem2, sizeof(double));
+
+            PER(temp1_double,temp2_double);
+
+            if (not_comparable && !both_zero) /* not comparable */
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
+                        ABS(temp1_double-temp2_double));
+                }
+                options->not_cmp=1;
+                nfound++;
+            }
+
+            else
+
+                if ( per > options->percent && ABS(temp1_double-temp2_double) > options->delta )
+                {
+                    if ( print_data(options) )
                     {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P,temp1_double,temp2_double,
-                                ABS(temp1_double-temp2_double),
-                                ABS(1-temp2_double/temp1_double));
-                        }
-                        nfound++;
+                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(F_FORMAT_P,temp1_double,temp2_double,
+                            ABS(temp1_double-temp2_double),
+                            ABS(1-temp2_double/temp1_double));
                     }
-            } /* NaN */
+                    nfound++;
+                }
+                mem1+=sizeof(double);
+                mem2+=sizeof(double);
+                if (options->n && nfound>=options->count)
+                    return nfound;
+        }
+    }
+    else
+    {
+
+        for ( i = 0; i < nelmts; i++)
+        {
+            memcpy(&temp1_double, mem1, sizeof(double));
+            memcpy(&temp2_double, mem2, sizeof(double));
+
+            if (equal_double(temp1_double,temp2_double)==FALSE)
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                }
+                nfound++;
+            }
+
             mem1+=sizeof(double);
             mem2+=sizeof(double);
             if (options->n && nfound>=options->count)
                 return nfound;
-        } /* i */
+        } /* nelmts */
+
     }
 
- /*-------------------------------------------------------------------------
-  * -d and -p
-  *-------------------------------------------------------------------------
-  */
-    else if ( options->d && options->p)
+    return nfound;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function: diff_ldouble
+ *
+ * Purpose: diff a H5T_NATIVE_LDOUBLE type
+ *
+ * Return: number of differences found
+ *
+ *-------------------------------------------------------------------------
+ */
+#if H5_SIZEOF_LONG_DOUBLE !=0
+ 
+hsize_t diff_ldouble(unsigned char *mem1,
+                    unsigned char *mem2,
+                    hsize_t       nelmts,
+                    hsize_t       hyper_start,
+                    int           rank,
+                    hsize_t       *dims,
+                    hsize_t       *acc,
+                    hsize_t       *pos,
+                    diff_opt_t    *options,
+                    const char    *obj1,
+                    const char    *obj2,
+                    int           *ph)
+
+{
+    hsize_t     nfound=0;          /* number of differences found */
+    long double temp1_double;
+    long double temp2_double;
+    hsize_t     i;
+    double      per;
+    int         both_zero;
+
+
+    /* -d and !-p */
+    if (options->d && !options->p)
     {
 
         for ( i = 0; i < nelmts; i++)
         {
-            memcpy(&temp1_double, mem1, sizeof(double));
-            memcpy(&temp2_double, mem2, sizeof(double));
+            memcpy(&temp1_double, mem1, sizeof(long double));
+            memcpy(&temp2_double, mem2, sizeof(long double));
 
-            /*-------------------------------------------------------------------------
-            * detect NaNs
-            *-------------------------------------------------------------------------
-            */
-            isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
-            isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
+            if (ABS(temp1_double-temp2_double) > options->delta)
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(LD_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                }
+                nfound++;
+            }
+            mem1+=sizeof(long double);
+            mem2+=sizeof(long double);
+            if (options->n && nfound>=options->count)
+                return nfound;
+        }
+    }
 
-            if ( !isnan1 && !isnan2)
+    /* !-d and -p */
+    else if (!options->d && options->p)
+    {
+
+        for ( i = 0; i < nelmts; i++)
+        {
+            memcpy(&temp1_double, mem1, sizeof(long double));
+            memcpy(&temp2_double, mem2, sizeof(long double));
+
+            PER(temp1_double,temp2_double);
+
+            if (not_comparable && !both_zero) /* not comparable */
             {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(LD_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
+                        ABS(temp1_double-temp2_double));
+                }
+                options->not_cmp=1;
+                nfound++;
+            }
 
-                PER(temp1_double,temp2_double);
+            else
 
-                if (not_comparable && !both_zero) /* not comparable */
+                if ( per > options->percent )
                 {
                     if ( print_data(options) )
                     {
                         print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
                         parallel_print(SPACES);
-                        parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                            ABS(temp1_double-temp2_double));
+                        parallel_print(LD_FORMAT_P,temp1_double,temp2_double,
+                            ABS(temp1_double-temp2_double),
+                            ABS(1-temp2_double/temp1_double));
                     }
-                    options->not_cmp=1;
                     nfound++;
                 }
+                mem1+=sizeof(long double);
+                mem2+=sizeof(long double);
+                if (options->n && nfound>=options->count)
+                    return nfound;
+        }
+    }
+
+    /* -d and -p */
+    else if ( options->d && options->p)
+    {
+
+        for ( i = 0; i < nelmts; i++)
+        {
+            memcpy(&temp1_double, mem1, sizeof(long double));
+            memcpy(&temp2_double, mem2, sizeof(long double));
+
+            PER(temp1_double,temp2_double);
+
+            if (not_comparable && !both_zero) /* not comparable */
+            {
+                if ( print_data(options) )
+                {
+                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(LD_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
+                        ABS(temp1_double-temp2_double));
+                }
+                options->not_cmp=1;
+                nfound++;
+            }
 
-                else
+            else
 
-                    if ( per > options->percent && ABS(temp1_double-temp2_double) > options->delta )
+                if ( per > options->percent && ABS(temp1_double-temp2_double) > options->delta )
+                {
+                    if ( print_data(options) )
                     {
-                        if ( print_data(options) )
-                        {
-                            print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                            parallel_print(SPACES);
-                            parallel_print(F_FORMAT_P,temp1_double,temp2_double,
-                                ABS(temp1_double-temp2_double),
-                                ABS(1-temp2_double/temp1_double));
-                        }
-                        nfound++;
+                        print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                        parallel_print(SPACES);
+                        parallel_print(LD_FORMAT_P,temp1_double,temp2_double,
+                            ABS(temp1_double-temp2_double),
+                            ABS(1-temp2_double/temp1_double));
                     }
-
-            } /* NaN */
-            mem1+=sizeof(double);
-            mem2+=sizeof(double);
-            if (options->n && nfound>=options->count)
-                return nfound;
-        } /* i */
+                    nfound++;
+                }
+                mem1+=sizeof(long double);
+                mem2+=sizeof(long double);
+                if (options->n && nfound>=options->count)
+                    return nfound;
+        }
     }
-
- /*-------------------------------------------------------------------------
-  * no -d and -p
-  *-------------------------------------------------------------------------
-  */
     else
     {
 
         for ( i = 0; i < nelmts; i++)
         {
-            memcpy(&temp1_double, mem1, sizeof(double));
-            memcpy(&temp2_double, mem2, sizeof(double));
+            memcpy(&temp1_double, mem1, sizeof(long double));
+            memcpy(&temp2_double, mem2, sizeof(long double));
 
-            if (equal_double(temp1_double,temp2_double)==FALSE)
+            if (equal_ldouble(temp1_double,temp2_double)==FALSE)
             {
                 if ( print_data(options) )
                 {
                     print_pos(ph,0,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
                     parallel_print(SPACES);
-                    parallel_print(F_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
+                    parallel_print(LD_FORMAT,temp1_double,temp2_double,ABS(temp1_double-temp2_double));
                 }
                 nfound++;
             }
 
-            mem1+=sizeof(double);
-            mem2+=sizeof(double);
+            mem1+=sizeof(long double);
+            mem2+=sizeof(long double);
             if (options->n && nfound>=options->count)
                 return nfound;
         } /* nelmts */
@@ -3085,8 +3416,7 @@ hsize_t diff_double(unsigned char *mem1,
     return nfound;
 }
 
-
-
+#endif /* H5_SIZEOF_LONG_DOUBLE */
 
 /*-------------------------------------------------------------------------
  * Function: diff_schar
@@ -4948,9 +5278,6 @@ error:
  * Purpose:     use a relative error formula to deal with floating point
  *              uncertainty
  *
- * Programmer:  pvn
- *              October 24, 2006
- *
  * Modifications:
  *  8/1/2007. handle NaNs
  *
@@ -5012,13 +5339,78 @@ hbool_t equal_double(double value, double expected)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    equal_float
+ * Function:    equal_ldouble
  *
  * Purpose:     use a relative error formula to deal with floating point
  *              uncertainty
  *
- * Programmer:  pvn
- *              October 24, 2006
+ *-------------------------------------------------------------------------
+ */
+
+#if H5_SIZEOF_LONG_DOUBLE !=0
+static
+hbool_t equal_ldouble(long double value, long double expected)
+{
+    int both_zero;
+    int is_zero;
+
+#if defined (H5DIFF_DO_NAN)
+
+/*-------------------------------------------------------------------------
+ * detect NaNs
+ *-------------------------------------------------------------------------
+ */
+    int isnan1 = my_isnan(FLT_LDOUBLE,&value);
+    int isnan2 = my_isnan(FLT_LDOUBLE,&expected);
+
+   /*-------------------------------------------------------------------------
+    * we consider NaN == NaN to be true
+    *-------------------------------------------------------------------------
+    */
+    if ( isnan1 && isnan2 )
+    {
+        return TRUE;
+    }
+
+   /*-------------------------------------------------------------------------
+    * one is a NaN, do not compare but assume difference
+    *-------------------------------------------------------------------------
+    */
+    if ( (isnan1 && !isnan2) || ( !isnan1 && isnan2 ) )
+    {
+        return FALSE;
+    }
+
+   /*-------------------------------------------------------------------------
+    * both are not NaNs, compare
+    *-------------------------------------------------------------------------
+    */
+
+#endif
+
+    BOTH_ZERO(value,expected)
+    if (both_zero)
+        return TRUE;
+
+    IS_ZERO(expected)
+    if (is_zero)
+        return(equal_ldouble(expected,value));
+
+    if ( ABS( (value-expected) / expected) < H5DIFF_DBL_EPSILON)
+        return TRUE;
+    else
+        return FALSE;
+
+}
+
+#endif /* #if H5_SIZEOF_LONG_DOUBLE !=0 */
+ 
+
+/*-------------------------------------------------------------------------
+ * Function:    equal_float
+ *
+ * Purpose:     use a relative error formula to deal with floating point
+ *              uncertainty
  *
  * Modifications:
  *  8/1/2007. handle NaNs
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index 6048796..38b7f16 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -1,17 +1,17 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* Copyright by The HDF Group.                                               *
+* Copyright by the Board of Trustees of the University of Illinois.         *
+* All rights reserved.                                                      *
+*                                                                           *
+* This file is part of HDF5.  The full HDF5 copyright notice, including     *
+* terms governing use, modification, and redistribution, is contained in    *
+* the files COPYING and Copyright.html.  COPYING can be found at the root   *
+* of the source code distribution tree; Copyright.html can be found at the  *
+* root level of an installed copy of the electronic HDF5 document set and   *
+* is linked from the top-level documents page.  It can also be found at     *
+* http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+* access to either file, you may request a copy from help@hdfgroup.org.     *
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "h5diff.h"
 #include "ph5diff.h"
@@ -19,19 +19,46 @@
 #include "h5tools.h"
 
 /*-------------------------------------------------------------------------
- * Function: diff_dataset
- *
- * Purpose: check for comparable datasets and read into a compatible
- *  memory type
- *
- * Return: Number of differences found
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- *-------------------------------------------------------------------------
- */
+* Function: print_size
+*
+* Purpose: print dimensions
+*
+*-------------------------------------------------------------------------
+*/
+#if defined (H5DIFF_DEBUG)
+static void
+print_size (int rank, hsize_t *dims)
+{
+    int i;
+    
+    parallel_print("[" );
+    for ( i = 0; i < rank-1; i++)
+    {
+        parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[i]);
+        parallel_print("x");
+    }
+    parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[rank-1]);
+    parallel_print("]\n" );
+    
+}
+#endif /* H5DIFF_DEBUG */
+
+
+
+/*-------------------------------------------------------------------------
+* Function: diff_dataset
+*
+* Purpose: check for comparable datasets and read into a compatible
+*  memory type
+*
+* Return: Number of differences found
+*
+* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+*
+* Date: May 9, 2003
+*
+*-------------------------------------------------------------------------
+*/
 hsize_t diff_dataset( hid_t file1_id,
                       hid_t file2_id,
                       const char *obj1_name,
@@ -43,36 +70,37 @@ hsize_t diff_dataset( hid_t file1_id,
     hid_t   dcpl1 = -1;
     hid_t   dcpl2 = -1;
     hsize_t nfound = 0;
-
-   /*-------------------------------------------------------------------------
+    
+    /*-------------------------------------------------------------------------
     * open the handles
     *-------------------------------------------------------------------------
     */
     /* disable error reporting */
-    H5E_BEGIN_TRY
+    H5E_BEGIN_TRY 
     {
-        /* open the datasets */
-        if((did1 = H5Dopen2(file1_id, obj1_name, H5P_DEFAULT)) < 0)
+        /* Open the datasets */
+        if((did1 = H5Dopen2(file1_id, obj1_name, H5P_DEFAULT)) < 0) 
         {
             printf("Cannot open dataset <%s>\n", obj1_name);
             goto error;
         }
-
-        if((did2 = H5Dopen2(file2_id, obj2_name, H5P_DEFAULT)) < 0)
+        if((did2 = H5Dopen2(file2_id, obj2_name, H5P_DEFAULT)) < 0) 
         {
             printf("Cannot open dataset <%s>\n", obj2_name);
             goto error;
         }
         /* enable error reporting */
     } H5E_END_TRY;
-
-
-    if ((dcpl1 = H5Dget_create_plist(did1)) < 0)
+    
+    
+    if((dcpl1 = H5Dget_create_plist(did1)) < 0)
         goto error;
-    if ((dcpl2 = H5Dget_create_plist(did2)) < 0)
+    if((dcpl2 = H5Dget_create_plist(did2)) < 0)
+    {
         goto error;
-
-   /*-------------------------------------------------------------------------
+    }
+    
+    /*-------------------------------------------------------------------------
     * check if the dataset creation property list has filters that
     * are not registered in the current configuration
     * 1) the external filters GZIP and SZIP might not be available
@@ -88,94 +116,93 @@ hsize_t diff_dataset( hid_t file1_id,
             obj2_name,
             options);
     }
-   /*-------------------------------------------------------------------------
+    /*-------------------------------------------------------------------------
     * close
     *-------------------------------------------------------------------------
     */
     /* disable error reporting */
-    H5E_BEGIN_TRY
-    {
+    H5E_BEGIN_TRY {
         H5Pclose(dcpl1);
         H5Pclose(dcpl2);
         H5Dclose(did1);
         H5Dclose(did2);
         /* enable error reporting */
     } H5E_END_TRY;
-
+    
     return nfound;
-
+    
 error:
     options->err_stat=1;
     /* disable error reporting */
-    H5E_BEGIN_TRY
-    {
+    H5E_BEGIN_TRY {
         H5Pclose(dcpl1);
         H5Pclose(dcpl2);
         H5Dclose(did1);
         H5Dclose(did2);
         /* enable error reporting */
     } H5E_END_TRY;
-
+    
     return nfound;
 }
 
 /*-------------------------------------------------------------------------
- * Function: diff_datasetid
- *
- * Purpose: check for comparable datasets and read into a compatible
- *  memory type
- *
- * Return: Number of differences found
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: May 9, 2003
- *
- * Modifications:
- *
- * October 2006:  Read by hyperslabs for big datasets.
- *
- *  A threshold of H5TOOLS_MALLOCSIZE (128 MB) is the limit upon which I/O hyperslab is done
- *  i.e., if the memory needed to read a dataset is greater than this limit,
- *  then hyperslab I/O is done instead of one operation I/O
- *  For each dataset, the memory needed is calculated according to
- *
- *  memory needed = number of elements * size of each element
- *
- *  if the memory needed is lower than H5TOOLS_MALLOCSIZE, then the following operations
- *  are done
- *
- *  H5Dread( input_dataset1 )
- *  H5Dread( input_dataset2 )
- *
- *  with all elements in the datasets selected. If the memory needed is greater than
- *  H5TOOLS_MALLOCSIZE, then the following operations are done instead:
- *
- *  a strip mine is defined for each dimension k (a strip mine is defined as a
- *  hyperslab whose size is memory manageable) according to the formula
- *
- *  (1) strip_mine_size[k ] = MIN(dimension[k ], H5TOOLS_BUFSIZE / size of memory type)
- *
- *  where H5TOOLS_BUFSIZE is a constant currently defined as 1MB. This formula assures
- *  that for small datasets (small relative to the H5TOOLS_BUFSIZE constant), the strip
- *  mine size k is simply defined as its dimension k, but for larger datasets the
- *  hyperslab size is still memory manageable.
- *  a cycle is done until the number of elements in the dataset is reached. In each
- *  iteration, two parameters are defined for the function H5Sselect_hyperslab,
- *  the start and size of each hyperslab, according to
- *
- *  (2) hyperslab_size [k] = MIN(dimension[k] - hyperslab_offset[k], strip_mine_size [k])
- *
- *  where hyperslab_offset [k] is initially set to zero, and later incremented in
- *  hyperslab_size[k] offsets. The reason for the operation
- *
- *  dimension[k] - hyperslab_offset[k]
- *
- *  in (2) is that, when using the strip mine size, it assures that the "remaining" part
- *  of the dataset that does not fill an entire strip mine is processed.
- *
- *-------------------------------------------------------------------------
- */
+* Function: diff_datasetid
+*
+* Purpose: check for comparable datasets and read into a compatible
+*  memory type
+*
+* Return: Number of differences found
+*
+* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+*
+* Date: May 9, 2003
+*
+* Modifications:
+*
+*
+* October 2006:  Read by hyperslabs for big datasets.
+*
+*  A threshold of H5TOOLS_MALLOCSIZE (128 MB) is the limit upon which I/O hyperslab is done
+*  i.e., if the memory needed to read a dataset is greater than this limit,
+*  then hyperslab I/O is done instead of one operation I/O
+*  For each dataset, the memory needed is calculated according to
+*
+*  memory needed = number of elements * size of each element
+*
+*  if the memory needed is lower than H5TOOLS_MALLOCSIZE, then the following operations
+*  are done
+*
+*  H5Dread( input_dataset1 )
+*  H5Dread( input_dataset2 )
+*
+*  with all elements in the datasets selected. If the memory needed is greater than
+*  H5TOOLS_MALLOCSIZE, then the following operations are done instead:
+*
+*  a strip mine is defined for each dimension k (a strip mine is defined as a
+*  hyperslab whose size is memory manageable) according to the formula
+*
+*  (1) strip_mine_size[k ] = MIN(dimension[k ], H5TOOLS_BUFSIZE / size of memory type)
+*
+*  where H5TOOLS_BUFSIZE is a constant currently defined as 1MB. This formula assures
+*  that for small datasets (small relative to the H5TOOLS_BUFSIZE constant), the strip
+*  mine size k is simply defined as its dimension k, but for larger datasets the
+*  hyperslab size is still memory manageable.
+*  a cycle is done until the number of elements in the dataset is reached. In each
+*  iteration, two parameters are defined for the function H5Sselect_hyperslab,
+*  the start and size of each hyperslab, according to
+*
+*  (2) hyperslab_size [k] = MIN(dimension[k] - hyperslab_offset[k], strip_mine_size [k])
+*
+*  where hyperslab_offset [k] is initially set to zero, and later incremented in
+*  hyperslab_size[k] offsets. The reason for the operation
+*
+*  dimension[k] - hyperslab_offset[k]
+*
+*  in (2) is that, when using the strip mine size, it assures that the "remaining" part
+*  of the dataset that does not fill an entire strip mine is processed.
+*
+*-------------------------------------------------------------------------
+*/
 hsize_t diff_datasetid( hid_t did1,
                         hid_t did2,
                         const char *obj1_name,
@@ -212,54 +239,56 @@ hsize_t diff_datasetid( hid_t did1,
     void       *sm_buf2=NULL;
     size_t     need;                   /* bytes needed for malloc */
     int        i;
-
-    /* get the dataspace handle */
+    
+    /* Get the dataspace handle */
     if ( (sid1 = H5Dget_space(did1)) < 0 )
         goto error;
-
-    /* get rank */
+    
+    /* Get rank */
     if ( (rank1 = H5Sget_simple_extent_ndims(sid1)) < 0 )
         goto error;
-
-    /* get the dataspace handle */
+    
+    /* Get the dataspace handle */
     if ( (sid2 = H5Dget_space(did2)) < 0 )
         goto error;
-
-    /* get rank */
+    
+    /* Get rank */
     if ( (rank2 = H5Sget_simple_extent_ndims(sid2)) < 0 )
         goto error;
-
-    /* get dimensions */
+    
+    /* Get dimensions */
     if ( H5Sget_simple_extent_dims(sid1,dims1,maxdim1) < 0 )
         goto error;
-
-    /* get dimensions */
+    
+    /* Get dimensions */
     if ( H5Sget_simple_extent_dims(sid2,dims2,maxdim2) < 0 )
+    {
         goto error;
-
+    }
+    
     /*-------------------------------------------------------------------------
-     * get the file data type
-     *-------------------------------------------------------------------------
-     */
-
-    /* get the data type */
+    * get the file data type
+    *-------------------------------------------------------------------------
+    */
+    
+    /* Get the data type */
     if ( (f_tid1 = H5Dget_type(did1)) < 0 )
         goto error;
-
-    /* get the data type */
+    
+    /* Get the data type */
     if ( (f_tid2 = H5Dget_type(did2)) < 0 )
+    {
         goto error;
-
+    }
+    
     /*-------------------------------------------------------------------------
-     * check for empty datasets
-     *-------------------------------------------------------------------------
-     */
-
+    * check for empty datasets
+    *-------------------------------------------------------------------------
+    */
+    
     storage_size1=H5Dget_storage_size(did1);
     storage_size2=H5Dget_storage_size(did2);
-    if (storage_size1<0 || storage_size2<0)
-        goto error;
-
+    
     if (storage_size1==0 || storage_size2==0)
     {
         if (options->m_verbose && obj1_name && obj2_name)
@@ -267,12 +296,12 @@ hsize_t diff_datasetid( hid_t did1,
         cmp=0;
         options->not_cmp=1;
     }
-
-   /*-------------------------------------------------------------------------
+    
+    /*-------------------------------------------------------------------------
     * check for comparable TYPE and SPACE
     *-------------------------------------------------------------------------
     */
-
+    
     if (diff_can_type(f_tid1,
         f_tid2,
         rank1,
@@ -288,47 +317,46 @@ hsize_t diff_datasetid( hid_t did1,
         cmp=0;
         options->not_cmp=1;
     }
-
-   /*-------------------------------------------------------------------------
+    
+    /*-------------------------------------------------------------------------
     * memory type and sizes
     *-------------------------------------------------------------------------
     */
     if ((m_tid1=h5tools_get_native_type(f_tid1)) < 0)
         goto error;
-
+    
     if ((m_tid2=h5tools_get_native_type(f_tid2)) < 0)
         goto error;
-
+    
     m_size1 = H5Tget_size( m_tid1 );
     m_size2 = H5Tget_size( m_tid2 );
-
-   /*-------------------------------------------------------------------------
+    
+    /*-------------------------------------------------------------------------
     * check for different signed/unsigned types
     *-------------------------------------------------------------------------
     */
-
+    
     sign1=H5Tget_sign(m_tid1);
     sign2=H5Tget_sign(m_tid2);
     if ( sign1 != sign2 )
     {
-        if (options->m_verbose && obj1_name)
-        {
+        if (options->m_verbose && obj1_name) {
             parallel_print("Comparison not supported: <%s> has sign %s ", obj1_name, get_sign(sign1));
             parallel_print("and <%s> has sign %s\n", obj2_name, get_sign(sign2));
         }
-
+        
         cmp=0;
         options->not_cmp=1;
     }
-
-   /*-------------------------------------------------------------------------
+    
+    /*-------------------------------------------------------------------------
     * only attempt to compare if possible
     *-------------------------------------------------------------------------
     */
     if (cmp)
     {
-
-       /*-------------------------------------------------------------------------
+        
+        /*-------------------------------------------------------------------------
         * get number of elements
         *-------------------------------------------------------------------------
         */
@@ -337,43 +365,43 @@ hsize_t diff_datasetid( hid_t did1,
         {
             nelmts1 *= dims1[i];
         }
-
+        
         nelmts2 = 1;
         for (i = 0; i < rank2; i++)
         {
             nelmts2 *= dims2[i];
         }
-
+        
         assert(nelmts1==nelmts2);
-
-       /*-------------------------------------------------------------------------
+        
+        /*-------------------------------------------------------------------------
         * "upgrade" the smaller memory size
         *-------------------------------------------------------------------------
         */
-
+        
         if ( m_size1 != m_size2 )
         {
             if ( m_size1 < m_size2 )
             {
                 H5Tclose(m_tid1);
-
+                
                 if ((m_tid1=h5tools_get_native_type(f_tid2)) < 0)
                     goto error;
-
+                
                 m_size1 = H5Tget_size( m_tid1 );
             }
             else
             {
                 H5Tclose(m_tid2);
-
+                
                 if ((m_tid2=h5tools_get_native_type(f_tid1)) < 0)
                     goto error;
-
+                
                 m_size2 = H5Tget_size( m_tid2 );
             }
         }
         assert(m_size1==m_size2);
-
+        
         /* print names */
         if (obj1_name) {
             name1=diff_basename(obj1_name);
@@ -381,27 +409,27 @@ hsize_t diff_datasetid( hid_t did1,
         if (obj2_name) {
             name2=diff_basename(obj2_name);
         }
-
-
-       /*-------------------------------------------------------------------------
+        
+        
+        /*-------------------------------------------------------------------------
         * read/compare
         *-------------------------------------------------------------------------
         */
-
+        
         need = (size_t)(nelmts1*m_size1);  /* bytes needed */
         if ( need < H5TOOLS_MALLOCSIZE)
         {
             buf1 = HDmalloc(need);
             buf2 = HDmalloc(need);
         }
-
+        
         if ( buf1!=NULL && buf2!=NULL)
         {
             if ( H5Dread(did1,m_tid1,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf1) < 0 )
                 goto error;
             if ( H5Dread(did2,m_tid2,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf2) < 0 )
                 goto error;
-
+            
             /* array diff */
             nfound = diff_array(buf1,
                 buf2,
@@ -416,55 +444,54 @@ hsize_t diff_datasetid( hid_t did1,
                 did1,
                 did2);
         }
-
+        
         else /* possibly not enough memory, read/compare by hyperslabs */
-
+            
         {
             size_t        p_type_nbytes = m_size1; /*size of memory type */
             hsize_t       p_nelmts = nelmts1;      /*total selected elmts */
             hsize_t       elmtno;                  /*counter  */
             int           carry;                   /*counter carry value */
             unsigned int  vl_data = 0;             /*contains VL datatypes */
-
+            
             /* stripmine info */
             hsize_t       sm_size[H5S_MAX_RANK];   /*stripmine size */
             hsize_t       sm_nbytes;               /*bytes per stripmine */
             hsize_t       sm_nelmts;               /*elements per stripmine*/
             hid_t         sm_space;                /*stripmine data space */
-
+            
             /* hyperslab info */
             hsize_t       hs_offset[H5S_MAX_RANK]; /*starting offset */
             hsize_t       hs_size[H5S_MAX_RANK];   /*size this pass */
             hsize_t       hs_nelmts;               /*elements in request */
             hsize_t       zero[8];                 /*vector of zeros */
-
+            
             /* check if we have VL data in the dataset's datatype */
             if (H5Tdetect_class(m_tid1, H5T_VLEN) == TRUE)
                 vl_data = TRUE;
-
-            /*
-             * determine the strip mine size and allocate a buffer. The strip mine is
-             * a hyperslab whose size is manageable.
-             */
+            
+                /*
+                * determine the strip mine size and allocate a buffer. The strip mine is
+                * a hyperslab whose size is manageable.
+            */
             sm_nbytes = p_type_nbytes;
-
-            for (i = rank1; i > 0; --i)
-            {
+            
+            for (i = rank1; i > 0; --i) {
                 sm_size[i - 1] = MIN(dims1[i - 1], H5TOOLS_BUFSIZE / sm_nbytes);
                 sm_nbytes *= sm_size[i - 1];
                 assert(sm_nbytes > 0);
             }
-
+            
             sm_buf1 = malloc((size_t)sm_nbytes);
             sm_buf2 = malloc((size_t)sm_nbytes);
-
+            
             sm_nelmts = sm_nbytes / p_type_nbytes;
             sm_space = H5Screate_simple(1, &sm_nelmts, NULL);
-
+            
             /* the stripmine loop */
             memset(hs_offset, 0, sizeof hs_offset);
             memset(zero, 0, sizeof zero);
-
+            
             for (elmtno = 0; elmtno < p_nelmts; elmtno += hs_nelmts)
             {
                 /* calculate the hyperslab size */
@@ -489,16 +516,14 @@ hsize_t diff_datasetid( hid_t did1,
                     H5Sselect_all(sm_space);
                     hs_nelmts = 1;
                 } /* rank */
-
+                
                 if ( H5Dread(did1,m_tid1,sm_space,sid1,H5P_DEFAULT,sm_buf1) < 0 )
                     goto error;
                 if ( H5Dread(did2,m_tid2,sm_space,sid2,H5P_DEFAULT,sm_buf2) < 0 )
                     goto error;
-
-                /* get array differences. in the case of hyperslab read, increment the
-                   number of differences found in each hyperslab and pass the
-                   position at the beggining for printing
-                 */
+                
+                /* get array differences. in the case of hyperslab read, increment the number of differences
+                found in each hyperslab and pass the position at the beggining for printing */
                 nfound += diff_array(sm_buf1,
                     sm_buf2,
                     hs_nelmts,
@@ -511,14 +536,14 @@ hsize_t diff_datasetid( hid_t did1,
                     m_tid1,
                     did1,
                     did2);
-
+                
                 /* reclaim any VL memory, if necessary */
                 if(vl_data)
                 {
                     H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf1);
                     H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf2);
                 }
-
+                
                 /* calculate the next hyperslab offset */
                 for (i = rank1, carry = 1; i > 0 && carry; --i)
                 {
@@ -529,7 +554,7 @@ hsize_t diff_datasetid( hid_t did1,
                         carry = 0;
                 } /* i */
             } /* elmtno */
-
+            
             H5Sclose(sm_space);
             /* free */
             if (sm_buf1!=NULL)
@@ -542,24 +567,26 @@ hsize_t diff_datasetid( hid_t did1,
                 free(sm_buf2);
                 sm_buf2=NULL;
             }
-
-  } /* hyperslab read */
+            
+ } /* hyperslab read */
  }/*cmp*/
-
- /*-------------------------------------------------------------------------
+ 
+  /*-------------------------------------------------------------------------
   * compare attributes
   * the if condition refers to cases when the dataset is a referenced object
   *-------------------------------------------------------------------------
   */
-
+  
   if (obj1_name)
+  {
       nfound += diff_attr(did1,did2,obj1_name,obj2_name,options);
-
- /*-------------------------------------------------------------------------
+  }
+  
+  /*-------------------------------------------------------------------------
   * close
   *-------------------------------------------------------------------------
   */
-
+  
   /* free */
   if (buf1!=NULL)
   {
@@ -581,9 +608,8 @@ hsize_t diff_datasetid( hid_t did1,
       free(sm_buf2);
       sm_buf2=NULL;
   }
-
-  H5E_BEGIN_TRY
-  {
+  
+  H5E_BEGIN_TRY {
       H5Sclose(sid1);
       H5Sclose(sid2);
       H5Tclose(f_tid1);
@@ -591,12 +617,12 @@ hsize_t diff_datasetid( hid_t did1,
       H5Tclose(m_tid1);
       H5Tclose(m_tid2);
   } H5E_END_TRY;
-
+  
   return nfound;
-
+  
 error:
   options->err_stat=1;
-
+  
   /* free */
   if (buf1!=NULL)
   {
@@ -618,10 +644,9 @@ error:
       free(sm_buf2);
       sm_buf2=NULL;
   }
-
+  
   /* disable error reporting */
-  H5E_BEGIN_TRY
-  {
+  H5E_BEGIN_TRY {
       H5Sclose(sid1);
       H5Sclose(sid2);
       H5Tclose(f_tid1);
@@ -630,26 +655,26 @@ error:
       H5Tclose(m_tid2);
       /* enable error reporting */
   } H5E_END_TRY;
-
+  
   return nfound;
 }
 
 /*-------------------------------------------------------------------------
- * Function: diff_can_type
- *
- * Purpose: check for comparable TYPE and SPACE
- *
- * Return:
- *  1, can compare
- *  0, cannot compare
- * -1, error
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: November 3, 2003
- *
- *-------------------------------------------------------------------------
- */
+* Function: diff_can_type
+*
+* Purpose: check for comparable TYPE and SPACE
+*
+* Return:
+*  1, can compare
+*  0, cannot compare
+* -1, error
+*
+* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+*
+* Date: November 3, 2003
+*
+*-------------------------------------------------------------------------
+*/
 
 int diff_can_type( hid_t       f_tid1, /* file data type */
                    hid_t       f_tid2, /* file data type */
@@ -663,26 +688,28 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
                    const char  *obj2_name,
                    diff_opt_t  *options )
 {
+    
+    
     H5T_class_t  tclass1;
     H5T_class_t  tclass2;
     int          maxdim_diff=0;          /* maximum dimensions are different */
     int          dim_diff=0;             /* current dimensions are different */
     int          i;
-
-   /*-------------------------------------------------------------------------
+    
+    /*-------------------------------------------------------------------------
     * check for the same class
     *-------------------------------------------------------------------------
     */
-
+    
     if ((tclass1=H5Tget_class(f_tid1)) < 0)
         return -1;
-
+    
     if ((tclass2=H5Tget_class(f_tid2)) < 0)
         return -1;
-
+    
     if ( tclass1 != tclass2 )
     {
-        if (options->m_verbose && obj1_name)
+        if (options->m_verbose && obj1_name) 
         {
             printf("Comparison not possible: <%s> is of class %s and <%s> is of class %s\n",
                 obj1_name, get_class(tclass1),
@@ -690,12 +717,12 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
         }
         return 0;
     }
-
-   /*-------------------------------------------------------------------------
+    
+    /*-------------------------------------------------------------------------
     * check for non supported classes
     *-------------------------------------------------------------------------
     */
-
+    
     assert(tclass1==tclass2);
     switch (tclass1)
     {
@@ -709,41 +736,46 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
     case H5T_ENUM:
     case H5T_VLEN:
     case H5T_REFERENCE:
-
+        
         break;
-
+        
     default: /*H5T_TIME */
         if (options->m_verbose && obj1_name )
             printf("Comparison not supported: <%s> and <%s> are of class %s\n",
             obj1_name,obj2_name,get_class(tclass2) );
         return 0;
     }
-
-   /*-------------------------------------------------------------------------
+    
+    /*-------------------------------------------------------------------------
     * check for equal file datatype; warning only
     *-------------------------------------------------------------------------
     */
-
+    
     if ( (H5Tequal(f_tid1, f_tid2)==0) && options->m_verbose && obj1_name)
     {
+        
+        H5T_class_t cl = H5Tget_class(f_tid1);
+   
         printf("Warning: different storage datatype\n");
-        printf("<%s> has file datatype ", obj1_name);
-        print_type(f_tid1);
-        printf("\n");
-        printf("<%s> has file datatype ", obj2_name);
-        print_type(f_tid2);
-        printf("\n");
+        if ( cl == H5T_INTEGER || cl == H5T_FLOAT )
+        {
+            printf("<%s> has file datatype ", obj1_name);
+            print_type(f_tid1);
+            printf("\n");
+            printf("<%s> has file datatype ", obj2_name);
+            print_type(f_tid2);
+            printf("\n");
+        }
     }
-
-   /*-------------------------------------------------------------------------
+    
+    /*-------------------------------------------------------------------------
     * check for the same rank
     *-------------------------------------------------------------------------
     */
-
+    
     if ( rank1 != rank2 )
     {
-        if (options->m_verbose && obj1_name)
-        {
+        if (options->m_verbose && obj1_name) {
             printf("Comparison not supported: <%s> has rank %d, dimensions ", obj1_name, rank1);
             print_dimensions(rank1,dims1);
             printf(", max dimensions ");
@@ -756,12 +788,12 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
         }
         return 0;
     }
-
-   /*-------------------------------------------------------------------------
+    
+    /*-------------------------------------------------------------------------
     * check for different dimensions
     *-------------------------------------------------------------------------
     */
-
+    
     assert(rank1==rank2);
     for ( i=0; i<rank1; i++)
     {
@@ -773,20 +805,18 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
         if ( dims1[i] != dims2[i] )
             dim_diff=1;
     }
-
-   /*-------------------------------------------------------------------------
+    
+    /*-------------------------------------------------------------------------
     * current dimensions
     *-------------------------------------------------------------------------
     */
-
+    
     if (dim_diff==1)
     {
-        if (options->m_verbose && obj1_name)
-        {
+        if (options->m_verbose && obj1_name) {
             printf("Comparison not supported: <%s> has rank %d, dimensions ", obj1_name, rank1);
             print_dimensions(rank1,dims1);
-            if (maxdim1 && maxdim2)
-            {
+            if (maxdim1 && maxdim2) {
                 printf(", max dimensions ");
                 print_dimensions(rank1,maxdim1);
                 printf("\n" );
@@ -798,15 +828,14 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
         }
         return 0;
     }
-
-   /*-------------------------------------------------------------------------
+    
+    /*-------------------------------------------------------------------------
     * maximum dimensions; just give a warning
     *-------------------------------------------------------------------------
     */
     if (maxdim1 && maxdim2 && maxdim_diff==1 && obj1_name )
     {
-        if (options->m_verbose)
-        {
+        if (options->m_verbose) {
             printf( "Warning: different maximum dimensions\n");
             printf("<%s> has max dimensions ", obj1_name);
             print_dimensions(rank1,maxdim1);
@@ -816,18 +845,20 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
             printf("\n");
         }
     }
-
+    
     return 1;
 }
 
 
+
+
 /*-------------------------------------------------------------------------
- * Function: print_sizes
- *
- * Purpose: Print datatype sizes
- *
- *-------------------------------------------------------------------------
- */
+* Function: print_sizes
+*
+* Purpose: Print datatype sizes
+*
+*-------------------------------------------------------------------------
+*/
 #if defined (H5DIFF_DEBUG)
 void print_sizes( const char *obj1,
                   const char *obj2,
@@ -836,67 +867,41 @@ void print_sizes( const char *obj1,
                   hid_t m_tid1,
                   hid_t m_tid2 )
 {
- size_t  f_size1, f_size2;       /* size of type in file */
- size_t  m_size1, m_size2;       /* size of type in memory */
-
- f_size1 = H5Tget_size( f_tid1 );
- f_size2 = H5Tget_size( f_tid2 );
- m_size1 = H5Tget_size( m_tid1 );
- m_size2 = H5Tget_size( m_tid2 );
-
- printf("\n");
- printf("------------------\n");
- printf("sizeof(char)   %u\n", sizeof(char) );
- printf("sizeof(short)  %u\n", sizeof(short) );
- printf("sizeof(int)    %u\n", sizeof(int) );
- printf("sizeof(long)   %u\n", sizeof(long) );
- printf("<%s> ------------------\n", obj1);
- printf("type on file   ");
- print_type(f_tid1);
- printf("\n");
- printf("size on file   %u\n", f_size1 );
-
- printf("type on memory ");
- print_type(m_tid1);
- printf("\n");
- printf("size on memory %u\n", m_size1 );
-
- printf("<%s> ------------------\n", obj2);
- printf("type on file   ");
- print_type(f_tid2);
- printf("\n");
- printf("size on file   %u\n", f_size2 );
-
- printf("type on memory ");
- print_type(m_tid2);
- printf("\n");
- printf("size on memory %u\n", m_size2 );
- printf("\n");
-}
-#endif /* H5DIFF_DEBUG */
-
-/*-------------------------------------------------------------------------
- * Function: print_size
- *
- * Purpose: print dimensions
- *
- *-------------------------------------------------------------------------
- */
-#if defined (H5DIFF_DEBUG)
-static void
-print_size (int rank, hsize_t *dims)
-{
-    int i;
-
-    parallel_print("[" );
-    for ( i = 0; i < rank-1; i++)
-    {
-        parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[i]);
-        parallel_print("x");
-    }
-    parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[rank-1]);
-    parallel_print("]\n" );
-
+    size_t  f_size1, f_size2;       /* size of type in file */
+    size_t  m_size1, m_size2;       /* size of type in memory */
+    
+    f_size1 = H5Tget_size( f_tid1 );
+    f_size2 = H5Tget_size( f_tid2 );
+    m_size1 = H5Tget_size( m_tid1 );
+    m_size2 = H5Tget_size( m_tid2 );
+    
+    printf("\n");
+    printf("------------------\n");
+    printf("sizeof(char)   %u\n", sizeof(char) );
+    printf("sizeof(short)  %u\n", sizeof(short) );
+    printf("sizeof(int)    %u\n", sizeof(int) );
+    printf("sizeof(long)   %u\n", sizeof(long) );
+    printf("<%s> ------------------\n", obj1);
+    printf("type on file   ");
+    print_type(f_tid1);
+    printf("\n");
+    printf("size on file   %u\n", f_size1 );
+    
+    printf("type on memory ");
+    print_type(m_tid1);
+    printf("\n");
+    printf("size on memory %u\n", m_size1 );
+    
+    printf("<%s> ------------------\n", obj2);
+    printf("type on file   ");
+    print_type(f_tid2);
+    printf("\n");
+    printf("size on file   %u\n", f_size2 );
+    
+    printf("type on memory ");
+    print_type(m_tid2);
+    printf("\n");
+    printf("size on memory %u\n", m_size2 );
+    printf("\n");
 }
 #endif /* H5DIFF_DEBUG */
-