bubble-dynamics

commit a5c76104814604c98cf2ee2365e2559d5f1273a2
parent 5786f0a370b9f225b9aaae33cba3313be8a64cb3
Author: Fabian Wermelinger <fabianw@mavt.ethz.ch>
Date:   Mon, 26 Sep 2016 09:33:33 +0200

added default type argument for Trhs in kernels

Diffstat:
M
src/bubbleDynamics.cpp
 | 
8
++++----
M
src/kernels/Dahlquist.h
 | 
4
++--
M
src/kernels/KMCluster_TY.h
 | 
2
+-
M
src/kernels/KellerMiksis.h
 | 
2
+-
M
src/kernels/RayleighPlesset.h
 | 
2
+-
M
src/kernels/RayleighPlesset_HBGL.h
 | 
2
+-

6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/bubbleDynamics.cpp b/src/bubbleDynamics.cpp
@@ -34,7 +34,7 @@ void say_hello(const int argc, const char * argv[])
     cout << endl;
 }
 
-template <typename Tinput, typename Trhs>
+template <typename Tinput, typename Trhs=Tinput>
 KernelBase<Tinput,Trhs>* kernelFactory(ArgumentParser& parser, Tinput& U, BubbleData& simConfig)
 {
     int yeaBinary;
@@ -69,7 +69,7 @@ KernelBase<Tinput,Trhs>* kernelFactory(ArgumentParser& parser, Tinput& U, Bubble
         return nullptr;
 }
 
-template <typename Tinput, typename Trhs>
+template <typename Tinput, typename Trhs=Tinput>
 StepperBase<Tinput,Trhs>* stepperFactory(ArgumentParser& p, Tinput& U, StepperSettings& S, BubbleData& D)
 {
     KernelBase<Tinput,Trhs> * const kern = kernelFactory<Tinput,Trhs>(p, U, D);
@@ -96,12 +96,12 @@ int main(int argc, const char** argv)
     vec_t U(simConfig.Nbubbles);
 
     // Select stepper and kernel
-    StepperBase<vec_t,vec_t> * const stepper = stepperFactory<vec_t,vec_t>(parser, U, stepperData, simConfig);
+    StepperBase<vec_t> * const stepper = stepperFactory<vec_t>(parser, U, stepperData, simConfig);
     assert(stepper != nullptr);
 
     simConfig.print();
 
-    size_t& step         = stepperData.step;
+    size_t& step       = stepperData.step;
     Real& t            = stepperData.t;
     Real& dt           = stepperData.dt;
     const Real& tFinal = stepperData.tFinal;
diff --git a/src/kernels/Dahlquist.h b/src/kernels/Dahlquist.h
@@ -11,7 +11,7 @@
 #include "KernelBase.h"
 #include "GnuplotDump.h"
 
-template <typename Tinput, typename Trhs>
+template <typename Tinput, typename Trhs=Tinput>
 class Dahlquist : public KernelBase<Tinput,Trhs>
 {
     GnuplotDump m_gp;
@@ -34,7 +34,7 @@ public:
     }
 };
 
-template <typename Tinput, typename Trhs>
+template <typename Tinput, typename Trhs=Tinput>
 class DahlquistLSRK3 : public Dahlquist<Tinput,Trhs>
 {
     using Dahlquist<Tinput, Trhs>::m_a;
diff --git a/src/kernels/KMCluster_TY.h b/src/kernels/KMCluster_TY.h
@@ -20,7 +20,7 @@
 #include "GnuplotDump.h"
 
 
-template <typename Tinput, typename Trhs>
+template <typename Tinput, typename Trhs=Tinput>
 class KMCluster_TY : public KernelBase<Tinput,Trhs>
 {
     const size_t _N;
diff --git a/src/kernels/KellerMiksis.h b/src/kernels/KellerMiksis.h
@@ -13,7 +13,7 @@
 #include "BubbleBase.h"
 #include "GnuplotDump.h"
 
-template <typename Tinput, typename Trhs>
+template <typename Tinput, typename Trhs=Tinput>
 class KellerMiksis : public KernelBase<Tinput,Trhs>
 {
     const size_t _N;
diff --git a/src/kernels/RayleighPlesset.h b/src/kernels/RayleighPlesset.h
@@ -13,7 +13,7 @@
 #include "BubbleBase.h"
 #include "GnuplotDump.h"
 
-template <typename Tinput, typename Trhs>
+template <typename Tinput, typename Trhs=Tinput>
 class RayleighPlesset : public KernelBase<Tinput,Trhs>
 {
     const size_t _N;
diff --git a/src/kernels/RayleighPlesset_HBGL.h b/src/kernels/RayleighPlesset_HBGL.h
@@ -13,7 +13,7 @@
 #include "BubbleBase.h"
 #include "GnuplotDump.h"
 
-template <typename Tinput, typename Trhs>
+template <typename Tinput, typename Trhs=Tinput>
 class RayleighPlesset_HBGL : public KernelBase<Tinput,Trhs>
 {
     const size_t _N;