Skip to content

Commit

Permalink
Removed creation of vatoms when using DISTANCES GROUPA/GROUPB syntax (#…
Browse files Browse the repository at this point in the history
…1193)

* Removed creation of vatoms when using DISTANCES GROUPA/GROUPB syntax

* Added details of changes made yesterday to change log

---------

Co-authored-by: Gareth Aneurin Tribello <[email protected]>
  • Loading branch information
gtribello and Gareth Aneurin Tribello authored Feb 6, 2025
1 parent ea1bcc7 commit 9100551
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
1 change: 1 addition & 0 deletions CHANGES/v2.10.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Before switching to version 2.10, users are invited to carefully read the follow
- 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.
- Dimensionality reduction methods and landmark selection actions have a new syntax. A good introduction that explains how to use these actions can be found in [this tutorial](https://plumed-school.github.io/lessons/21/006/data/DIMENSIONALITY.html)
- if you use \ref DISTANCES with the GROUP or GROUPA/GROUPB syntax each distance is no longer allocated to a position in space. You thus cannot use the GROUP or GROUPA/GROUPB variants of action with methods such as \ref DUMPMULTICOLVAR, \ref MULTICOLVARDENS or \ref SMAC. To be clear if you use \DISTANCES with the ATOMS1/ATOMS2/ATOMS3/... syntax you can still use it with \ref DUMPMULTICOLVAR, \ref MULTICOLVARDENS or \ref SMAC. We believe this second use case was the variant of the old version that was widely used.

- 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
Expand Down
19 changes: 0 additions & 19 deletions src/multicolvar/Distances.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -279,32 +279,13 @@ Distances::Distances(const ActionOptions& ao):
if( grpb.size()==0 ) {
error("found GROUPA but no corresponding GROUPB");
}
std::string grpstr = getShortcutLabel() + "_grp: GROUP ATOMS=";
bool printcomment=false;
for(unsigned i=0; i<grpa.size(); ++i) {
for(unsigned j=0; j<grpb.size(); ++j) {
std::string num;
Tools::convert( i*grpb.size() + j + 1, num );
dline += " ATOMS" + num + "=" + grpa[i] + "," + grpb[j];
if( i*grpb.size() + j<6 ) {
readInputLine( getShortcutLabel() + "_vatom" + num + ": CENTER ATOMS=" + grpa[i] + "," + grpb[j], true );
} else {
readInputLine( getShortcutLabel() + "_vatom" + num + ": CENTER ATOMS=" + grpa[i] + "," + grpb[j], false );
printcomment=true;
}
if( i+j==0 ) {
grpstr += getShortcutLabel() + "_vatom" + num;
} else {
grpstr += "," + getShortcutLabel() + "_vatom" + num;
}
}
}
std::string num;
Tools::convert( grpa.size()*grpb.size(), num );
if( printcomment ) {
addCommentToShortcutOutput("# A further " + num + " CENTER like the ones above were also created but are not shown");
}
readInputLine( grpstr );
} else {
std::string grpstr = getShortcutLabel() + "_grp: GROUP ATOMS=";
for(unsigned i=1;; ++i) {
Expand Down

1 comment on commit 9100551

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