Skip to content

Commit

Permalink
Added new multicolour features from hack the tree (#1020)
Browse files Browse the repository at this point in the history
* Started adding vector/matrix/grid stuff into Value from hack-the-tree

In hack-the-tree you can pass vectors/matrices and grids through Values.
This necessitates some changes to the Value class.  In particular inputForce
becomes a vector and similarly the double value becomes a vector called data.  I avoid
having a confusing vector called derivatives (which is not always the derivatives).
If I have a scalar I store the value and the derivatives in the data vector.  data
thus has a length of 1 + number of derivatives.  The first element is the value of the scalar.

Notice that I also have functionality to set the value to be a constant that is calculated once and
only once during the calculation

* Using basic/rt-make-extracv to test passing values from plumed to code

I added a few lines into the script here to test the code that allows you
to get values from PLUMED and pass them back to the calling program. This
means you can test this functionality even when you don't have python installed

* Added functionality for passing data to and from PLUMED from hack-the-tree

This functionality introduces two new actions into plumed:

PUT = an ActionWithValue that transfers some data from a pointer that is passed from the MD code to a PLMD::Value.
GET = an ActionWithArgument that transfers data from a PLMD::Value to a pointer than is passed from the MD code

Notice that you can also pass a pointer to the forces on a object that is passed to PUT.  The forces from value
are then added to the MD code's force pointer when you call the apply method.

To demonstrate how this functionality works I have replaced all the stuff for passing extraCVs to PLUMED with PUT
commands

I have amm also using GET in place of the old DataFetchingObject class, which has now been deleted

* Passing cell vectors through PUT action

This commit modifies the code so that cell vectors are passed through a
PUT action.  The virial is then passed as the forces that any forces on the
input value are added on.  To deal with the fact that the virial and cell should only
be passed from one of the MD codes processes there is a special new class PbcAction
that deals with passing the cell vectors.  Methods from this class are also invoked
when the box parameters are sought elswhere in the code.

Notice that I have also added the DomainDecomposition class from hack-the-tree here.
Much of the functionality in this class is not yet used.  It also needs to be modified
before it can be used here.  I felt as we merge hack-the-tree it is easier to start out
with a code that resembles the one in hack-the-tree.

* Changes to pass timestep from MD code to PLUMED through a PUT action

The timestep is now passed to PLUMED using a PUT action.  The timestep is
thus stored in a value called timestep that can be accessed using the label
timestep.  Notice that changes to the object that collects the data from the MD
code were required here because the timestep is passed directly (and not via a
pointer).  To resolve this there is a variable in DataPassingObject that can hold
a double that is passed from the MD code.

* Passing kBT through a PUT action

kBT is now passed from the MD code into a PLMD::Value by passing the value
to a PUT action.  Whenever an action needs kBT you can call a method in action
called getkBT.  This reads in the keyword TEMP (if it is registered).  If TEMP
is present the value read for this flag is multiplied by Boltzmann's constant.  If
TEMP is not present then the kBT value that was passed from the MD code to PLUMED is
returned.

* Ran astyle and fixed some codecheck issues

* Fixed ccpcheck issues and issues with DEBUG mode

* Fixed bug in last commit

This should resolve the problem that is cauased when you call
setNatoms multiple times and it tries to create multiple
DOMAIN_DECOMPOSITION objects

* Functionality for passing atoms moved from Atoms to DOMAIN_DECOMPOSITION

The atomic positions, masses and charges are now passed from the MD code into PLMD::Values.
Five PLMD::Value objects are created to hold these quantities.  These PLMD::Value objects are
all vectors with natoms elements.  The ActionWithValue that owns each of thse PLMD::Values is
a PUT object.  These PUT objects are created by a new action called DOMAIN_DECOMPOSITION.  This
action is created when you call cmd("setNatoms").  However, this action could be created from the
MD code directly by doing cmd("readInputLine mdcode: DOMAIN_DECOMPOSITION").  This would then
give the flexibility to pass quantities other than the the positions, masses and charges to PLUMED.

N.B. The passing of energy between the MD code and PLUMED is broken by this commit.  I will fix this
on the next commit.

* Fixed mechanism for passing energy between MD code and PLUMED

The energy is now passed through a specialised PUT action.  When apply is called
for this PUT action the rescaleForces method of the position and forces PUT actions
are called.  This allows one to adjust the forces on the atoms in the correct way due
to a force that acts on the value of the energy

* Fixed dates for copyright in header in these files

* Getting group from Group class rather than storing groups in Atoms

If, when interpretting an atom list, ActionAtomistic encounters a group it now calls a method
of the Group action with that label to get the relevant list of atoms.  This means you no longer
need to store all the groups in a map in the Atoms class.

* Added getKBoltzmann, getUnits and usingNaturalUnits methods to Action

To get Boltzmann's constant, the units or a bool telling you if PLUMED is using
natural units inside an action you used to have to include a call something like the following

plumed.getAtoms().getUnits()

As this is used in a lot of places I put a method in Action so you can now get the units using:

getUnits()

instead.  I have made similar changes from:

plumed.getAtoms().getKBoltzman()

to

getKBoltzmann()

and

plumed.getAtos().usingNaturalUnits()

to

usingNaturalUnits()

* Moved duplicated functionality for getting forces from Values in Function and Colvar to ActionWithValue

The way that you get the forces from the Values is the same in Function and in Colvar.  I thus created a
method called getForcesFromValues in ActionWithValue and used this method in Function and Colvar.  I also
rewrote the interface for the methods setForcesOnAtoms and addForcesToArguments.  You now passed a reference
to an unsigned which keeps track of where you are in the forcesForApply array that is passed to this functions.

* Virtual atom positions are now passed in three PLMD::Value

ActionWithVirtualAtom now creates 5 values: the x, y and z position of the atom
and the mass and charge of the atom.  This replaces the mechanism whereby additional
atoms were created in the Atoms class.  ActionAtomistic creates vectors containing
pointers to the PLMD::Values that are created by the PUT actions that pass positions from
the MD code and the Virtual Atom actions.  If virtual atoms are needed a dependency on the
virtual atoms action is created in requestAtoms.

* Moved code for storing real precision to DataPassingTools and out of Atoms

* Moved passing of units from MD code into PlumedMain and out of Atoms

* Removed Atoms and MDAtoms classes as they are no longer used and ran astyle to fix formatting

* Fixed bug for ccpcheck with extra docs adding in header file for DomainDecomposition

* Fixed bug due to unintialised variable "resetable" in constructor for ActionToPutData

* This test doesn't really use mpi so removed need for it

* Fixed a couple of unitialised variables

* Changed a couple of unsigned variables to size_t variables to stop some complaints

* Ran asyle and fixed some warnings that the compiler gave

* Added virtual destructors in DataPassingObject and DataPassingTools

* Fixed code quality issues that were flagged by github

* Wrote code to ensure Values that should be calclated during update are calculated during update

In hack the tree all averages are stored in PLMD::Value objects.  Furthermore, you can
calculate a function of an average that is stored in a PLMD::Value.  This function should
not be calculated when you call calculate, however.  It should be called during the update
step.  This little bit of code allows plumed to deal with functions of averages

* Rewrote functions so that we can use them with vector, grid and matrix as input eventually.

It is useful to be able to use the CUSTOM, SORT and Piecewise functions with inputs other than scalars.
If a multiple vectors are passed to CUSTOM, for example, you can compute the defined function element wise.
This mechanism is used extensively when implementing complicated CVs in the hack-the-tree branch.  In order
for this to appear simple to users a shortcut action is called when you create one of the functions above.
This shortcut action decides whether the input is a scalar, vector, matrix or grid and calls the version of the
action that is appropriate to the input arguments.  FunctionOfScalar, FunctionOfVector, FunctionOfMatrix and
FunctionOfGrid template classes are used to create CUSTOM_SCALAR, CUSTOM_VECTOR, CUSTOM_MATRIX and CUSTOM_GRID
actions.  The type of function being used is the template parameter and must inherit from the class FunctionTemplateBase.

In this commit I adjusted the code so that this new mechanism is used for scalar function.  We cannot compute vectors yet
with PLUMED so there is no point in adding the FunctionOfVector code from hack-the-tree yet.  However, I will add this in a
future commit that will take place shortly.

Changes to regtests are simply because there is an additional action in the input.  Action with labels such as @3 thus change
to having labels like @4

* Added shortcut action to create basic Colvars as I will use them in MultiColvar to create vectors of these basic quantities

ANGLE, DIPOLE, DISTANCE, POSITION and TORSION currently calculate 1 or more scalar quantities.
It would be easy to imagine another version of these colvars that takes multiple groups of atoms
and that calculates multiple angles or multiple distances.  This is what MultiColvar does.  In hack-the-tree,
however, it is implemented as a wrapper round the underlying Colvars.  Eventually you will be able to implement
a Multicolvar and a Colvar just by implementing a Colvar

* Started reimplimenting MultiColvar in a much simpler way

A MultiColvar in hack-the-tree is a vector of colvars of a particular type.  You specify
what is to be calculated for a distance multicolvar by doing:

DISTANCE ATOMS1=1,2 ATOMS2=3,4 ATOMS3=5,6

A vector containing three distances is then computed.  I have implemented this by writing a
general templace class called MultiColvarTemplate.  The template parameter of this class is one
of the regular Colvars that we have implementations.  You can thus reuse the code for Distance
to calculate the vector with three distances above.

To make this work I have to move some of the functionality in the underlying colvars to three
static functions. To be clear, you can still implement Colvars in the old way.  Hopefully
the way to implement a Colvar so that it is automatically a MultiColvar is relatively self explanatory.

* Added code to calculate functions of Vectors

Now that we can calculate a vector of CVs using MultiColvarTemplate we should also
be able to calculate a function of the vectors that the MultiColvarTemplate function
outputs.  The same set of functions (and more) that are available for scalars can be used
to calculate functions of vectors.  We thus defined a FunctionOfVector class here.

I also modified the rt-basic-print regtest to test the FunctionOfVector class

* Started ensuring ActionWithVector works as it should

* Derivatives for new multicolvar implementation are now working

* Changed a few loop variable types in MultiColvarTemplate to prevent warnings

* Added command land tool that provides a mermaid graph that illustrates how data passes through the code

With PLUMED passing Vector, matrices, grids and scalars between actions it is useful to have some
illustration of how data is being passed about inside the code.  This commit provides a tool that
can be used to visualise inputs.  Show_graph draws a graph.  Each node in the graph is an action
and the connections between nodes illustrate the PLMD::Value objects that are passed between Actions.
If a connection is coloured black then a scalar is passed.  If it is blue, red or green then a vector,
matrix and grid respectively is being passed.  Lastly violet connections are used to show how atoms are
passed between actions.

* Further developments on show_graph functionality

You can now do plumed show_graph --force and it will output a graph
that shows you how forces are applied in the input.

* Added functionality to show_graph for ActionWithVector as well

* Added the code required to apply forces on vectors

* Added code to show graph to indicate how forces are applied in ActionWithVector

* Created two new modules called volumes and symfunc

This is a tidy-up of the multicolvar module.  The contents of the multicolvar
module are different in hack-the-tree so I have thus made the contents of the
multicolvar module the same as the contents for hack-the-tree to make transferring
the code from the hack-the-tree branch to hear more straightforward

* All multicolvars now implemented using new hack-the-tree functionality

Multicolvar like syntax is now implemented by using shortcut actions to create
a chain of Plumed actions that calculate the final scalar quantities that you could
calculate from the single line commands before. ActionWithArguments has been adjusted so
that it can identify the "components" of shortcut actions.  The output syntax is thus unchanged.

I no longer have numerical derivatives for multicolvars as I think it is not particularly useful.
This is why some regtests have been changed.  For these tests I now check analytic forces against
numerical forces.

This commit also breaks some regtests ( volumes/rt23, pamm/rt-pamm-periodic, analytis/rt-weights-integral and analysis/rt-uweights-integral).
I know how to fix the code to repair these problems.  Substantial changes are required, however, which I will move to a later commit

* Added functionality from hack-the-tree for constact matrices (and coordination numbers)

A useful first step in calculating many CVs in condensed matter is to compute a matrix
in which element ij tells you if there is a "bond" between atoms/molecule i and atom/molecule
j.  If this matrix is multiplied by a vector of ones you get the coordination numbers of the
molecules.  You can calculate SPRINT coordinates from the eigendecmposition of this matrix.
You can also find clusters of atoms by doing a clustering on the adjacency graph that this matrix
describes.

I have written a base class here to calculate these adjacency matrices.  This base class can also
be used to do products of matrices and vectors (to get coordination numbers).

* Fixed perovskite nucleation CV with product of transformed coordination numbers

* Added test to ensure graph for perovskite derivatives is created correctly

* Fixes to output of graphs so that it works on GitHub

Also clarified forward graphs for actions that use matrices

* And put new matrix subgraphs in backward graph as well

* Modified SecondaryStructureVariables so they work like new MultiColvar

* Added function to diagonalise a matrix

Matrix eigenvalues and eigenvectors can be used as a collective variable and
are in the SPRINT methodology.

* Added action to select components of a vector/matrix

* Full implementation of SPRINT collective variables as shortcut action

* Added action to compute matrix inverse

* Reworked clustering functionality to bring it in line with what is done in hack-the-tree

Also realised that there were some mistakes in the way that matrices were stored.  I have fixed
these now.

Will write more notes on clustering and how it works now.

* Added more functionality from hack-the-tree branch for matrices

* Implementation of Behler symmetry functions

* Added first attempt at hexatic order parameter

* Coordination number action now implemented as product of contact matrix and vector of ones

* Rewritten cubic harnomic symmetry functions as they are written in hack-the-tree branch

* Added implementations of new measures of tetrahedraility from hack-the-tree branch

* Added warning in neighbors about non-continuus symmetry functions that can be created using this action

* Implemented hack-the-tree version of CENTER_OF_MULTICOLVAR.

When you use caclulate a center of mass the weights can come from any vector.
This change allows you to use any arbitrary vector calculated by PLUMED as the weights
in a center of mass calculation

* Added shortcut to create actions that add a restraint on the components of a vector

* Added VSTACK command to join vectors in a matrix

* Added shortcut actions to calculate gyration tensor variables with weights from any vector

* Implemented Steinhardt parameters in the way they are implemented in hack-the-tree

* Added shortcut action for doing local average of CV and copied regtests from htt

* Important commit that should be added with Q6 stuff.

I moved the 64.xyz trajectory that is used in many tests on Q6 to the trajectories directory
so we only have one copy.  I then forgot to add the moved file.

* Moved new implementation of SMAC from htt here

* Added COORD_ANGLES shortcut action to calculate properties of the distribution of angles in the first coordination sphere

* New implmenetation of local_average of Q6 vectors

This is implmeneted as a shortcut

* Reimplemented functionality for calculating the number of particles in a particular volume and the average value of a quantity in a volume

We can introduce a new type of ActionVolume object that takes in a series of atom positions and returns a vector that is one if each of those
atoms are within a particular part of the box and that is zero otherwise.  If you take the sum of these vectors you get the number of atoms
that is in the particular part of the box of interest.  However, you can also multiply these ones and zeros by vectors of symmetry functions
and hence determine the average value of a particular symmetry function in a particular part of the box.  This functionality was implemented
in previous versions of PLUMED but now it is done in a much more transparent way.

* Can now do multiple matrix vector products with MATRIX_TIMES_VECTOR

The ability to multiply multiple matrices by a single vector or a single matrix by multiple
vectors is useful when you calculate Steinhardt parameters.  Previously I used multiple
MATRIX_VECTOR_PRODUCT actions to do all these operations.  When implemented this way, however,
there is some additional computational overhead.  By allowing all the matrix vector multiplications
to take place in a single action you reduce the computational expense.

* First commit of module for molecular crystalline order from Jake McKibbin, Erik Santiso and me

This module will provide tools for comparing the relative orientations of molecules in a medium with the
orientations that they have in the ideal crystal structure of the solid.  Some of the functionality for
this sort of CV is already available in PLUMED.  Tests to ensure that you can use these features in the way
that Jake and Erik use them have thus been included in this commit.  This commit also includes the beginnings
of a class for calculating quaternions.  This class will be used when determining the orientations of the molecules.

* Added derivatives of quaternion CVs

* Added shortcut to calculate DOPS order parameter

* Fixed typo in documention for DOPS

* Added quaternion product matrix action

This is used to calculate relative orientations of molecules in the ROPS order parameter from Trout and Santiso.
In Trout and Santiso's work they use a different method for calculating the quaternion than we used in our original implementation
of the quaternion.  We thus changed the way the quaternion is calculated so that what we do is consistent with what is done in those works.
In practise this means the signs of the imaginary components of the quaternions change.  This is why there are changes in the regression tests

* Fixed derivatives for Quaternion

* Added flag to turn off task reduction in cases when user is printing out all values in a vector while computing the average of the vector in a part of the box

* Added shortcut to compute rops order parameter that is used by E. Santiso group

* Reworked implementation of KDE, grids and histograms

* Fixed gradient CV

* Using new version of grid for contour finding stuff

* Moved all distance from contour stuff to contour directory and added test for distance from spherical contour

* Fixed fourier transform to work with new style grids and deleted most of old style grid stuff

* Added shortcut to compute the RDF

* Added shortcut action to compute entropy CV by Pablo Piaggi.

* Added function that allows you to calculate a function that stored on a grid

* Added a couple of regtests to check whether functions that like HIGHEST, MOMENTS and LOWEST can accept scalar input

* Transferred a couple of regtests from hack-the-tree to this new branch.

These regtests check things in the topology matrix

* Created a new module to caluclate the distance/s from a reference point

To calculate the distance from a reference point we do the product of a row vector with a column vector.
This can easily be extended to the mahalanobis distance by adding in a covariance.  Furthermore, we can calcualte
multiple distances at once by multiplying a matrix by its transpose.

* Fixed the implementation of PAMM so that it uses the new methods for calculating distances from reference points

* Added additional regtests for crystdistrib stuff and base for bops

* Added Bops Shortcut from Jake and regtests

* Fixed test forces for tests on bops and rops

* Reworked ENVIRONMENTSIMILARITY so it no longer uses old implementation of MultiColvar

ENVIRONMENTSIMILARITY is now implemented as a shortcut that calls DISTANCE_MATRIX and CUSTOM

* Removed old code in vesselbase and multicolvar that is no longer used

* Fixed liscence agreement

* Fixed issues with compiling that were introduced by merge

* Fixed this regtest which needed changing after merge

* Ran astyle

* Fixed json outputting for files in crystdistrib

* Added documentation to many actions to fix problems higlighted by ccpcheck

* Fixed more issues highlighted by cppcheck

* Fixed regtests rt-simplecubic and rt-averaged-q6-spAspB and ran astyle

* Fixed some reference values in regression tests for crystdistrib

* Added test on passing vectors from plumed to python

* Fixed issues in regtests basic/rt-make-exception and gridtools/rt-integral

* Decreased precision in rt-bops regtest so we can pass tests on github

* Fixed tests and building so new optional modules (adjmat,symfunc,etc) are treated correctly when plumed is built and tested without them active

* Ensuring that tests that are reliant on particular modules are not run when those modules are not available

* Fixed bug in InterpolateGrid that only causes problem when you compile with debug flags

* Python test for passing grids from plumed to python

* Ensured you can get number of bins with debug even when bounds is not set

* Moved duplicated large file to trajectories directory in regtests and lowered precision of some tests so that they work on intel

* Decreased precision and adjusted tests in crystdistrib so they are passed with clang and intel compilers

* Removed some trajectories that were duplicated

* Fixed a bug that was introduced by merge

* Small fixes for cppcheck things

* Some small changes to tests of crystdistrib to get rid of things that cannot be reproduced exactly on intel configuration on github actions

* Removed unecessary printing of forces in some regtests

* Removed new switching function types as they can be done with CUSTOM

* Fixed test of transferring vectors from plumed to python

* Fixed unitialised variable that was flagged by valgrind in FunctionTemplateBase

* Fixed uninintialized variable in way suggested by @GiovanniBussi

* Fixed typo in for loop

* Removed RETURN_DERIV option from SwitchingFunction as requested by @GiovanniBussi

The feature was only used in one place and it was easy to have the code working without it

* Added explicit destructors in ActionWithVector and ActionWithMatrix so that there are no pointers to actions that are not there in the code

* Added description of changes made to change log

* Removed REPLICA keyword from print actions.  This functionality can be put into UPDATE_IF

* Ran astyle

* Added functionality in FindGridOptimum to prevent this from hanging on intel machines

When you use the intel compiler isinf returns 0 if you pass it infinity (brilliant!).  I have thus
incorporated a workaround here to ensure that FindGridOptimum detects cases where all the points on the
grid are infinite that doesn't rely on isinf.

* Ran astyle

* Changed the way -nan is converted to nan in fixzeros script so it works for tests involving grids as well as tests involving lepton

If your output contains nans you should use a format specifier like %8.4f and the fixzeros script will then work if you have a compiler that
outputs -nan.  If you use %f or %.7f then I think that nan is put at the start of the space.  If you use %8.4f then the nan will be put in the final
three characters of the format specifier

---------

Co-authored-by: Gareth Aneurin Tribello <[email protected]>
Co-authored-by: Gareth Aneurin Tribello <[email protected]>
  • Loading branch information
3 people authored Feb 29, 2024
1 parent 460974a commit 79c832a
Show file tree
Hide file tree
Showing 1,892 changed files with 2,859,237 additions and 617,167 deletions.
36 changes: 36 additions & 0 deletions CHANGES/v2.10.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@

This page contains changes that will end up in 2.10

The passing of data between actions has been made more flexible. Now, in addition to passing scalars between actions, you can also
pass vectors, matrices and functions computed on grids between actions. The ways in which you can use these new functionalities are
detailed here:

https://plumed-school.github.io/lessons/23/001/data/NAVIGATION.html

The old input syntax for most actions should work the same as it did in previous versions of the code. However if you investigate the log
you will see that these old functionalities are reproduced by using shortcut actions that generate more complicated plumed inputs.

- Changes relevant for users:
- **PLUMED 2.10 requires a C++17 compatible compiler**.
- It is now possible to use an embedded Python interpreter to implement collective variables and functions in Python. This is largely based on a previous implementation by Toni Giorgino
Expand All @@ -15,6 +24,29 @@ This page contains changes that will end up in 2.10
that can be linked against the proper CUDA libraries and loaded at runtime with \ref LOAD. Documentation about how to install and use this feature can be found in directory
`plugins/cudaCoord`.

- Changes leading to differences with previous versions:
- In \ref TORSION you now use the keywords VECTORA and VECTORB in place of VECTOR1 and VECTOR2.
- In \ref DISTANCES you can no longer use the GROUP or GROUPA/GROUPB keywords. Explicitly list all the distances you want to compute using ATOMS1,ATOMS2,ATOMS3...
- In \ref ANGLES you can no longer use the GROUP, GROUPA/GROUPB/GROUPC keywords. Explicitly list all the distances you want to compute using ATOMS1,ATOMS2,ATOMS3...
- Action NBONDS no longer exists. The same effect can be achieved through a more transparent implementation that you can read about here: https://plumed-school.github.io/lessons/23/001/data/Steinhardt.html
- Action CENTER_OF_MULTICOLVAR no longer exists. You now simply use \ref CENTER with the PHASES option and a vector as input for the weights.

- Places where we strongly recommend using the new sytax:
- If you are using \ref DFSCLUSTERING and the \ref CLUSTER_PROPERTIES or \ref CLUSTER_DISTRIBUTION actions you are strongly encouraged to read: https://plumed-school.github.io/lessons/23/001/data/Clusters.html
We think you will find the newer syntax for these actions much easier to use.

- Modules that were built from code taken from the old crystllization and multicolvar modules.
- symfunc contains code for computing symmetry functions much of which was taken from the old crystallization module
- volumes contains code for determing whether atoms are within a particular part of the box or not. This is largely built from code that was formerly in the multicolvar module
- clusters contains code for determining if atoms are clustered together or not. This is build from code that was formerly in the crystallization module
- gridtools contains code for doing kernel density estimation and manipulating functions on grids
- contour contains code for computing Willard-Chandler dividing surfaces.
- refdist contains code for calculating distances between configuations.
- fourier contains code for computing fourier transforms of functions on grids

- New contributed modules:
- A new crystdistrib module by Jake McKibben, Gareth Tribello and Erik Santiso for computing order parameters that can be used to study the formation of molecular crystals.

- Changes relevant for developers:
- Removed some shortcuts for `ActionRegister.h` (from the modules bias colvar function sasa and vatom) and `CLToolRegister.h` (from the module cltools), now the two headers can only be included with `#include "core/ActionRegister.h"` or `#include "core/CLToolRegister.h"`.
- `plumed mklib` can now process more than one cpp file. Files are combined in a single library.
Expand All @@ -23,3 +55,7 @@ This page contains changes that will end up in 2.10
On MacOS, `plumed-runtime` executable can now find a working libplumedKernel.dylib by using a relative rpath.
These changes should make this executable as functional as the normal `plumed` executable but with the advantage of loading symbols in a local namespace (see above).
- A new \ref benchmark tool has been added to time execution of sample input files and facilitate the comparison across multiple PLUMED versions.
- You can now pass any scalars, vectors, matrices and functions (and forces on these objects) in and out of PLUMED using the functionality described here: https://plumed-school.github.io/lessons/23/001/data/MDInterfaceI.html
- You can also pass vectors that are scattered across the domains by using the functionality detailed here: https://plumed-school.github.io/lessons/23/001/data/MDInterfaceII.html
- You can use ActionShortcut to create complex inputs from a simpler initial input. The nest will then allow users to explore these more complex inputs.
- You can use \ref show_graph to create diagrams showing how values and forces are passed between the various actions in your input files.
2 changes: 1 addition & 1 deletion json/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ endif
endif

clean:
rm -fr syntax.json
rm -fr action_list syntax.json
11 changes: 9 additions & 2 deletions regtest/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,28 @@
!/Makefile
!/README
!/adjmat
!/fourier
!/function
!/analysis
!/annfunc
!/basic
!/core
!/crystallization
!/contour
!/crystdistrib
!/dimred
!/eds
!/envsim
!/drr
!/logmfd
!/mapping
!/maze
!/multicolvar
!/python
!/refdist
!/secondarystructure
!/trajectories
!/scripts
!/manyrestraints
!/symfunc
!/molfile_plugin
!/pamm
!/isdb
Expand All @@ -33,6 +37,9 @@
!/s2cm
!/pytorch
!/membranefusion
!/volumes
!/gridtools
!/clusters
!/unittest
# These files we just want to ignore completely
tmp
Expand Down
File renamed without changes.
18 changes: 18 additions & 0 deletions regtest/adjmat/rt-basic-matrix/colvar.reference
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#! FIELDS time c1.w.1.1 c1.w.1.2 c1.w.1.3 c1.w.1.4 c1.w.1.5 c1.w.1.6 c1.w.1.7 c1.w.2.1 c1.w.2.2 c1.w.2.3 c1.w.2.4 c1.w.2.5 c1.w.2.6 c1.w.2.7 c1.w.3.1 c1.w.3.2 c1.w.3.3 c1.w.3.4 c1.w.3.5 c1.w.3.6 c1.w.3.7 c1.w.4.1 c1.w.4.2 c1.w.4.3 c1.w.4.4 c1.w.4.5 c1.w.4.6 c1.w.4.7 c1.w.5.1 c1.w.5.2 c1.w.5.3 c1.w.5.4 c1.w.5.5 c1.w.5.6 c1.w.5.7 c1.w.6.1 c1.w.6.2 c1.w.6.3 c1.w.6.4 c1.w.6.5 c1.w.6.6 c1.w.6.7 c1.w.7.1 c1.w.7.2 c1.w.7.3 c1.w.7.4 c1.w.7.5 c1.w.7.6 c1.w.7.7
0.000000 0.0000 0.9728 0.5865 0.3712 0.5865 0.9732 0.9753 0.9728 0.0000 0.9771 0.6027 0.3895 0.5937 0.5727 0.5865 0.9771 0.0000 0.9758 0.6022 0.3904 0.1011 0.3712 0.6027 0.9758 0.0000 0.9758 0.6039 0.0500 0.5865 0.3895 0.6022 0.9758 0.0000 0.9774 0.1011 0.9732 0.5937 0.3904 0.6039 0.9774 0.0000 0.5739 0.9753 0.5727 0.1011 0.0500 0.1011 0.5739 0.0000
1.000000 0.0000 0.9734 0.5349 0.3573 0.5874 0.9789 0.4855 0.9734 0.0000 0.9652 0.5507 0.3781 0.6041 0.9683 0.5349 0.9652 0.0000 0.9678 0.5791 0.3515 0.9545 0.3573 0.5507 0.9678 0.0000 0.9799 0.5852 0.4335 0.5874 0.3781 0.5791 0.9799 0.0000 0.9709 0.1645 0.9789 0.6041 0.3515 0.5852 0.9709 0.0000 0.1677 0.4855 0.9683 0.9545 0.4335 0.1645 0.1677 0.0000
2.000000 0.0000 0.9820 0.2619 0.2686 0.5526 0.9699 0.5145 0.9820 0.0000 0.6094 0.3054 0.2918 0.5900 0.9667 0.2619 0.6094 0.0000 0.9805 0.5505 0.2469 0.9625 0.2686 0.3054 0.9805 0.0000 0.9708 0.5513 0.5427 0.5526 0.2918 0.5505 0.9708 0.0000 0.9795 0.2669 0.9699 0.5900 0.2469 0.5513 0.9795 0.0000 0.2541 0.5145 0.9667 0.9625 0.5427 0.2669 0.2541 0.0000
3.000000 0.0000 0.9760 0.6039 0.3190 0.3162 0.5946 0.9826 0.9760 0.0000 0.9778 0.5487 0.2524 0.2673 0.5398 0.6039 0.9778 0.0000 0.9716 0.5503 0.2580 0.2508 0.3190 0.5487 0.9716 0.0000 0.9798 0.5315 0.2818 0.3162 0.2524 0.5503 0.9798 0.0000 0.9628 0.5948 0.5946 0.2673 0.2580 0.5315 0.9628 0.0000 0.9603 0.9826 0.5398 0.2508 0.2818 0.5948 0.9603 0.0000
4.000000 0.0000 0.9744 0.5303 0.2569 0.2729 0.5573 0.9798 0.9744 0.0000 0.9814 0.5926 0.3079 0.3505 0.6051 0.5303 0.9814 0.0000 0.9693 0.5676 0.3026 0.2465 0.2569 0.5926 0.9693 0.0000 0.9806 0.5488 0.2540 0.2729 0.3079 0.5676 0.9806 0.0000 0.9621 0.5723 0.5573 0.3505 0.3026 0.5488 0.9621 0.0000 0.9631 0.9798 0.6051 0.2465 0.2540 0.5723 0.9631 0.0000
5.000000 0.0000 0.9799 0.5381 0.9709 0.2423 0.5369 0.2330 0.9799 0.0000 0.9709 0.5381 0.5369 0.2423 0.2330 0.5381 0.9709 0.0000 0.2304 0.9784 0.2383 0.5408 0.9709 0.5381 0.2304 0.0000 0.2383 0.9784 0.5408 0.2423 0.5369 0.9784 0.2383 0.0000 0.5372 0.9746 0.5369 0.2423 0.2383 0.9784 0.5372 0.0000 0.9746 0.2330 0.2330 0.5408 0.5408 0.9746 0.9746 0.0000
6.000000 0.0000 0.9775 0.6505 0.6495 0.9641 0.1910 0.3737 0.9775 0.0000 0.9726 0.6916 0.6560 0.1428 0.1217 0.6505 0.9726 0.0000 0.9742 0.6170 0.4632 0.1761 0.6495 0.6916 0.9742 0.0000 0.9631 0.9782 0.7802 0.9641 0.6560 0.6170 0.9631 0.0000 0.7697 0.9501 0.1910 0.1428 0.4632 0.9782 0.7697 0.0000 0.9609 0.3737 0.1217 0.1761 0.7802 0.9501 0.9609 0.0000
7.000000 0.0000 0.9722 0.1762 0.2432 0.7768 0.9785 0.4503 0.9722 0.0000 0.6590 0.6411 0.9582 0.8047 0.9635 0.1762 0.6590 0.0000 0.9812 0.6401 0.1636 0.9601 0.2432 0.6411 0.9812 0.0000 0.9629 0.4666 0.6112 0.7768 0.9582 0.6401 0.9629 0.0000 0.9584 0.5486 0.9785 0.8047 0.1636 0.4666 0.9584 0.0000 0.1875 0.4503 0.9635 0.9601 0.6112 0.5486 0.1875 0.0000
8.000000 0.0000 0.9548 0.6102 0.6377 0.9657 0.9666 0.4444 0.9548 0.0000 0.9657 0.6378 0.6103 0.9666 0.4449 0.6102 0.9657 0.0000 0.9767 0.6750 0.5369 0.1180 0.6377 0.6378 0.9767 0.0000 0.9767 0.3148 0.0649 0.9657 0.6103 0.6750 0.9767 0.0000 0.5372 0.1179 0.9666 0.9666 0.5369 0.3148 0.5372 0.0000 0.9830 0.4444 0.4449 0.1180 0.0649 0.1179 0.9830 0.0000
9.000000 0.0000 0.9619 0.6531 0.6531 0.9619 0.9672 0.4884 0.9619 0.0000 0.9808 0.6742 0.6356 0.5433 0.1107 0.6531 0.9808 0.0000 0.9683 0.6742 0.1467 0.0259 0.6531 0.6742 0.9683 0.0000 0.9808 0.1467 0.0259 0.9619 0.6356 0.6742 0.9808 0.0000 0.5432 0.1107 0.9672 0.5433 0.1467 0.1467 0.5432 0.0000 0.9835 0.4884 0.1107 0.0259 0.0259 0.1107 0.9835 0.0000
10.000000 0.0000 0.9592 0.6286 0.6600 0.9723 0.9821 0.4764 0.9592 0.0000 0.9634 0.6408 0.6226 0.5291 0.1012 0.6286 0.9634 0.0000 0.9785 0.6764 0.1107 0.0201 0.6600 0.6408 0.9785 0.0000 0.9745 0.1202 0.0215 0.9723 0.6226 0.6764 0.9745 0.0000 0.5664 0.1074 0.9821 0.5291 0.1107 0.1202 0.5664 0.0000 0.9841 0.4764 0.1012 0.0201 0.0215 0.1074 0.9841 0.0000
11.000000 0.0000 0.9803 0.9728 0.5695 0.0979 0.0198 0.0049 0.9803 0.0000 0.5781 0.1021 0.0214 0.0061 0.0020 0.9728 0.5781 0.0000 0.9775 0.5887 0.1220 0.0216 0.5695 0.1021 0.9775 0.0000 0.9785 0.4846 0.0729 0.0979 0.0214 0.5887 0.9785 0.0000 0.9878 0.5024 0.0198 0.0061 0.1220 0.4846 0.9878 0.0000 0.9812 0.0049 0.0020 0.0216 0.0729 0.5024 0.9812 0.0000
12.000000 0.0000 0.9713 0.6526 0.6694 0.9788 0.4995 0.1458 0.9713 0.0000 0.9713 0.6902 0.6902 0.9678 0.5614 0.6526 0.9713 0.0000 0.9788 0.6694 0.4995 0.1457 0.6694 0.6902 0.9788 0.0000 0.9673 0.1075 0.0314 0.9788 0.6902 0.6694 0.9673 0.0000 0.1075 0.0314 0.4995 0.9678 0.4995 0.1075 0.1075 0.0000 0.9818 0.1458 0.5614 0.1457 0.0314 0.0314 0.9818 0.0000
13.000000 0.0000 0.9628 0.6577 0.6574 0.9636 0.4817 0.2488 0.9628 0.0000 0.9796 0.6696 0.6355 0.9704 0.5662 0.6577 0.9796 0.0000 0.9695 0.6778 0.5488 0.1007 0.6574 0.6696 0.9695 0.0000 0.9805 0.1035 0.0251 0.9636 0.6355 0.6778 0.9805 0.0000 0.0951 0.0342 0.4817 0.9704 0.5488 0.1035 0.0951 0.0000 0.9827 0.2488 0.5662 0.1007 0.0251 0.0342 0.9827 0.0000
14.000000 0.0000 0.9630 0.6384 0.6746 0.9808 0.5168 0.3093 0.9630 0.0000 0.9622 0.6543 0.6558 0.9618 0.5428 0.6384 0.9622 0.0000 0.9808 0.6749 0.5337 0.1246 0.6746 0.6543 0.9808 0.0000 0.9684 0.1406 0.0467 0.9808 0.6558 0.6749 0.9684 0.0000 0.1378 0.0710 0.5168 0.9618 0.5337 0.1406 0.1378 0.0000 0.9836 0.3093 0.5428 0.1246 0.0467 0.0710 0.9836 0.0000
15.000000 0.0000 0.9762 0.5888 0.4357 0.6043 0.9765 0.0872 0.9762 0.0000 0.9753 0.6465 0.3872 0.5993 0.5240 0.5888 0.9753 0.0000 0.9777 0.5755 0.3670 0.9629 0.4357 0.6465 0.9777 0.0000 0.9785 0.6357 0.5314 0.6043 0.3872 0.5755 0.9785 0.0000 0.9755 0.0866 0.9765 0.5993 0.3670 0.6357 0.9755 0.0000 0.0431 0.0872 0.5240 0.9629 0.5314 0.0866 0.0431 0.0000
16.000000 0.0000 0.9617 0.5579 0.3687 0.6575 0.9813 0.6415 0.9617 0.0000 0.9617 0.6924 0.7360 0.6924 0.9593 0.5579 0.9617 0.0000 0.9813 0.6576 0.3687 0.6416 0.3687 0.6924 0.9813 0.0000 0.9573 0.5518 0.6421 0.6575 0.7360 0.6576 0.9573 0.0000 0.9573 0.9520 0.9813 0.6924 0.3687 0.5518 0.9573 0.0000 0.6421 0.6415 0.9593 0.6416 0.6421 0.9520 0.6421 0.0000
5 changes: 5 additions & 0 deletions regtest/adjmat/rt-basic-matrix/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
type=driver
plumed_modules=adjmat
# this is to test a different name
arg="--plumed plumed.dat --ixyz isomers.xyz --dump-forces forces --dump-forces-fmt=%8.4f" # --debug-forces forces.num"
extra_files="../../trajectories/isomers.xyz"
18 changes: 18 additions & 0 deletions regtest/adjmat/rt-basic-matrix/coords.reference
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#! FIELDS time cc.1 cc.2 cc.3 cc.4 cc.5 cc.6 cc.7
0.000000 4.46566 4.10850 3.63302 3.57930 3.63245 4.11256 2.37411
1.000000 3.91738 4.43991 4.35299 3.87437 3.65999 3.65829 3.17390
2.000000 3.54957 3.74537 3.61167 3.61935 3.61214 3.59171 3.50725
3.000000 3.79237 3.56206 3.61228 3.63247 3.65638 3.57460 3.61015
4.000000 3.57150 3.81183 3.59765 3.60209 3.66333 3.68429 3.62085
5.000000 3.50112 3.50112 3.49697 3.49697 3.50777 3.50777 3.49693
6.000000 3.80643 3.56238 3.85363 5.03687 4.92002 3.50579 3.36274
7.000000 3.59722 4.99874 3.58017 3.90625 4.84507 3.55930 3.72120
8.000000 4.57943 4.58007 3.88238 3.60851 3.88263 4.30509 2.17297
9.000000 4.68555 3.90649 3.44913 3.44909 3.90647 3.33067 1.74511
10.000000 4.67865 3.81642 3.37773 3.39538 3.91952 3.29259 1.71067
11.000000 2.64515 1.68995 3.26061 3.18501 3.17662 2.60149 1.58498
12.000000 3.91745 4.85212 3.91728 3.44451 3.44455 3.16351 1.89748
13.000000 3.97196 4.78409 3.93409 3.40543 3.38665 3.18219 1.95781
14.000000 4.08288 4.73992 3.91445 3.46537 3.48869 3.27422 2.07807
15.000000 3.66878 4.10845 4.44719 4.20548 3.60765 3.59714 2.23526
16.000000 4.16870 5.00342 4.16888 4.19368 4.91772 4.19356 4.47857
Loading

2 comments on commit 79c832a

@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/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/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/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

@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/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/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/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.