[MOAB-dev] commit/MOAB: iulian07: Merged in iulian07/without_hdf5 (pull request #34)

[commits-noreply at bitbucket.org]

1 new commit in MOAB:

https://bitbucket.org/fathomteam/moab/commits/fda46ce7dea8/
Changeset:   fda46ce7dea8
Branch:      master
User:        iulian07
Date:        2014-07-14 16:14:00
Summary:     Merged in iulian07/without_hdf5 (pull request #34)

configure without hdf5 in parallel fix
Affected #:  6 files

diff --git a/itaps/igeom/Makefile.am b/itaps/igeom/Makefile.am
index 93314d0..28d619d 100644
--- a/itaps/igeom/Makefile.am
+++ b/itaps/igeom/Makefile.am
@@ -27,7 +27,10 @@ libFBiGeomMOAB_la_include_HEADERS = \
 	FBiGeom_f.h
 
 # stuff for test program
-check_PROGRAMS = testgeom  testSmoothGeom testSmooth2
+check_PROGRAMS =
+if HDF5_FILE
+  check_PROGRAMS += testgeom  testSmoothGeom testSmooth2
+
 testgeom_SOURCES = testgeom.cc
 testgeom_DEPENDENCIES = libFBiGeomMOAB.la \
                         $(top_builddir)/itaps/imesh/libiMesh.la \
@@ -54,7 +57,9 @@ testSmooth2_LDADD = libFBiGeomMOAB.la \
                  $(top_builddir)/itaps/imesh/libiMesh.la \
                  $(top_builddir)/src/libMOAB.la \
                  ${MOAB_CXX_LINKFLAGS} ${MOAB_CXX_LIBS}
-                 
+
+endif 
+               
 TESTS = $(check_PROGRAMS)
 
 # Automake doesn't seem to have a directory defined for

diff --git a/itaps/imesh/Makefile.am b/itaps/imesh/Makefile.am
index 647b8c1..06e2c50 100644
--- a/itaps/imesh/Makefile.am
+++ b/itaps/imesh/Makefile.am
@@ -37,7 +37,9 @@ if PARALLEL
   AM_CPPFLAGS += -I$(top_srcdir)/src/parallel -I$(top_srcdir)/src/parallel/moab
 
 #  check_PROGRAMS += partest iMeshP_unit_tests moabtest
-  check_PROGRAMS += partest MOAB_iMeshP_unit_tests 
+if PARALLEL_HDF5
+  check_PROGRAMS += MOAB_iMeshP_unit_tests partest
+endif
 #  moabtest_SOURCES = moabtest.F
 
 #  check_PROGRAMS += ftest

diff --git a/src/parallel/ParallelComm.cpp b/src/parallel/ParallelComm.cpp
index 10ce709..886ef77 100644
--- a/src/parallel/ParallelComm.cpp
+++ b/src/parallel/ParallelComm.cpp
@@ -8143,9 +8143,11 @@ ErrorCode ParallelComm::post_irecv(std::vector<unsigned int>& shared_procs,
     }
   
     if (MB_SUCCESS != result && print_em) {
+#ifdef HDF5_FILE
       std::ostringstream ent_str;
       ent_str << "mesh." << procConfig.proc_rank() << ".h5m";
       mbImpl->write_mesh(ent_str.str().c_str());
+#endif
     }
   
     return result;

diff --git a/test/io/read_gcrm_nc.cpp b/test/io/read_gcrm_nc.cpp
index c4a2290..b079574 100644
--- a/test/io/read_gcrm_nc.cpp
+++ b/test/io/read_gcrm_nc.cpp
@@ -71,8 +71,6 @@ void test_read_all()
   ErrorCode rval = mb.load_file(example, 0, opts.c_str());
   CHECK_ERR(rval);
 
-  mb.write_file("gcrm.h5m");
-
   int procs = 1;
 #ifdef USE_MPI
   ParallelComm* pcomm = ParallelComm::get_pcomm(&mb, 0);

diff --git a/test/parallel/Makefile.am b/test/parallel/Makefile.am
index b42ba0b..4d7705b 100644
--- a/test/parallel/Makefile.am
+++ b/test/parallel/Makefile.am
@@ -31,8 +31,6 @@ if USE_MPIEXEC
 endif
 
 TESTS = pcomm_unit \
-        parallel_unit_tests \
-        uber_parallel_test \
         scdtest \
         pcomm_serial \
 	par_spatial_locator_test \
@@ -42,7 +40,9 @@ TESTS = pcomm_unit \
         $(MBCSLAM_TESTS)
 
 if PARALLEL_HDF5
-  HDF5_TESTS = parallel_hdf5_test mhdf_parallel parallel_write_test
+  HDF5_TESTS = parallel_hdf5_test mhdf_parallel parallel_write_test \
+        parallel_unit_tests \
+        uber_parallel_test
 else
   HDF5_TESTS = 
 endif
@@ -61,19 +61,31 @@ else
 endif
 endif
 
+
 if ENABLE_mbcoupler
+if PARALLEL_HDF5
   COUPLER_TESTS = par_coupler_test
 else
   COUPLER_TESTS = 
+endif 
+else
+  COUPLER_TESTS = 
 endif
 
 if ENABLE_mbcslam
+if PARALLEL_HDF5
   MBCSLAM_TESTS = par_intx_sph 
 else
+  MBCSLAM_TESTS =
+endif
+else
   MBCSLAM_TESTS = 
 endif
 
-check_PROGRAMS = $(TESTS) mbparallelcomm_test partcheck structured3 parmerge
+check_PROGRAMS = $(TESTS) mbparallelcomm_test partcheck structured3 
+if PARALLEL_HDF5
+  check_PROGRAMS += parmerge
+endif
 
 pcomm_unit_SOURCES = pcomm_unit.cpp
 parallel_hdf5_test_SOURCES = parallel_hdf5_test.cc

diff --git a/test/parallel/ucdtrvpart.cpp b/test/parallel/ucdtrvpart.cpp
index cdd5e70..062f1c1 100644
--- a/test/parallel/ucdtrvpart.cpp
+++ b/test/parallel/ucdtrvpart.cpp
@@ -128,8 +128,10 @@ void test_read_parallel(int num_verts, bool test_nb_nodes)
       CHECK_EQUAL(total_verts, num_verts);
   }
 
+#ifdef HDF5_PARALLEL
   std::string write_options("PARALLEL=WRITE_PART;");
   mb.write_file("test.h5m", NULL, write_options.c_str());
+#endif
 }
 
 void test_multiple_loads_of_same_file()

Repository URL: https://bitbucket.org/fathomteam/moab/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.