Move densityfitting to its own directory
authorPaul Bauer <paul.bauer.q@gmail.com>
Tue, 7 Jul 2020 16:10:13 +0000 (16:10 +0000)
committerArtem Zhmurov <zhmurov@gmail.com>
Tue, 7 Jul 2020 16:10:13 +0000 (16:10 +0000)
Preparing for adding more applied_forces modules

Change-Id: Ieec20d1f0752a369d26352ec6b0997812decd21e

20 files changed:
src/gromacs/applied_forces/CMakeLists.txt
src/gromacs/applied_forces/densityfitting/CMakeLists.txt [new file with mode: 0644]
src/gromacs/applied_forces/densityfitting/densityfitting.cpp [moved from src/gromacs/applied_forces/densityfitting.cpp with 100% similarity]
src/gromacs/applied_forces/densityfitting/densityfitting.h [moved from src/gromacs/applied_forces/densityfitting.h with 100% similarity]
src/gromacs/applied_forces/densityfitting/densityfittingamplitudelookup.cpp [moved from src/gromacs/applied_forces/densityfittingamplitudelookup.cpp with 100% similarity]
src/gromacs/applied_forces/densityfitting/densityfittingamplitudelookup.h [moved from src/gromacs/applied_forces/densityfittingamplitudelookup.h with 100% similarity]
src/gromacs/applied_forces/densityfitting/densityfittingforceprovider.cpp [moved from src/gromacs/applied_forces/densityfittingforceprovider.cpp with 100% similarity]
src/gromacs/applied_forces/densityfitting/densityfittingforceprovider.h [moved from src/gromacs/applied_forces/densityfittingforceprovider.h with 100% similarity]
src/gromacs/applied_forces/densityfitting/densityfittingoptions.cpp [moved from src/gromacs/applied_forces/densityfittingoptions.cpp with 99% similarity]
src/gromacs/applied_forces/densityfitting/densityfittingoptions.h [moved from src/gromacs/applied_forces/densityfittingoptions.h with 98% similarity]
src/gromacs/applied_forces/densityfitting/densityfittingoutputprovider.cpp [moved from src/gromacs/applied_forces/densityfittingoutputprovider.cpp with 97% similarity]
src/gromacs/applied_forces/densityfitting/densityfittingoutputprovider.h [moved from src/gromacs/applied_forces/densityfittingoutputprovider.h with 97% similarity]
src/gromacs/applied_forces/densityfitting/densityfittingparameters.cpp [moved from src/gromacs/applied_forces/densityfittingparameters.cpp with 97% similarity]
src/gromacs/applied_forces/densityfitting/densityfittingparameters.h [moved from src/gromacs/applied_forces/densityfittingparameters.h with 98% similarity]
src/gromacs/applied_forces/densityfitting/tests/CMakeLists.txt [new file with mode: 0644]
src/gromacs/applied_forces/densityfitting/tests/densityfitting.cpp [moved from src/gromacs/applied_forces/tests/densityfitting.cpp with 98% similarity]
src/gromacs/applied_forces/densityfitting/tests/densityfittingamplitudelookup.cpp [moved from src/gromacs/applied_forces/tests/densityfittingamplitudelookup.cpp with 98% similarity]
src/gromacs/applied_forces/densityfitting/tests/densityfittingoptions.cpp [moved from src/gromacs/applied_forces/tests/densityfittingoptions.cpp with 99% similarity]
src/gromacs/applied_forces/tests/CMakeLists.txt
src/gromacs/mdrun/mdmodules.cpp

index d7ea182db697e511d50b1b3f1210eaeeaa8edaa2..bdca6f54ec64d47bbd7d9874403994e219d85d8a 100644 (file)
@@ -1,7 +1,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2015,2016,2019, by the GROMACS development team, led by
+# Copyright (c) 2015,2016,2019,2020, 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.
 # the research papers on the package. Check out http://www.gromacs.org.
 
 gmx_add_libgromacs_sources(
-    densityfitting.cpp
-    densityfittingamplitudelookup.cpp
-    densityfittingforceprovider.cpp
-    densityfittingoptions.cpp
-    densityfittingoutputprovider.cpp
-    densityfittingparameters.cpp
     electricfield.cpp
     )
 
