From 8dad92c71471f5a39250adef8d342202abf45d50 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Fri, 24 May 2013 15:45:19 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9909 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- doc/Section_commands.html | 15 +++++++++++++-- doc/Section_commands.txt | 15 +++++++++++++-- doc/units.html | 10 +++++----- doc/units.txt | 10 +++++----- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/doc/Section_commands.html b/doc/Section_commands.html index 59a72def79..54d01f4523 100644 --- a/doc/Section_commands.html +++ b/doc/Section_commands.html @@ -122,8 +122,19 @@ variable X delete 

region 1 block $((xlo+xhi)/2+sqrt(v_area)) 2 INF INF EDGE EDGE
-

The latter produces an identical result, without having to define and -discard a temporary variable X. +

so that you do not have to define (or discard) a temporary variable X. +

+

Note that neither the curly-bracket or immediate form of variables can +contain nested $ characters for other variables to substitute for. +Thus you cannot do this: +

+
variable        a equal 2
+variable        b2 equal 4
+print           "B2 = ${b$a}" 
+
+

Nor can you specify this $($x-1.0) for an immediate variable, but +you could use $(v_x-1.0), since the latter is valid syntax for an +equal-style variable.

See the variable command for more details of how strings are assigned to variables and evaluated, and how they can be diff --git a/doc/Section_commands.txt b/doc/Section_commands.txt index e1ce39a535..cd3f385369 100644 --- a/doc/Section_commands.txt +++ b/doc/Section_commands.txt @@ -118,8 +118,19 @@ can be replaced by region 1 block $((xlo+xhi)/2+sqrt(v_area)) 2 INF INF EDGE EDGE :pre -The latter produces an identical result, without having to define and -discard a temporary variable X. +so that you do not have to define (or discard) a temporary variable X. + +Note that neither the curly-bracket or immediate form of variables can +contain nested $ characters for other variables to substitute for. +Thus you cannot do this: + +variable a equal 2 +variable b2 equal 4 +print "B2 = $\{b$a\}" :pre + +Nor can you specify this $($x-1.0) for an immediate variable, but +you could use $(v_x-1.0), since the latter is valid syntax for an +"equal-style variable"_variable.html. See the "variable"_variable.html command for more details of how strings are assigned to variables and evaluated, and how they can be diff --git a/doc/units.html b/doc/units.html index 8fc0774c19..aa94ee8d37 100644 --- a/doc/units.html +++ b/doc/units.html @@ -72,7 +72,7 @@ by the number of atoms, i.e. energy/atom. This can be changed via the

  • velocity = Angstroms/femtosecond
  • force = Kcal/mole-Angstrom
  • torque = Kcal/mole -
  • temperature = degrees K +
  • temperature = Kelvin
  • pressure = atmospheres
  • dynamic viscosity = Poise
  • charge = multiple of electron charge (+1.0 is a proton) @@ -89,7 +89,7 @@ by the number of atoms, i.e. energy/atom. This can be changed via the
  • velocity = Angstroms/picosecond
  • force = eV/Angstrom
  • torque = eV -
  • temperature = degrees K +
  • temperature = Kelvin
  • pressure = bars
  • dynamic viscosity = Poise
  • charge = multiple of electron charge (+1.0 is a proton) @@ -106,7 +106,7 @@ by the number of atoms, i.e. energy/atom. This can be changed via the
  • velocity = meters/second
  • force = Newtons
  • torque = Newton-meters -
  • temperature = degrees K +
  • temperature = Kelvin
  • pressure = Pascals
  • dynamic viscosity = Pascal*second
  • charge = Coulombs @@ -123,7 +123,7 @@ by the number of atoms, i.e. energy/atom. This can be changed via the
  • velocity = centimeters/second
  • force = dynes
  • torque = dyne-centimeters -
  • temperature = degrees K +
  • temperature = Kelvin
  • pressure = dyne/cm^2 or barye = 1.0e-6 bars
  • dynamic viscosity = Poise
  • charge = statcoulombs or esu @@ -139,7 +139,7 @@ by the number of atoms, i.e. energy/atom. This can be changed via the
  • energy = Hartrees
  • velocity = Bohr/atomic time units [1.03275e-15 seconds]
  • force = Hartrees/Bohr -
  • temperature = degrees K +
  • temperature = Kelvin
  • pressure = Pascals
  • charge = multiple of electron charge (+1.0 is a proton)
  • dipole moment = Debye diff --git a/doc/units.txt b/doc/units.txt index 610b298a03..2e0a991b7c 100644 --- a/doc/units.txt +++ b/doc/units.txt @@ -69,7 +69,7 @@ energy = Kcal/mole velocity = Angstroms/femtosecond force = Kcal/mole-Angstrom torque = Kcal/mole -temperature = degrees K +temperature = Kelvin pressure = atmospheres dynamic viscosity = Poise charge = multiple of electron charge (+1.0 is a proton) @@ -86,7 +86,7 @@ energy = eV velocity = Angstroms/picosecond force = eV/Angstrom torque = eV -temperature = degrees K +temperature = Kelvin pressure = bars dynamic viscosity = Poise charge = multiple of electron charge (+1.0 is a proton) @@ -103,7 +103,7 @@ energy = Joules velocity = meters/second force = Newtons torque = Newton-meters -temperature = degrees K +temperature = Kelvin pressure = Pascals dynamic viscosity = Pascal*second charge = Coulombs @@ -120,7 +120,7 @@ energy = ergs velocity = centimeters/second force = dynes torque = dyne-centimeters -temperature = degrees K +temperature = Kelvin pressure = dyne/cm^2 or barye = 1.0e-6 bars dynamic viscosity = Poise charge = statcoulombs or esu @@ -136,7 +136,7 @@ time = femtoseconds energy = Hartrees velocity = Bohr/atomic time units \[1.03275e-15 seconds\] force = Hartrees/Bohr -temperature = degrees K +temperature = Kelvin pressure = Pascals charge = multiple of electron charge (+1.0 is a proton) dipole moment = Debye