[MOAB-dev] commit/MOAB: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in MOAB:

https://bitbucket.org/fathomteam/moab/commits/3964edaad183/
Changeset:   3964edaad183
Branch:      None
User:        iulian07
Date:        2014-07-03 00:42:08
Summary:     without hdf5 tests in parallel

some need to be simply disabled, as they are using reader/writer
in parallel.
When configured without hdf5, we can't run them

Affected #:  2 files

diff --git a/itaps/imesh/Makefile.am b/itaps/imesh/Makefile.am
index 647b8c1..6d9bf74 100644
--- a/itaps/imesh/Makefile.am
+++ b/itaps/imesh/Makefile.am
@@ -37,7 +37,10 @@ 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 
+  check_PROGRAMS += partest  
+if PARALLEL_HDF5
+  check_PROGRAMS += MOAB_iMeshP_unit_tests 
+endif
 #  moabtest_SOURCES = moabtest.F
 
 #  check_PROGRAMS += ftest

diff --git a/test/parallel/Makefile.am b/test/parallel/Makefile.am
index b42ba0b..abd817e 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


https://bitbucket.org/fathomteam/moab/commits/efe212ff13f1/
Changeset:   efe212ff13f1
Branch:      iulian07/without_hdf5
User:        iulian07
Date:        2014-07-03 01:21:10
Summary:     fix for build without hdf5

guard writing / reading hdf5 files

Affected #:  5 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 6d9bf74..06e2c50 100644
--- a/itaps/imesh/Makefile.am
+++ b/itaps/imesh/Makefile.am
@@ -37,9 +37,8 @@ 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  
 if PARALLEL_HDF5
-  check_PROGRAMS += MOAB_iMeshP_unit_tests 
+  check_PROGRAMS += MOAB_iMeshP_unit_tests partest
 endif
 #  moabtest_SOURCES = moabtest.F
 

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 abd817e..e755184 100644
--- a/test/parallel/Makefile.am
+++ b/test/parallel/Makefile.am
@@ -42,7 +42,7 @@ TESTS = pcomm_unit \
 if PARALLEL_HDF5
   HDF5_TESTS = parallel_hdf5_test mhdf_parallel parallel_write_test \
         parallel_unit_tests \
-        uber_parallel_test 
+        uber_parallel_test parmerge
 else
   HDF5_TESTS = 
 endif
@@ -61,19 +61,28 @@ 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 
 
 pcomm_unit_SOURCES = pcomm_unit.cpp
 parallel_hdf5_test_SOURCES = parallel_hdf5_test.cc

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.