Update brutus to be C++17 compatible

Author: LourensVeen

src/amuse/community/brutus/interface.cc

@@ -2,7 +2,6 @@
 // Includes
 ////////////////////////////////////////////////////////
 #include <iostream>
-using namespace std;
 
 #include <fstream>
 #include <cstdlib>
@@ -14,21 +13,21 @@ using namespace std;
 ////////////////////////////////////////////////////////
 // Declare global variables
 ////////////////////////////////////////////////////////
-ofstream odata;
+std::ofstream odata;
 
 int particle_id_counter = 0;
 
-int numBits = 64;  
+int numBits = 64;
 int numDigits = numBits/4;
 
-string out_directory;
+std::string out_directory;
 std::map<int, int> local_index_map;
 
 /*
  * We need this result_strings array to ensure that
  * C++ strings are not reclaimed before the function ends
  */
-string result_strings[10];
+std::string result_strings[10];
 
 Brutus *brutus = NULL;
 
@@ -38,15 +37,18 @@ mpreal t = "0";
 
 mpreal epsilon = "1e-6"; // Bulirsch-Stoer tolerance
 
-vector<mpreal> data, data_radius;
+std::vector<mpreal> data, data_radius;
 
 ////////////////////////////////////////////////////////
 // Amuse interface functions
 ////////////////////////////////////////////////////////
