← Back to branch summary

~ubuntu-branches/debian/sid/lammps/sid

« back to all changes in this revision

Viewing changes to src/fix_setforce.cpp

  • Committer: Package Import Robot
  • Author(s): Anton Gladky
  • Date: 2013-11-20 22:41:36 UTC
  • mfrom: (1.2.2)
  • Revision ID: package-import@ubuntu.com-20131120224136-tzx7leh606fqnckm
Tags: 0~20131119.git7162cf0-1
* [e65b919] Imported Upstream version 0~20131119.git7162cf0
* [f7bddd4] Fix some problems, introduced by upstream recently.
* [3616dfc] Use wrap-and-sort script.
* [7e92030] Ignore quilt dir

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/fix_setforce.cpp
24
24
#include "variable.h"
25
25
#include "memory.h"
26
26
#include "error.h"
 
27
#include "force.h"
27
28
 
28
29
using namespace LAMMPS_NS;
29
30
using namespace FixConst;
51
52
  } else if (strcmp(arg[3],"NULL") == 0) {
52
53
    xstyle = NONE;
53
54
  } else {
54
 
    xvalue = atof(arg[3]);
 
55
    xvalue = force->numeric(FLERR,arg[3]);
55
56
    xstyle = CONSTANT;
56
57
  }
57
58
  if (strstr(arg[4],"v_") == arg[4]) {
61
62
  } else if (strcmp(arg[4],"NULL") == 0) {
62
63
    ystyle = NONE;
63
64
  } else {
64
 
    yvalue = atof(arg[4]);
 
65
    yvalue = force->numeric(FLERR,arg[4]);
65
66
    ystyle = CONSTANT;
66
67
  }
67
68
  if (strstr(arg[5],"v_") == arg[5]) {
71
72
  } else if (strcmp(arg[5],"NULL") == 0) {
72
73
    zstyle = NONE;
73
74
  } else {
74
 
    zvalue = atof(arg[5]);
 
75
    zvalue = force->numeric(FLERR,arg[5]);
75
76
    zstyle = CONSTANT;
76
77
  }
77
78