[MOAB-dev] commit/MOAB: danwu: Allow a parallel MOAB build with netcdf (but without pnetcdf) to use Zoltan partition for MPAS reader.

[commits-noreply at bitbucket.org]

1 new commit in MOAB:

https://bitbucket.org/fathomteam/moab/commits/a3774594bf19/
Changeset:   a3774594bf19
Branch:      master
User:        danwu
Date:        2013-11-08 18:07:42
Summary:     Allow a parallel MOAB build with netcdf (but without pnetcdf) to use Zoltan partition for MPAS reader.

Affected #:  2 files

diff --git a/src/io/NCHelperMPAS.cpp b/src/io/NCHelperMPAS.cpp
index 6a73e31..54ba598 100644
--- a/src/io/NCHelperMPAS.cpp
+++ b/src/io/NCHelperMPAS.cpp
@@ -4,7 +4,7 @@
 #include "moab/SpectralMeshTool.hpp"
 #include "MBTagConventions.hpp"
 
-#if HAVE_ZOLTAN
+#ifdef HAVE_ZOLTAN
 #include "MBZoltan.hpp"
 #endif
 
@@ -971,7 +971,7 @@ ErrorCode NCHelperMPAS::redistribute_local_cells(int start_cell_idx)
 {
   // If possible, apply Zoltan partition
   if (_readNC->partMethod == ScdParData::RCBZOLTAN) {
-#if defined(USE_MPI) && defined(PNETCDF_FILE) && defined(HAVE_ZOLTAN)
+#if defined(USE_MPI) && defined(HAVE_ZOLTAN)
     // Read x coordinates of cell centers
     int xCellVarId;
     int success = NCFUNC(inq_varid)(_fileId, "xCell", &xCellVarId);

diff --git a/test/parallel/mpastrvpart.cpp b/test/parallel/mpastrvpart.cpp
index 7ff375a..b42f11e 100644
--- a/test/parallel/mpastrvpart.cpp
+++ b/test/parallel/mpastrvpart.cpp
@@ -16,14 +16,14 @@ static const char example[] = STRINGIFY(MESHDIR) "/io/mpasx1.642.t.2.nc";
 
 void test_read_onevar_trivial();
 void test_read_onevar_trivial_no_mixed_elements();
-#if defined(USE_MPI) && defined(PNETCDF_FILE) && defined(HAVE_ZOLTAN)
+#if defined(USE_MPI) && defined(HAVE_ZOLTAN)
 void test_read_onevar_rcbzoltan();
 void test_read_onevar_rcbzoltan_no_mixed_elements();
 #endif
 
 void test_read_mesh_parallel_trivial();
 void test_read_mesh_parallel_trivial_no_mixed_elements();
-#if defined(USE_MPI) && defined(PNETCDF_FILE) && defined(HAVE_ZOLTAN)
+#if defined(USE_MPI) && defined(HAVE_ZOLTAN)
 void test_read_mesh_parallel_rcbzoltan();
 void test_read_mesh_parallel_rcbzoltan_no_mixed_elements();
 #endif
@@ -50,14 +50,14 @@ int main(int argc, char* argv[])
 
   result += RUN_TEST(test_read_onevar_trivial);
   result += RUN_TEST(test_read_onevar_trivial_no_mixed_elements);
-#if defined(USE_MPI) && defined(PNETCDF_FILE) && defined(HAVE_ZOLTAN)
+#if defined(USE_MPI) && defined(HAVE_ZOLTAN)
   result += RUN_TEST(test_read_onevar_rcbzoltan);
   result += RUN_TEST(test_read_onevar_rcbzoltan_no_mixed_elements);
 #endif
 
   result += RUN_TEST(test_read_mesh_parallel_trivial);
   result += RUN_TEST(test_read_mesh_parallel_trivial_no_mixed_elements);
-#if defined(USE_MPI) && defined(PNETCDF_FILE) && defined(HAVE_ZOLTAN)
+#if defined(USE_MPI) && defined(HAVE_ZOLTAN)
   result += RUN_TEST(test_read_mesh_parallel_rcbzoltan);
   result += RUN_TEST(test_read_mesh_parallel_rcbzoltan_no_mixed_elements);
 #endif

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.