Skip to content

Commit

Permalink
Merge branch 'v2.9' into v2.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@carlocamilloni
carlocamilloni committed Oct 10, 2024
2 parents 4df397b + 9462399 commit 56789e9
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 0 deletions.
12 changes: 12 additions & 0 deletions regtest/basic/rt-WALLS-sign/COLVAR.reference
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#! FIELDS time p.x uw1.bias lw1.bias uw2.bias lw2.bias uw3.bias lw3.bias uw4.bias lw4.bias uw1.force2 lw1.force2 uw2.force2 lw2.force2 uw3.force2 lw3.force2 uw4.force2 lw4.force2
0.000000 -5.000000 0.000000 5.000000 0.000000 25.000000 0.000000 125.000000 0.000000 625.000000 0.000000 1.000000 0.000000 100.000000 0.000000 5625.000000 0.000000 250000.000000
1.000000 -4.000000 0.000000 4.000000 0.000000 16.000000 0.000000 64.000000 0.000000 256.000000 0.000000 1.000000 0.000000 64.000000 0.000000 2304.000000 0.000000 65536.000000
2.000000 -3.000000 0.000000 3.000000 0.000000 9.000000 0.000000 27.000000 0.000000 81.000000 0.000000 1.000000 0.000000 36.000000 0.000000 729.000000 0.000000 11664.000000
3.000000 -2.000000 0.000000 2.000000 0.000000 4.000000 0.000000 8.000000 0.000000 16.000000 0.000000 1.000000 0.000000 16.000000 0.000000 144.000000 0.000000 1024.000000
4.000000 -1.000000 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 0.000000 4.000000 0.000000 9.000000 0.000000 16.000000
5.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
6.000000 1.000000 1.000000 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 0.000000 1.000000 0.000000 4.000000 0.000000 9.000000 0.000000 16.000000 0.000000
7.000000 2.000000 2.000000 0.000000 4.000000 0.000000 8.000000 0.000000 16.000000 0.000000 1.000000 0.000000 16.000000 0.000000 144.000000 0.000000 1024.000000 0.000000
8.000000 3.000000 3.000000 0.000000 9.000000 0.000000 27.000000 0.000000 81.000000 0.000000 1.000000 0.000000 36.000000 0.000000 729.000000 0.000000 11664.000000 0.000000
9.000000 4.000000 4.000000 0.000000 16.000000 0.000000 64.000000 0.000000 256.000000 0.000000 1.000000 0.000000 64.000000 0.000000 2304.000000 0.000000 65536.000000 0.000000
10.000000 5.000000 5.000000 0.000000 25.000000 0.000000 125.000000 0.000000 625.000000 0.000000 1.000000 0.000000 100.000000 0.000000 5625.000000 0.000000 250000.000000 0.000000
1 change: 1 addition & 0 deletions regtest/basic/rt-WALLS-sign/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../../scripts/test.make
11 changes: 11 additions & 0 deletions regtest/basic/rt-WALLS-sign/config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
type=driver
arg="--plumed plumed.dat --ixyz trajectory.xyz"


function plumed_regtest_before() {
for x in {-5..5}; do
echo "1"
echo "100 100 100"
echo "C $x 0 0"
done > trajectory.xyz
}
12 changes: 12 additions & 0 deletions regtest/basic/rt-WALLS-sign/der.reference
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#! FIELDS time parameter uw1.bias lw1.bias uw2.bias lw2.bias uw3.bias lw3.bias uw4.bias lw4.bias
0.000000 0 0.000 -1.000 0.000 -10.000 0.000 -75.000 0.000 -500.000
1.000000 0 0.000 -1.000 0.000 -8.000 0.000 -48.000 0.000 -256.000
2.000000 0 0.000 -1.000 0.000 -6.000 0.000 -27.000 0.000 -108.000
3.000000 0 0.000 -1.000 0.000 -4.000 0.000 -12.000 0.000 -32.000
4.000000 0 0.000 -1.000 0.000 -2.000 0.000 -3.000 0.000 -4.000
5.000000 0 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000
6.000000 0 1.000 0.000 2.000 0.000 3.000 0.000 4.000 0.000
7.000000 0 1.000 0.000 4.000 0.000 12.000 0.000 32.000 0.000
8.000000 0 1.000 0.000 6.000 0.000 27.000 0.000 108.000 0.000
9.000000 0 1.000 0.000 8.000 0.000 48.000 0.000 256.000 0.000
10.000000 0 1.000 0.000 10.000 0.000 75.000 0.000 500.000 0.000
13 changes: 13 additions & 0 deletions regtest/basic/rt-WALLS-sign/plumed.dat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
p: POSITION ATOM=1 NOPBC

