Difference for src/colvarmodule.C from version 1.30 to 1.31

version 1.30version 1.31
Line 295
Line 295
  
   std::string colvar_conf = "";   std::string colvar_conf = "";
   size_t pos = 0;   size_t pos = 0;
   while (parse->key_lookup(conf, "colvar", colvar_conf, pos)) {   while (parse->key_lookup(conf, "colvar", &colvar_conf, &pos)) {
  
     if (colvar_conf.size()) {     if (colvar_conf.size()) {
       cvm::log(cvm::line_marker);       cvm::log(cvm::line_marker);
Line 350
Line 350
 { {
   std::string bias_conf = "";   std::string bias_conf = "";
   size_t conf_saved_pos = 0;   size_t conf_saved_pos = 0;
   while (parse->key_lookup(conf, keyword, bias_conf, conf_saved_pos)) {   while (parse->key_lookup(conf, keyword, &bias_conf, &conf_saved_pos)) {
     if (bias_conf.size()) {     if (bias_conf.size()) {
       cvm::log(cvm::line_marker);       cvm::log(cvm::line_marker);
       cvm::increase_depth();       cvm::increase_depth();
Line 673
Line 673
   variables_active()->resize(0);   variables_active()->resize(0);
   variables_active()->reserve(variables()->size());   variables_active()->reserve(variables()->size());
   for (cvi = variables()->begin(); cvi != variables()->end(); cvi++) {   for (cvi = variables()->begin(); cvi != variables()->end(); cvi++) {
      // This is a dynamic feature - the next call should be to enable()
      // or disable() when dynamic dependency resolution is fully implemented
     (*cvi)->set_enabled(colvardeps::f_cv_active,     (*cvi)->set_enabled(colvardeps::f_cv_active,
       step_absolute() % (*cvi)->get_time_step_factor() == 0);       step_absolute() % (*cvi)->get_time_step_factor() == 0);
     variables_active()->push_back(*cvi);     variables_active()->push_back(*cvi);


Legend:
Removed in v.1.30 
changed lines
 Added in v.1.31



Made by using version 1.53 of cvs2html