From fd00e3165c8306e47c169bcea6a5df7de669d71b Mon Sep 17 00:00:00 2001 From: Mark Abraham Date: Sat, 17 Apr 2021 08:47:58 +0000 Subject: [PATCH] Rename files to follow style --- docs/doxygen/lib/mdmodules.md | 2 +- .../applied_forces/densityfitting/densityfitting.cpp | 2 +- .../applied_forces/densityfitting/densityfittingoptions.cpp | 4 ++-- .../applied_forces/densityfitting/tests/densityfitting.cpp | 4 ++-- src/gromacs/fileio/checkpoint.cpp | 2 +- src/gromacs/gmxpreprocess/grompp.cpp | 2 +- src/gromacs/gmxpreprocess/readir.cpp | 2 +- src/gromacs/mdlib/energyoutput.cpp | 2 +- src/gromacs/mdlib/tests/energyoutput.cpp | 2 +- src/gromacs/mdrun/mdmodules.cpp | 2 +- src/gromacs/mdrun/runner.cpp | 2 +- src/gromacs/mdrun/simulationinput.h | 2 +- src/gromacs/mdrun/simulatorbuilder.cpp | 2 +- .../{mdmodulenotification-impl.h => mdmodulesnotifier.h} | 6 +++--- .../{mdmodulenotification.h => mdmodulesnotifiers.h} | 6 +++--- src/gromacs/utility/tests/CMakeLists.txt | 2 +- ...{mdmodulenotification-impl.cpp => mdmodulesnotifier.cpp} | 2 +- 17 files changed, 23 insertions(+), 23 deletions(-) rename src/gromacs/utility/{mdmodulenotification-impl.h => mdmodulesnotifier.h} (98%) rename src/gromacs/utility/{mdmodulenotification.h => mdmodulesnotifiers.h} (98%) rename src/gromacs/utility/tests/{mdmodulenotification-impl.cpp => mdmodulesnotifier.cpp} (98%) diff --git a/docs/doxygen/lib/mdmodules.md b/docs/doxygen/lib/mdmodules.md index f0f36441d6..f3c7be022c 100644 --- a/docs/doxygen/lib/mdmodules.md +++ b/docs/doxygen/lib/mdmodules.md @@ -162,7 +162,7 @@ and local atom sets by subscribing to callback functions. To include a notification for your module * Add the function signature for the callback function to the - `MDModulesNotifiers` in `mdmodulenotification.h`, + `MDModulesNotifiers` in `mdmodulesnotifiers.h`, ```C++ BuildMDModulesNotifier<..., diff --git a/src/gromacs/applied_forces/densityfitting/densityfitting.cpp b/src/gromacs/applied_forces/densityfitting/densityfitting.cpp index ed14140132..af6af7678a 100644 --- a/src/gromacs/applied_forces/densityfitting/densityfitting.cpp +++ b/src/gromacs/applied_forces/densityfitting/densityfitting.cpp @@ -56,7 +56,7 @@ #include "gromacs/utility/classhelpers.h" #include "gromacs/utility/exceptions.h" #include "gromacs/utility/keyvaluetreebuilder.h" -#include "gromacs/utility/mdmodulenotification.h" +#include "gromacs/utility/mdmodulesnotifiers.h" #include "densityfittingforceprovider.h" #include "densityfittingoptions.h" diff --git a/src/gromacs/applied_forces/densityfitting/densityfittingoptions.cpp b/src/gromacs/applied_forces/densityfitting/densityfittingoptions.cpp index a008212c19..b7693599fe 100644 --- a/src/gromacs/applied_forces/densityfitting/densityfittingoptions.cpp +++ b/src/gromacs/applied_forces/densityfitting/densityfittingoptions.cpp @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2019,2020, by the GROMACS development team, led by + * Copyright (c) 2019,2020,2021, by the GROMACS development team, led by * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, * and including many others, as listed in the AUTHORS file in the * top-level source directory and at http://www.gromacs.org. @@ -52,7 +52,7 @@ #include "gromacs/utility/exceptions.h" #include "gromacs/utility/keyvaluetreebuilder.h" #include "gromacs/utility/keyvaluetreetransform.h" -#include "gromacs/utility/mdmodulenotification.h" +#include "gromacs/utility/mdmodulesnotifiers.h" #include "gromacs/utility/strconvert.h" #include "densityfittingamplitudelookup.h" diff --git a/src/gromacs/applied_forces/densityfitting/tests/densityfitting.cpp b/src/gromacs/applied_forces/densityfitting/tests/densityfitting.cpp index 8ceca2f914..36e6e3a1e9 100644 --- a/src/gromacs/applied_forces/densityfitting/tests/densityfitting.cpp +++ b/src/gromacs/applied_forces/densityfitting/tests/densityfitting.cpp @@ -1,7 +1,7 @@ /* * This file is part of the GROMACS molecular simulation package. * - * Copyright (c) 2019,2020, by the GROMACS development team, led by + * Copyright (c) 2019,2020,2021, by the GROMACS development team, led by * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, * and including many others, as listed in the AUTHORS file in the * top-level source directory and at http://www.gromacs.org. @@ -58,7 +58,7 @@ #include "gromacs/options/treesupport.h" #include "gromacs/utility/keyvaluetreebuilder.h" #include "gromacs/utility/keyvaluetreetransform.h" -#include "gromacs/utility/mdmodulenotification.h" +#include "gromacs/utility/mdmodulesnotifiers.h" #include "gromacs/utility/real.h" #include "gromacs/utility/smalloc.h" #include "gromacs/utility/stringcompare.h" diff --git a/src/gromacs/fileio/checkpoint.cpp b/src/gromacs/fileio/checkpoint.cpp index 18dc33422e..6ba495992d 100644 --- a/src/gromacs/fileio/checkpoint.cpp +++ b/src/gromacs/fileio/checkpoint.cpp @@ -85,7 +85,7 @@ #include "gromacs/utility/keyvaluetree.h" #include "gromacs/utility/keyvaluetreebuilder.h" #include "gromacs/utility/keyvaluetreeserializer.h" -#include "gromacs/utility/mdmodulenotification.h" +#include "gromacs/utility/mdmodulesnotifiers.h" #include "gromacs/utility/programcontext.h" #include "gromacs/utility/smalloc.h" #include "gromacs/utility/sysinfo.h" diff --git a/src/gromacs/gmxpreprocess/grompp.cpp b/src/gromacs/gmxpreprocess/grompp.cpp index 2f10d3b364..c8faf6d05b 100644 --- a/src/gromacs/gmxpreprocess/grompp.cpp +++ b/src/gromacs/gmxpreprocess/grompp.cpp @@ -107,7 +107,7 @@ #include "gromacs/utility/listoflists.h" #include "gromacs/utility/logger.h" #include "gromacs/utility/loggerbuilder.h" -#include "gromacs/utility/mdmodulenotification.h" +#include "gromacs/utility/mdmodulesnotifiers.h" #include "gromacs/utility/smalloc.h" #include "gromacs/utility/snprintf.h" diff --git a/src/gromacs/gmxpreprocess/readir.cpp b/src/gromacs/gmxpreprocess/readir.cpp index 1bdd33ebb5..24f78964b2 100644 --- a/src/gromacs/gmxpreprocess/readir.cpp +++ b/src/gromacs/gmxpreprocess/readir.cpp @@ -86,7 +86,7 @@ #include "gromacs/utility/keyvaluetreebuilder.h" #include "gromacs/utility/keyvaluetreemdpwriter.h" #include "gromacs/utility/keyvaluetreetransform.h" -#include "gromacs/utility/mdmodulenotification.h" +#include "gromacs/utility/mdmodulesnotifiers.h" #include "gromacs/utility/smalloc.h" #include "gromacs/utility/strconvert.h" #include "gromacs/utility/stringcompare.h" diff --git a/src/gromacs/mdlib/energyoutput.cpp b/src/gromacs/mdlib/energyoutput.cpp index e736b2c5c0..1def84ec7b 100644 --- a/src/gromacs/mdlib/energyoutput.cpp +++ b/src/gromacs/mdlib/energyoutput.cpp @@ -82,7 +82,7 @@ #include "gromacs/utility/arraysize.h" #include "gromacs/utility/enumerationhelpers.h" #include "gromacs/utility/fatalerror.h" -#include "gromacs/utility/mdmodulenotification.h" +#include "gromacs/utility/mdmodulesnotifiers.h" #include "gromacs/utility/smalloc.h" #include "gromacs/utility/stringutil.h" diff --git a/src/gromacs/mdlib/tests/energyoutput.cpp b/src/gromacs/mdlib/tests/energyoutput.cpp index ec11ab68a8..c60df687e7 100644 --- a/src/gromacs/mdlib/tests/energyoutput.cpp +++ b/src/gromacs/mdlib/tests/energyoutput.cpp @@ -68,7 +68,7 @@ #include "gromacs/mdtypes/state.h" #include "gromacs/topology/topology.h" #include "gromacs/utility/cstringutil.h" -#include "gromacs/utility/mdmodulenotification.h" +#include "gromacs/utility/mdmodulesnotifiers.h" #include "gromacs/utility/stringutil.h" #include "gromacs/utility/textreader.h" #include "gromacs/utility/unique_cptr.h" diff --git a/src/gromacs/mdrun/mdmodules.cpp b/src/gromacs/mdrun/mdmodules.cpp index fabeb2f4ef..0117d3aa93 100644 --- a/src/gromacs/mdrun/mdmodules.cpp +++ b/src/gromacs/mdrun/mdmodules.cpp @@ -53,7 +53,7 @@ #include "gromacs/utility/keyvaluetree.h" #include "gromacs/utility/keyvaluetreebuilder.h" #include "gromacs/utility/keyvaluetreetransform.h" -#include "gromacs/utility/mdmodulenotification.h" +#include "gromacs/utility/mdmodulesnotifiers.h" #include "gromacs/utility/smalloc.h" namespace gmx diff --git a/src/gromacs/mdrun/runner.cpp b/src/gromacs/mdrun/runner.cpp index e53d3c16c5..0c8a982509 100644 --- a/src/gromacs/mdrun/runner.cpp +++ b/src/gromacs/mdrun/runner.cpp @@ -161,7 +161,7 @@ #include "gromacs/utility/keyvaluetree.h" #include "gromacs/utility/logger.h" #include "gromacs/utility/loggerbuilder.h" -#include "gromacs/utility/mdmodulenotification.h" +#include "gromacs/utility/mdmodulesnotifiers.h" #include "gromacs/utility/physicalnodecommunicator.h" #include "gromacs/utility/pleasecite.h" #include "gromacs/utility/programcontext.h" diff --git a/src/gromacs/mdrun/simulationinput.h b/src/gromacs/mdrun/simulationinput.h index 06d8331d10..9c7d225aa0 100644 --- a/src/gromacs/mdrun/simulationinput.h +++ b/src/gromacs/mdrun/simulationinput.h @@ -48,7 +48,7 @@ #include "gromacs/mdrun/simulationinputhandle.h" #include "gromacs/mdtypes/checkpointdata.h" -#include "gromacs/utility/mdmodulenotification.h" +#include "gromacs/utility/mdmodulesnotifiers.h" // Forward declarations for types from other modules that are opaque to the public API. // TODO: Document the sources of these symbols or import a (self-documenting) fwd header. diff --git a/src/gromacs/mdrun/simulatorbuilder.cpp b/src/gromacs/mdrun/simulatorbuilder.cpp index 1f8620c32a..90b87f703d 100644 --- a/src/gromacs/mdrun/simulatorbuilder.cpp +++ b/src/gromacs/mdrun/simulatorbuilder.cpp @@ -51,7 +51,7 @@ #include "gromacs/mdtypes/state.h" #include "gromacs/modularsimulator/modularsimulator.h" #include "gromacs/topology/topology.h" -#include "gromacs/utility/mdmodulenotification.h" +#include "gromacs/utility/mdmodulesnotifiers.h" #include "legacysimulator.h" #include "membedholder.h" diff --git a/src/gromacs/utility/mdmodulenotification-impl.h b/src/gromacs/utility/mdmodulesnotifier.h similarity index 98% rename from src/gromacs/utility/mdmodulenotification-impl.h rename to src/gromacs/utility/mdmodulesnotifier.h index d488132105..4f080af8e5 100644 --- a/src/gromacs/utility/mdmodulenotification-impl.h +++ b/src/gromacs/utility/mdmodulesnotifier.h @@ -34,15 +34,15 @@ */ /*! \libinternal \file * \brief - * Declares gmx::MDModulesNotifier. + * Declares gmx::MDModulesNotifier and builder. * * \author Christian Blau * \inlibraryapi * \ingroup module_utility */ -#ifndef GMX_UTILITY_MDMODULENOTIFICATION_IMPL_H -#define GMX_UTILITY_MDMODULENOTIFICATION_IMPL_H +#ifndef GMX_UTILITY_MDMODULESNOTIFIER_H +#define GMX_UTILITY_MDMODULESNOTIFIER_H #include #include diff --git a/src/gromacs/utility/mdmodulenotification.h b/src/gromacs/utility/mdmodulesnotifiers.h similarity index 98% rename from src/gromacs/utility/mdmodulenotification.h rename to src/gromacs/utility/mdmodulesnotifiers.h index 88491e378e..147de9235a 100644 --- a/src/gromacs/utility/mdmodulenotification.h +++ b/src/gromacs/utility/mdmodulesnotifiers.h @@ -41,13 +41,13 @@ * \ingroup module_utility */ -#ifndef GMX_UTILITY_MDMODULENOTIFICATION_H -#define GMX_UTILITY_MDMODULENOTIFICATION_H +#ifndef GMX_UTILITY_MDMODULESNOTIFIERS_H +#define GMX_UTILITY_MDMODULESNOTIFIERS_H #include #include -#include "gromacs/utility/mdmodulenotification-impl.h" +#include "gromacs/utility/mdmodulesnotifier.h" struct t_commrec; struct gmx_mtop_t; diff --git a/src/gromacs/utility/tests/CMakeLists.txt b/src/gromacs/utility/tests/CMakeLists.txt index 856a949540..7532e3c008 100644 --- a/src/gromacs/utility/tests/CMakeLists.txt +++ b/src/gromacs/utility/tests/CMakeLists.txt @@ -47,7 +47,7 @@ gmx_add_unit_test(UtilityUnitTests utility-test keyvaluetreetransform.cpp listoflists.cpp logger.cpp - mdmodulenotification-impl.cpp + mdmodulesnotifier.cpp path.cpp physicalnodecommunicator.cpp range.cpp diff --git a/src/gromacs/utility/tests/mdmodulenotification-impl.cpp b/src/gromacs/utility/tests/mdmodulesnotifier.cpp similarity index 98% rename from src/gromacs/utility/tests/mdmodulenotification-impl.cpp rename to src/gromacs/utility/tests/mdmodulesnotifier.cpp index 1e7515a5b6..1fc550b59e 100644 --- a/src/gromacs/utility/tests/mdmodulenotification-impl.cpp +++ b/src/gromacs/utility/tests/mdmodulesnotifier.cpp @@ -41,7 +41,7 @@ */ #include "gmxpre.h" -#include "gromacs/utility/mdmodulenotification-impl.h" +#include "gromacs/utility/mdmodulesnotifier.h" #include -- 2.22.0