+add_subdirectory(densityfitting)
+
 if (BUILD_TESTING)
     add_subdirectory(tests)
 endif()
diff --git a/src/gromacs/applied_forces/densityfitting/CMakeLists.txt b/src/gromacs/applied_forces/densityfitting/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b9f779e
--- /dev/null
@@ -0,0 +1,46 @@
+#
+# This file is part of the GROMACS molecular simulation package.
+#
+# Copyright (c) 2020, 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.
+#
+# GROMACS 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 2.1
+# of the License, or (at your option) any later version.
+#
+# GROMACS 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 GROMACS; if not, see
+# http://www.gnu.org/licenses, or write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+#
+# If you want to redistribute modifications to GROMACS, please
+# consider that scientific software is very special. Version
+# control is crucial - bugs must be traceable. We will be happy to
+# consider code for inclusion in the official distribution, but
+# derived work must not be called official GROMACS. Details are found
+# in the README & COPYING files - if they are missing, get the
+# official version at http://www.gromacs.org.
+#
+# To help us fund GROMACS development, we humbly ask that you cite
+# the research papers on the package. Check out http://www.gromacs.org.
+
+gmx_add_libgromacs_sources(
+    densityfitting.cpp
+    densityfittingamplitudelookup.cpp
+    densityfittingforceprovider.cpp
+    densityfittingoptions.cpp
+    densityfittingoutputprovider.cpp
+    densityfittingparameters.cpp
+    )
+
+if (BUILD_TESTING)
+    add_subdirectory(tests)
+endif()
similarity index 99%
rename from src/gromacs/applied_forces/densityfittingoptions.cpp
rename to src/gromacs/applied_forces/densityfitting/densityfittingoptions.cpp
index 29b69cbbeced09d4fd6c42324c8a7247b8b4fd8d..6be0dbf1bad1ebd48ebd3d1a2f19351cae898bdf 100644 (file)
@@ -43,7 +43,7 @@
 
 #include "densityfittingoptions.h"
 
-#include "gromacs/applied_forces/densityfitting.h"
+#include "gromacs/applied_forces/densityfitting/densityfitting.h"
 #include "gromacs/math/densityfit.h"
 #include "gromacs/options/basicoptions.h"
 #include "gromacs/options/optionsection.h"
similarity index 98%
rename from src/gromacs/applied_forces/densityfittingoptions.h
rename to src/gromacs/applied_forces/densityfitting/densityfittingoptions.h
index 993a94b00e7702ff638fd6a684a44c8a85fb7d6a..be2f65b61974a26672be6d7eb602000bfd135aed 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2019, by the GROMACS development team, led by
+ * Copyright (c) 2019,2020, 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.
similarity index 97%
rename from src/gromacs/applied_forces/densityfittingoutputprovider.cpp
rename to src/gromacs/applied_forces/densityfitting/densityfittingoutputprovider.cpp
index 8b4aebf8f5a1f0247181cfa442763ab823869d20..b7168c79bcb6eae0b0a74d814dbd458719cc512f 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2019, by the GROMACS development team, led by
+ * Copyright (c) 2019,2020, 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.
similarity index 97%
rename from src/gromacs/applied_forces/densityfittingoutputprovider.h
rename to src/gromacs/applied_forces/densityfitting/densityfittingoutputprovider.h
index 6958f4e2fcd3788024002bda58141cdb31f9ab07..9bd165def2268ba5ef618be7b2a9764a30069ebf 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2019, by the GROMACS development team, led by
+ * Copyright (c) 2019,2020, 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.
similarity index 97%
rename from src/gromacs/applied_forces/densityfittingparameters.cpp
rename to src/gromacs/applied_forces/densityfitting/densityfittingparameters.cpp
index ee7a725e4795140b707b98bb810081b0a17be261..906dc25b6edbe26bc0e25a2bbfdebfc689ac7af3 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2019, by the GROMACS development team, led by
+ * Copyright (c) 2019,2020, 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.
similarity index 98%
rename from src/gromacs/applied_forces/densityfittingparameters.h
rename to src/gromacs/applied_forces/densityfitting/densityfittingparameters.h
index 96ec5900b2c8534198ba34c80714488ec41e98f7..17a70545f0836ec2105265778e0f8e1cb0ea2d42 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2019, by the GROMACS development team, led by
+ * Copyright (c) 2019,2020, 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.
diff --git a/src/gromacs/applied_forces/densityfitting/tests/CMakeLists.txt b/src/gromacs/applied_forces/densityfitting/tests/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5d6e61d
--- /dev/null
@@ -0,0 +1,40 @@
+#
+# This file is part of the GROMACS molecular simulation package.
+#
+# Copyright (c) 2020, 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.
+#
+# GROMACS 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 2.1
+# of the License, or (at your option) any later version.
+#
+# GROMACS 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 GROMACS; if not, see
+# http://www.gnu.org/licenses, or write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+#
+# If you want to redistribute modifications to GROMACS, please
+# consider that scientific software is very special. Version
+# control is crucial - bugs must be traceable. We will be happy to
+# consider code for inclusion in the official distribution, but
+# derived work must not be called official GROMACS. Details are found
+# in the README & COPYING files - if they are missing, get the
+# official version at http://www.gromacs.org.
+#
+# To help us fund GROMACS development, we humbly ask that you cite
+# the research papers on the package. Check out http://www.gromacs.org.
+
+gmx_add_unit_test(DensityFittingAppliedForcesUnitTest density_fitting_applied_forces-test
+    CPP_SOURCE_FILES
+        densityfitting.cpp
+        densityfittingoptions.cpp
+        densityfittingamplitudelookup.cpp
+        )
similarity index 98%
rename from src/gromacs/applied_forces/tests/densityfitting.cpp
rename to src/gromacs/applied_forces/densityfitting/tests/densityfitting.cpp
index bc5ae180d944313633f83cd4b28a8f1b75972757..f9b09904e207956a373a2d65b69b05c1208151c5 100644 (file)
@@ -41,7 +41,7 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/applied_forces/densityfitting.h"
+#include "gromacs/applied_forces/densityfitting/densityfitting.h"
 
 #include <gtest/gtest.h>
 
