From 57458b6dc5ae35095a3d1645c024f492ad67aca3 Mon Sep 17 00:00:00 2001 From: Daniele Date: Sat, 3 Jun 2023 09:08:10 +0200 Subject: [PATCH] Cleaning (?) headers (#941) * removed the actionRegister shortcut from bias * removed the CLTollRegister shortcut from cltools (why that is in core and not in cltools?) * Again removed some shortcuts to actionRegister.h * removed the ActionRegister.h shorcuts * rectified the style changes due to clang-format * now compiles * updated the changelog for developers in the 2.10 --------- Co-authored-by: Daniele Rapetti --- CHANGES/v2.10.md | 2 ++ src/annfunc/ANN.cpp | 2 +- src/bias/ABMD.cpp | 2 +- src/bias/ActionRegister.h | 25 ------------------------- src/bias/BiasValue.cpp | 2 +- src/bias/ExtendedLagrangian.cpp | 2 +- src/bias/External.cpp | 2 +- src/bias/LWalls.cpp | 2 +- src/bias/MetaD.cpp | 2 +- src/bias/MovingRestraint.cpp | 2 +- src/bias/PBMetaD.cpp | 2 +- src/bias/Restraint.cpp | 2 +- src/bias/UWalls.cpp | 2 +- src/cltools/CLToolRegister.h | 25 ------------------------- src/cltools/Completion.cpp | 2 +- src/cltools/Driver.cpp | 2 +- src/cltools/GenExample.cpp | 2 +- src/cltools/GenJson.cpp | 2 +- src/cltools/GenTemplate.cpp | 2 +- src/cltools/Info.cpp | 2 +- src/cltools/Manual.cpp | 2 +- src/cltools/PdbRenumber.cpp | 2 +- src/cltools/SimpleMD.cpp | 2 +- src/cltools/SumHills.cpp | 2 +- src/cltools/kT.cpp | 2 +- src/cltools/pesmd.cpp | 2 +- src/colvar/ActionRegister.h | 25 ------------------------- src/colvar/Angle.cpp | 2 +- src/colvar/Cell.cpp | 2 +- src/colvar/Constant.cpp | 2 +- src/colvar/ContactMap.cpp | 2 +- src/colvar/Coordination.cpp | 2 +- src/colvar/DHEnergy.cpp | 2 +- src/colvar/DRMSD.cpp | 2 +- src/colvar/Dimer.cpp | 2 +- src/colvar/Dipole.cpp | 2 +- src/colvar/Distance.cpp | 2 +- src/colvar/EEFSolv.cpp | 2 +- src/colvar/ERMSD.cpp | 2 +- src/colvar/Energy.cpp | 2 +- src/colvar/ExtraCV.cpp | 2 +- src/colvar/Fake.cpp | 2 +- src/colvar/GHBFIX.cpp | 2 +- src/colvar/Gyration.cpp | 2 +- src/colvar/MultiRMSD.cpp | 2 +- src/colvar/PCARMSD.cpp | 2 +- src/colvar/PathMSDBase.cpp | 2 +- src/colvar/PathMSDBase.h | 2 +- src/colvar/Position.cpp | 2 +- src/colvar/ProjectionOnAxis.cpp | 2 +- src/colvar/Puckering.cpp | 2 +- src/colvar/RMSD.cpp | 2 +- src/colvar/Template.cpp | 2 +- src/colvar/Torsion.cpp | 2 +- src/colvar/Volume.cpp | 2 +- src/drr/drrtool.cpp | 2 +- src/function/ActionRegister.h | 25 ------------------------- src/function/Combine.cpp | 2 +- src/function/Custom.cpp | 2 +- src/function/Ensemble.cpp | 2 +- src/function/FuncPathGeneral.cpp | 2 +- src/function/FuncPathMSD.cpp | 2 +- src/function/FuncSumHills.cpp | 2 +- src/function/LocalEnsemble.cpp | 2 +- src/function/Sort.cpp | 2 +- src/function/Stats.cpp | 2 +- src/function/Target.cpp | 2 +- src/funnel/FPS.cpp | 2 +- src/funnel/Funnel.cpp | 2 +- src/isdb/Caliber.cpp | 2 +- src/isdb/FretEfficiency.cpp | 2 +- src/isdb/Metainference.cpp | 2 +- src/isdb/Rescale.cpp | 2 +- src/isdb/Select.cpp | 2 +- src/mapping/PathTools.cpp | 2 +- src/piv/PIV.cpp | 2 +- src/pytorch/PytorchModel.cpp | 2 +- src/sasa/ActionRegister.h | 23 ----------------------- src/sasa/sasa_HASEL.cpp | 2 +- src/sasa/sasa_LCPO.cpp | 2 +- src/vatom/ActionRegister.h | 25 ------------------------- src/vatom/Center.cpp | 2 +- src/vatom/FixedAtom.cpp | 2 +- src/vatom/Ghost.cpp | 2 +- src/ves/MD_LinearExpansionPES.cpp | 2 +- 85 files changed, 80 insertions(+), 226 deletions(-) delete mode 100644 src/bias/ActionRegister.h delete mode 100644 src/cltools/CLToolRegister.h delete mode 100644 src/colvar/ActionRegister.h delete mode 100644 src/function/ActionRegister.h delete mode 100644 src/sasa/ActionRegister.h delete mode 100644 src/vatom/ActionRegister.h diff --git a/CHANGES/v2.10.md b/CHANGES/v2.10.md index c235faa699..430998292d 100644 --- a/CHANGES/v2.10.md +++ b/CHANGES/v2.10.md @@ -4,3 +4,5 @@ This page contains changes that will end up in 2.10 +- 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"`. \ No newline at end of file diff --git a/src/annfunc/ANN.cpp b/src/annfunc/ANN.cpp index fb192a48fd..4f797d387e 100644 --- a/src/annfunc/ANN.cpp +++ b/src/annfunc/ANN.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "function/Function.h" -#include "function/ActionRegister.h" +#include "core/ActionRegister.h" #include "cassert" #include diff --git a/src/bias/ABMD.cpp b/src/bias/ABMD.cpp index dd9400ce52..89ceb6f69a 100644 --- a/src/bias/ABMD.cpp +++ b/src/bias/ABMD.cpp @@ -21,7 +21,7 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Bias.h" #include "tools/Random.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include namespace PLMD { diff --git a/src/bias/ActionRegister.h b/src/bias/ActionRegister.h deleted file mode 100644 index ea128efdd5..0000000000 --- a/src/bias/ActionRegister.h +++ /dev/null @@ -1,25 +0,0 @@ -/* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - Copyright (c) 2012-2023 The plumed team - (see the PEOPLE file at the root of the distribution for a list of names) - - See http://www.plumed.org for more information. - - This file is part of plumed, version 2. - - plumed is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - plumed is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with plumed. If not, see . -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ -#ifndef __PLUMED_bias_ActionRegister_h -#define __PLUMED_bias_ActionRegister_h -#include "core/ActionRegister.h" -#endif diff --git a/src/bias/BiasValue.cpp b/src/bias/BiasValue.cpp index 161385f6c5..7fa6ca2435 100644 --- a/src/bias/BiasValue.cpp +++ b/src/bias/BiasValue.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Bias.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" namespace PLMD { namespace bias { diff --git a/src/bias/ExtendedLagrangian.cpp b/src/bias/ExtendedLagrangian.cpp index caeffa71a0..b8b25ec3a5 100644 --- a/src/bias/ExtendedLagrangian.cpp +++ b/src/bias/ExtendedLagrangian.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Bias.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/Random.h" #include "core/PlumedMain.h" #include "core/Atoms.h" diff --git a/src/bias/External.cpp b/src/bias/External.cpp index 436208c10b..ce422c1682 100644 --- a/src/bias/External.cpp +++ b/src/bias/External.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Bias.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/Grid.h" #include "tools/Exception.h" #include "tools/File.h" diff --git a/src/bias/LWalls.cpp b/src/bias/LWalls.cpp index 5e6834234a..b25e84126d 100644 --- a/src/bias/LWalls.cpp +++ b/src/bias/LWalls.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Bias.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" namespace PLMD { namespace bias { diff --git a/src/bias/MetaD.cpp b/src/bias/MetaD.cpp index 0f1e75533e..6444fc27cf 100644 --- a/src/bias/MetaD.cpp +++ b/src/bias/MetaD.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Bias.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "core/ActionSet.h" #include "core/PlumedMain.h" #include "core/Atoms.h" diff --git a/src/bias/MovingRestraint.cpp b/src/bias/MovingRestraint.cpp index 5065d2476c..65f8c63791 100644 --- a/src/bias/MovingRestraint.cpp +++ b/src/bias/MovingRestraint.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Bias.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" namespace PLMD { namespace bias { diff --git a/src/bias/PBMetaD.cpp b/src/bias/PBMetaD.cpp index cafe7533e1..d9860d7290 100644 --- a/src/bias/PBMetaD.cpp +++ b/src/bias/PBMetaD.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Bias.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "core/ActionSet.h" #include "core/PlumedMain.h" #include "core/Atoms.h" diff --git a/src/bias/Restraint.cpp b/src/bias/Restraint.cpp index 4644fa2eae..24546ee94f 100644 --- a/src/bias/Restraint.cpp +++ b/src/bias/Restraint.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Bias.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" namespace PLMD { namespace bias { diff --git a/src/bias/UWalls.cpp b/src/bias/UWalls.cpp index 0abc063f9e..4d68ee9d37 100644 --- a/src/bias/UWalls.cpp +++ b/src/bias/UWalls.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Bias.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" namespace PLMD { namespace bias { diff --git a/src/cltools/CLToolRegister.h b/src/cltools/CLToolRegister.h deleted file mode 100644 index 2bf9d900fa..0000000000 --- a/src/cltools/CLToolRegister.h +++ /dev/null @@ -1,25 +0,0 @@ -/* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - Copyright (c) 2012-2023 The plumed team - (see the PEOPLE file at the root of the distribution for a list of names) - - See http://www.plumed.org for more information. - - This file is part of plumed, version 2. - - plumed is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - plumed is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with plumed. If not, see . -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ -#ifndef __PLUMED_cltools_CLToolRegister_h -#define __PLUMED_cltools_CLToolRegister_h -#include "core/CLToolRegister.h" -#endif diff --git a/src/cltools/Completion.cpp b/src/cltools/Completion.cpp index 40b826330d..92c27bf0a1 100644 --- a/src/cltools/Completion.cpp +++ b/src/cltools/Completion.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "CLTool.h" -#include "CLToolRegister.h" +#include "core/CLToolRegister.h" #include "tools/Tools.h" #include "config/Config.h" #include "core/ActionRegister.h" diff --git a/src/cltools/Driver.cpp b/src/cltools/Driver.cpp index 4a8251b131..b0ff6e5e0e 100644 --- a/src/cltools/Driver.cpp +++ b/src/cltools/Driver.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "CLTool.h" -#include "CLToolRegister.h" +#include "core/CLToolRegister.h" #include "tools/Tools.h" #include "core/PlumedMain.h" #include "core/ActionSet.h" diff --git a/src/cltools/GenExample.cpp b/src/cltools/GenExample.cpp index c660c0b92f..fb4a5d4a9d 100644 --- a/src/cltools/GenExample.cpp +++ b/src/cltools/GenExample.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "CLTool.h" -#include "CLToolRegister.h" +#include "core/CLToolRegister.h" #include "tools/Tools.h" #include "config/Config.h" #include "core/ActionRegister.h" diff --git a/src/cltools/GenJson.cpp b/src/cltools/GenJson.cpp index 39d687bd5b..d1542d1f6a 100644 --- a/src/cltools/GenJson.cpp +++ b/src/cltools/GenJson.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "CLTool.h" -#include "CLToolRegister.h" +#include "core/CLToolRegister.h" #include "tools/Tools.h" #include "config/Config.h" #include "core/ActionRegister.h" diff --git a/src/cltools/GenTemplate.cpp b/src/cltools/GenTemplate.cpp index adea0a0c7b..c0579ab321 100644 --- a/src/cltools/GenTemplate.cpp +++ b/src/cltools/GenTemplate.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "CLTool.h" -#include "CLToolRegister.h" +#include "core/CLToolRegister.h" #include "tools/Tools.h" #include "core/ActionRegister.h" #include diff --git a/src/cltools/Info.cpp b/src/cltools/Info.cpp index 42fd2ff23b..bedb79b140 100644 --- a/src/cltools/Info.cpp +++ b/src/cltools/Info.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "CLTool.h" -#include "CLToolRegister.h" +#include "core/CLToolRegister.h" #include "tools/Tools.h" #include "config/Config.h" #include diff --git a/src/cltools/Manual.cpp b/src/cltools/Manual.cpp index 65fe24e596..f6f95c3e7c 100644 --- a/src/cltools/Manual.cpp +++ b/src/cltools/Manual.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "CLTool.h" -#include "CLToolRegister.h" +#include "core/CLToolRegister.h" #include "tools/Tools.h" #include "config/Config.h" #include "core/ActionRegister.h" diff --git a/src/cltools/PdbRenumber.cpp b/src/cltools/PdbRenumber.cpp index ba86300a88..33d382a324 100644 --- a/src/cltools/PdbRenumber.cpp +++ b/src/cltools/PdbRenumber.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "CLTool.h" -#include "CLToolRegister.h" +#include "core/CLToolRegister.h" #include "tools/Tools.h" #include "core/ActionRegister.h" #include "tools/IFile.h" diff --git a/src/cltools/SimpleMD.cpp b/src/cltools/SimpleMD.cpp index 0aed2de99c..87f63953ed 100644 --- a/src/cltools/SimpleMD.cpp +++ b/src/cltools/SimpleMD.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "CLTool.h" -#include "CLToolRegister.h" +#include "core/CLToolRegister.h" #include "core/PlumedMain.h" #include "tools/Vector.h" #include "tools/Random.h" diff --git a/src/cltools/SumHills.cpp b/src/cltools/SumHills.cpp index eb147d67bd..040c52f3fc 100644 --- a/src/cltools/SumHills.cpp +++ b/src/cltools/SumHills.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "CLTool.h" -#include "CLToolRegister.h" +#include "core/CLToolRegister.h" #include "tools/Tools.h" #include "core/Action.h" #include "core/ActionRegister.h" diff --git a/src/cltools/kT.cpp b/src/cltools/kT.cpp index be760a9f7c..92bc71f04f 100644 --- a/src/cltools/kT.cpp +++ b/src/cltools/kT.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "CLTool.h" -#include "CLToolRegister.h" +#include "core/CLToolRegister.h" #include "tools/Tools.h" #include "config/Config.h" #include "tools/Units.h" diff --git a/src/cltools/pesmd.cpp b/src/cltools/pesmd.cpp index 6842f9be54..10080cf557 100644 --- a/src/cltools/pesmd.cpp +++ b/src/cltools/pesmd.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "CLTool.h" -#include "CLToolRegister.h" +#include "core/CLToolRegister.h" #include "core/PlumedMain.h" #include "tools/Vector.h" #include "tools/Random.h" diff --git a/src/colvar/ActionRegister.h b/src/colvar/ActionRegister.h deleted file mode 100644 index b7b64761aa..0000000000 --- a/src/colvar/ActionRegister.h +++ /dev/null @@ -1,25 +0,0 @@ -/* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - Copyright (c) 2012-2023 The plumed team - (see the PEOPLE file at the root of the distribution for a list of names) - - See http://www.plumed.org for more information. - - This file is part of plumed, version 2. - - plumed is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - plumed is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with plumed. If not, see . -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ -#ifndef __PLUMED_colvar_ActionRegister_h -#define __PLUMED_colvar_ActionRegister_h -#include "core/ActionRegister.h" -#endif diff --git a/src/colvar/Angle.cpp b/src/colvar/Angle.cpp index 97ff219730..341246a773 100644 --- a/src/colvar/Angle.cpp +++ b/src/colvar/Angle.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/Angle.h" namespace PLMD { diff --git a/src/colvar/Cell.cpp b/src/colvar/Cell.cpp index c6c447ac7e..83c935f71b 100644 --- a/src/colvar/Cell.cpp +++ b/src/colvar/Cell.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" namespace PLMD { namespace colvar { diff --git a/src/colvar/Constant.cpp b/src/colvar/Constant.cpp index ea8de35ac3..14482c053f 100644 --- a/src/colvar/Constant.cpp +++ b/src/colvar/Constant.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" #include "core/Atoms.h" diff --git a/src/colvar/ContactMap.cpp b/src/colvar/ContactMap.cpp index c82075f88f..7e02b60506 100644 --- a/src/colvar/ContactMap.cpp +++ b/src/colvar/ContactMap.cpp @@ -21,7 +21,7 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" #include "tools/NeighborList.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/SwitchingFunction.h" namespace PLMD { diff --git a/src/colvar/Coordination.cpp b/src/colvar/Coordination.cpp index 146f799292..508cb2337e 100644 --- a/src/colvar/Coordination.cpp +++ b/src/colvar/Coordination.cpp @@ -21,7 +21,7 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "CoordinationBase.h" #include "tools/SwitchingFunction.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" namespace PLMD { namespace colvar { diff --git a/src/colvar/DHEnergy.cpp b/src/colvar/DHEnergy.cpp index fe67cea498..6d702e5873 100644 --- a/src/colvar/DHEnergy.cpp +++ b/src/colvar/DHEnergy.cpp @@ -21,7 +21,7 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "CoordinationBase.h" #include "tools/SwitchingFunction.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" #include "core/Atoms.h" diff --git a/src/colvar/DRMSD.cpp b/src/colvar/DRMSD.cpp index b869fea912..7e49787683 100644 --- a/src/colvar/DRMSD.cpp +++ b/src/colvar/DRMSD.cpp @@ -21,7 +21,7 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" #include "core/PlumedMain.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/PDB.h" #include "reference/DRMSD.h" #include "reference/MetricRegister.h" diff --git a/src/colvar/Dimer.cpp b/src/colvar/Dimer.cpp index 36818daafb..ae44af4b86 100644 --- a/src/colvar/Dimer.cpp +++ b/src/colvar/Dimer.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" namespace PLMD { diff --git a/src/colvar/Dipole.cpp b/src/colvar/Dipole.cpp index 5e985e3c5b..077162de17 100644 --- a/src/colvar/Dipole.cpp +++ b/src/colvar/Dipole.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" namespace PLMD { namespace colvar { diff --git a/src/colvar/Distance.cpp b/src/colvar/Distance.cpp index bf901435f9..da7e28b37c 100644 --- a/src/colvar/Distance.cpp +++ b/src/colvar/Distance.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/Pbc.h" namespace PLMD { diff --git a/src/colvar/EEFSolv.cpp b/src/colvar/EEFSolv.cpp index 7cf1a1e07e..cf22f6df6e 100644 --- a/src/colvar/EEFSolv.cpp +++ b/src/colvar/EEFSolv.cpp @@ -23,7 +23,7 @@ /* This class was originally written by Thomas Loehr */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "core/ActionSet.h" #include "core/PlumedMain.h" #include "core/GenericMolInfo.h" diff --git a/src/colvar/ERMSD.cpp b/src/colvar/ERMSD.cpp index 5ce858b23c..ebb654d3fc 100644 --- a/src/colvar/ERMSD.cpp +++ b/src/colvar/ERMSD.cpp @@ -27,7 +27,7 @@ #include "Colvar.h" #include "core/PlumedMain.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/PDB.h" #include "tools/ERMSD.h" #include "core/Atoms.h" diff --git a/src/colvar/Energy.cpp b/src/colvar/Energy.cpp index e3f6a49132..2265dd346d 100644 --- a/src/colvar/Energy.cpp +++ b/src/colvar/Energy.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" #include "core/Atoms.h" diff --git a/src/colvar/ExtraCV.cpp b/src/colvar/ExtraCV.cpp index 4313772722..618d6791ac 100644 --- a/src/colvar/ExtraCV.cpp +++ b/src/colvar/ExtraCV.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" #include "core/Atoms.h" diff --git a/src/colvar/Fake.cpp b/src/colvar/Fake.cpp index df42695fb7..334267908c 100644 --- a/src/colvar/Fake.cpp +++ b/src/colvar/Fake.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" namespace PLMD { namespace colvar { diff --git a/src/colvar/GHBFIX.cpp b/src/colvar/GHBFIX.cpp index a8fea5304f..77938c295d 100644 --- a/src/colvar/GHBFIX.cpp +++ b/src/colvar/GHBFIX.cpp @@ -21,7 +21,7 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "CoordinationBase.h" #include "tools/SwitchingFunction.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" #include "core/Atoms.h" #include "tools/IFile.h" diff --git a/src/colvar/Gyration.cpp b/src/colvar/Gyration.cpp index a18aa1a90f..e1054d86c0 100644 --- a/src/colvar/Gyration.cpp +++ b/src/colvar/Gyration.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" namespace PLMD { diff --git a/src/colvar/MultiRMSD.cpp b/src/colvar/MultiRMSD.cpp index 24e94eb5e6..527f91c40f 100644 --- a/src/colvar/MultiRMSD.cpp +++ b/src/colvar/MultiRMSD.cpp @@ -21,7 +21,7 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" #include "core/PlumedMain.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/PDB.h" #include "reference/MultiDomainRMSD.h" #include "reference/MetricRegister.h" diff --git a/src/colvar/PCARMSD.cpp b/src/colvar/PCARMSD.cpp index d350966fc1..ce6d40a32a 100644 --- a/src/colvar/PCARMSD.cpp +++ b/src/colvar/PCARMSD.cpp @@ -22,7 +22,7 @@ #include "Colvar.h" #include "core/Atoms.h" #include "core/PlumedMain.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/PDB.h" #include "tools/RMSD.h" #include "tools/Tools.h" diff --git a/src/colvar/PathMSDBase.cpp b/src/colvar/PathMSDBase.cpp index 013874eabb..0f403d9001 100644 --- a/src/colvar/PathMSDBase.cpp +++ b/src/colvar/PathMSDBase.cpp @@ -21,7 +21,7 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "PathMSDBase.h" #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" #include "core/Atoms.h" #include "tools/PDB.h" diff --git a/src/colvar/PathMSDBase.h b/src/colvar/PathMSDBase.h index bf6486af81..e8312b6014 100644 --- a/src/colvar/PathMSDBase.h +++ b/src/colvar/PathMSDBase.h @@ -23,7 +23,7 @@ #define __PLUMED_colvar_PathMSDBase_h #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/PDB.h" #include "tools/RMSD.h" diff --git a/src/colvar/Position.cpp b/src/colvar/Position.cpp index 9739f704c1..1c7448539a 100644 --- a/src/colvar/Position.cpp +++ b/src/colvar/Position.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/Pbc.h" namespace PLMD { diff --git a/src/colvar/ProjectionOnAxis.cpp b/src/colvar/ProjectionOnAxis.cpp index 705d18c8a8..a0cb02df99 100644 --- a/src/colvar/ProjectionOnAxis.cpp +++ b/src/colvar/ProjectionOnAxis.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/Angle.h" namespace PLMD { diff --git a/src/colvar/Puckering.cpp b/src/colvar/Puckering.cpp index 58ee4cf955..08be02dc0e 100644 --- a/src/colvar/Puckering.cpp +++ b/src/colvar/Puckering.cpp @@ -21,7 +21,7 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" #include "core/PlumedMain.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/Torsion.h" namespace PLMD { diff --git a/src/colvar/RMSD.cpp b/src/colvar/RMSD.cpp index 5aa710a5d4..210d81047e 100644 --- a/src/colvar/RMSD.cpp +++ b/src/colvar/RMSD.cpp @@ -21,7 +21,7 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" #include "core/PlumedMain.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/PDB.h" #include "reference/RMSDBase.h" #include "reference/MetricRegister.h" diff --git a/src/colvar/Template.cpp b/src/colvar/Template.cpp index 67210fbcf6..f162df9642 100644 --- a/src/colvar/Template.cpp +++ b/src/colvar/Template.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" namespace PLMD { namespace colvar { diff --git a/src/colvar/Torsion.cpp b/src/colvar/Torsion.cpp index 955c5eb5ae..8ff93c67a6 100644 --- a/src/colvar/Torsion.cpp +++ b/src/colvar/Torsion.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/Torsion.h" namespace PLMD { diff --git a/src/colvar/Volume.cpp b/src/colvar/Volume.cpp index 9da5e497ac..60f8b93c07 100644 --- a/src/colvar/Volume.cpp +++ b/src/colvar/Volume.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Colvar.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" namespace PLMD { namespace colvar { diff --git a/src/drr/drrtool.cpp b/src/drr/drrtool.cpp index 62c574dcd3..101590c89a 100644 --- a/src/drr/drrtool.cpp +++ b/src/drr/drrtool.cpp @@ -17,7 +17,7 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #ifdef __PLUMED_HAS_BOOST_SERIALIZATION #include "cltools/CLTool.h" -#include "cltools/CLToolRegister.h" +#include "core/CLToolRegister.h" #include "config/Config.h" #include "core/ActionRegister.h" #include "DRR.h" diff --git a/src/function/ActionRegister.h b/src/function/ActionRegister.h deleted file mode 100644 index 5d108e16d0..0000000000 --- a/src/function/ActionRegister.h +++ /dev/null @@ -1,25 +0,0 @@ -/* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - Copyright (c) 2012-2023 The plumed team - (see the PEOPLE file at the root of the distribution for a list of names) - - See http://www.plumed.org for more information. - - This file is part of plumed, version 2. - - plumed is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - plumed is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with plumed. If not, see . -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ -#ifndef __PLUMED_function_ActionRegister_h -#define __PLUMED_function_ActionRegister_h -#include "core/ActionRegister.h" -#endif diff --git a/src/function/Combine.cpp b/src/function/Combine.cpp index f0cb547907..4d7f8bfa29 100644 --- a/src/function/Combine.cpp +++ b/src/function/Combine.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Function.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" namespace PLMD { namespace function { diff --git a/src/function/Custom.cpp b/src/function/Custom.cpp index d6ec8ba108..d3b0070852 100644 --- a/src/function/Custom.cpp +++ b/src/function/Custom.cpp @@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "Function.h" #include "lepton/Lepton.h" diff --git a/src/function/Ensemble.cpp b/src/function/Ensemble.cpp index 3f3089ad40..6be10458b2 100644 --- a/src/function/Ensemble.cpp +++ b/src/function/Ensemble.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Function.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" #include "core/Atoms.h" diff --git a/src/function/FuncPathGeneral.cpp b/src/function/FuncPathGeneral.cpp index 778f86c135..8052752022 100644 --- a/src/function/FuncPathGeneral.cpp +++ b/src/function/FuncPathGeneral.cpp @@ -21,7 +21,7 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Function.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/IFile.h" #include diff --git a/src/function/FuncPathMSD.cpp b/src/function/FuncPathMSD.cpp index 901fd1d869..e5aec34ac8 100644 --- a/src/function/FuncPathMSD.cpp +++ b/src/function/FuncPathMSD.cpp @@ -21,7 +21,7 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Function.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" namespace PLMD { namespace function { diff --git a/src/function/FuncSumHills.cpp b/src/function/FuncSumHills.cpp index bbc567cead..17042d35fc 100644 --- a/src/function/FuncSumHills.cpp +++ b/src/function/FuncSumHills.cpp @@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "Function.h" #include "tools/Exception.h" #include "tools/Communicator.h" diff --git a/src/function/LocalEnsemble.cpp b/src/function/LocalEnsemble.cpp index 2aa79547c6..905c7255d3 100644 --- a/src/function/LocalEnsemble.cpp +++ b/src/function/LocalEnsemble.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Function.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/OpenMP.h" namespace PLMD { diff --git a/src/function/Sort.cpp b/src/function/Sort.cpp index ca92ff2ec6..608c9de716 100644 --- a/src/function/Sort.cpp +++ b/src/function/Sort.cpp @@ -19,7 +19,7 @@ You should have received a copy of the GNU Lesser General Public License along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "Function.h" namespace PLMD { diff --git a/src/function/Stats.cpp b/src/function/Stats.cpp index 11dc0f2fa3..ae2f5c78b8 100644 --- a/src/function/Stats.cpp +++ b/src/function/Stats.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Function.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" namespace PLMD { namespace function { diff --git a/src/function/Target.cpp b/src/function/Target.cpp index 7d5985f18b..7e6953b422 100644 --- a/src/function/Target.cpp +++ b/src/function/Target.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Function.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/PDB.h" #include "reference/MetricRegister.h" #include "reference/ArgumentOnlyDistance.h" diff --git a/src/funnel/FPS.cpp b/src/funnel/FPS.cpp index 90c93e1606..29e6c649a7 100644 --- a/src/funnel/FPS.cpp +++ b/src/funnel/FPS.cpp @@ -7,7 +7,7 @@ Users are free to download, adapt and use the code as long as it is not for commercial purposes. +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "colvar/Colvar.h" -#include "colvar/ActionRegister.h" +#include "core/ActionRegister.h" #include #include #include diff --git a/src/funnel/Funnel.cpp b/src/funnel/Funnel.cpp index bb696f88a3..7a9c83b851 100644 --- a/src/funnel/Funnel.cpp +++ b/src/funnel/Funnel.cpp @@ -7,7 +7,7 @@ Users are free to download, adapt and use the code as long as it is not for commercial purposes. +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "bias/Bias.h" -#include "bias/ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/Grid.h" #include "tools/Exception.h" #include "tools/File.h" diff --git a/src/isdb/Caliber.cpp b/src/isdb/Caliber.cpp index e6e78c3331..412f2d435c 100644 --- a/src/isdb/Caliber.cpp +++ b/src/isdb/Caliber.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "bias/Bias.h" -#include "bias/ActionRegister.h" +#include "core/ActionRegister.h" #include "core/Atoms.h" #include "core/PlumedMain.h" #include diff --git a/src/isdb/FretEfficiency.cpp b/src/isdb/FretEfficiency.cpp index 19c24ca2a5..068b52d529 100644 --- a/src/isdb/FretEfficiency.cpp +++ b/src/isdb/FretEfficiency.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "colvar/Colvar.h" -#include "colvar/ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" #include "tools/Pbc.h" diff --git a/src/isdb/Metainference.cpp b/src/isdb/Metainference.cpp index c9b81317d8..0278abaaea 100644 --- a/src/isdb/Metainference.cpp +++ b/src/isdb/Metainference.cpp @@ -21,7 +21,7 @@ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "bias/Bias.h" -#include "bias/ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" #include "core/Atoms.h" #include "core/Value.h" diff --git a/src/isdb/Rescale.cpp b/src/isdb/Rescale.cpp index e0bfb09c7c..b05ccd23cc 100644 --- a/src/isdb/Rescale.cpp +++ b/src/isdb/Rescale.cpp @@ -23,7 +23,7 @@ */ #include "bias/Bias.h" -#include "bias/ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" #include "core/Atoms.h" #include "core/Value.h" diff --git a/src/isdb/Select.cpp b/src/isdb/Select.cpp index 28ead4ce92..a2a466a917 100644 --- a/src/isdb/Select.cpp +++ b/src/isdb/Select.cpp @@ -23,7 +23,7 @@ */ #include "function/Function.h" -#include "function/ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" namespace PLMD { diff --git a/src/mapping/PathTools.cpp b/src/mapping/PathTools.cpp index 9fb98d2547..0cf4a0922b 100644 --- a/src/mapping/PathTools.cpp +++ b/src/mapping/PathTools.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "cltools/CLTool.h" -#include "cltools/CLToolRegister.h" +#include "core/CLToolRegister.h" #include "tools/Tools.h" #include "tools/Pbc.h" #include "core/Value.h" diff --git a/src/piv/PIV.cpp b/src/piv/PIV.cpp index 8476f201e9..8c00aaf41f 100644 --- a/src/piv/PIV.cpp +++ b/src/piv/PIV.cpp @@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "colvar/Colvar.h" -#include "colvar/ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" #include "core/ActionWithVirtualAtom.h" #include "tools/NeighborList.h" diff --git a/src/pytorch/PytorchModel.cpp b/src/pytorch/PytorchModel.cpp index 2245ffffe3..ae5861a0bb 100644 --- a/src/pytorch/PytorchModel.cpp +++ b/src/pytorch/PytorchModel.cpp @@ -23,7 +23,7 @@ along with plumed. If not, see . #include "core/PlumedMain.h" #include "function/Function.h" -#include "function/ActionRegister.h" +#include "core/ActionRegister.h" #include #include diff --git a/src/sasa/ActionRegister.h b/src/sasa/ActionRegister.h deleted file mode 100644 index 86da034c3b..0000000000 --- a/src/sasa/ActionRegister.h +++ /dev/null @@ -1,23 +0,0 @@ -/* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -Copyright (c) 2021, Andrea Arsiccio - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ -#ifndef __PLUMED_sasa_ActionRegister_h -#define __PLUMED_sasa_ActionRegister_h -#include "core/ActionRegister.h" -#endif diff --git a/src/sasa/sasa_HASEL.cpp b/src/sasa/sasa_HASEL.cpp index 3d421f9b08..325793ea2f 100644 --- a/src/sasa/sasa_HASEL.cpp +++ b/src/sasa/sasa_HASEL.cpp @@ -19,7 +19,7 @@ freely, subject to the following restrictions: +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Sasa.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" #include "core/GenericMolInfo.h" #include "core/ActionSet.h" diff --git a/src/sasa/sasa_LCPO.cpp b/src/sasa/sasa_LCPO.cpp index 0d5bf5d08c..5d4ae03b9c 100755 --- a/src/sasa/sasa_LCPO.cpp +++ b/src/sasa/sasa_LCPO.cpp @@ -19,7 +19,7 @@ freely, subject to the following restrictions: +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "Sasa.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" #include "core/GenericMolInfo.h" #include "core/ActionSet.h" diff --git a/src/vatom/ActionRegister.h b/src/vatom/ActionRegister.h deleted file mode 100644 index 3d761e4465..0000000000 --- a/src/vatom/ActionRegister.h +++ /dev/null @@ -1,25 +0,0 @@ -/* +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - Copyright (c) 2012-2023 The plumed team - (see the PEOPLE file at the root of the distribution for a list of names) - - See http://www.plumed.org for more information. - - This file is part of plumed, version 2. - - plumed is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - plumed is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with plumed. If not, see . -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ -#ifndef __PLUMED_vatom_ActionRegister_h -#define __PLUMED_vatom_ActionRegister_h -#include "core/ActionRegister.h" -#endif diff --git a/src/vatom/Center.cpp b/src/vatom/Center.cpp index 461f92eb66..3ac5faf534 100644 --- a/src/vatom/Center.cpp +++ b/src/vatom/Center.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "ActionWithVirtualAtom.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "core/PlumedMain.h" #include "core/Atoms.h" #include diff --git a/src/vatom/FixedAtom.cpp b/src/vatom/FixedAtom.cpp index f97ebe3cd7..1eca36cbab 100644 --- a/src/vatom/FixedAtom.cpp +++ b/src/vatom/FixedAtom.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "ActionWithVirtualAtom.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/Vector.h" #include "tools/Exception.h" diff --git a/src/vatom/Ghost.cpp b/src/vatom/Ghost.cpp index d5a9252e0a..db52f24ac4 100644 --- a/src/vatom/Ghost.cpp +++ b/src/vatom/Ghost.cpp @@ -20,7 +20,7 @@ along with plumed. If not, see . +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ #include "ActionWithVirtualAtom.h" -#include "ActionRegister.h" +#include "core/ActionRegister.h" #include "tools/Vector.h" #include "tools/Exception.h" diff --git a/src/ves/MD_LinearExpansionPES.cpp b/src/ves/MD_LinearExpansionPES.cpp index 302ec631f7..6ad3068b65 100644 --- a/src/ves/MD_LinearExpansionPES.cpp +++ b/src/ves/MD_LinearExpansionPES.cpp @@ -27,7 +27,7 @@ #include "GridProjWeights.h" #include "cltools/CLTool.h" -#include "cltools/CLToolRegister.h" +#include "core/CLToolRegister.h" #include "tools/Vector.h" #include "tools/Random.h" #include "tools/Grid.h"