delaunay_sync.h: clear() resets cell_status_ to nullptr

periodic_delaunay_3d.h: make Warpdrive's LaguerreSimple3d friend (needs to modify things in there for large-scale OT problems)
BrunoLevy · Dec 8, 2024 · bc94922 · bc94922
1 parent 9b3d317
commit bc94922
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/lib/geogram/NL/nl_amgcl.cpp b/src/lib/geogram/NL/nl_amgcl.cpp
@@ -862,10 +862,6 @@ template <class Backend> NLboolean nlSolveAMGCL_generic() {
 
     GEO::Stopwatch* Wbuild = new GEO::Stopwatch("AMGCL build", ctxt->verbose);
 
-    if(ctxt->verbose) {
-	GEO::Logger::out("AMGCL build") << "starting..." << std::endl;
-    }
-
     if(nlExtensionIsInitialized_CUDA()) {
 	nlBlasResetStats(nlCUDABlas());
     }
@@ -882,7 +878,7 @@ template <class Backend> NLboolean nlSolveAMGCL_generic() {
     delete Wbuild;
 
     if(ctxt->verbose) {
-	GEO::Logger::out("AMGCL solve") << "starting..." << std::endl;
+	GEO::Logger::out("AMGCL solve") << "Start..." << std::endl;
     }
 
     // Start timer when running iterative solver

diff --git a/src/lib/geogram/delaunay/delaunay_sync.h b/src/lib/geogram/delaunay/delaunay_sync.h
@@ -292,6 +292,7 @@ namespace GEO {
             }
 #endif
             delete[] cell_status_;
+	    cell_status_ = nullptr;
             size_ = 0;
             capacity_ = 0;
         }

diff --git a/src/lib/geogram/delaunay/periodic_delaunay_3d.h b/src/lib/geogram/delaunay/periodic_delaunay_3d.h
@@ -511,6 +511,8 @@ namespace GEO {
 	    double  phase_II_insert_t_;
 	    index_t phase_II_insert_nb_;
 	} stats_;
+
+	friend class LaguerreDiagramOmegaSimple3d;
     };