Check for nullptr in debug builds

Signed-off-by: Steven Hahn <[email protected]>
ORNL-Fusion · May 16, 2024 · 2926f18 · 2926f18
1 parent 8ce0079
commit 2926f18
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/korc_c_random.cpp b/src/korc_c_random.cpp
@@ -1,5 +1,6 @@
-#include <random>
 #include <chrono>
+#include <random>
+#include <stdexcept>
 
 class random {
     std::mt19937_64 engine;
@@ -51,10 +52,18 @@ extern "C" {
     }
 
     double random_get_number_U(void *r) {
+#ifndef NDEBUG
+        if(r == nullptr)
+          throw std::runtime_error("random_U object not initialized!");
+#endif
         return static_cast<class random_U *> (r)->get_number_U();
     }
 
     double random_get_number_N(void *r) {
+#ifndef NDEBUG
+        if(r == nullptr)
+          throw std::runtime_error("random_N object not initialized!");
+#endif
         return static_cast<class random_N *> (r)->get_number_N();
     }
 

diff --git a/src/korc_velocity_distribution.f90 b/src/korc_velocity_distribution.f90
@@ -419,12 +419,9 @@ subroutine gyro_distribution(params,F,spp)
       call RANDOM_NUMBER(theta)
       call finalize_random_seed
     else
-      call initialize_random(1)
-      call initialize_random_U(1)
       do pp=1_idef,spp%ppp
          theta(pp)=get_random_U()
       enddo
-      call finalize_random()
     endif
     theta = 2.0_rp*C_PI*theta