[svn-r25142] - comment out IOD layout code as it does not work anymore with new IOD

- prepend username to file name in tests

14 files changed, 38 insertions, 17 deletions

diff --git a/examples/h5ff_client_analysis.c b/examples/h5ff_client_analysis.c
index 00d459b..4028b7f 100644
--- a/examples/h5ff_client_analysis.c
+++ b/examples/h5ff_client_analysis.c
@@ -237,7 +237,7 @@ ship_analysis(const char *file_name, const char *dataset_name)
 int
 main(int argc, char **argv)
 {
-    const char *file_name="eff_analysis_file.h5";
+    char file_name[50];
     const char *dataset_name="D1";
     hsize_t ntuples = NTUPLES;
     hsize_t ncomponents = 3;
@@ -247,6 +247,8 @@ main(int argc, char **argv)
 
     int provided;
 
+    sprintf(file_name, "%s_%s", getenv("USER"), "eff_file_analysis.h5");
+
     MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &provided);
     if(MPI_THREAD_MULTIPLE != provided) {
         fprintf(stderr, "MPI does not have MPI_THREAD_MULTIPLE support\n");
diff --git a/examples/h5ff_client_attr.c b/examples/h5ff_client_attr.c
index dd2ca7c..3a2d5a4 100644
--- a/examples/h5ff_client_attr.c
+++ b/examples/h5ff_client_attr.c
@@ -10,8 +10,7 @@
 #include "hdf5.h"
 
 int main(int argc, char **argv) {
-    const char file_name[]="eff_file_attr.h5";
-
+    char file_name[50];
     hid_t file_id;
     hid_t gid1;
     hid_t sid, dtid, stype_id;
@@ -43,6 +42,8 @@ int main(int argc, char **argv) {
     unsigned int i = 0;
     herr_t ret;
 
+    sprintf(file_name, "%s_%s", getenv("USER"), "eff_file_attr.h5");
+
     MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &provided);
     if(MPI_THREAD_MULTIPLE != provided) {
         fprintf(stderr, "MPI does not have MPI_THREAD_MULTIPLE support\n");
diff --git a/examples/h5ff_client_do.c b/examples/h5ff_client_do.c
index 2ed0a26..69bc566 100644
--- a/examples/h5ff_client_do.c
+++ b/examples/h5ff_client_do.c
@@ -10,7 +10,7 @@
 #include "hdf5.h"

 

 int main(int argc, char **argv) {

-    const char file_name[]="acg_file.h5";

+    char file_name[]="acg_file.h5";

     hid_t file_id;

     hid_t       dsid = -1;      /* Dataset ID */

     hid_t       sid = -1;       /* Dataspace ID */

diff --git a/examples/h5ff_client_dset.c b/examples/h5ff_client_dset.c
index 01bfca2..9e5f847 100644
--- a/examples/h5ff_client_dset.c
+++ b/examples/h5ff_client_dset.c
@@ -39,8 +39,7 @@ checksum_crc64(const void *buf, size_t buf_size)
 }
 
 int main(int argc, char **argv) {
-    const char file_name[]="eff_file_dset.h5";
-
+    char file_name[50];
     hid_t file_id;
     hid_t gid1, gid2, gid3;
     hid_t sid, scalar, dtid;
@@ -76,6 +75,8 @@ int main(int argc, char **argv) {
     uint32_t cs_scope = 0;
     herr_t ret;
 
+    sprintf(file_name, "%s_%s", getenv("USER"), "eff_file_dset.h5");
+
     MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &provided);
     if(MPI_THREAD_MULTIPLE != provided) {
         fprintf(stderr, "MPI does not have MPI_THREAD_MULTIPLE support\n");
diff --git a/examples/h5ff_client_evict_deltas.c b/examples/h5ff_client_evict_deltas.c
index c3b151a..df422b9 100644
--- a/examples/h5ff_client_evict_deltas.c
+++ b/examples/h5ff_client_evict_deltas.c
@@ -10,7 +10,7 @@
 #include "hdf5.h"

 

 int main(int argc, char **argv) {

-    const char file_name[]="eff_file_deltas.h5";

+    char file_name[50];

     hid_t file_id;

     hid_t gid;

     hid_t did, map;

@@ -36,6 +36,8 @@ int main(int argc, char **argv) {
     size_t num_events = 0;

     herr_t ret;

 

+    sprintf(file_name, "%s_%s", getenv("USER"), "eff_file_evdt.h5");

+

     MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &provided);

     if(MPI_THREAD_MULTIPLE != provided) {

         fprintf(stderr, "MPI does not have MPI_THREAD_MULTIPLE support\n");

diff --git a/examples/h5ff_client_links.c b/examples/h5ff_client_links.c
index 44fe902..a4a0c81 100644
--- a/examples/h5ff_client_links.c
+++ b/examples/h5ff_client_links.c
@@ -10,7 +10,7 @@
 #include "hdf5.h"

 

 int main(int argc, char **argv) {

-    const char file_name[]="eff_file_links.h5";

+    char file_name[50];

     hid_t file_id;

     hid_t gid1, gid2, gid3, gid4, gid5;

     hid_t did1, did2, did3;

@@ -34,6 +34,8 @@ int main(int argc, char **argv) {
     size_t num_events = 0;

     herr_t ret;

 

+    sprintf(file_name, "%s_%s", getenv("USER"), "eff_file_links.h5");

+

     MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &provided);

     if(MPI_THREAD_MULTIPLE != provided) {

         fprintf(stderr, "MPI does not have MPI_THREAD_MULTIPLE support\n");

diff --git a/examples/h5ff_client_map.c b/examples/h5ff_client_map.c
index c248ab0..b351843 100644
--- a/examples/h5ff_client_map.c
+++ b/examples/h5ff_client_map.c
@@ -10,7 +10,7 @@
 #include "hdf5.h"

 

 int main(int argc, char **argv) {

-    const char file_name[]="eff_file_map.h5";

+    char file_name[50];

     hid_t file_id;

     hid_t gid1, gid2, dtid1, dtid2;

     hid_t map1, map2, map3;

@@ -47,6 +47,8 @@ int main(int argc, char **argv) {
     int key, value;

     hbool_t exists;

 

+    sprintf(file_name, "%s_%s", getenv("USER"), "eff_file_map.h5");

+

     MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &provided);

     if(MPI_THREAD_MULTIPLE != provided) {

         fprintf(stderr, "MPI does not have MPI_THREAD_MULTIPLE support\n");

diff --git a/examples/h5ff_client_multiple_cont.c b/examples/h5ff_client_multiple_cont.c
index 42b32a0..367eeff 100644
--- a/examples/h5ff_client_multiple_cont.c
+++ b/examples/h5ff_client_multiple_cont.c
@@ -12,8 +12,8 @@
 #include "hdf5.h"

 

 int main(int argc, char **argv) {

-    const char file_name1[]="eff_file_1";

-    const char file_name2[]="eff_file_2";

+    char file_name1[50];

+    char file_name2[50];

     hid_t fid1, fid2;

     hid_t gid1, gid2;

     hid_t did1, did2;

@@ -41,6 +41,9 @@ int main(int argc, char **argv) {
     size_t num_events = 0;

     herr_t ret;

 

+    sprintf(file_name1, "%s_%s", getenv("USER"), "eff_file_2.h5");

+    sprintf(file_name2, "%s_%s", getenv("USER"), "eff_file_1.h5");

+

     MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &provided);

     if(MPI_THREAD_MULTIPLE != provided) {

         fprintf(stderr, "MPI does not have MPI_THREAD_MULTIPLE support\n");

diff --git a/examples/h5ff_client_obj.c b/examples/h5ff_client_obj.c
index a47f7f2..476b637 100644
--- a/examples/h5ff_client_obj.c
+++ b/examples/h5ff_client_obj.c
@@ -10,7 +10,7 @@
 #include "hdf5.h"

 

 int main(int argc, char **argv) {

-    const char file_name[]="eff_file_obj.h5";

+    char file_name[50];

     hid_t file_id;

     hid_t gid;

     hid_t did, map;

@@ -34,6 +34,8 @@ int main(int argc, char **argv) {
     size_t num_events = 0;

     herr_t ret;

 

+    sprintf(file_name, "%s_%s", getenv("USER"), "eff_file_obj.h5");

+

     MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &provided);

     if(MPI_THREAD_MULTIPLE != provided) {

         fprintf(stderr, "MPI does not have MPI_THREAD_MULTIPLE support\n");

diff --git a/examples/h5ff_client_old_api.c b/examples/h5ff_client_old_api.c
index b8c94ac..27e28ba 100644
--- a/examples/h5ff_client_old_api.c
+++ b/examples/h5ff_client_old_api.c
@@ -6,7 +6,7 @@
 #include "hdf5.h"

 

 int main(int argc, char **argv) {

-    const char file_name[]="eff_file.h5";

+    char file_name[]="eff_file.h5";

     hid_t file_id;

     hid_t gid1, gid2, gid3;

     hid_t dataspaceId;

diff --git a/examples/h5ff_client_prefetch.c b/examples/h5ff_client_prefetch.c
index b3bcd07..cc63552 100644
--- a/examples/h5ff_client_prefetch.c
+++ b/examples/h5ff_client_prefetch.c
@@ -10,7 +10,7 @@
 #include "hdf5.h"

 

 int main(int argc, char **argv) {

-    const char file_name[]="eff_file_prefetch2.h5";

+    char file_name[50];

     hid_t file_id;

     hid_t gid;

     hid_t did, map;

@@ -36,6 +36,8 @@ int main(int argc, char **argv) {
     size_t num_events = 0;

     herr_t ret;

 

+    sprintf(file_name, "%s_%s", getenv("USER"), "eff_file_pref.h5");

+

     MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &provided);

     if(MPI_THREAD_MULTIPLE != provided) {

         fprintf(stderr, "MPI does not have MPI_THREAD_MULTIPLE support\n");

diff --git a/examples/h5ff_client_trans.c b/examples/h5ff_client_trans.c
index 36915ce..4f08507 100644
--- a/examples/h5ff_client_trans.c
+++ b/examples/h5ff_client_trans.c
@@ -12,7 +12,7 @@
 #include "hdf5.h"

 

 int main(int argc, char **argv) {

-    const char file_name[]="eff_file.h5";

+    char file_name[]="eff_file.h5";

     hid_t file_id;

     hid_t fapl_id, trspl_id;

     hid_t tid1, tid2, tid3;

diff --git a/examples/h5ff_client_view.c b/examples/h5ff_client_view.c
index a225332..2ed89e2 100644
--- a/examples/h5ff_client_view.c
+++ b/examples/h5ff_client_view.c
@@ -434,7 +434,7 @@ test_view(const char *file_name, const char *dataset_name,
 int
 main(int argc, char **argv)
 {
-    const char *file_name="eff_file_view.h5";
+    char file_name[50];
     const char *dataset_name="D1";
     hsize_t ntuples = NTUPLES;
     hsize_t ncomponents = 3;
@@ -444,6 +444,8 @@ main(int argc, char **argv)
 
     int provided;
 
+    sprintf(file_name, "%s_%s", getenv("USER"), "eff_file_view.h5");
+
     MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &provided);
     if(MPI_THREAD_MULTIPLE != provided) {
         fprintf(stderr, "MPI does not have MPI_THREAD_MULTIPLE support\n");
diff --git a/examples/h5ff_client_vl_data.c b/examples/h5ff_client_vl_data.c
index 5a503d4..f6c3785 100644
--- a/examples/h5ff_client_vl_data.c
+++ b/examples/h5ff_client_vl_data.c
@@ -10,7 +10,7 @@
 #include "hdf5.h"
 
 int main(int argc, char **argv) {
-    const char file_name[]="eff_file_vl_dset.h5";
+    char file_name[50];
 
     hid_t file_id;
     hid_t sid, vl_dtid, str_dtid;
@@ -48,6 +48,8 @@ int main(int argc, char **argv) {
     uint32_t cs_scope = 0;
     herr_t ret;
 
+    sprintf(file_name, "%s_%s", getenv("USER"), "eff_file_vl_data.h5");
+
     MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &provided);
     if(MPI_THREAD_MULTIPLE != provided) {
         fprintf(stderr, "MPI does not have MPI_THREAD_MULTIPLE support\n");