DataOutFilter::n_cells 0

n_cells() now returns 0 instead of invalid_unsigned_int

diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc
index 3debbf2dbe50f227df824c95b558ad298d7d67af..6108f647682b1f59ae42dd829adfde5f386d97d6 100644 (file)
--- a/source/base/data_out_base.cc
+++ b/source/base/data_out_base.cc
@@ -384,7 +384,7 @@ namespace DataOutBase
   DataOutFilter::DataOutFilter()
     : flags(false, true)
     , node_dim(numbers::invalid_unsigned_int)
-    , num_cells(numbers::invalid_unsigned_int)
+    , num_cells(0)
   {}
 
 
@@ -392,7 +392,7 @@ namespace DataOutBase
   DataOutFilter::DataOutFilter(const DataOutBase::DataOutFilterFlags &flags)
     : flags(flags)
     , node_dim(numbers::invalid_unsigned_int)
-    , num_cells(numbers::invalid_unsigned_int)
+    , num_cells(0)
   {}
 
 
@@ -8200,9 +8200,7 @@ DataOutInterface<dim, spacedim>::create_xdmf_entry(
   std::uint64_t local_node_cell_count[2], global_node_cell_count[2];
 
   local_node_cell_count[0] = data_filter.n_nodes();
-  // n_cells returns an invalid unsigned int if the object is empty:
-  local_node_cell_count[1] =
-    (data_filter.n_nodes() > 0) ? data_filter.n_cells() : 0;
+  local_node_cell_count[1] = data_filter.n_cells();
 
   const int myrank = Utilities::MPI::this_mpi_process(comm);
   // And compute the global total

diff --git a/tests/data_out/data_out_hdf5_03.with_hdf5=true.with_p4est=true.mpirun=2.output b/tests/data_out/data_out_hdf5_03.with_hdf5=true.with_p4est=true.mpirun=2.output
index 001e715fdb12f872112ce56ee35504ed7862226a..5cdd66edd46be6bd5252d5c38c0c3cb187bdb6cc 100644 (file)
--- a/tests/data_out/data_out_hdf5_03.with_hdf5=true.with_p4est=true.mpirun=2.output
+++ b/tests/data_out/data_out_hdf5_03.with_hdf5=true.with_p4est=true.mpirun=2.output
@@ -58,6 +58,6 @@ DEAL:0::n_cells on my rank: 8
 
 DEAL:0::ok
 
-DEAL:1::n_cells on my rank: 4294967295
-DEAL:1::n_cells on my rank: 4294967295
+DEAL:1::n_cells on my rank: 0
+DEAL:1::n_cells on my rank: 0
 

diff --git a/tests/data_out/data_out_hdf5_03.with_hdf5=true.with_p4est=true.mpirun=3.output b/tests/data_out/data_out_hdf5_03.with_hdf5=true.with_p4est=true.mpirun=3.output
index 807a068c37c65c2553c7355784511f9eac9ef692..8e26788a16da22ae4f02dbc63399482826ff97e7 100644 (file)
--- a/tests/data_out/data_out_hdf5_03.with_hdf5=true.with_p4est=true.mpirun=3.output
+++ b/tests/data_out/data_out_hdf5_03.with_hdf5=true.with_p4est=true.mpirun=3.output
@@ -1,5 +1,5 @@
 
-DEAL:0::n_cells on my rank: 4294967295
+DEAL:0::n_cells on my rank: 0
 <?xml version="1.0" ?>
 <!DOCTYPE Xdmf SYSTEM "Xdmf.dtd" []>
 <Xdmf Version="2.0">
@@ -28,7 +28,7 @@ DEAL:0::n_cells on my rank: 4294967295
 </Xdmf>
 
 DEAL:0::ok
-DEAL:0::n_cells on my rank: 4294967295
+DEAL:0::n_cells on my rank: 0
 <?xml version="1.0" ?>
 <!DOCTYPE Xdmf SYSTEM "Xdmf.dtd" []>
 <Xdmf Version="2.0">
@@ -58,10 +58,10 @@ DEAL:0::n_cells on my rank: 4294967295
 
 DEAL:0::ok
 
-DEAL:1::n_cells on my rank: 4294967295
+DEAL:1::n_cells on my rank: 0
 DEAL:1::n_cells on my rank: 8
 
 
 DEAL:2::n_cells on my rank: 4
-DEAL:2::n_cells on my rank: 4294967295
+DEAL:2::n_cells on my rank: 0