From 5a6226caa5a4b6c347733b5d67ad33f33baf8bc7 Mon Sep 17 00:00:00 2001
From: Steve Plimpton <sjplimp@sandia.gov>
Date: Tue, 25 Sep 2018 10:50:43 -0600
Subject: [PATCH] jive src headers with doc page entries and example scripts
---
....txt => compute_smd_triangle_vertices.txt} | 6 +-
doc/src/compute_spin.txt | 13 ++---
doc/src/fix_msst.txt | 2 +-
doc/src/fix_nve_awpmd.txt | 56 +++++++++++++++++++
doc/src/fix_poems.txt | 2 +-
doc/src/pair_body_nparticle.txt | 2 +-
doc/src/pair_buck6d_coul_gauss.txt | 4 +-
doc/src/pair_lj_expand.txt | 23 ++++++--
doc/src/pair_meam_spline.txt | 4 +-
doc/src/pair_meam_sw_spline.txt | 4 +-
doc/src/pair_sdk.txt | 14 +++--
doc/src/pair_spin_magelec.txt | 8 +--
doc/src/pair_spin_neel.txt | 36 ++++++------
examples/SPIN/bfo/in.spin.bfo | 2 +-
examples/SPIN/cobalt_fcc/in.spin.cobalt_fcc | 2 +-
examples/SPIN/cobalt_hcp/in.spin.cobalt_hcp | 2 +-
examples/SPIN/iron/in.spin.iron | 2 +-
examples/SPIN/nickel/in.spin.nickel | 2 +-
examples/SPIN/read_restart/in.spin.read_data | 2 +-
examples/SPIN/read_restart/in.spin.restart | 2 +-
.../SPIN/read_restart/in.spin.write_restart | 2 +-
.../fluid_structure_interaction.lmp | 2 +-
src/PYTHON/fix_python_invoke.h | 2 +-
src/SPIN/compute_spin.h | 2 +-
src/SPIN/pair_spin.h | 7 ---
....cpp => compute_smd_triangle_vertices.cpp} | 0
...ices.h => compute_smd_triangle_vertices.h} | 0
src/USER-SMD/compute_smd_vol.h | 2 +-
src/USER-SMD/fix_smd_setvel.h | 6 +-
29 files changed, 140 insertions(+), 71 deletions(-)
rename doc/src/{compute_smd_triangle_mesh_vertices.txt => compute_smd_triangle_vertices.txt} (91%)
create mode 100644 doc/src/fix_nve_awpmd.txt
rename src/USER-SMD/{compute_smd_triangle_mesh_vertices.cpp => compute_smd_triangle_vertices.cpp} (100%)
rename src/USER-SMD/{compute_smd_triangle_mesh_vertices.h => compute_smd_triangle_vertices.h} (100%)
diff --git a/doc/src/compute_smd_triangle_mesh_vertices.txt b/doc/src/compute_smd_triangle_vertices.txt
similarity index 91%
rename from doc/src/compute_smd_triangle_mesh_vertices.txt
rename to doc/src/compute_smd_triangle_vertices.txt
index cd1f8fdd9b..487b1b590b 100644
--- a/doc/src/compute_smd_triangle_mesh_vertices.txt
+++ b/doc/src/compute_smd_triangle_vertices.txt
@@ -6,14 +6,14 @@
:line
-compute smd/triangle/mesh/vertices :h3
+compute smd/triangle/vertices command :h3
[Syntax:]
-compute ID group-ID smd/triangle/mesh/vertices :pre
+compute ID group-ID smd/triangle/vertices :pre
ID, group-ID are documented in "compute"_compute.html command
-smd/triangle/mesh/vertices = style name of this compute command :ul
+smd/triangle/vertices = style name of this compute command :ul
[Examples:]
diff --git a/doc/src/compute_spin.txt b/doc/src/compute_spin.txt
index e6185a2dd8..4edecc2408 100644
--- a/doc/src/compute_spin.txt
+++ b/doc/src/compute_spin.txt
@@ -10,14 +10,14 @@ compute spin command :h3
[Syntax:]
-compute ID group-ID compute/spin :pre
+compute ID group-ID spin :pre
ID, group-ID are documented in "compute"_compute.html command
-compute/spin = style name of this compute command :ul
+spin = style name of this compute command :ul
[Examples:]
-compute out_mag all compute/spin :pre
+compute out_mag all spin :pre
[Description:]
@@ -26,7 +26,8 @@ of atoms having spins.
This compute calculates 6 magnetic quantities.
-The three first quantities are the x,y and z coordinates of the total magnetization.
+The three first quantities are the x,y and z coordinates of the total
+magnetization.
The fourth quantity is the norm of the total magnetization.
@@ -39,7 +40,7 @@ The simplest way to output the results of the compute spin calculation
is to define some of the quantities as variables, and to use the thermo and
thermo_style commands, for example:
-compute out_mag all compute/spin :pre
+compute out_mag all spin :pre
variable mag_z equal c_out_mag\[3\]
variable mag_norm equal c_out_mag\[4\]
@@ -53,7 +54,6 @@ the total magnetization, and the magnetic temperature. Three variables are
assigned to those quantities. The thermo and thermo_style commands print them
every 10 timesteps.
-
[Output info:]
The array values are "intensive". The array values will be in
@@ -68,7 +68,6 @@ has to be "spin" for this compute to be valid.
[Related commands:] none
-
[Default:] none
:line
diff --git a/doc/src/fix_msst.txt b/doc/src/fix_msst.txt
index e31f61e5f7..7f0e5512ae 100644
--- a/doc/src/fix_msst.txt
+++ b/doc/src/fix_msst.txt
@@ -6,7 +6,7 @@
:line
- fix msst command :h3
+fix msst command :h3
[Syntax:]
diff --git a/doc/src/fix_nve_awpmd.txt b/doc/src/fix_nve_awpmd.txt
new file mode 100644
index 0000000000..c266d46eee
--- /dev/null
+++ b/doc/src/fix_nve_awpmd.txt
@@ -0,0 +1,56 @@
+"LAMMPS WWW Site"_lws - "LAMMPS Documentation"_ld - "LAMMPS Commands"_lc :c
+
+:link(lws,http://lammps.sandia.gov)
+:link(ld,Manual.html)
+:link(lc,Commands_all.html)
+
+:line
+
+fix nve/awpmd command :h3
+
+[Syntax:]
+
+fix ID group-ID nve/awpmd :pre
+
+ID, group-ID are documented in "fix"_fix.html command
+nve/awpmd = style name of this fix command :ul
+
+[Examples:]
+
+fix 1 all nve/awpmd :pre
+
+[Description:]
+
+Perform constant NVE integration to update position and velocity for
+nuclei and electrons in the group for the "Antisymmetrized Wave Packet
+Molecular Dynamics"_pair_awpmd.html model. V is volume; E is energy.
+This creates a system trajectory consistent with the microcanonical
+ensemble.
+
+The operation of this fix is exactly like that described by the "fix
+nve"_fix_nve.html command, except that the width and width-velocity of
+the electron wavefunctions are also updated.
+
+:line
+
+[Restart, fix_modify, output, run start/stop, minimize info:]
+
+No information about this fix is written to "binary restart
+files"_restart.html. None of the "fix_modify"_fix_modify.html options
+are relevant to this fix. No global or per-atom quantities are stored
+by this fix for access by various "output commands"_Howto_output.html.
+No parameter of this fix can be used with the {start/stop} keywords of
+the "run"_run.html command. This fix is not invoked during "energy
+minimization"_minimize.html.
+
+[Restrictions:]
+
+This fix is part of the USER-AWPMD package. It is only enabled if
+LAMMPS was built with that package. See the "Build
+package"_Build_package.html doc page for more info.
+
+[Related commands:]
+
+"fix nve"_fix_nve.html
+
+[Default:] none
diff --git a/doc/src/fix_poems.txt b/doc/src/fix_poems.txt
index 52ab0ca44d..8fe793ce7f 100644
--- a/doc/src/fix_poems.txt
+++ b/doc/src/fix_poems.txt
@@ -6,7 +6,7 @@
:line
-fix poems :h3
+fix poems command :h3
Syntax:
diff --git a/doc/src/pair_body_nparticle.txt b/doc/src/pair_body_nparticle.txt
index 158eb68ca8..7d841119ca 100644
--- a/doc/src/pair_body_nparticle.txt
+++ b/doc/src/pair_body_nparticle.txt
@@ -6,7 +6,7 @@
:line
-pair_style body command :h3
+pair_style body/nparticle command :h3
[Syntax:]
diff --git a/doc/src/pair_buck6d_coul_gauss.txt b/doc/src/pair_buck6d_coul_gauss.txt
index d9780e0320..21de3330f4 100644
--- a/doc/src/pair_buck6d_coul_gauss.txt
+++ b/doc/src/pair_buck6d_coul_gauss.txt
@@ -6,8 +6,8 @@
:line
-pair_style buck6d/coul/gauss/dsf :h3
-pair_style buck6d/coul/gauss/long :h3
+pair_style buck6d/coul/gauss/dsf command :h3
+pair_style buck6d/coul/gauss/long command :h3
[Syntax:]
diff --git a/doc/src/pair_lj_expand.txt b/doc/src/pair_lj_expand.txt
index d26c88e4f7..f37cb0fb83 100644
--- a/doc/src/pair_lj_expand.txt
+++ b/doc/src/pair_lj_expand.txt
@@ -9,6 +9,8 @@
pair_style lj/expand command :h3
pair_style lj/expand/gpu command :h3
pair_style lj/expand/omp command :h3
+pair_style lj/expand/coul/long command :h3
+pair_style lj/expand/coul/long/gpu command :h3
[Syntax:]
@@ -22,6 +24,11 @@ pair_style lj/expand 2.5
pair_coeff * * 1.0 1.0 0.5
pair_coeff 1 1 1.0 1.0 -0.2 2.0 :pre
+pair_style lj/expand/coul/long 2.5
+pair_style lj/expand/coul/long 2.5 4.0
+pair_coeff * * 1.0 1.0 0.5
+pair_coeff 1 1 1.0 1.0 -0.2 3.0 :pre
+
[Description:]
Style {lj/expand} computes a LJ interaction with a distance shifted by
@@ -34,11 +41,12 @@ formula:
Rc is the cutoff which does not include the delta distance. I.e. the
actual force cutoff is the sum of cutoff + delta.
-The following coefficients must be defined for each pair of atoms
-types via the "pair_coeff"_pair_coeff.html command as in the examples
-above, or in the data file or restart files read by the
-"read_data"_read_data.html or "read_restart"_read_restart.html
-commands, or by mixing as described below:
+For all of the {lj/expand} pair styles, the following coefficients must
+be defined for each pair of atoms types via the
+"pair_coeff"_pair_coeff.html command as in the examples above, or in
+the data file or restart files read by the "read_data"_read_data.html
+or "read_restart"_read_restart.html commands, or by mixing as
+described below:
epsilon (energy units)
sigma (distance units)
@@ -48,6 +56,11 @@ cutoff (distance units) :ul
The delta values can be positive or negative. The last coefficient is
optional. If not specified, the global LJ cutoff is used.
+For {lj/expand/coul/long} only the LJ cutoff can be specified since a
+Coulombic cutoff cannot be specified for an individual I,J type pair.
+All type pairs use the same global Coulombic cutoff specified in the
+pair_style command.
+
:line
Styles with a {gpu}, {intel}, {kk}, {omp}, or {opt} suffix are
diff --git a/doc/src/pair_meam_spline.txt b/doc/src/pair_meam_spline.txt
index df5db81264..74adba2432 100644
--- a/doc/src/pair_meam_spline.txt
+++ b/doc/src/pair_meam_spline.txt
@@ -6,8 +6,8 @@
:line
-pair_style meam/spline :h3
-pair_style meam/spline/omp :h3
+pair_style meam/spline command :h3
+pair_style meam/spline/omp command :h3
[Syntax:]
diff --git a/doc/src/pair_meam_sw_spline.txt b/doc/src/pair_meam_sw_spline.txt
index 2e8c26658a..8281315031 100644
--- a/doc/src/pair_meam_sw_spline.txt
+++ b/doc/src/pair_meam_sw_spline.txt
@@ -6,8 +6,8 @@
:line
-pair_style meam/sw/spline :h3
-pair_style meam/sw/spline/omp :h3
+pair_style meam/sw/spline command :h3
+pair_style meam/sw/spline/omp command :h3
[Syntax:]
diff --git a/doc/src/pair_sdk.txt b/doc/src/pair_sdk.txt
index b977aefe88..06a0a42d5a 100644
--- a/doc/src/pair_sdk.txt
+++ b/doc/src/pair_sdk.txt
@@ -13,6 +13,8 @@ pair_style lj/sdk/omp command :h3
pair_style lj/sdk/coul/long command :h3
pair_style lj/sdk/coul/long/gpu command :h3
pair_style lj/sdk/coul/long/omp command :h3
+pair_style lj/sdk/coul/msm command :h3
+pair_style lj/sdk/coul/msm/omp command :h3
[Syntax:]
@@ -35,6 +37,10 @@ pair_style lj/sdk/coul/long 10.0
pair_style lj/sdk/coul/long 10.0 12.0
pair_coeff 1 1 lj9_6 100.0 3.5 12.0 :pre
+pair_style lj/sdk/coul/msm 10.0
+pair_style lj/sdk/coul/msm 10.0 12.0
+pair_coeff 1 1 lj9_6 100.0 3.5 12.0 :pre
+
[Description:]
The {lj/sdk} styles compute a 9/6, 12/4, or 12/6 Lennard-Jones potential,
@@ -75,10 +81,10 @@ and Coulombic interactions for this type pair. If both coefficients
are specified, they are used as the LJ and Coulombic cutoffs for this
type pair.
-For {lj/sdk/coul/long} only the LJ cutoff can be specified since a
-Coulombic cutoff cannot be specified for an individual I,J type pair.
-All type pairs use the same global Coulombic cutoff specified in the
-pair_style command.
+For {lj/sdk/coul/long} and {lj/sdk/coul/msm} only the LJ cutoff can be
+specified since a Coulombic cutoff cannot be specified for an
+individual I,J type pair. All type pairs use the same global
+Coulombic cutoff specified in the pair_style command.
:line
diff --git a/doc/src/pair_spin_magelec.txt b/doc/src/pair_spin_magelec.txt
index f552c56a4b..360f440792 100644
--- a/doc/src/pair_spin_magelec.txt
+++ b/doc/src/pair_spin_magelec.txt
@@ -6,11 +6,11 @@
:line
-pair_style spin/me command :h3
+pair_style spin/magelec command :h3
[Syntax:]
-pair_style spin/me cutoff :pre
+pair_style spin/magelec cutoff :pre
cutoff = global cutoff pair (distance in metal units) :ulb,l
@@ -18,8 +18,8 @@ cutoff = global cutoff pair (distance in metal units) :ulb,l
[Examples:]
-pair_style spin/me 4.5
-pair_coeff * * me 4.5 0.00109 1.0 1.0 1.0 :pre
+pair_style spin/magelec 4.5
+pair_coeff * * magelec 4.5 0.00109 1.0 1.0 1.0 :pre
[Description:]
diff --git a/doc/src/pair_spin_neel.txt b/doc/src/pair_spin_neel.txt
index fe3bb1ad14..7af71021a0 100644
--- a/doc/src/pair_spin_neel.txt
+++ b/doc/src/pair_spin_neel.txt
@@ -29,34 +29,36 @@ between pairs of magnetic spins:
:c,image(Eqs/pair_spin_neel_interaction.jpg)
-where si and sj are two neighboring magnetic spins of two particles,
+where si and sj are two neighboring magnetic spins of two particles,
rij = ri - rj is the inter-atomic distance between the two particles,
-eij = (ri - rj)/|ri-rj| is their normalized separation vector
-and g1, q1 and q2 are three functions defining the intensity of the
-dipolar and quadrupolar contributions, with:
+eij = (ri - rj)/|ri-rj| is their normalized separation vector and g1,
+q1 and q2 are three functions defining the intensity of the dipolar
+and quadrupolar contributions, with:
:c,image(Eqs/pair_spin_neel_functions.jpg)
-With the functions g(rij) and q(rij) defined and fitted according to the same
-Bethe-Slater function used to fit the exchange interaction:
+With the functions g(rij) and q(rij) defined and fitted according to
+the same Bethe-Slater function used to fit the exchange interaction:
:c,image(Eqs/pair_spin_exchange_function.jpg)
-where a, b and d are the three constant coefficients defined in the associated
-"pair_coeff" command.
+where a, b and d are the three constant coefficients defined in the
+associated "pair_coeff" command.
-The coefficients a, b, and d need to be fitted so that the function above matches with
-the values of the magneto-elastic constant of the materials at stake.
+The coefficients a, b, and d need to be fitted so that the function
+above matches with the values of the magneto-elastic constant of the
+materials at stake.
-Examples and more explanations about this function and its parametrization are reported
-in "(Tranchida)"_#Tranchida6. More examples of parametrization will be provided in
-future work.
+Examples and more explanations about this function and its
+parametrization are reported in "(Tranchida)"_#Tranchida6. More
+examples of parametrization will be provided in future work.
-From this DM interaction, each spin i will be submitted to a magnetic torque
-omega and its associated atom to a force F (for spin-lattice calculations only).
+From this DM interaction, each spin i will be submitted to a magnetic
+torque omega and its associated atom to a force F (for spin-lattice
+calculations only).
-More details about the derivation of these torques/forces are reported in
-"(Tranchida)"_#Tranchida6.
+More details about the derivation of these torques/forces are reported
+in "(Tranchida)"_#Tranchida6.
:line
diff --git a/examples/SPIN/bfo/in.spin.bfo b/examples/SPIN/bfo/in.spin.bfo
index de23ba87ba..e3c88b0f06 100644
--- a/examples/SPIN/bfo/in.spin.bfo
+++ b/examples/SPIN/bfo/in.spin.bfo
@@ -36,7 +36,7 @@ fix 3 all nve/spin lattice no
timestep 0.0002
-compute out_mag all compute/spin
+compute out_mag all spin
compute out_pe all pe
compute out_ke all ke
compute out_temp all temp
diff --git a/examples/SPIN/cobalt_fcc/in.spin.cobalt_fcc b/examples/SPIN/cobalt_fcc/in.spin.cobalt_fcc
index fd6833727b..ea98eeba94 100644
--- a/examples/SPIN/cobalt_fcc/in.spin.cobalt_fcc
+++ b/examples/SPIN/cobalt_fcc/in.spin.cobalt_fcc
@@ -40,7 +40,7 @@ timestep 0.0001
# compute and output options
-compute out_mag all compute/spin
+compute out_mag all spin
compute out_pe all pe
compute out_ke all ke
compute out_temp all temp
diff --git a/examples/SPIN/cobalt_hcp/in.spin.cobalt_hcp b/examples/SPIN/cobalt_hcp/in.spin.cobalt_hcp
index 35aa1df86c..3ff0b1cadf 100644
--- a/examples/SPIN/cobalt_hcp/in.spin.cobalt_hcp
+++ b/examples/SPIN/cobalt_hcp/in.spin.cobalt_hcp
@@ -40,7 +40,7 @@ fix 3 all nve/spin lattice yes
timestep 0.0001
-compute out_mag all compute/spin
+compute out_mag all spin
compute out_pe all pe
compute out_ke all ke
compute out_temp all temp
diff --git a/examples/SPIN/iron/in.spin.iron b/examples/SPIN/iron/in.spin.iron
index c2d5082cb6..1db5007dff 100644
--- a/examples/SPIN/iron/in.spin.iron
+++ b/examples/SPIN/iron/in.spin.iron
@@ -37,7 +37,7 @@ timestep 0.0001
# compute and output options
-compute out_mag all compute/spin
+compute out_mag all spin
compute out_pe all pe
compute out_ke all ke
compute out_temp all temp
diff --git a/examples/SPIN/nickel/in.spin.nickel b/examples/SPIN/nickel/in.spin.nickel
index ba447b077f..0ed2fac410 100644
--- a/examples/SPIN/nickel/in.spin.nickel
+++ b/examples/SPIN/nickel/in.spin.nickel
@@ -38,7 +38,7 @@ timestep 0.0001
# compute and output options
-compute out_mag all compute/spin
+compute out_mag all spin
compute out_pe all pe
compute out_ke all ke
compute out_temp all temp
diff --git a/examples/SPIN/read_restart/in.spin.read_data b/examples/SPIN/read_restart/in.spin.read_data
index 80de036661..17343994b5 100644
--- a/examples/SPIN/read_restart/in.spin.read_data
+++ b/examples/SPIN/read_restart/in.spin.read_data
@@ -25,7 +25,7 @@ timestep 0.0001
# define outputs and computes
-compute out_mag all compute/spin
+compute out_mag all spin
compute out_pe all pe
compute out_ke all ke
compute out_temp all temp
diff --git a/examples/SPIN/read_restart/in.spin.restart b/examples/SPIN/read_restart/in.spin.restart
index a1198ccf93..39157fdac4 100644
--- a/examples/SPIN/read_restart/in.spin.restart
+++ b/examples/SPIN/read_restart/in.spin.restart
@@ -29,7 +29,7 @@ timestep 0.0001
# define outputs
-compute out_mag all compute/spin
+compute out_mag all spin
compute out_pe all pe
compute out_ke all ke
compute out_temp all temp
diff --git a/examples/SPIN/read_restart/in.spin.write_restart b/examples/SPIN/read_restart/in.spin.write_restart
index 84fea24611..42f07fd316 100644
--- a/examples/SPIN/read_restart/in.spin.write_restart
+++ b/examples/SPIN/read_restart/in.spin.write_restart
@@ -34,7 +34,7 @@ timestep 0.0001
# compute and output options
-compute out_mag all compute/spin
+compute out_mag all spin
compute out_pe all pe
compute out_ke all ke
compute out_temp all temp
diff --git a/examples/USER/smd/fluid_structure_interaction/fluid_structure_interaction.lmp b/examples/USER/smd/fluid_structure_interaction/fluid_structure_interaction.lmp
index 5100a52d84..0f7d726e21 100644
--- a/examples/USER/smd/fluid_structure_interaction/fluid_structure_interaction.lmp
+++ b/examples/USER/smd/fluid_structure_interaction/fluid_structure_interaction.lmp
@@ -129,7 +129,7 @@ compute contact_radius all smd/contact/radius
compute S solids smd/tlsph/stress
compute nn water smd/ulsph/num/neighs
compute epl solids smd/plastic/strain
-compute vol all smd/volume
+compute vol all smd/vol
compute rho all smd/rho
dump dump_id all custom 100 dump.LAMMPS id type x y &
diff --git a/src/PYTHON/fix_python_invoke.h b/src/PYTHON/fix_python_invoke.h
index c277e295a1..89310eeded 100644
--- a/src/PYTHON/fix_python_invoke.h
+++ b/src/PYTHON/fix_python_invoke.h
@@ -13,8 +13,8 @@
#ifdef FIX_CLASS
-FixStyle(python,FixPythonInvoke)
FixStyle(python/invoke,FixPythonInvoke)
+FixStyle(python,FixPythonInvoke)
#else
diff --git a/src/SPIN/compute_spin.h b/src/SPIN/compute_spin.h
index b57876b7a0..c5d55b84cb 100644
--- a/src/SPIN/compute_spin.h
+++ b/src/SPIN/compute_spin.h
@@ -13,7 +13,7 @@
#ifdef COMPUTE_CLASS
-ComputeStyle(compute/spin,ComputeSpin)
+ComputeStyle(spin,ComputeSpin)
#else
diff --git a/src/SPIN/pair_spin.h b/src/SPIN/pair_spin.h
index 100eec1732..1be8550c65 100644
--- a/src/SPIN/pair_spin.h
+++ b/src/SPIN/pair_spin.h
@@ -11,12 +11,6 @@
See the README file in the top-level LAMMPS directory.
------------------------------------------------------------------------- */
-#ifdef PAIR_CLASS
-
-PairStyle(pair/spin,PairSpin)
-
-#else
-
#ifndef LMP_PAIR_SPIN_H
#define LMP_PAIR_SPIN_H
@@ -46,7 +40,6 @@ friend class FixNVESpin;
}
-#endif
#endif
/* ERROR/WARNING messages:
diff --git a/src/USER-SMD/compute_smd_triangle_mesh_vertices.cpp b/src/USER-SMD/compute_smd_triangle_vertices.cpp
similarity index 100%
rename from src/USER-SMD/compute_smd_triangle_mesh_vertices.cpp
rename to src/USER-SMD/compute_smd_triangle_vertices.cpp
diff --git a/src/USER-SMD/compute_smd_triangle_mesh_vertices.h b/src/USER-SMD/compute_smd_triangle_vertices.h
similarity index 100%
rename from src/USER-SMD/compute_smd_triangle_mesh_vertices.h
rename to src/USER-SMD/compute_smd_triangle_vertices.h
diff --git a/src/USER-SMD/compute_smd_vol.h b/src/USER-SMD/compute_smd_vol.h
index 5525ce57cb..08ad150627 100644
--- a/src/USER-SMD/compute_smd_vol.h
+++ b/src/USER-SMD/compute_smd_vol.h
@@ -25,7 +25,7 @@
#ifdef COMPUTE_CLASS
-ComputeStyle(smd/volume,ComputeSMDVol)
+ComputeStyle(smd/vol,ComputeSMDVol)
#else
diff --git a/src/USER-SMD/fix_smd_setvel.h b/src/USER-SMD/fix_smd_setvel.h
index a3e650e682..f5fc34b4ea 100644
--- a/src/USER-SMD/fix_smd_setvel.h
+++ b/src/USER-SMD/fix_smd_setvel.h
@@ -24,12 +24,12 @@
#ifdef FIX_CLASS
-FixStyle(smd/setvelocity,FixSMDSetVel)
+FixStyle(smd/setvel,FixSMDSetVel)
#else
-#ifndef LMP_FIX_SMD_SET_VELOCITY_H
-#define LMP_FIX_SMD_SET_VELOCITY_H
+#ifndef LMP_FIX_SMD_SETVEL_H
+#define LMP_FIX_SMD_SETVEL_H
#include "fix.h"
--
GitLab