diff --git a/doc/src/Build_extras.rst b/doc/src/Build_extras.rst index 6e2069c0ec..00d1238f04 100644 --- a/doc/src/Build_extras.rst +++ b/doc/src/Build_extras.rst @@ -2074,21 +2074,21 @@ Eigen3 is a template library, so you do not need to build it. .. tab:: Traditional make You can download the Eigen3 library manually if you prefer; follow - the instructions in ``lib/smd/README``. You can also do it in one + the instructions in ``lib/machdyn/README``. You can also do it in one step from the ``lammps/src`` dir, using a command like these, - which simply invokes the ``lib/smd/Install.py`` script with the + which simply invokes the ``lib/machdyn/Install.py`` script with the specified args: .. code-block:: bash - make lib-smd # print help message - make lib-smd args="-b" # download to lib/smd/eigen3 - make lib-smd args="-p /usr/include/eigen3" # use existing Eigen installation in /usr/include/eigen3 + make lib-machdyn # print help message + make lib-machdyn args="-b" # download to lib/machdyn/eigen3 + make lib-machdyn args="-p /usr/include/eigen3" # use existing Eigen installation in /usr/include/eigen3 Note that a symbolic (soft) link named ``includelink`` is created - in ``lib/smd`` to point to the Eigen dir. When LAMMPS builds it + in ``lib/machdyn`` to point to the Eigen dir. When LAMMPS builds it will use this link. You should not need to edit the - ``lib/smd/Makefile.lammps`` file. + ``lib/machdyn/Makefile.lammps`` file. ---------- diff --git a/lib/machdyn/Install.py b/lib/machdyn/Install.py index 8471316401..6d54c14f2a 100644 --- a/lib/machdyn/Install.py +++ b/lib/machdyn/Install.py @@ -31,8 +31,8 @@ checksums = { \ # help message HELP = """ -Syntax from src dir: make lib-smd args="-b" - or: make lib-smd args="-p /usr/include/eigen3" +Syntax from src dir: make lib-machdyn args="-b" + or: make lib-machdyn args="-p /usr/include/eigen3" Syntax from lib dir: python Install.py -b or: python Install.py -p /usr/include/eigen3" @@ -40,8 +40,8 @@ Syntax from lib dir: python Install.py -b Example: -make lib-smd args="-b" # download/build in default lib/smd/eigen-eigen-* -make lib-smd args="-p /usr/include/eigen3" # use existing Eigen installation in /usr/include/eigen3 +make lib-machdyn args="-b" # download/build in default lib/machdyn/eigen-eigen-* +make lib-machdyn args="-p /usr/include/eigen3" # use existing Eigen installation in /usr/include/eigen3 """ pgroup = parser.add_mutually_exclusive_group() @@ -105,7 +105,7 @@ if buildflag: edir = os.path.join(homepath, "eigen-%s" % version) os.rename(edir, eigenpath) -# create link in lib/smd to Eigen src dir +# create link in lib/machdyn to Eigen src dir print("Creating link to Eigen include folder") if os.path.isfile("includelink") or os.path.islink("includelink"): diff --git a/lib/machdyn/README b/lib/machdyn/README index 38a2957648..24a88b5c78 100644 --- a/lib/machdyn/README +++ b/lib/machdyn/README @@ -4,7 +4,7 @@ to use the MACHDYN package in a LAMMPS input script. The Eigen library is available at http://eigen.tuxfamily.org. It's a general C++ template library for linear algebra. -You can type "make lib-smd" from the src directory to see help on how +You can type "make lib-machdyn" from the src directory to see help on how to download build this library via make commands, or you can do the same thing by typing "python Install.py" from within this directory, or you can do it manually by following the instructions below. @@ -12,13 +12,13 @@ or you can do it manually by following the instructions below. Instructions: 1. Download the Eigen tarball at http://eigen.tuxfamily.org and - unpack the tarball either in this /lib/smd directory or somewhere + unpack the tarball either in this lib/machdyn directory or somewhere else on your system. It should unpack with into a directory with a name similar to eigen-eigen-bdd17ee3b1b3. You can rename the directory to just "eigen" if you wish. Note that Eigen is a template library, so you do not have to build it. -2. Create a soft link in this dir (lib/smd) +2. Create a soft link in this dir (lib/machdyn) to the eigen directory. E.g if you unpacked Eigen in this dir: % ln -s eigen-eigen-bdd17ee3b1b3 includelink If you unpacked Eigen somewhere else and renamed