+
+extern "C" {
+
 int initialize_code() {
     odata.open("temp.log");
 
-    mpreal::set_default_prec(numBits);  
+    mpreal::set_default_prec(numBits);
 
     brutus = new Brutus();
 
@@ -62,7 +64,7 @@ int initialize_code() {
 
 // functions with "_string" assign strings to mpreals, and without "_string" assign doubles to mpreals
 
-int new_particle_string(int *particle_identifier, char* mass, 
+int new_particle_string(int *particle_identifier, char* mass,
         char* x, char* y, char* z, char* vx, char* vy, char* vz, char* radius) {
 
     data.push_back(mass);
@@ -80,7 +82,7 @@ int new_particle_string(int *particle_identifier, char* mass,
 
     return 0;
 }
-int new_particle_float64(int *particle_identifier, double mass, 
+int new_particle_float64(int *particle_identifier, double mass,
         double x, double y, double z, double vx, double vy, double vz, double radius) {
 
     data.push_back( (mpreal)mass );
@@ -139,7 +141,7 @@ int get_begin_time(double * output) {
 // Timestep parameter, eta
 int set_eta_string(char* myeta) {
     eta = myeta;
-    brutus->set_eta(eta); 
+    brutus->set_eta(eta);
     return 0;
 }
 int get_eta_string(char **myeta) {
@@ -200,12 +202,12 @@ int get_bs_tolerance_string(char **bs_tolerance) {
 }
 int set_bs_tolerance(double bs_tolerance) {
 
-odata << t << ": changing e from " << epsilon << ", to " << bs_tolerance << endl;
+odata << t << ": changing e from " << epsilon << ", to " << bs_tolerance << std::endl;
 
     epsilon = (mpreal) bs_tolerance;
     brutus->set_tolerance(epsilon);
 
-odata << epsilon << " " << brutus->get_tolerance() << endl;
+odata << epsilon << " " << brutus->get_tolerance() << std::endl;
 
     return 0;
 }
@@ -215,14 +217,14 @@ int get_bs_tolerance(double *bs_tolerance) {
 }
 // Word-length, numBits in mantissa
 int set_word_length(int mynumBits) {
-odata << t << ": changing L from " << numBits << ", to " << mynumBits << endl;
+odata << t << ": changing L from " << numBits << ", to " << mynumBits << std::endl;
 
     numBits = mynumBits;
     mpreal::set_default_prec(numBits);
     numDigits = (int)abs(log10( pow("2.0", -numBits) )).toLong();
     brutus->set_numBits(numBits);
 
-odata << numBits << " " << brutus->get_numBits() << endl;
+odata << numBits << " " << brutus->get_numBits() << std::endl;
 
     return 0;
 }
@@ -263,7 +265,7 @@ int get_mass_string(int id, char **mass) {
   mass_string = data[id*7+0].toString();
   *mass = (char*) mass_string.c_str();
   return 0;
-} 
+}
 int set_mass_string(int id, char *mass) {
   if (id < 0 || id >= particle_id_counter){
     return -1;
@@ -277,7 +279,7 @@ int get_mass(int id, double* mass) {
   }
   *mass = data[id*7+0].toDouble();
   return 0;
-} 
+}
 int set_mass(int id, double mass) {
   if (id < 0 || id >= particle_id_counter){
     return -1;
@@ -379,7 +381,7 @@ std::string get_state_strings_vx;
 std::string get_state_strings_vy;
 std::string get_state_strings_vz;
 std::string get_state_strings_r;
-int get_state_string(int id, char** m, char** x, char** y, char** z, char** vx, char** vy, char** vz, char** radius) {  
+int get_state_string(int id, char** m, char** x, char** y, char** z, char** vx, char** vy, char** vz, char** radius) {
   if (id < 0 || id >= particle_id_counter){
     return -1;
   }
@@ -445,7 +447,7 @@ int set_state(int id, double m, double x, double y, double z, double vx, double
 }
 
 std::string radius_string;
-int get_radius_string(int id, char** radius){ 
+int get_radius_string(int id, char** radius){
   if (id < 0 || id >= particle_id_counter){
     return -1;
   }
@@ -460,7 +462,7 @@ int set_radius_string(int id, char* radius) {
   data_radius[id] = radius;
   return 0;
 }
-int get_radius(int id, double* radius){ 
+int get_radius(int id, double* radius){
   if (id < 0 || id >= particle_id_counter){
     return -1;
   }
@@ -523,7 +525,7 @@ int get_index_of_first_particle(int* id){return -2;}
 int get_index_of_next_particle(int id, int* idnext){return -2;}
 
 std::string total_mass_string;
-int get_total_mass_string(char **M){ 
+int get_total_mass_string(char **M){
   int N = data.size()/7;
   mpreal Mtot = "0";
   for(int i=0; i<N; i++) {
@@ -534,7 +536,7 @@ int get_total_mass_string(char **M){
   return 0;
 }
 
-int get_total_mass(double* M){ 
+int get_total_mass(double* M){
   int N = data.size()/7;
   mpreal Mtot = "0";
   for(int i=0; i<N; i++) {
@@ -564,7 +566,7 @@ int get_potential_energy_m(mpreal* ep) {
 
       eptot -= mi*mj/sqrt(dr2);
     }
-  }  
+  }
 
   *ep = eptot;
   return 0;
@@ -608,8 +610,8 @@ int get_kinetic_energy_string( char **ep) {
 std::string total_energy_string;
 
 int get_total_energy_string( char **ep) {
-    mpreal ektot = "0";   
-    mpreal eptot = "0";   
+    mpreal ektot = "0";
+    mpreal eptot = "0";
     mpreal etot = "0";
     get_potential_energy_m(&eptot);
     get_kinetic_energy_m(&ektot);
@@ -633,40 +635,40 @@ int get_kinetic_energy(double* ek) {
   return 0;
 }
 
-int get_center_of_mass_position(double* x , double* y, double* z){ 
+int get_center_of_mass_position(double* x , double* y, double* z){
   int N = data.size()/7;
   mpreal Mtot = "0";
   for(int i=0; i<N; i++) {
     Mtot += data[i*7];
   }
 
-  vector<mpreal> rcm(3,"0");
+  std::vector<mpreal> rcm(3,"0");
   for(int i=0; i<N; i++) {
     for(int j=0; j<3; j++) {
       rcm[j] += data[i*7]*data[i*7+(j+1)];
     }
   }
-  for(int i=0; i<3; i++) rcm[i] /= Mtot;  
+  for(int i=0; i<3; i++) rcm[i] /= Mtot;
 
   *x = rcm[0].toDouble();
   *y = rcm[1].toDouble();
   *z = rcm[2].toDouble();
   return 0;
 }
-int get_center_of_mass_velocity(double* vx, double* vy, double* vz){ 
+int get_center_of_mass_velocity(double* vx, double* vy, double* vz){
   int N = data.size()/7;
   mpreal Mtot = "0";
   for(int i=0; i<N; i++) {
     Mtot += data[i*7];
   }
 
-  vector<mpreal> vcm(3,"0");
+  std::vector<mpreal> vcm(3,"0");
   for(int i=0; i<N; i++) {
     for(int j=0; j<3; j++) {
       vcm[j] += data[i*7]*data[i*7+(j+4)];
     }
   }
-  for(int i=0; i<3; i++) vcm[i] /= Mtot;  
+  for(int i=0; i<3; i++) vcm[i] /= Mtot;
 
   *vx = vcm[0].toDouble();
   *vy = vcm[1].toDouble();
@@ -675,3 +677,7 @@ int get_center_of_mass_velocity(double* vx, double* vy, double* vz){
 }
 
 int get_acceleration(int id, double* ax, double* ay, double* az){return -2;}
+int set_acceleration(int id, double ax, double ay, double az){return -2;}
+
+}       // extern "C"
+

src/amuse/community/brutus/src/Brutus.cpp

@@ -12,7 +12,7 @@ Brutus::Brutus() {
 
   setup();
 }
-Brutus::Brutus(vector<mpreal> &data) {
+Brutus::Brutus(std::vector<mpreal> &data) {
   t = "0";
   this->data = data;
   N = data.size()/7;  
@@ -24,7 +24,7 @@ Brutus::Brutus(vector<mpreal> &data) {
 
   setup();
 }
-Brutus::Brutus(mpreal &t, vector<mpreal> &data, mpreal &tolerance) {
+Brutus::Brutus(mpreal &t, std::vector<mpreal> &data, mpreal &tolerance) {
   this->t = t;
   this->data = data;
   N = data.size()/7;  
@@ -36,7 +36,7 @@ Brutus::Brutus(mpreal &t, vector<mpreal> &data, mpreal &tolerance) {
 
   setup();
 }
-Brutus::Brutus(mpreal &t, vector<mpreal> &data, mpreal &tolerance, int &numBits) {
+Brutus::Brutus(mpreal &t, std::vector<mpreal> &data, mpreal &tolerance, int &numBits) {
   this->t = t;
   this->data = data;
   N = data.size()/7;  
@@ -49,7 +49,7 @@ Brutus::Brutus(mpreal &t, vector<mpreal> &data, mpreal &tolerance, int &numBits)
   setup();
 }
 
-void Brutus::set_data(vector<mpreal> &data) {
+void Brutus::set_data(std::vector<mpreal> &data) {
   this->data = data;
   N = data.size()/7; 
 
@@ -98,7 +98,7 @@ int Brutus::get_numBits(mpreal tolerance) {
   mpreal absloge = abs( log10(tolerance) );
   return 4*(int)absloge.toLong()+32;
 }
-mpreal Brutus::fit_slope(vector<mpreal> &x, vector<mpreal> &y) {
+mpreal Brutus::fit_slope(std::vector<mpreal> &x, std::vector<mpreal> &y) {
   mpreal a = "0";
   int N = x.size();
 
@@ -142,7 +142,7 @@ void Brutus::evolve(mpreal t_end) {
     bool converged = bs.integrate(cl, dt);
 
     if(!converged) {
-      cerr << "Not converged at " << t << "!" << endl;
+      std::cerr << "Not converged at " << t << "!" << std::endl;
       exit(1);
     }
 
@@ -154,22 +154,22 @@ void Brutus::evolve(mpreal t_end) {
 mpreal Brutus::get_t() {
   return t;
 }
-vector<mpreal> Brutus::get_data() {
+std::vector<mpreal> Brutus::get_data() {
   return data;
 }
-vector<double> Brutus::get_data_double() {
+std::vector<double> Brutus::get_data_double() {
   int N = data.size()/7;
-  vector<double> v(7*N, 0);
+  std::vector<double> v(7*N, 0);
   for(int i=0; i<N; i++) {
     for(int j=0; j<7; j++) {
       v[i*7+j] = data[i*7+j].toDouble();
     }
   }
   return v;
 }
-vector<string> Brutus::get_data_string() {
+std::vector<std::string> Brutus::get_data_string() {
   int N = data.size()/7;
-  vector<string> v(7*N, "0");
+  std::vector<std::string> v(7*N, "0");
   for(int i=0; i<N; i++) {
     for(int j=0; j<7; j++) {
       v[i*7+j] = data[i*7+j].toString();

src/amuse/community/brutus/src/Brutus.h

@@ -8,7 +8,7 @@
 class Brutus {
   mpreal t;
   int N;  
-  vector<mpreal> data;
+  std::vector<mpreal> data;
 
   mpreal tolerance;
   int numBits;
@@ -21,11 +21,11 @@ class Brutus {
   public:
 
   Brutus();
-  Brutus(vector<mpreal> &data);
-  Brutus(mpreal &t, vector<mpreal> &data, mpreal &tolerance);
-  Brutus(mpreal &t, vector<mpreal> &data, mpreal &tolerance, int &numBits);
+  Brutus(std::vector<mpreal> &data);
+  Brutus(mpreal &t, std::vector<mpreal> &data, mpreal &tolerance);
+  Brutus(mpreal &t, std::vector<mpreal> &data, mpreal &tolerance, int &numBits);
 
-  void set_data(vector<mpreal> &data);
+  void set_data(std::vector<mpreal> &data);
   void set_eta(mpreal &eta);
   void set_tolerance(mpreal &tolerance);
   void set_numBits(int &numBits);
@@ -35,15 +35,15 @@ class Brutus {
   mpreal get_tolerance();
   int get_numBits();
   int get_numBits(mpreal tolerance);
-  mpreal fit_slope(vector<mpreal> &x, vector<mpreal> &y);
+  mpreal fit_slope(std::vector<mpreal> &x, std::vector<mpreal> &y);
 
   void setup();
   void evolve(mpreal t_end);
 
   mpreal get_t();
-  vector<mpreal> get_data();
-  vector<double> get_data_double();
-  vector<string> get_data_string();
+  std::vector<mpreal> get_data();
+  std::vector<double> get_data_double();
+  std::vector<std::string> get_data_string();
 };
 
 #endif