Commit 27dac024 authored by sjplimp's avatar sjplimp Committed by GitHub
Browse files

Merge pull request #209 from akohlmey/static-double-deallocation-workaround 

workaround for double free issue when using USER-COLVARS with with lammps python wrapper and python package
parents 467bcad0 683689c8

lib/colvars/colvarmodule.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1557,5 +1557,5 @@ size_t const colvarmodule::cv_prec = 14; 
size_t const colvarmodule::cv_width = 21;

size_t const colvarmodule::en_prec  = 14;

size_t const colvarmodule::en_width = 21;

std::string const colvarmodule::line_marker =

const char * const colvarmodule::line_marker = (const char *)

  "----------------------------------------------------------------------\n";

lib/colvars/colvarmodule.h

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ public: 
  /// Number of characters to represent the collective variables energy

  static size_t const en_width;

  /// Line separator in the log output

  static std::string const line_marker;

  static const char * const line_marker;





  // proxy functions

src/USER-COLVARS/colvarproxy_lammps.cpp

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ double colvarproxy_lammps::compute() 
  previous_step = _lmp->update->ntimestep;



  if (cvm::debug()) {

    cvm::log(cvm::line_marker+

    cvm::log(std::string(cvm::line_marker)+

             "colvarproxy_lammps, step no. "+cvm::to_str(colvars->it)+"\n"+

             "Updating internal data.\n");

  }

CRA Git | Maintained and supported by SUSTech CRA and CCSE