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

allow to extract properties in NH integrator only when they are active

Browse Source
This commit is contained in:
Axel Kohlmeyer
2016-11-14 09:27:33 -05:00
parent 0c25f3b1d6
commit fdf5d68f9f
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/fix_nh.cpp
View File

@ -1698,25 +1698,29 @@ void FixNH::reset_dt()
void *FixNH::extract(const char *str, int &dim) void *FixNH::extract(const char *str, int &dim)
{ {
dim=0; dim=0;
if (strcmp(str,"t_target") == 0) { if (tstat_flag && strcmp(str,"t_target") == 0) {
return &t_target; return &t_target;
} else if (strcmp(str,"t_start") == 0) { } else if (tstat_flag && strcmp(str,"t_start") == 0) {
return &t_start; return &t_start;
} else if (strcmp(str,"t_stop") == 0) { } else if (tstat_flag && strcmp(str,"t_stop") == 0) {
return &t_stop; return &t_stop;
} else if (strcmp(str,"mtchain") == 0) { } else if (tstat_flag && strcmp(str,"mtchain") == 0) {
return &mtchain;
} else if (pstat_flag && strcmp(str,"mpchain") == 0) {
return &mtchain; return &mtchain;
} }
dim=1; dim=1;
if (strcmp(str,"eta") == 0) { if (tstat_flag && strcmp(str,"eta") == 0) {
return η return η
} else if (strcmp(str,"p_flag") == 0) { } else if (pstat_flag && strcmp(str,"etap") == 0) {
return η
} else if (pstat_flag && strcmp(str,"p_flag") == 0) {
return &p_flag; return &p_flag;
} else if (strcmp(str,"p_start") == 0) { } else if (pstat_flag && strcmp(str,"p_start") == 0) {
return &p_start; return &p_start;
} else if (strcmp(str,"p_stop") == 0) { } else if (pstat_flag && strcmp(str,"p_stop") == 0) {
return &p_stop; return &p_stop;
} else if (strcmp(str,"p_target") == 0) { } else if (pstat_flag && strcmp(str,"p_target") == 0) {
return &p_target; return &p_target;
} }
return NULL; return NULL;