From f3907732bcf4c324933eab307d7224de5a44ca44 Mon Sep 17 00:00:00 2001
From: fbischoff <florian.bischoff@hu-berlin.de>
Date: Fri, 16 Aug 2024 10:23:24 -0400
Subject: [PATCH] fix merging master

---
 src/madness/world/cloud.h   | 1 +
 src/madness/world/worlddc.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/madness/world/cloud.h b/src/madness/world/cloud.h
index 43508ca4773..df0017606ad 100644
--- 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
index 671e2964071..c6ead97b07e 100644
--- 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();