From 78b9dc5374514fc211c03f45448f8dadf20db69d Mon Sep 17 00:00:00 2001 From: Giovanni Bussi <giovanni.bussi@gmail.com> Date: Tue, 11 Dec 2012 09:43:03 +0100 Subject: [PATCH] Moved vessel-base to vesselbase --- src/multicolvar/Makefile | 2 +- src/multicolvar/MultiColvar.cpp | 2 +- src/multicolvar/MultiColvar.h | 2 +- src/multicolvar/VesselCVdens.cpp | 4 ++-- src/multicolvar/VesselMean.cpp | 4 ++-- src/multicolvar/VesselWithin.cpp | 4 ++-- src/{vessel-base => vesselbase}/.gitignore | 0 src/{vessel-base => vesselbase}/ActionWithVessel.cpp | 0 src/{vessel-base => vesselbase}/ActionWithVessel.h | 0 src/{vessel-base => vesselbase}/Makefile | 0 src/{vessel-base => vesselbase}/NormedSumVessel.cpp | 0 src/{vessel-base => vesselbase}/NormedSumVessel.h | 0 src/{vessel-base => vesselbase}/SumVessel.cpp | 0 src/{vessel-base => vesselbase}/SumVessel.h | 0 src/{vessel-base => vesselbase}/Vessel.cpp | 0 src/{vessel-base => vesselbase}/Vessel.h | 0 src/{vessel-base => vesselbase}/VesselAccumulator.cpp | 0 src/{vessel-base => vesselbase}/VesselAccumulator.h | 0 src/{vessel-base => vesselbase}/VesselLessThan.cpp | 0 src/{vessel-base => vesselbase}/VesselMin.cpp | 0 src/{vessel-base => vesselbase}/VesselMoment.cpp | 0 src/{vessel-base => vesselbase}/VesselMoreThan.cpp | 0 src/{vessel-base => vesselbase}/VesselRegister.cpp | 0 src/{vessel-base => vesselbase}/VesselRegister.h | 0 src/{vessel-base => vesselbase}/VesselStoreAllValues.cpp | 0 src/{vessel-base => vesselbase}/VesselStoreAllValues.h | 0 src/{vessel-base => vesselbase}/VesselSum.cpp | 0 src/{vessel-base => vesselbase}/VesselValueAccess.cpp | 0 src/{vessel-base => vesselbase}/VesselValueAccess.h | 0 src/{vessel-base => vesselbase}/module.type | 0 30 files changed, 9 insertions(+), 9 deletions(-) rename src/{vessel-base => vesselbase}/.gitignore (100%) rename src/{vessel-base => vesselbase}/ActionWithVessel.cpp (100%) rename src/{vessel-base => vesselbase}/ActionWithVessel.h (100%) rename src/{vessel-base => vesselbase}/Makefile (100%) rename src/{vessel-base => vesselbase}/NormedSumVessel.cpp (100%) rename src/{vessel-base => vesselbase}/NormedSumVessel.h (100%) rename src/{vessel-base => vesselbase}/SumVessel.cpp (100%) rename src/{vessel-base => vesselbase}/SumVessel.h (100%) rename src/{vessel-base => vesselbase}/Vessel.cpp (100%) rename src/{vessel-base => vesselbase}/Vessel.h (100%) rename src/{vessel-base => vesselbase}/VesselAccumulator.cpp (100%) rename src/{vessel-base => vesselbase}/VesselAccumulator.h (100%) rename src/{vessel-base => vesselbase}/VesselLessThan.cpp (100%) rename src/{vessel-base => vesselbase}/VesselMin.cpp (100%) rename src/{vessel-base => vesselbase}/VesselMoment.cpp (100%) rename src/{vessel-base => vesselbase}/VesselMoreThan.cpp (100%) rename src/{vessel-base => vesselbase}/VesselRegister.cpp (100%) rename src/{vessel-base => vesselbase}/VesselRegister.h (100%) rename src/{vessel-base => vesselbase}/VesselStoreAllValues.cpp (100%) rename src/{vessel-base => vesselbase}/VesselStoreAllValues.h (100%) rename src/{vessel-base => vesselbase}/VesselSum.cpp (100%) rename src/{vessel-base => vesselbase}/VesselValueAccess.cpp (100%) rename src/{vessel-base => vesselbase}/VesselValueAccess.h (100%) rename src/{vessel-base => vesselbase}/module.type (100%) diff --git a/src/multicolvar/Makefile b/src/multicolvar/Makefile index ee7634d37..8d67390a9 100644 --- a/src/multicolvar/Makefile +++ b/src/multicolvar/Makefile @@ -1,4 +1,4 @@ -USE=core tools vessel-base +USE=core tools vesselbase BUILDAFTER=config # generic makefile diff --git a/src/multicolvar/MultiColvar.cpp b/src/multicolvar/MultiColvar.cpp index 9b83aa7fb..366c399a2 100644 --- a/src/multicolvar/MultiColvar.cpp +++ b/src/multicolvar/MultiColvar.cpp @@ -23,7 +23,7 @@ #include "core/PlumedMain.h" #include "core/ActionSet.h" #include "core/SetupMolInfo.h" -#include "vessel-base/Vessel.h" +#include "vesselbase/Vessel.h" #include "tools/Pbc.h" #include <vector> #include <string> diff --git a/src/multicolvar/MultiColvar.h b/src/multicolvar/MultiColvar.h index 38e90252b..a82f45a0a 100644 --- a/src/multicolvar/MultiColvar.h +++ b/src/multicolvar/MultiColvar.h @@ -24,7 +24,7 @@ #include "core/ActionAtomistic.h" #include "core/ActionWithValue.h" -#include "vessel-base/ActionWithVessel.h" +#include "vesselbase/ActionWithVessel.h" #include <vector> #define PLUMED_MULTICOLVAR_INIT(ao) Action(ao),MultiColvar(ao) diff --git a/src/multicolvar/VesselCVdens.cpp b/src/multicolvar/VesselCVdens.cpp index e9a5ecd91..988859f20 100644 --- a/src/multicolvar/VesselCVdens.cpp +++ b/src/multicolvar/VesselCVdens.cpp @@ -22,8 +22,8 @@ #include "core/PlumedMain.h" #include "core/ActionSet.h" -#include "vessel-base/VesselRegister.h" -#include "vessel-base/NormedSumVessel.h" +#include "vesselbase/VesselRegister.h" +#include "vesselbase/NormedSumVessel.h" #include "ActionVolume.h" #include "MultiColvar.h" #include "tools/HistogramBead.h" diff --git a/src/multicolvar/VesselMean.cpp b/src/multicolvar/VesselMean.cpp index 06be7c78d..c2b887689 100644 --- a/src/multicolvar/VesselMean.cpp +++ b/src/multicolvar/VesselMean.cpp @@ -19,8 +19,8 @@ You should have received a copy of the GNU Lesser General Public License along with plumed. If not, see <http://www.gnu.org/licenses/>. +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ -#include "vessel-base/VesselRegister.h" -#include "vessel-base/NormedSumVessel.h" +#include "vesselbase/VesselRegister.h" +#include "vesselbase/NormedSumVessel.h" #include "MultiColvar.h" namespace PLMD { diff --git a/src/multicolvar/VesselWithin.cpp b/src/multicolvar/VesselWithin.cpp index e864c7d2e..95241ac98 100644 --- a/src/multicolvar/VesselWithin.cpp +++ b/src/multicolvar/VesselWithin.cpp @@ -20,8 +20,8 @@ along with plumed. If not, see <http://www.gnu.org/licenses/>. +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */ -#include "vessel-base/VesselRegister.h" -#include "vessel-base/NormedSumVessel.h" +#include "vesselbase/VesselRegister.h" +#include "vesselbase/NormedSumVessel.h" #include "MultiColvar.h" #include "tools/HistogramBead.h" diff --git a/src/vessel-base/.gitignore b/src/vesselbase/.gitignore similarity index 100% rename from src/vessel-base/.gitignore rename to src/vesselbase/.gitignore diff --git a/src/vessel-base/ActionWithVessel.cpp b/src/vesselbase/ActionWithVessel.cpp similarity index 100% rename from src/vessel-base/ActionWithVessel.cpp rename to src/vesselbase/ActionWithVessel.cpp diff --git a/src/vessel-base/ActionWithVessel.h b/src/vesselbase/ActionWithVessel.h similarity index 100% rename from src/vessel-base/ActionWithVessel.h rename to src/vesselbase/ActionWithVessel.h diff --git a/src/vessel-base/Makefile b/src/vesselbase/Makefile similarity index 100% rename from src/vessel-base/Makefile rename to src/vesselbase/Makefile diff --git a/src/vessel-base/NormedSumVessel.cpp b/src/vesselbase/NormedSumVessel.cpp similarity index 100% rename from src/vessel-base/NormedSumVessel.cpp rename to src/vesselbase/NormedSumVessel.cpp diff --git a/src/vessel-base/NormedSumVessel.h b/src/vesselbase/NormedSumVessel.h similarity index 100% rename from src/vessel-base/NormedSumVessel.h rename to src/vesselbase/NormedSumVessel.h diff --git a/src/vessel-base/SumVessel.cpp b/src/vesselbase/SumVessel.cpp similarity index 100% rename from src/vessel-base/SumVessel.cpp rename to src/vesselbase/SumVessel.cpp diff --git a/src/vessel-base/SumVessel.h b/src/vesselbase/SumVessel.h similarity index 100% rename from src/vessel-base/SumVessel.h rename to src/vesselbase/SumVessel.h diff --git a/src/vessel-base/Vessel.cpp b/src/vesselbase/Vessel.cpp similarity index 100% rename from src/vessel-base/Vessel.cpp rename to src/vesselbase/Vessel.cpp diff --git a/src/vessel-base/Vessel.h b/src/vesselbase/Vessel.h similarity index 100% rename from src/vessel-base/Vessel.h rename to src/vesselbase/Vessel.h diff --git a/src/vessel-base/VesselAccumulator.cpp b/src/vesselbase/VesselAccumulator.cpp similarity index 100% rename from src/vessel-base/VesselAccumulator.cpp rename to src/vesselbase/VesselAccumulator.cpp diff --git a/src/vessel-base/VesselAccumulator.h b/src/vesselbase/VesselAccumulator.h similarity index 100% rename from src/vessel-base/VesselAccumulator.h rename to src/vesselbase/VesselAccumulator.h diff --git a/src/vessel-base/VesselLessThan.cpp b/src/vesselbase/VesselLessThan.cpp similarity index 100% rename from src/vessel-base/VesselLessThan.cpp rename to src/vesselbase/VesselLessThan.cpp diff --git a/src/vessel-base/VesselMin.cpp b/src/vesselbase/VesselMin.cpp similarity index 100% rename from src/vessel-base/VesselMin.cpp rename to src/vesselbase/VesselMin.cpp diff --git a/src/vessel-base/VesselMoment.cpp b/src/vesselbase/VesselMoment.cpp similarity index 100% rename from src/vessel-base/VesselMoment.cpp rename to src/vesselbase/VesselMoment.cpp diff --git a/src/vessel-base/VesselMoreThan.cpp b/src/vesselbase/VesselMoreThan.cpp similarity index 100% rename from src/vessel-base/VesselMoreThan.cpp rename to src/vesselbase/VesselMoreThan.cpp diff --git a/src/vessel-base/VesselRegister.cpp b/src/vesselbase/VesselRegister.cpp similarity index 100% rename from src/vessel-base/VesselRegister.cpp rename to src/vesselbase/VesselRegister.cpp diff --git a/src/vessel-base/VesselRegister.h b/src/vesselbase/VesselRegister.h similarity index 100% rename from src/vessel-base/VesselRegister.h rename to src/vesselbase/VesselRegister.h diff --git a/src/vessel-base/VesselStoreAllValues.cpp b/src/vesselbase/VesselStoreAllValues.cpp similarity index 100% rename from src/vessel-base/VesselStoreAllValues.cpp rename to src/vesselbase/VesselStoreAllValues.cpp diff --git a/src/vessel-base/VesselStoreAllValues.h b/src/vesselbase/VesselStoreAllValues.h similarity index 100% rename from src/vessel-base/VesselStoreAllValues.h rename to src/vesselbase/VesselStoreAllValues.h diff --git a/src/vessel-base/VesselSum.cpp b/src/vesselbase/VesselSum.cpp similarity index 100% rename from src/vessel-base/VesselSum.cpp rename to src/vesselbase/VesselSum.cpp diff --git a/src/vessel-base/VesselValueAccess.cpp b/src/vesselbase/VesselValueAccess.cpp similarity index 100% rename from src/vessel-base/VesselValueAccess.cpp rename to src/vesselbase/VesselValueAccess.cpp diff --git a/src/vessel-base/VesselValueAccess.h b/src/vesselbase/VesselValueAccess.h similarity index 100% rename from src/vessel-base/VesselValueAccess.h rename to src/vesselbase/VesselValueAccess.h diff --git a/src/vessel-base/module.type b/src/vesselbase/module.type similarity index 100% rename from src/vessel-base/module.type rename to src/vesselbase/module.type -- GitLab