Merge branch 'v2.5' into v2.6

chen-jialan · Sep 2, 2020 · e671334 · e671334
2 parents 2dae0d3 + bdd5839
commit e671334
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/colvar/Puckering.cpp b/src/colvar/Puckering.cpp
@@ -67,7 +67,7 @@ namespace colvar {
  \plumedfile
  #SETTINGS MOLFILE=regtest/basic/rt65/AA.pdb
  MOLINFO STRUCTURE=rna.pdb MOLTYPE=rna
- PUCKERING ATOMS=@sugar-3 LABEL=puck
+ PUCKERING ATOMS=@sugar-2 LABEL=puck
  PRINT ARG=puck.phs FILE=COLVAR
  \endplumedfile
 

diff --git a/src/function/Piecewise.cpp b/src/function/Piecewise.cpp
@@ -59,8 +59,8 @@ argument with suffix _pfunc.
 dist1: DISTANCE ATOMS=1,10
 dist2: DISTANCE ATOMS=2,11
 
-pw: PIECEWISE POINT0=1,10 POINT1=1,PI POINT2=3,10 ARG=dist1
-ppww: PIECEWISE POINT0=1,10 POINT1=1,PI POINT2=3,10 ARG=dist1,dist2
+pw: PIECEWISE POINT0=1,10 POINT1=2,PI POINT2=3,10 ARG=dist1
+ppww: PIECEWISE POINT0=1,10 POINT1=2,PI POINT2=3,10 ARG=dist1,dist2
 PRINT ARG=pw,ppww.dist1_pfunc,ppww.dist2_pfunc
 \endplumedfile