Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

Plumed AlphaFold
- Activity
- Members
- Labels
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

38ec9ca0

There was an error fetching the commit references. Please try again later.

Commit 38ec9ca0 authored 12 years ago by Giovanni Bussi

Downloads
- Plain Diff

Merge branch 'master' into tree-refactoring

Conflicts:
	src/basic/BiasExternal.cpp

parents 92646c6d 4c6aaafd

No related branches found

No related tags found

Loading

Changes 13

Expand all Hide whitespace changes

Inline Side-by-side

Showing

configurations/mac.clang 2 additions, 2 deletions

configurations/mac.clang
configurations/mac.gcc 3 additions, 3 deletions

configurations/mac.gcc
configurations/mac.mpi.gcc 3 additions, 3 deletions

configurations/mac.mpi.gcc
regtest/rt12/potential 9 additions, 6 deletions

regtest/rt12/potential
regtest/rt39/deriv.reference 26208 additions, 26208 deletions

regtest/rt39/deriv.reference
regtest/rt39/plumed.dat 1 addition, 1 deletion

regtest/rt39/plumed.dat
regtest/rt40/deriv.reference 26208 additions, 26208 deletions

regtest/rt40/deriv.reference
regtest/rt40/plumed.dat 1 addition, 1 deletion

regtest/rt40/plumed.dat
src/basic/BiasExternal.cpp 51 additions, 4 deletions

src/basic/BiasExternal.cpp
src/basic/BiasMetaD.cpp 35 additions, 38 deletions

src/basic/BiasMetaD.cpp
src/tools/Grid.cpp 123 additions, 91 deletions

src/tools/Grid.cpp
src/tools/Grid.h 24 additions, 14 deletions

src/tools/Grid.h
src/tools/PlumedFile.cpp 11 additions, 8 deletions

src/tools/PlumedFile.cpp

with 52679 additions and 52587 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment