Adjust C++ code for Verlet according to #257

Author: berquist

contents/verlet_integration/code/c++/verlet.cpp

@@ -1,6 +1,9 @@
+#include <iomanip>
 #include <iostream>
+#include <utility>
+
+typedef std::pair<double, double> vpair;
 
-// Simple function for velocity-verlet
 double verlet(double pos, double acc, double dt) {
 
   double prev_pos = pos;
@@ -16,8 +19,7 @@ double verlet(double pos, double acc, double dt) {
   return time;
 }
 
-// Simple function for stormer-verlet
-double stormer_verlet(double pos, double acc, double dt) {
+std::pair<double, double> stormer_verlet(double pos, double acc, double dt) {
 
   double prev_pos = pos;
   double time = 0;
@@ -28,14 +30,15 @@ double stormer_verlet(double pos, double acc, double dt) {
     prev_pos = pos;
     pos = next_pos;
 
-    // The acceleration is constant, so the velocity is straightforward
+    // The acceleration is constant, so the velocity is
+    // straightforward
     vel += acc * dt;
   }
 
-  return time;
+  return std::make_pair(time, vel);
 }
 
-double velocity_verlet(double pos, double acc, double dt) {
+std::pair<double, double> velocity_verlet(double pos, double acc, double dt) {
 
   double time = 0;
   double vel = 0;
@@ -45,18 +48,41 @@ double velocity_verlet(double pos, double acc, double dt) {
     vel += acc * dt;
   }
 
-  return time;
+  return std::make_pair(time, vel);
 }
 
 int main() {
+  double time, vel;
+  vpair time_vel_pair;
+
+  std::cout << std::fixed << std::setprecision(8);
+
+  // Note that depending on the simulation, you might want to have the
+  // Verlet loop outside.
+
+  // For example, if your acceleration chages as a function of time,
+  // you might need to also change the acceleration to be read into
+  // each of these functions.
+
+  time = verlet(5.0, -10, 0.01);
+  std::cout << "Time for Verlet integration is: " \
+            << time << std::endl;
+
+  time_vel_pair = stormer_verlet(5.0, -10, 0.01);
+  time = time_vel_pair.first;
+  vel = time_vel_pair.second;
+  std::cout << "Time for Stormer Verlet integration is: " \
+            << time << std::endl;
+  std::cout << "Velocity for Stormer Verlet integration is: " \
+            << vel << std::endl;
 
-  // Note that depending on the simulation, you might want to have the verlet
-  // loop outside.
+  time_vel_pair = velocity_verlet(5.0, -10, 0.01);
+  time = time_vel_pair.first;
+  vel = time_vel_pair.second;
+  std::cout << "Time for velocity Verlet integration is: " \
+            << time << std::endl;
+  std::cout << "Velocity for velocity Verlet integration is: " \
+            << vel << std::endl;
 
-  // For example, if your acceleration chages as a function of time, you might
-  // need to also change the acceleration to be read into each of these
-  // functions
-  std::cout << verlet(5.0, -10, 0.01) << std::endl;
-  std::cout << stormer_verlet(5.0, -10, 0.01) << std::endl;
-  std::cout << velocity_verlet(5.0, -10, 0.01) << std::endl;
+  return 0;
 }

contents/verlet_integration/verlet_integration.md

@@ -33,7 +33,7 @@ Here is what it looks like in code:
 {% sample lang="jl" %}
 [import:1-13, lang:"julia"](code/julia/verlet.jl)
 {% sample lang="cpp" %}
-[import:4-17, lang:"c_cpp"](code/c++/verlet.cpp)
+[import:7-20, lang:"c_cpp"](code/c++/verlet.cpp)
 {% sample lang="c" %}
 [import:3-14, lang:"c_cpp"](code/c/verlet.c)
 {% sample lang="java" %}
@@ -79,7 +79,7 @@ Here's what it looks like in code:
 {% sample lang="jl" %}
 [import:15-31, lang:"julia"](code/julia/verlet.jl)
 {% sample lang="cpp" %}
-[import:20-36, lang:"c_cpp"](code/c++/verlet.cpp)
+[import:22-39, lang:"c_cpp"](code/c++/verlet.cpp)
 {% sample lang="c" %}
 [import:16-31, lang:"c_cpp"](code/c/verlet.c)
 {% sample lang="java" %}
@@ -136,7 +136,7 @@ Here is the velocity Verlet method in code:
 {% sample lang="jl" %}
 [import:33-45, lang:"julia"](code/julia/verlet.jl)
 {% sample lang="cpp" %}
-[import:38-49, lang:"c_cpp"](code/c++/verlet.cpp)
+[import:41-52, lang:"c_cpp"](code/c++/verlet.cpp)
 {% sample lang="c" %}
 [import:33-43, lang:"c_cpp"](code/c/verlet.c)
 {% sample lang="java" %}