Skip to content

Commit

Permalink
More features from hack-the-tree (#1033)
Browse files Browse the repository at this point in the history
* Got rid of MultiRMSD action as it makes no sense and now doing DRMSD using a shortcut

* RMSD no longer depends on reference class

* Started adding shortcut for RMSD action

* Rewritten PCAVARS as a shortcut that uses multiple actions and shows how this is matrix vector multiplication

* Reimplemented PATH and GPROPERTYMAP using features of new code

* Simplification of RMSD vector and PCAVARS

* Added new version of geometric path that is computed via trigonometry

* Added new version of pathtools that doesn't rely on reference class

* Fixed adaptive path to work with new style distances

* Removed code that is no longer used

* Added DRMSD metric for PATHs

* Ran astyle and fixed json file

* Fixed a number of issues that were flagged by ccpcheck

* Added requirement to these regtests so they are not run when modules required are not compiled

* Got rid of an exception in VSTACK as it is overly specific

* Fixed bug that occurs try to convert a PDB with no atoms to a constant

* Fixed out of bounds error when applying GeometricPath

* Small fixes for things flagged up by code review by Github tools and Giovanni

---------

Co-authored-by: Gareth Aneurin Tribello <garethtribello@Gareths-MacBook-Pro.local>
Co-authored-by: Gareth Aneurin Tribello <garethtribello@gareths-mbp.mp.qub.ac.uk>
  • Loading branch information
3 people committed Mar 6, 2024
1 parent 026f7df commit 6a56f54
Show file tree
Hide file tree
Showing 196 changed files with 140,714 additions and 137,969 deletions.
3 changes: 0 additions & 3 deletions regtest/adjmat/rt-graph-2/graph.md.reference
Expand Up @@ -32,9 +32,6 @@ subgraph subc1 [c1]
end
cc -- ones --> ones
linkStyle 6 stroke:blue,color:blue;
ones(["label=ones
CONSTANT
"])
Box("label=Box
PBC
")
Expand Down
6 changes: 0 additions & 6 deletions regtest/adjmat/rt-graph-4/graph.md.reference
Expand Up @@ -78,9 +78,6 @@ subgraph subcm_cncn [cm_cncn]
end
cc_cnI -- ones192 --> ones192
linkStyle 17 stroke:blue,color:blue;
ones192(["label=ones192
CONSTANT
"])
subgraph subcm_cncn [cm_cncn]
end
cc_cnpb -- ones64 --> ones64
Expand All @@ -89,9 +86,6 @@ subgraph subcm_cncn [cm_cncn]
end
cc_cncn -- ones64 --> ones64
linkStyle 19 stroke:blue,color:blue;
ones64(["label=ones64
CONSTANT
"])
Box("label=Box
PBC
")
Expand Down
1 change: 1 addition & 0 deletions regtest/basic/rt-drmsd/config
@@ -1,3 +1,4 @@
plumed_modules=adjmat
type=driver
# this is to test a different name
arg="--plumed plumed.dat --trajectory-stride 10 --timestep 0.005 --ixyz trajectory.xyz --dump-forces forces --dump-forces-fmt=%8.4f"
Expand Down
2 changes: 1 addition & 1 deletion regtest/basic/rt-molfile-1/COLVAR.reference
@@ -1,4 +1,4 @@
#! FIELDS time rmsd0 rmsd1 sum @4.bias @4.force2
#! FIELDS time rmsd0 rmsd1 sum @6.bias @6.force2
0.000000 0.000 0.149 0.149 197.034 394.068
0.005000 0.072 0.160 0.231 195.399 390.797
0.010000 0.032 0.147 0.178 196.450 392.899
Expand Down
2 changes: 1 addition & 1 deletion regtest/basic/rt-molfile-2/COLVAR.reference
@@ -1,4 +1,4 @@
#! FIELDS time rmsd0 rmsd1 sum @4.bias @4.force2
#! FIELDS time rmsd0 rmsd1 sum @6.bias @6.force2
0.000000 0.000 0.149 0.149 197.034 394.068
0.005000 0.072 0.160 0.231 195.399 390.797
0.010000 0.032 0.147 0.178 196.450 392.899
Expand Down
1 change: 1 addition & 0 deletions regtest/basic/rt-multirmsd/config
@@ -1,3 +1,4 @@
plumed_modules=adjmat
type=driver
# this is to test a different name
arg="--plumed plumed.dat --trajectory-stride 10 --timestep 0.005 --ixyz trajectory.xyz --dump-forces forces --dump-forces-fmt=%8.4f"
Expand Down
271 changes: 0 additions & 271 deletions regtest/basic/rt-multirmsd/deriv.reference

This file was deleted.

1 comment on commit 6a56f54

@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/ADAPTIVE_PATH.tmp
Found broken examples in automatic/ANGLES.tmp
Found broken examples in automatic/ANN.tmp
Found broken examples in automatic/AROUND.tmp
Found broken examples in automatic/CAVITY.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/CONVERT_TO_FES.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/DUMPCUBE.tmp
Found broken examples in automatic/DUMPGRID.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/HISTOGRAM.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/INSPHERE.tmp
Found broken examples in automatic/INTERPOLATE_GRID.tmp
Found broken examples in automatic/LOCAL_AVERAGE.tmp
Found broken examples in automatic/LOCAL_Q3.tmp
Found broken examples in automatic/LOCAL_Q4.tmp
Found broken examples in automatic/LOCAL_Q6.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/MULTICOLVARDENS.tmp
Found broken examples in automatic/OUTPUT_CLUSTER.tmp
Found broken examples in automatic/PAMM.tmp
Found broken examples in automatic/PARABETARMSD.tmp
Found broken examples in automatic/PATH.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/QUATERNION.tmp
Found broken examples in automatic/REWEIGHT_BIAS.tmp
Found broken examples in automatic/REWEIGHT_METAD.tmp
Found broken examples in automatic/SPRINT.tmp
Found broken examples in automatic/TETRAHEDRALPORE.tmp
Found broken examples in automatic/TORSION.tmp
Found broken examples in automatic/TORSIONS.tmp
Found broken examples in automatic/WHAM_HISTOGRAM.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.