fix merging master

m-a-d-n-e-s-s · Aug 16, 2024 · f390773 · f390773
1 parent becdef2
commit f390773
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/madness/world/cloud.h b/src/madness/world/cloud.h
@@ -374,6 +374,7 @@ class Cloud {
 
     mutable std::atomic<long> reading_time=0l;    // in ms
     mutable std::atomic<long> writing_time=0l;    // in ms
+    mutable std::atomic<long> writing_time1=0l;    // in ms
     mutable std::atomic<long> replication_time=0l;    // in ms
     mutable std::atomic<long> cache_reads=0l;
     mutable std::atomic<long> cache_stores=0l;

diff --git a/src/madness/world/worlddc.h b/src/madness/world/worlddc.h
@@ -1628,7 +1628,7 @@ namespace madness {
                 using const_iterator = typename dcT::const_iterator;
 
                 // const size_t default_size = 100*1024*1024;
-                const size_t default_size = 8ul<<30;
+                // const size_t default_size = 8ul<<30;
 
                 World* world = ar.get_world();
                 world->gop.fence();