Commit 3a74ccff authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

update colvars library to version 2016-09-03 

(cherry picked from commit 4181f5ac9d7291544e6848f8e8423025857936bc)
parent c8cfd53c

lib/colvars/colvarmodule.cpp

+6 −2
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ int colvarmodule::read_config_file(char const *config_filename) 
  std::string conf = "";

  std::string line;

  while (colvarparse::getline_nocomments(config_s, line)) {

    // Delete lines that contain only white space after removing comments

    if (line.find_first_not_of(colvarparse::white_space) != std::string::npos)

      conf.append(line+"\n");

  }

  config_s.close();
@@ -101,6 +103,8 @@ int colvarmodule::read_config_string(std::string const &config_str) 
  std::string conf = "";

  std::string line;

  while (colvarparse::getline_nocomments(config_s, line)) {

    // Delete lines that contain only white space after removing comments

    if (line.find_first_not_of(colvarparse::white_space) != std::string::npos)

      conf.append(line+"\n");

  }

  return parse_config(conf);

lib/colvars/colvarmodule.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#define COLVARMODULE_H



#ifndef COLVARS_VERSION

#define COLVARS_VERSION "2016-08-19"

#define COLVARS_VERSION "2016-09-03"

#endif



#ifndef COLVARS_DEBUG

lib/colvars/colvarparse.cpp

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ int colvarparse::check_keywords(std::string &conf, char const *key) 
    }

  }



  init();

  clear_keyword_registry();



  return COLVARS_OK;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE