minor bug fixes

yoctoyotta1024 · Nov 23, 2023 · f331400 · f331400
1 parent ed49dc0
commit f331400
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/libs/superdrops/coalbure.hpp b/libs/superdrops/coalbure.hpp
@@ -182,7 +182,7 @@ If flag = 2 -> breakup. Otherwise -> rebound. */
   switch (flag)
   {
   case 1: // coalescence
-    is_null = coalesce_superdroplet_pair(gamma, drop1, drop2);
+    is_null = coal.coalesce_superdroplet_pair(gamma, drop1, drop2);
     break;
   case 2: // breakup
     bu.breakup_superdroplet_pair(drop1, drop2);

diff --git a/libs/superdrops/collisionkinetics.hpp b/libs/superdrops/collisionkinetics.hpp
@@ -26,9 +26,9 @@
 
 #include <Kokkos_Core.hpp>
 
-#include "../../cleoconstants.hpp"
-#include "../superdrop.hpp"
-#include "../terminalvelocity.hpp"
+#include "../cleoconstants.hpp"
+#include "./superdrop.hpp"
+#include "./terminalvelocity.hpp"
 
 namespace dlc = dimless_constants;
 namespace DC = dimmed_constants;

diff --git a/src/main.cpp b/src/main.cpp
@@ -59,6 +59,7 @@
 
 #include "superdrops/breakup_nfrags.hpp"
 #include "superdrops/breakup.hpp"
+#include "superdrops/coalbure.hpp"
 #include "superdrops/coalescence.hpp"
 #include "superdrops/collisionprobs/golovinprob.hpp"
 #include "superdrops/collisionprobs/longhydroprob.hpp"
@@ -125,7 +126,7 @@ config_collisions(const Config &config, const Timesteps &tsteps)
 {
   const PairProbability auto collprob = LongHydroProb();
   const NFragments auto nfrags = ConstNFrags(5.0);
-  const MicrophysicalProcess auto colls = CoalBuRe(steps.get_collstep(),
+  const MicrophysicalProcess auto colls = CoalBuRe(tsteps.get_collstep(),
                                                    &step2realtime,
                                                    collprob,
                                                    nfrags);