The seg-fault in rdesigneur tests are due to BhallaLab#388.

dilawar · Feb 23, 2020 · 17a1f3a · 17a1f3a
1 parent ccb180c
commit 17a1f3a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/kinetics/PoolBase.cpp b/kinetics/PoolBase.cpp
@@ -225,8 +225,7 @@ const Cinfo* PoolBase::initCinfo()
 static const Cinfo* poolCinfo = PoolBase::initCinfo();
 
 //////////////////////////////////////////////////////////////
-PoolBase::PoolBase()
-    : concInit_( 0.0 )
+PoolBase::PoolBase() : concInit_( 0.0 )
 {;}
 
 PoolBase::~PoolBase()

diff --git a/kinetics/PoolBase.h b/kinetics/PoolBase.h
@@ -153,6 +153,7 @@ class PoolBase
 
     //////////////////////////////////////////////////////////////////
     static const Cinfo* initCinfo();
+
 private:
     double concInit_; /// Initial concentration.
     // We don't store the conc here as this is computed on the fly

diff --git a/ksolve/Stoich.cpp b/ksolve/Stoich.cpp
@@ -193,16 +193,17 @@ const Cinfo* Stoich::initCinfo()
     // MsgDest Definitions
     //////////////////////////////////////////////////////////////
     static DestFinfo unzombify( "unzombify",
-                                "Restore all zombies to their native state",
-                                new OpFunc0< Stoich >( &Stoich::unZombifyModel )
-                              );
+            "Restore all zombies to their native state",
+            new OpFunc0< Stoich >( &Stoich::unZombifyModel )
+            );
+
     static DestFinfo scaleBufsAndRates( "scaleBufsAndRates",
-                                        "Args: voxel#, volRatio\n"
-                                        "Handles requests for runtime volume changes in the specified "
-                                        "voxel#, Used in adaptors changing spine vols.",
-                                        new OpFunc2< Stoich, unsigned int, double >(
-                                            &Stoich::scaleBufsAndRates )
-                                      );
+            "Args: voxel#, volRatio\n"
+            "Handles requests for runtime volume changes in the specified "
+            "voxel#, Used in adaptors changing spine vols.",
+            new OpFunc2< Stoich, unsigned int, double >(
+                &Stoich::scaleBufsAndRates )
+            );
 
     //////////////////////////////////////////////////////////////
     // SrcFinfo Definitions
@@ -274,6 +275,7 @@ Stoich::Stoich()
 Stoich::~Stoich()
 {
     unZombifyModel();
+
     // Note that we cannot do the unZombify here, because it is too
     // prone to problems with the ordering of the delete operations
     // relative to the zombies.

diff --git a/ksolve/Stoich.h b/ksolve/Stoich.h
@@ -483,6 +483,7 @@ class Stoich
     //////////////////////////////////////////////////////////////////
     static const unsigned int PoolIsNotOnSolver;
     static const Cinfo* initCinfo();
+
 private:
     /**
      * True if the stoich matrix is set up to handle only one-way