ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sjplimp
2011-09-13 22:07:53 +00:00
parent a34506c420
commit dfa59d7cb0
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/SHOCK/fix_nphug.cpp
View File

@ -402,13 +402,13 @@ int FixNPHug::pack_restart_data(double *list)
calculate the number of data to be packed calculate the number of data to be packed
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
int FixNPHug::size_restart() int FixNPHug::size_restart_global()
{ {
int nsize = 3; int nsize = 3;
// call the base class function // call the base class function
nsize += FixNH::size_restart(); nsize += FixNH::size_restart_global();
return nsize; return nsize;
} }

3
src/SHOCK/fix_nphug.h
View File

@ -32,7 +32,6 @@ class FixNPHug : public FixNH {
void setup(int); void setup(int);
int modify_param(int, char **); int modify_param(int, char **);
int pack_restart_data(double *); // pack restart data int pack_restart_data(double *); // pack restart data
int size_restart(); // return size
void restart(char *); void restart(char *);
private: private:
@ -52,6 +51,8 @@ class FixNPHug : public FixNH {
double v0,p0,e0,rho0; double v0,p0,e0,rho0;
int idir; int idir;
int uniaxial; int uniaxial;
int size_restart_global();
}; };
} }

4
src/fix_nh.cpp
View File

@ -1118,7 +1118,7 @@ void FixNH::remap()
void FixNH::write_restart(FILE *fp) void FixNH::write_restart(FILE *fp)
{ {
int nsize = size_restart(); int nsize = size_restart_global();
double *list; double *list;
memory->create(list,nsize,"nh:list"); memory->create(list,nsize,"nh:list");
@ -1138,7 +1138,7 @@ void FixNH::write_restart(FILE *fp)
calculate the number of data to be packed calculate the number of data to be packed
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
int FixNH::size_restart() int FixNH::size_restart_global()
{ {
int nsize = 2; int nsize = 2;
if (tstat_flag) nsize += 1 + 2*mtchain; if (tstat_flag) nsize += 1 + 2*mtchain;

2
src/fix_nh.h
View File

@ -34,7 +34,6 @@ class FixNH : public Fix {
virtual double compute_vector(int); virtual double compute_vector(int);
void write_restart(FILE *); void write_restart(FILE *);
virtual int pack_restart_data(double *); // pack restart data virtual int pack_restart_data(double *); // pack restart data
virtual int size_restart(); // return size
virtual void restart(char *); virtual void restart(char *);
int modify_param(int, char **); int modify_param(int, char **);
void reset_target(double); void reset_target(double);
@ -122,6 +121,7 @@ class FixNH : public Fix {
virtual void nh_v_press(); virtual void nh_v_press();
virtual void nh_v_temp(); virtual void nh_v_temp();
virtual void compute_temp_target(); virtual void compute_temp_target();
virtual int size_restart_global();
void compute_sigma(); void compute_sigma();
void compute_deviatoric(); void compute_deviatoric();