Commit e368acda authored by Steve Plimpton's avatar Steve Plimpton Committed by GitHub
Browse files

Merge pull request #700 from giacomofiorin/colvars-fix 

Import segfault fix in Colvars module
parents 40147a7a 6e7504f1

doc/src/PDF/colvars-refman-lammps.pdf

+20.7 KiB (587 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

lib/colvars/colvarmodule.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1020,14 +1020,14 @@ colvarmodule::~colvarmodule() 
  if ((proxy->smp_thread_id() == COLVARS_NOT_IMPLEMENTED) ||

      (proxy->smp_thread_id() == 0)) {



    reset();



    // Delete contents of static arrays

    colvarbias::delete_features();

    colvar::delete_features();

    colvar::cvc::delete_features();

    atom_group::delete_features();



    reset();



    delete parse;

    parse = NULL;

    proxy = NULL;

lib/colvars/colvars_version.h

+1 −1
Original line number Diff line number Diff line 
#ifndef COLVARS_VERSION

#define COLVARS_VERSION "2017-10-11"

#define COLVARS_VERSION "2017-10-19"

// This file is part of the Collective Variables module (Colvars).

// The original version of Colvars and its updates are located at:

// https://github.com/colvars/colvars

CRA Git | Maintained and supported by SUSTech CRA and CCSE