git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4238 f3b2605a-c512-4ea7-a41b-209d697bcdaa

src/compute_displace_atom.cpp

@@ -35,18 +35,18 @@ ComputeDisplaceAtom::ComputeDisplaceAtom(LAMMPS *lmp, int narg, char **arg) :
   peratom_flag = 1;
   size_peratom_cols = 4;
 
-  // create a new fix store  style
-  // id = compute-ID + store, fix group = compute group
+  // create a new fix store/state  style
+  // id = compute-ID + store_state, fix group = compute group
 
-  int n = strlen(id) + strlen("_store") + 1;
+  int n = strlen(id) + strlen("_store_state") + 1;
   id_fix = new char[n];
   strcpy(id_fix,id);
-  strcat(id_fix,"_store");
+  strcat(id_fix,"_store_state");
 
   char **newarg = new char*[7];
   newarg[0] = id_fix;
   newarg[1] = group->names[igroup];
-  newarg[2] = (char *) "store";
+  newarg[2] = (char *) "store/state";
   newarg[3] = (char *) "0";
   newarg[4] = (char *) "xu";
   newarg[5] = (char *) "yu";

src/compute_msd.cpp

@@ -49,18 +49,18 @@ ComputeMSD::ComputeMSD(LAMMPS *lmp, int narg, char **arg) :
     } else error->all("Illegal compute msd command");
   }
 
-  // create a new fix store style with or without com keyword
-  // id = compute-ID + store, fix group = compute group
+  // create a new fix store/state style with or without com keyword
+  // id = compute-ID + store_state, fix group = compute group
 
-  int n = strlen(id) + strlen("_store") + 1;
+  int n = strlen(id) + strlen("_store_state") + 1;
   id_fix = new char[n];
   strcpy(id_fix,id);
-  strcat(id_fix,"_store");
+  strcat(id_fix,"_store_state");
 
   char **newarg = new char*[9];
   newarg[0] = id_fix;
   newarg[1] = group->names[igroup];
-  newarg[2] = (char *) "store";
+  newarg[2] = (char *) "store/state";
   newarg[3] = (char *) "0";
   newarg[4] = (char *) "xu";
   newarg[5] = (char *) "yu";

src/fix_store.h → src/fix_store_state.h

@@ -13,21 +13,21 @@
 
 #ifdef FIX_CLASS
 
-FixStyle(store,FixStore)
+FixStyle(store/state,FixStoreState)
 
 #else
 
-#ifndef LMP_FIX_STORE_H
-#define LMP_FIX_STORE_H
+#ifndef LMP_FIX_STORE_STATE_H
+#define LMP_FIX_STORE_STATE_H
 
 #include "fix.h"
 
 namespace LAMMPS_NS {
 
-class FixStore : public Fix {
+class FixStoreState : public Fix {
  public:
-  FixStore(class LAMMPS *, int, char **);
-  ~FixStore();
+  FixStoreState(class LAMMPS *, int, char **);
+  ~FixStoreState();
   int setmask();
   void init();
   void setup(int);
@@ -56,7 +56,7 @@ class FixStore : public Fix {
   int kflag,cfv_flag,firstflag;
   int cfv_any;             // 1 if any compute/fix/variable specified
 
-  typedef void (FixStore::*FnPtrPack)(int);
+  typedef void (FixStoreState::*FnPtrPack)(int);
   FnPtrPack *pack_choice;              // ptrs to pack functions
 
   void pack_id(int);