From 075598b405c5acd8afed76a9c380a16c50fbdf21 Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Thu, 10 May 2018 23:44:27 -0400
Subject: [PATCH] port dump_modify maxfiles option to COMPRESS and MPIIO
package
---
src/COMPRESS/dump_atom_gz.cpp | 13 +++++++++++++
src/COMPRESS/dump_cfg_gz.cpp | 13 +++++++++++++
src/COMPRESS/dump_custom_gz.cpp | 13 +++++++++++++
src/COMPRESS/dump_xyz_gz.cpp | 13 +++++++++++++
src/MPIIO/dump_atom_mpiio.cpp | 13 +++++++++++++
src/MPIIO/dump_cfg_mpiio.cpp | 13 +++++++++++++
src/MPIIO/dump_custom_mpiio.cpp | 13 +++++++++++++
src/MPIIO/dump_xyz_mpiio.cpp | 13 +++++++++++++
src/dump.cpp | 2 +-
src/dump_custom.cpp | 4 ++--
10 files changed, 107 insertions(+), 3 deletions(-)
diff --git a/src/COMPRESS/dump_atom_gz.cpp b/src/COMPRESS/dump_atom_gz.cpp
index fb605b74ce..ef7e6583be 100644
--- a/src/COMPRESS/dump_atom_gz.cpp
+++ b/src/COMPRESS/dump_atom_gz.cpp
@@ -71,6 +71,19 @@ void DumpAtomGZ::openfile()
sprintf(filecurrent,pad,filestar,update->ntimestep,ptr+1);
}
*ptr = '*';
+ if (maxfiles > 0) {
+ if (numfiles < maxfiles) {
+ nameslist[numfiles] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[numfiles],filecurrent);
+ ++numfiles;
+ } else {
+ remove(nameslist[fileidx]);
+ delete[] nameslist[fileidx];
+ nameslist[fileidx] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[fileidx],filecurrent);
+ fileidx = (fileidx + 1) % maxfiles;
+ }
+ }
}
// each proc with filewriter = 1 opens a file
diff --git a/src/COMPRESS/dump_cfg_gz.cpp b/src/COMPRESS/dump_cfg_gz.cpp
index a1ffa92ec8..aaeb878584 100644
--- a/src/COMPRESS/dump_cfg_gz.cpp
+++ b/src/COMPRESS/dump_cfg_gz.cpp
@@ -75,6 +75,19 @@ void DumpCFGGZ::openfile()
sprintf(filecurrent,pad,filestar,update->ntimestep,ptr+1);
}
*ptr = '*';
+ if (maxfiles > 0) {
+ if (numfiles < maxfiles) {
+ nameslist[numfiles] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[numfiles],filecurrent);
+ ++numfiles;
+ } else {
+ remove(nameslist[fileidx]);
+ delete[] nameslist[fileidx];
+ nameslist[fileidx] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[fileidx],filecurrent);
+ fileidx = (fileidx + 1) % maxfiles;
+ }
+ }
}
// each proc with filewriter = 1 opens a file
diff --git a/src/COMPRESS/dump_custom_gz.cpp b/src/COMPRESS/dump_custom_gz.cpp
index 52d67445be..9c30f4742f 100644
--- a/src/COMPRESS/dump_custom_gz.cpp
+++ b/src/COMPRESS/dump_custom_gz.cpp
@@ -73,6 +73,19 @@ void DumpCustomGZ::openfile()
sprintf(filecurrent,pad,filestar,update->ntimestep,ptr+1);
}
*ptr = '*';
+ if (maxfiles > 0) {
+ if (numfiles < maxfiles) {
+ nameslist[numfiles] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[numfiles],filecurrent);
+ ++numfiles;
+ } else {
+ remove(nameslist[fileidx]);
+ delete[] nameslist[fileidx];
+ nameslist[fileidx] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[fileidx],filecurrent);
+ fileidx = (fileidx + 1) % maxfiles;
+ }
+ }
}
// each proc with filewriter = 1 opens a file
diff --git a/src/COMPRESS/dump_xyz_gz.cpp b/src/COMPRESS/dump_xyz_gz.cpp
index 047ad8652f..7be1a10fe2 100644
--- a/src/COMPRESS/dump_xyz_gz.cpp
+++ b/src/COMPRESS/dump_xyz_gz.cpp
@@ -73,6 +73,19 @@ void DumpXYZGZ::openfile()
sprintf(filecurrent,pad,filestar,update->ntimestep,ptr+1);
}
*ptr = '*';
+ if (maxfiles > 0) {
+ if (numfiles < maxfiles) {
+ nameslist[numfiles] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[numfiles],filecurrent);
+ ++numfiles;
+ } else {
+ remove(nameslist[fileidx]);
+ delete[] nameslist[fileidx];
+ nameslist[fileidx] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[fileidx],filecurrent);
+ fileidx = (fileidx + 1) % maxfiles;
+ }
+ }
}
// each proc with filewriter = 1 opens a file
diff --git a/src/MPIIO/dump_atom_mpiio.cpp b/src/MPIIO/dump_atom_mpiio.cpp
index 4422ef1cdf..f2f2991442 100644
--- a/src/MPIIO/dump_atom_mpiio.cpp
+++ b/src/MPIIO/dump_atom_mpiio.cpp
@@ -77,6 +77,19 @@ void DumpAtomMPIIO::openfile()
sprintf(filecurrent,pad,filestar,update->ntimestep,ptr+1);
}
*ptr = '*';
+ if (maxfiles > 0) {
+ if (numfiles < maxfiles) {
+ nameslist[numfiles] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[numfiles],filecurrent);
+ ++numfiles;
+ } else {
+ remove(nameslist[fileidx]);
+ delete[] nameslist[fileidx];
+ nameslist[fileidx] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[fileidx],filecurrent);
+ fileidx = (fileidx + 1) % maxfiles;
+ }
+ }
}
if (append_flag) { // append open
diff --git a/src/MPIIO/dump_cfg_mpiio.cpp b/src/MPIIO/dump_cfg_mpiio.cpp
index 5086d1dc6c..09fd63bca5 100644
--- a/src/MPIIO/dump_cfg_mpiio.cpp
+++ b/src/MPIIO/dump_cfg_mpiio.cpp
@@ -96,6 +96,19 @@ void DumpCFGMPIIO::openfile()
sprintf(filecurrent,pad,filestar,update->ntimestep,ptr+1);
}
*ptr = '*';
+ if (maxfiles > 0) {
+ if (numfiles < maxfiles) {
+ nameslist[numfiles] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[numfiles],filecurrent);
+ ++numfiles;
+ } else {
+ remove(nameslist[fileidx]);
+ delete[] nameslist[fileidx];
+ nameslist[fileidx] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[fileidx],filecurrent);
+ fileidx = (fileidx + 1) % maxfiles;
+ }
+ }
}
if (append_flag) { // append open
diff --git a/src/MPIIO/dump_custom_mpiio.cpp b/src/MPIIO/dump_custom_mpiio.cpp
index 2da6dd700d..ce981a7d1f 100644
--- a/src/MPIIO/dump_custom_mpiio.cpp
+++ b/src/MPIIO/dump_custom_mpiio.cpp
@@ -98,6 +98,19 @@ void DumpCustomMPIIO::openfile()
sprintf(filecurrent,pad,filestar,update->ntimestep,ptr+1);
}
*ptr = '*';
+ if (maxfiles > 0) {
+ if (numfiles < maxfiles) {
+ nameslist[numfiles] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[numfiles],filecurrent);
+ ++numfiles;
+ } else {
+ remove(nameslist[fileidx]);
+ delete[] nameslist[fileidx];
+ nameslist[fileidx] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[fileidx],filecurrent);
+ fileidx = (fileidx + 1) % maxfiles;
+ }
+ }
}
if (append_flag) { // append open
diff --git a/src/MPIIO/dump_xyz_mpiio.cpp b/src/MPIIO/dump_xyz_mpiio.cpp
index 4725efccd1..804832ec1e 100644
--- a/src/MPIIO/dump_xyz_mpiio.cpp
+++ b/src/MPIIO/dump_xyz_mpiio.cpp
@@ -98,6 +98,19 @@ void DumpXYZMPIIO::openfile()
sprintf(filecurrent,pad,filestar,update->ntimestep,ptr+1);
}
*ptr = '*';
+ if (maxfiles > 0) {
+ if (numfiles < maxfiles) {
+ nameslist[numfiles] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[numfiles],filecurrent);
+ ++numfiles;
+ } else {
+ remove(nameslist[fileidx]);
+ delete[] nameslist[fileidx];
+ nameslist[fileidx] = new char[strlen(filecurrent)+1];
+ strcpy(nameslist[fileidx],filecurrent);
+ fileidx = (fileidx + 1) % maxfiles;
+ }
+ }
}
if (append_flag) { // append open
diff --git a/src/dump.cpp b/src/dump.cpp
index ce9fc9a0a9..12b35c3395 100644
--- a/src/dump.cpp
+++ b/src/dump.cpp
@@ -573,7 +573,7 @@ void Dump::openfile()
strcpy(nameslist[fileidx],filecurrent);
fileidx = (fileidx + 1) % maxfiles;
}
- }
+ }
}
// each proc with filewriter = 1 opens a file
diff --git a/src/dump_custom.cpp b/src/dump_custom.cpp
index 174fcd73c8..47108e309e 100644
--- a/src/dump_custom.cpp
+++ b/src/dump_custom.cpp
@@ -60,7 +60,7 @@ DumpCustom::DumpCustom(LAMMPS *lmp, int narg, char **arg) :
earg(NULL), vtype(NULL), vformat(NULL), columns(NULL), choose(NULL),
dchoose(NULL), clist(NULL), field2index(NULL), argindex(NULL), id_compute(NULL),
compute(NULL), id_fix(NULL), fix(NULL), id_variable(NULL), variable(NULL),
- vbuf(NULL), id_custom(NULL), flag_custom(NULL), typenames(NULL),
+ vbuf(NULL), id_custom(NULL), flag_custom(NULL), typenames(NULL),
pack_choice(NULL)
{
if (narg == 5) error->all(FLERR,"No dump custom arguments specified");
@@ -1676,7 +1676,7 @@ int DumpCustom::modify_param(int narg, char **arg)
if (strcmp(arg[0],"refresh") == 0) {
if (narg < 2) error->all(FLERR,"Illegal dump_modify command");
- if (strncmp(arg[1],"c_",2) != 0)
+ if (strncmp(arg[1],"c_",2) != 0)
error->all(FLERR,"Illegal dump_modify command");
if (refreshflag) error->all(FLERR,"Dump modify can only have one refresh");
--
GitLab