uw1: UPPER_WALLS ARG=p.x AT=0 KAPPA=1.0 EXP=1
lw1: LOWER_WALLS ARG=p.x AT=0 KAPPA=1.0 EXP=1
uw2: UPPER_WALLS ARG=p.x AT=0 KAPPA=1.0 EXP=2
lw2: LOWER_WALLS ARG=p.x AT=0 KAPPA=1.0 EXP=2
uw3: UPPER_WALLS ARG=p.x AT=0 KAPPA=1.0 EXP=3
lw3: LOWER_WALLS ARG=p.x AT=0 KAPPA=1.0 EXP=3
uw4: UPPER_WALLS ARG=p.x AT=0 KAPPA=1.0 EXP=4
lw4: LOWER_WALLS ARG=p.x AT=0 KAPPA=1.0 EXP=4

PRINT ARG=p.x,*.bias,*.force2 FILE=COLVAR
DUMPDERIVATIVES ARG=*.bias FILE=der FMT=%04.3f

1 comment on commit 56789e9

@PlumedBot
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found broken examples in automatic/ANGLES.tmp
Found broken examples in automatic/ANN.tmp
Found broken examples in automatic/CAVITY.tmp
Found broken examples in automatic/CLASSICAL_MDS.tmp
Found broken examples in automatic/CLUSTER_DIAMETER.tmp
Found broken examples in automatic/CLUSTER_DISTRIBUTION.tmp
Found broken examples in automatic/CLUSTER_PROPERTIES.tmp
Found broken examples in automatic/CONSTANT.tmp
Found broken examples in automatic/CONTACT_MATRIX.tmp
Found broken examples in automatic/CONTACT_MATRIX_PROPER.tmp
Found broken examples in automatic/COORDINATIONNUMBER.tmp
Found broken examples in automatic/DFSCLUSTERING.tmp
Found broken examples in automatic/DISTANCE_FROM_CONTOUR.tmp
Found broken examples in automatic/EDS.tmp
Found broken examples in automatic/EMMI.tmp
Found broken examples in automatic/ENVIRONMENTSIMILARITY.tmp
Found broken examples in automatic/FIND_CONTOUR.tmp
Found broken examples in automatic/FIND_CONTOUR_SURFACE.tmp
Found broken examples in automatic/FIND_SPHERICAL_CONTOUR.tmp
Found broken examples in automatic/FOURIER_TRANSFORM.tmp
Found broken examples in automatic/FUNCPATHGENERAL.tmp
Found broken examples in automatic/FUNCPATHMSD.tmp
Found broken examples in automatic/FUNNEL.tmp
Found broken examples in automatic/FUNNEL_PS.tmp
Found broken examples in automatic/GHBFIX.tmp
Found broken examples in automatic/GPROPERTYMAP.tmp
Found broken examples in automatic/HBOND_MATRIX.tmp
Found broken examples in automatic/INCLUDE.tmp
Found broken examples in automatic/INCYLINDER.tmp
Found broken examples in automatic/INENVELOPE.tmp
Found broken examples in automatic/INTERPOLATE_GRID.tmp
Found broken examples in automatic/LOCAL_AVERAGE.tmp
Found broken examples in automatic/MAZE_OPTIMIZER_BIAS.tmp
Found broken examples in automatic/MAZE_RANDOM_ACCELERATION_MD.tmp
Found broken examples in automatic/MAZE_SIMULATED_ANNEALING.tmp
Found broken examples in automatic/MAZE_STEERED_MD.tmp
Found broken examples in automatic/METATENSOR.tmp
Found broken examples in automatic/MULTICOLVARDENS.tmp
Found broken examples in automatic/OUTPUT_CLUSTER.tmp
Found broken examples in automatic/PAMM.tmp
Found broken examples in automatic/PCA.tmp
Found broken examples in automatic/PCAVARS.tmp
Found broken examples in automatic/PIV.tmp
Found broken examples in automatic/PLUMED.tmp
Found broken examples in automatic/PYCVINTERFACE.tmp
Found broken examples in automatic/PYTHONFUNCTION.tmp
Found broken examples in automatic/Q3.tmp
Found broken examples in automatic/Q4.tmp
Found broken examples in automatic/Q6.tmp
Found broken examples in automatic/QUATERNION.tmp
Found broken examples in automatic/SIZESHAPE_POSITION_LINEAR_PROJ.tmp
Found broken examples in automatic/SIZESHAPE_POSITION_MAHA_DIST.tmp
Found broken examples in automatic/SPRINT.tmp
Found broken examples in automatic/TETRAHEDRALPORE.tmp
Found broken examples in automatic/TORSIONS.tmp
Found broken examples in automatic/WHAM_WEIGHTS.tmp
Found broken examples in AnalysisPP.md
Found broken examples in CollectiveVariablesPP.md
Found broken examples in MiscelaneousPP.md

Please sign in to comment.