bubble-dynamics

commit 5ad5427a87bef043bacf9de7577a95e52f73b49e
parent 9a1712de64378600332bfc1f5ed3b7543a686c61
Author: Fabian Wermelinger <fabianw@mavt.ethz.ch>
Date:   Mon, 12 Jun 2017 11:38:41 -0700

minor

Diffstat:
M
src/BubbleBase.h
 | 
3
++-
M
src/kernels/RayleighPlesset.h
 | 
4
++--

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/BubbleBase.h b/src/BubbleBase.h
@@ -137,7 +137,8 @@ struct BubbleData
     template <typename T>
     inline Real pBubble(const T& U, const size_t i=0) const
     {
-        return (p0 - pv + 2.0*sigma/R0[i])*std::pow(R0[i]/U[i][0], 3.0*gamma) - 2.0*sigma/U[i][0] - 4.0*nuL*rhoL/U[i][0]*U[i][1];
+        // return (p0 - pv + 2.0*sigma/R0[i])*std::pow(R0[i]/U[i][0], 3.0*gamma) - 2.0*sigma/U[i][0] - 4.0*nuL*rhoL/U[i][0]*U[i][1];
+        return (p0 - pv + 2.0*sigma/R0[i])*std::pow(R0[i]/U[i][0], 3.0*gamma);
     }
 
     void print() const
diff --git a/src/kernels/RayleighPlesset.h b/src/kernels/RayleighPlesset.h
@@ -59,8 +59,8 @@ public:
     virtual void write(const size_t step, const Real t, const Real dt, const Tinput& U, const void * const data=nullptr)
     {
         const BubbleData& bd = *(BubbleData const* const)data;
-        const Real odat[3] = {U[0][0], U[0][1], bd.pext(t)};
-        m_dumper->write(step, t, dt, &odat[0], 3);
+        const Real odat[4] = {U[0][0], U[0][1], bd.pext(t), bd.pBubble(U)};
+        m_dumper->write(step, t, dt, &odat[0], 4);
         // m_dumper->write(step, t, dt, U.data(), Tinput::DataType::SIZE*U.size());
     }
 };