similarity index 98%
rename from src/gromacs/applied_forces/tests/densityfittingamplitudelookup.cpp
rename to src/gromacs/applied_forces/densityfitting/tests/densityfittingamplitudelookup.cpp
index 2cd5125bfcc56220a0b90e03dc2ad7f978cb19d4..d0eeb3a9e3df47523225265a2395f97fc85d05e5 100644 (file)
@@ -41,7 +41,7 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/applied_forces/densityfittingamplitudelookup.h"
+#include "gromacs/applied_forces/densityfitting/densityfittingamplitudelookup.h"
 
 #include <vector>
 
similarity index 99%
rename from src/gromacs/applied_forces/tests/densityfittingoptions.cpp
rename to src/gromacs/applied_forces/densityfitting/tests/densityfittingoptions.cpp
index 6580498ba5caaad19f99c8db98bb0cc8a3df3f2e..54600746e0efd28520721b49e99640d47f9db5e1 100644 (file)
@@ -41,7 +41,7 @@
  */
 #include "gmxpre.h"
 
-#include "gromacs/applied_forces/densityfittingoptions.h"
+#include "gromacs/applied_forces/densityfitting/densityfittingoptions.h"
 
 #include <string>
 #include <vector>
index 7043e3e17d6e76b9296bafa6ff44063c440f4a20..48ff8a85ad5dda7a3d28a1a7b6e390fd7f3d6d7f 100644 (file)
@@ -34,8 +34,5 @@
 
 gmx_add_unit_test(AppliedForcesUnitTest applied_forces-test
     CPP_SOURCE_FILES
-        densityfitting.cpp
-        densityfittingoptions.cpp
-        densityfittingamplitudelookup.cpp
         electricfield.cpp
         )
index a8ff0a0352a6711a847c4d5e8e4e3b05c018a22a..1014a0adde1933fa711ff80d20f16746abd7d021 100644 (file)
@@ -38,8 +38,8 @@
 
 #include <memory>
 
-#include "gromacs/applied_forces/densityfitting.h"
 #include "gromacs/applied_forces/electricfield.h"
+#include "gromacs/applied_forces/densityfitting/densityfitting.h"
 #include "gromacs/imd/imd.h"
 #include "gromacs/mdtypes/iforceprovider.h"
 #include "gromacs/mdtypes/imdmodule.h"