Integrate change to stream access

Author: giacomofiorin

src/colvarbias_meta.cpp

@@ -569,7 +569,7 @@ int colvarbias_meta::init_interval_params(std::string const &conf)
   std::vector<int> interval_ulimit_cv;
   size_t i;
   size_t j;
-  // allocate accessory variable of colvar values to be used in energy and forces calculation 
+  // allocate accessory variable of colvar values to be used in energy and forces calculation
   curr_values.resize(num_variables());
   for (i = 0; i < num_variables(); i++) {
     curr_values[i].type(variables(i)->value());
@@ -908,10 +908,10 @@ int colvarbias_meta::reflect_hill_multid(cvm::real const &h_scale)
 
                    case multiple_replicas:
                      add_hill(hill(cvm::step_absolute(), hill_weight*h_scale, curr_cv_values, colvar_sigmas, replica_id));
-                     std::ostream *replica_hills_os =
-                       cvm::proxy->get_output_stream(replica_hills_file);
+                     std::ostream &replica_hills_os =
+                       cvm::proxy->output_stream(replica_hills_file);
                      if (replica_hills_os) {
-                       *replica_hills_os << hills.back();
+                       replica_hills_os << hills.back();
                      } else {
                        return cvm::error("Error: in metadynamics bias \""+this->name+"\""+
                                          ((comm != single_replica) ? ", replica \""+replica_id+"\"" : "")+
@@ -1328,7 +1328,7 @@ int colvarbias_meta::calc_forces(std::vector<colvarvalue> const *values)
     curr_bin = hills_energy->get_colvars_index_bound(curr_values);
   } else {
     curr_bin = hills_energy->get_colvars_index(curr_values);
-  }  
+  }
 
   if (hills_energy->index_ok(curr_bin)) {
     for (ir = 0; ir < replicas.size(); ir++) {
@@ -1493,9 +1493,9 @@ void colvarbias_meta::project_hills(colvarbias_meta::hill_iter  h_first,
                                     colvarbias_meta::hill_iter  h_last,
                                     colvar_grid_scalar         *he,
                                     colvar_grid_gradient       *hg,
-                                    std::vector<int> const &w_int_llimit_cv, 
+                                    std::vector<int> const &w_int_llimit_cv,
                                     std::vector<int> const &w_int_ulimit_cv,
-                                    std::vector<cvm::real> const &int_llimit, 
+                                    std::vector<cvm::real> const &int_llimit,
                                     std::vector<cvm::real> const &int_ulimit,
                                     bool print_progress)
 {
@@ -2105,7 +2105,7 @@ std::istream & colvarbias_meta::read_state_data(std::istream& is)
                cvm::to_str(hills.size())+" hills (this may take a while)...\n");
       project_hills(hills.begin(), hills.end(),
                     new_hills_energy, new_hills_energy_gradients,
-                    which_int_llimit_cv, which_int_ulimit_cv, 
+                    which_int_llimit_cv, which_int_ulimit_cv,
                     interval_llimit, interval_ulimit, true);
       cvm::log("rebinning done.\n");