diff --git a/include/ff/cuamoebamod.h b/include/ff/cumodamoeba.h similarity index 100% rename from include/ff/cuamoebamod.h rename to include/ff/cumodamoeba.h diff --git a/include/ff/amoebamod.h b/include/ff/modamoeba.h similarity index 100% rename from include/ff/amoebamod.h rename to include/ff/modamoeba.h diff --git a/include/ff/hippomod.h b/include/ff/modhippo.h similarity index 100% rename from include/ff/hippomod.h rename to include/ff/modhippo.h diff --git a/src/acc/amoeba/empoleewald.cpp b/src/acc/amoeba/empoleewald.cpp index 72a3cae63..f9aab889c 100644 --- a/src/acc/amoeba/empoleewald.cpp +++ b/src/acc/amoeba/empoleewald.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/energy.h" #include "ff/image.h" #include "ff/nblist.h" diff --git a/src/acc/amoeba/empolenonewald.cpp b/src/acc/amoeba/empolenonewald.cpp index a2ee915d2..265af8dfa 100644 --- a/src/acc/amoeba/empolenonewald.cpp +++ b/src/acc/amoeba/empolenonewald.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/energy.h" #include "ff/image.h" #include "ff/nblist.h" diff --git a/src/acc/amoeba/epolarewald.cpp b/src/acc/amoeba/epolarewald.cpp index c5830ac78..3804b32f8 100644 --- a/src/acc/amoeba/epolarewald.cpp +++ b/src/acc/amoeba/epolarewald.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/image.h" #include "ff/nblist.h" diff --git a/src/acc/amoeba/epolarnonewald.cpp b/src/acc/amoeba/epolarnonewald.cpp index 3a7c926cc..d73202568 100644 --- a/src/acc/amoeba/epolarnonewald.cpp +++ b/src/acc/amoeba/epolarnonewald.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/image.h" #include "ff/nblist.h" diff --git a/src/acc/amoeba/fieldewald.cpp b/src/acc/amoeba/fieldewald.cpp index 021293c22..4fbb4e68b 100644 --- a/src/acc/amoeba/fieldewald.cpp +++ b/src/acc/amoeba/fieldewald.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/image.h" #include "ff/nblist.h" diff --git a/src/acc/amoeba/fieldnonewald.cpp b/src/acc/amoeba/fieldnonewald.cpp index 0cbbc941d..032e7df74 100644 --- a/src/acc/amoeba/fieldnonewald.cpp +++ b/src/acc/amoeba/fieldnonewald.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/image.h" #include "ff/nblist.h" diff --git a/src/acc/amoeba/induce.cpp b/src/acc/amoeba/induce.cpp index 7d09b2ee1..ca09956aa 100644 --- a/src/acc/amoeba/induce.cpp +++ b/src/acc/amoeba/induce.cpp @@ -1,5 +1,5 @@ #include "ff/amoeba/induce.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/image.h" #include "ff/nblist.h" diff --git a/src/acc/amoeba/rotpole.cpp b/src/acc/amoeba/rotpole.cpp index 7e4396135..63b938a93 100644 --- a/src/acc/amoeba/rotpole.cpp +++ b/src/acc/amoeba/rotpole.cpp @@ -1,5 +1,5 @@ #include "seq/rotpole.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "math/libfunc.h" diff --git a/src/acc/amoeba/torque.cpp b/src/acc/amoeba/torque.cpp index 8c912ada3..ee5e8bb91 100644 --- a/src/acc/amoeba/torque.cpp +++ b/src/acc/amoeba/torque.cpp @@ -1,5 +1,5 @@ #include "seq/torque.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "math/libfunc.h" #include "seq/add.h" diff --git a/src/acc/aplus/echgtrn.cpp b/src/acc/aplus/echgtrn.cpp index 1267ca272..02c82c4a8 100644 --- a/src/acc/aplus/echgtrn.cpp +++ b/src/acc/aplus/echgtrn.cpp @@ -1,6 +1,6 @@ #include "ff/atom.h" #include "ff/elec.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/image.h" #include "ff/nblist.h" #include "ff/switch.h" diff --git a/src/acc/aplus/empole.cpp b/src/acc/aplus/empole.cpp index 3b26d212f..f2ae8f156 100644 --- a/src/acc/aplus/empole.cpp +++ b/src/acc/aplus/empole.cpp @@ -1,6 +1,6 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/image.h" #include "ff/nblist.h" #include "ff/pme.h" diff --git a/src/acc/aplus/epolar.cpp b/src/acc/aplus/epolar.cpp index a5c10fcb7..7ee5fe5fe 100644 --- a/src/acc/aplus/epolar.cpp +++ b/src/acc/aplus/epolar.cpp @@ -1,6 +1,6 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/image.h" #include "ff/nblist.h" #include "ff/pme.h" diff --git a/src/acc/aplus/field.cpp b/src/acc/aplus/field.cpp index c0a6d668e..1e42a5963 100644 --- a/src/acc/aplus/field.cpp +++ b/src/acc/aplus/field.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/image.h" #include "ff/nblist.h" diff --git a/src/acc/aplus/induce.cpp b/src/acc/aplus/induce.cpp index 2a32e9bad..27fa42e50 100644 --- a/src/acc/aplus/induce.cpp +++ b/src/acc/aplus/induce.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/image.h" #include "ff/nblist.h" diff --git a/src/acc/hippo/cflux.cpp b/src/acc/hippo/cflux.cpp index 6e496656d..db2ccce9d 100644 --- a/src/acc/hippo/cflux.cpp +++ b/src/acc/hippo/cflux.cpp @@ -1,8 +1,8 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/evalence.h" #include "ff/hippo/cflux.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "math/libfunc.h" #include "seq/add.h" #include "tool/darray.h" diff --git a/src/acc/hippo/echgtrn.cpp b/src/acc/hippo/echgtrn.cpp index 2049e7a8d..6d29dd862 100644 --- a/src/acc/hippo/echgtrn.cpp +++ b/src/acc/hippo/echgtrn.cpp @@ -1,6 +1,6 @@ #include "ff/atom.h" #include "ff/elec.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/image.h" #include "ff/nblist.h" #include "ff/switch.h" diff --git a/src/acc/hippo/empole.cpp b/src/acc/hippo/empole.cpp index 579909eea..7f5fd3f7b 100644 --- a/src/acc/hippo/empole.cpp +++ b/src/acc/hippo/empole.cpp @@ -1,6 +1,6 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/image.h" #include "ff/nblist.h" #include "ff/pme.h" diff --git a/src/acc/hippo/epolar.cpp b/src/acc/hippo/epolar.cpp index 84146d5a3..ddfa318fe 100644 --- a/src/acc/hippo/epolar.cpp +++ b/src/acc/hippo/epolar.cpp @@ -1,6 +1,6 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/image.h" #include "ff/nblist.h" #include "ff/pme.h" diff --git a/src/acc/hippo/erepel.cpp b/src/acc/hippo/erepel.cpp index 83fba5ee4..2d4941c74 100644 --- a/src/acc/hippo/erepel.cpp +++ b/src/acc/hippo/erepel.cpp @@ -1,5 +1,5 @@ #include "ff/hippo/erepel.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/image.h" #include "ff/nblist.h" diff --git a/src/acc/hippo/expol.cpp b/src/acc/hippo/expol.cpp index 50b87171e..056df646d 100644 --- a/src/acc/hippo/expol.cpp +++ b/src/acc/hippo/expol.cpp @@ -1,7 +1,7 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/elec.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/image.h" #include "ff/nblist.h" #include "ff/switch.h" diff --git a/src/acc/hippo/field.cpp b/src/acc/hippo/field.cpp index f3a8b24e5..0e37dc50c 100644 --- a/src/acc/hippo/field.cpp +++ b/src/acc/hippo/field.cpp @@ -1,6 +1,6 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/image.h" #include "ff/nblist.h" #include "ff/pme.h" diff --git a/src/acc/hippo/induce.cpp b/src/acc/hippo/induce.cpp index 2585c6795..cd547d65a 100644 --- a/src/acc/hippo/induce.cpp +++ b/src/acc/hippo/induce.cpp @@ -1,8 +1,8 @@ #include "ff/amoeba/induce.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/hippo/induce.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/image.h" #include "ff/nblist.h" #include "ff/switch.h" diff --git a/src/acc/osrw.cpp b/src/acc/osrw.cpp index 01aac6f01..534fc5040 100644 --- a/src/acc/osrw.cpp +++ b/src/acc/osrw.cpp @@ -1,5 +1,5 @@ #include "md/osrw.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/echarge.h" #include "ff/evalence.h" diff --git a/src/acc/pme.cpp b/src/acc/pme.cpp index 4c4605129..7be034106 100644 --- a/src/acc/pme.cpp +++ b/src/acc/pme.cpp @@ -1,5 +1,5 @@ #include "ff/pme.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/box.h" #include "ff/elec.h" diff --git a/src/amoeba/emplar.cpp b/src/amoeba/emplar.cpp index 88d4fc8d6..328a4ccba 100644 --- a/src/amoeba/emplar.cpp +++ b/src/amoeba/emplar.cpp @@ -1,5 +1,5 @@ #include "ff/amoeba/empole.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/energy.h" #include "math/zero.h" #include "tool/externfunc.h" diff --git a/src/amoeba/empole.cpp b/src/amoeba/empole.cpp index 1cea3f687..6d73d1c5e 100644 --- a/src/amoeba/empole.cpp +++ b/src/amoeba/empole.cpp @@ -1,5 +1,5 @@ #include "ff/amoeba/empole.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/elec.h" #include "ff/energy.h" #include "ff/hippo/empole.h" diff --git a/src/amoeba/epolar.cpp b/src/amoeba/epolar.cpp index 6280f7032..de08ed6dd 100644 --- a/src/amoeba/epolar.cpp +++ b/src/amoeba/epolar.cpp @@ -1,7 +1,7 @@ #include "ff/amoeba/epolar.h" #include "ff/amoeba/empole.h" #include "ff/amoeba/induce.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/hippo/epolar.h" #include "ff/elec.h" #include "ff/energy.h" diff --git a/src/amoeba/induce.cpp b/src/amoeba/induce.cpp index bc8de67a2..4675d280d 100644 --- a/src/amoeba/induce.cpp +++ b/src/amoeba/induce.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/nblist.h" #include "ff/potent.h" diff --git a/src/amoeba/mpole.cpp b/src/amoeba/mpole.cpp index b9161258f..1f7206dd5 100644 --- a/src/amoeba/mpole.cpp +++ b/src/amoeba/mpole.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/elec.h" #include "ff/pme.h" diff --git a/src/cu/amoeba/binding.cu b/src/cu/amoeba/binding.cu index 851dbc96b..729a8b034 100644 --- a/src/cu/amoeba/binding.cu +++ b/src/cu/amoeba/binding.cu @@ -1,5 +1,5 @@ -#include "ff/amoebamod.h" -#include "ff/cuamoebamod.h" +#include "ff/modamoeba.h" +#include "ff/cumodamoeba.h" #include "ff/potent.h" #include "tool/cudalib.h" #include "tool/darray.h" diff --git a/src/cu/amoeba/emplar.cu b/src/cu/amoeba/emplar.cu index 736a9526b..9d07c2ec5 100644 --- a/src/cu/amoeba/emplar.cu +++ b/src/cu/amoeba/emplar.cu @@ -1,8 +1,8 @@ #include "ff/amoeba/empole.h" #include "ff/amoeba/epolar.h" #include "ff/amoeba/induce.h" -#include "ff/amoebamod.h" -#include "ff/cuamoebamod.h" +#include "ff/modamoeba.h" +#include "ff/cumodamoeba.h" #include "ff/elec.h" #include "ff/image.h" #include "ff/pme.h" diff --git a/src/cu/amoeba/empole.cu b/src/cu/amoeba/empole.cu index 0b2bab711..eed092671 100644 --- a/src/cu/amoeba/empole.cu +++ b/src/cu/amoeba/empole.cu @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/image.h" #include "ff/pme.h" #include "ff/spatial.h" diff --git a/src/cu/amoeba/epolar.cu b/src/cu/amoeba/epolar.cu index 13652524f..de9558c92 100644 --- a/src/cu/amoeba/epolar.cu +++ b/src/cu/amoeba/epolar.cu @@ -1,5 +1,5 @@ -#include "ff/amoebamod.h" -#include "ff/cuamoebamod.h" +#include "ff/modamoeba.h" +#include "ff/cumodamoeba.h" #include "ff/image.h" #include "ff/pme.h" #include "ff/spatial.h" diff --git a/src/cu/amoeba/field.cu b/src/cu/amoeba/field.cu index 4021269ef..326c467c4 100644 --- a/src/cu/amoeba/field.cu +++ b/src/cu/amoeba/field.cu @@ -1,5 +1,5 @@ -#include "ff/amoebamod.h" -#include "ff/cuamoebamod.h" +#include "ff/modamoeba.h" +#include "ff/cumodamoeba.h" #include "ff/image.h" #include "ff/pme.h" #include "ff/spatial.h" diff --git a/src/cu/amoeba/pcg.cu b/src/cu/amoeba/pcg.cu index c239b442d..77c07e934 100644 --- a/src/cu/amoeba/pcg.cu +++ b/src/cu/amoeba/pcg.cu @@ -1,5 +1,5 @@ #include "ff/amoeba/induce.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/cuinduce.h" #include "ff/switch.h" #include "seq/launch.h" diff --git a/src/cu/amoeba/precond.cu b/src/cu/amoeba/precond.cu index 30302c8f2..61b73e5a1 100644 --- a/src/cu/amoeba/precond.cu +++ b/src/cu/amoeba/precond.cu @@ -1,5 +1,5 @@ -#include "ff/amoebamod.h" -#include "ff/cuamoebamod.h" +#include "ff/modamoeba.h" +#include "ff/cumodamoeba.h" #include "ff/image.h" #include "ff/spatial.h" #include "ff/switch.h" diff --git a/src/cu/amoeba/rotpole.cu b/src/cu/amoeba/rotpole.cu index 7245a8a52..3d71bc9dc 100644 --- a/src/cu/amoeba/rotpole.cu +++ b/src/cu/amoeba/rotpole.cu @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "seq/launch.h" #include "seq/rotpole.h" diff --git a/src/cu/amoeba/torque.cu b/src/cu/amoeba/torque.cu index 0bb3a5b67..046d47011 100644 --- a/src/cu/amoeba/torque.cu +++ b/src/cu/amoeba/torque.cu @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "math/libfunc.h" #include "seq/add.h" #include "seq/launch.h" diff --git a/src/cu/cumod.cu b/src/cu/cumod.cu index 98b0391bc..eaab27b79 100644 --- a/src/cu/cumod.cu +++ b/src/cu/cumod.cu @@ -1,3 +1,3 @@ #define TINKER_EXTERN_DEFINITION_FILE 1 -#include "ff/cuamoebamod.h" +#include "ff/cumodamoeba.h" diff --git a/src/cu/diagprecond.cu b/src/cu/diagprecond.cu index 8349e6e5c..b6e2e2217 100644 --- a/src/cu/diagprecond.cu +++ b/src/cu/diagprecond.cu @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "seq/launch.h" namespace tinker { diff --git a/src/cu/epolarrecip.cu b/src/cu/epolarrecip.cu index 142540370..970e679d8 100644 --- a/src/cu/epolarrecip.cu +++ b/src/cu/epolarrecip.cu @@ -1,6 +1,6 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/elec.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/pme.h" #include "seq/add.h" #include "seq/launch.h" diff --git a/src/cu/hippo/cflux.cu b/src/cu/hippo/cflux.cu index 868cafb72..e5827fe09 100644 --- a/src/cu/hippo/cflux.cu +++ b/src/cu/hippo/cflux.cu @@ -1,6 +1,6 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/evalence.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "math/zero.h" #include "seq/add.h" #include "seq/launch.h" diff --git a/src/cu/hippo/echgtrn.cu b/src/cu/hippo/echgtrn.cu index bb7eae7d2..b172e2ece 100644 --- a/src/cu/hippo/echgtrn.cu +++ b/src/cu/hippo/echgtrn.cu @@ -1,5 +1,5 @@ #include "ff/elec.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/image.h" #include "ff/spatial.h" #include "ff/switch.h" diff --git a/src/cu/hippo/empole.cu b/src/cu/hippo/empole.cu index d01f60331..0889ae59f 100644 --- a/src/cu/hippo/empole.cu +++ b/src/cu/hippo/empole.cu @@ -1,5 +1,5 @@ -#include "ff/amoebamod.h" -#include "ff/hippomod.h" +#include "ff/modamoeba.h" +#include "ff/modhippo.h" #include "ff/image.h" #include "ff/pme.h" #include "ff/spatial.h" diff --git a/src/cu/hippo/epolar.cu b/src/cu/hippo/epolar.cu index 45db4677f..d36744dfa 100644 --- a/src/cu/hippo/epolar.cu +++ b/src/cu/hippo/epolar.cu @@ -1,5 +1,5 @@ -#include "ff/amoebamod.h" -#include "ff/hippomod.h" +#include "ff/modamoeba.h" +#include "ff/modhippo.h" #include "ff/image.h" #include "ff/pme.h" #include "ff/spatial.h" diff --git a/src/cu/hippo/erepel.cu b/src/cu/hippo/erepel.cu index b661df5a5..e028b89a7 100644 --- a/src/cu/hippo/erepel.cu +++ b/src/cu/hippo/erepel.cu @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/hippo/erepel.h" #include "ff/image.h" #include "ff/spatial.h" diff --git a/src/cu/hippo/expol.cu b/src/cu/hippo/expol.cu index ce0b439a5..0388df879 100644 --- a/src/cu/hippo/expol.cu +++ b/src/cu/hippo/expol.cu @@ -1,6 +1,6 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/elec.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/image.h" #include "ff/spatial.h" #include "ff/switch.h" @@ -99,7 +99,6 @@ void dexpol_cu(int vers, const real (*uind)[3], grad_prec* depx, grad_prec* depy #include "ff/cuinduce.h" #include "ff/hippo/expol.h" #include "ff/hippo/induce.h" -#include "ff/hippomod.h" #include "tool/error.h" #include "tool/ioprint.h" #include diff --git a/src/cu/hippo/field.cu b/src/cu/hippo/field.cu index bfa88ee99..ff464ab19 100644 --- a/src/cu/hippo/field.cu +++ b/src/cu/hippo/field.cu @@ -1,5 +1,5 @@ -#include "ff/amoebamod.h" -#include "ff/hippomod.h" +#include "ff/modamoeba.h" +#include "ff/modhippo.h" #include "ff/image.h" #include "ff/pme.h" #include "ff/spatial.h" diff --git a/src/cu/hippo/pcg.cu b/src/cu/hippo/pcg.cu index a1f92c2d8..08e8d9363 100644 --- a/src/cu/hippo/pcg.cu +++ b/src/cu/hippo/pcg.cu @@ -1,5 +1,5 @@ #include "ff/amoeba/induce.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/cuinduce.h" #include "ff/hippo/induce.h" #include "ff/switch.h" diff --git a/src/cu/hippo/precond.cu b/src/cu/hippo/precond.cu index 8703482d0..b73827156 100644 --- a/src/cu/hippo/precond.cu +++ b/src/cu/hippo/precond.cu @@ -1,5 +1,5 @@ -#include "ff/amoebamod.h" -#include "ff/hippomod.h" +#include "ff/modamoeba.h" +#include "ff/modhippo.h" #include "ff/image.h" #include "ff/spatial.h" #include "ff/switch.h" diff --git a/src/cu/pme.cu b/src/cu/pme.cu index e19795260..41af19092 100644 --- a/src/cu/pme.cu +++ b/src/cu/pme.cu @@ -1,5 +1,5 @@ #include "ff/amoeba/empole.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/box.h" #include "ff/elec.h" #include "ff/pme.h" diff --git a/src/cu/upredict.cu b/src/cu/upredict.cu index b44b8a77a..d8762df70 100644 --- a/src/cu/upredict.cu +++ b/src/cu/upredict.cu @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "seq/launch.h" namespace tinker { diff --git a/src/elec.cpp b/src/elec.cpp index 07f5e41fd..1a13129dc 100644 --- a/src/elec.cpp +++ b/src/elec.cpp @@ -1,8 +1,8 @@ #include "ff/elec.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/echarge.h" #include "ff/energy.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/potent.h" #include "tool/iofortstr.h" #include diff --git a/src/hippo/cflux.cpp b/src/hippo/cflux.cpp index b4da92061..f3b2cd38a 100644 --- a/src/hippo/cflux.cpp +++ b/src/hippo/cflux.cpp @@ -1,6 +1,6 @@ #include "ff/atom.h" #include "ff/evalence.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/potent.h" #include "tool/darray.h" #include "tool/externfunc.h" diff --git a/src/hippo/echgtrn.cpp b/src/hippo/echgtrn.cpp index 1807abe43..d76ab5121 100644 --- a/src/hippo/echgtrn.cpp +++ b/src/hippo/echgtrn.cpp @@ -1,5 +1,5 @@ #include "ff/energy.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/potent.h" #include "math/zero.h" #include "tool/externfunc.h" diff --git a/src/hippo/empole.cpp b/src/hippo/empole.cpp index d7c7aa239..7c7b86474 100644 --- a/src/hippo/empole.cpp +++ b/src/hippo/empole.cpp @@ -1,10 +1,10 @@ #include "ff/amoeba/empole.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/elec.h" #include "ff/energy.h" #include "ff/hippo/cflux.h" #include "ff/hippo/empole.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/potent.h" #include "math/zero.h" #include "tool/externfunc.h" diff --git a/src/hippo/epolar.cpp b/src/hippo/epolar.cpp index 0be8eea48..d3e0eadb2 100644 --- a/src/hippo/epolar.cpp +++ b/src/hippo/epolar.cpp @@ -1,6 +1,6 @@ #include "ff/amoeba/epolar.h" #include "ff/amoeba/empole.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/elec.h" #include "ff/energy.h" #include "ff/hippo/cflux.h" diff --git a/src/hippo/erepel.cpp b/src/hippo/erepel.cpp index d232d44ae..f8a238017 100644 --- a/src/hippo/erepel.cpp +++ b/src/hippo/erepel.cpp @@ -1,6 +1,6 @@ #include "ff/hippo/erepel.h" #include "ff/amoeba/empole.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/energy.h" #include "ff/hippo/erepel.h" #include "ff/potent.h" diff --git a/src/hippo/expol.cpp b/src/hippo/expol.cpp index 39f3cebb6..5dedbd453 100644 --- a/src/hippo/expol.cpp +++ b/src/hippo/expol.cpp @@ -1,7 +1,7 @@ #include "ff/hippo/expol.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "tool/darray.h" #include "tool/iofortstr.h" #include diff --git a/src/md/osrw.cpp b/src/md/osrw.cpp index 50194fab3..c83841f1a 100644 --- a/src/md/osrw.cpp +++ b/src/md/osrw.cpp @@ -1,10 +1,10 @@ #include "md/osrw.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/echarge.h" #include "ff/energy.h" #include "ff/evalence.h" #include "ff/evdw.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/potent.h" #include "math/zero.h" #include "tool/argkey.h" diff --git a/src/mdsave.cpp b/src/mdsave.cpp index b8e1b06a5..91d7f4986 100644 --- a/src/mdsave.cpp +++ b/src/mdsave.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/energy.h" #include "ff/potent.h" #include "md/misc.h" diff --git a/src/mod.cpp b/src/mod.cpp index 497023061..48e491adc 100644 --- a/src/mod.cpp +++ b/src/mod.cpp @@ -1,6 +1,6 @@ #define TINKER_EXTERN_DEFINITION_FILE 1 -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/box.h" #include "ff/echarge.h" @@ -12,7 +12,7 @@ #include "ff/evdw.h" #include "ff/hippo/edisp.h" #include "ff/hippo/erepel.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/molecule.h" #include "ff/nblist.h" #include "ff/pme.h" diff --git a/src/nblist.cpp b/src/nblist.cpp index e0584af4b..af0f28e30 100644 --- a/src/nblist.cpp +++ b/src/nblist.cpp @@ -1,5 +1,5 @@ #include "ff/nblist.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/atom.h" #include "ff/echarge.h" #include "ff/echglj.h" @@ -7,7 +7,7 @@ #include "ff/evdw.h" #include "ff/hippo/edisp.h" #include "ff/hippo/erepel.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/potent.h" #include "ff/spatial.h" #include "ff/switch.h" diff --git a/src/xanalyze.cpp b/src/xanalyze.cpp index 66055b6bc..de8c358fa 100644 --- a/src/xanalyze.cpp +++ b/src/xanalyze.cpp @@ -1,6 +1,6 @@ #include "ff/amoeba/empole.h" #include "ff/amoeba/induce.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/echarge.h" #include "ff/energy.h" #include "ff/evalence.h" @@ -8,7 +8,7 @@ #include "ff/hippo/edisp.h" #include "ff/hippo/erepel.h" #include "ff/hippo/induce.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "ff/nblist.h" #include "ff/potent.h" #include "ff/rwcrd.h" diff --git a/test/aplusliquid.cpp b/test/aplusliquid.cpp index 891b5f475..4bca6d367 100644 --- a/test/aplusliquid.cpp +++ b/test/aplusliquid.cpp @@ -1,6 +1,6 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/evdw.h" -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "test.h" #include "testrt.h" diff --git a/test/chgtrn.cpp b/test/chgtrn.cpp index 93fc6d68b..0451883c9 100644 --- a/test/chgtrn.cpp +++ b/test/chgtrn.cpp @@ -1,4 +1,4 @@ -#include "ff/hippomod.h" +#include "ff/modhippo.h" #include "test.h" #include "testrt.h" diff --git a/test/emhippo.cpp b/test/emhippo.cpp index 9b1aa51f3..34f8b7c78 100644 --- a/test/emhippo.cpp +++ b/test/emhippo.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "test.h" #include "testrt.h" diff --git a/test/ephippo.cpp b/test/ephippo.cpp index 8dbf67049..0e57b840a 100644 --- a/test/ephippo.cpp +++ b/test/ephippo.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "test.h" #include "testrt.h" diff --git a/test/expol.cpp b/test/expol.cpp index fc08454a4..1999ba373 100644 --- a/test/expol.cpp +++ b/test/expol.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "test.h" #include "testrt.h" diff --git a/test/localframe.cpp b/test/localframe.cpp index de46278fe..6a9fc2c8d 100644 --- a/test/localframe.cpp +++ b/test/localframe.cpp @@ -1,7 +1,7 @@ #include "ff/amoeba/empole.h" #include "ff/amoeba/epolar.h" #include "ff/amoeba/induce.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include #include diff --git a/test/localframe3.cpp b/test/localframe3.cpp index 53d143863..91044bd22 100644 --- a/test/localframe3.cpp +++ b/test/localframe3.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "test.h" #include "testrt.h" diff --git a/test/nacl.cpp b/test/nacl.cpp index 2e158ee11..effaac84c 100644 --- a/test/nacl.cpp +++ b/test/nacl.cpp @@ -1,4 +1,4 @@ -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/evdw.h" #include "test.h" diff --git a/test/osrw.cpp b/test/osrw.cpp index 513665257..062b06f4d 100644 --- a/test/osrw.cpp +++ b/test/osrw.cpp @@ -1,5 +1,5 @@ #include "md/osrw.h" -#include "ff/amoebamod.h" +#include "ff/modamoeba.h" #include "ff/evdw.h" #include "test.h"