moebiusband/MD-Bench
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow any values for atoms_per_unit_cell

Browse Source 
Signed-off-by: Rafael Ravedutti <rafaelravedutti@gmail.com>
This commit is contained in:
Rafael Ravedutti 2021-04-21 13:01:06 +02:00
parent d3121ee08f
commit 3c7dbc833a
2 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/main-stub.c
View File

@ -56,6 +56,7 @@ int main(int argc, const char *argv[]) {
Atom *atom = (Atom *)(&atom_data); Atom *atom = (Atom *)(&atom_data);
Neighbor neighbor; Neighbor neighbor;
Parameter param; Parameter param;
int atoms_per_unit_cell = 8;
LIKWID_MARKER_INIT; LIKWID_MARKER_INIT;
LIKWID_MARKER_REGISTER("force"); LIKWID_MARKER_REGISTER("force");
@ -84,12 +85,18 @@ int main(int argc, const char *argv[]) {
param.nz = atoi(argv[++i]); param.nz = atoi(argv[++i]);
continue; continue;
} }
if((strcmp(argv[i], "-na") == 0))
{
atoms_per_unit_cell = atoi(argv[++i]);
continue;
}
if((strcmp(argv[i], "-h") == 0) || (strcmp(argv[i], "--help") == 0)) if((strcmp(argv[i], "-h") == 0) || (strcmp(argv[i], "--help") == 0))
{ {
printf("MD Bench: A minimalistic re-implementation of miniMD\n"); printf("MD Bench: A minimalistic re-implementation of miniMD\n");
printf(HLINE); printf(HLINE);
printf("-n / --nsteps <int>: set number of timesteps for simulation\n"); printf("-n / --nsteps <int>: set number of timesteps for simulation\n");
printf("-nx/-ny/-nz <int>: set linear dimension of systembox in x/y/z direction\n"); printf("-nx/-ny/-nz <int>: set linear dimension of systembox in x/y/z direction\n");
printf("-na <int>: set number of atoms per unit cell\n");
printf(HLINE); printf(HLINE);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
@ -103,11 +110,14 @@ int main(int argc, const char *argv[]) {
initAtom(atom); initAtom(atom);
DEBUG("Creating atoms...\n"); DEBUG("Creating atoms...\n");
const int atoms_per_unit_cell = 8;
for(int i = 0; i < param.nx; ++i) { for(int i = 0; i < param.nx; ++i) {
for(int j = 0; j < param.ny; ++j) { for(int j = 0; j < param.ny; ++j) {
for(int k = 0; k < param.nz; ++k) { for(int k = 0; k < param.nz; ++k) {
int added_atoms = 0;
int fac_x = 1;
int fac_y = 1;
int fac_z = 1;
int fmod = 0;
MD_FLOAT base_x = i * LATTICE_DISTANCE; MD_FLOAT base_x = i * LATTICE_DISTANCE;
MD_FLOAT base_y = j * LATTICE_DISTANCE; MD_FLOAT base_y = j * LATTICE_DISTANCE;
MD_FLOAT base_z = k * LATTICE_DISTANCE; MD_FLOAT base_z = k * LATTICE_DISTANCE;
@ -119,40 +129,25 @@ int main(int argc, const char *argv[]) {
growAtom(atom); growAtom(atom);
} }
if(atoms_per_unit_cell == 4) { while(fac_x * fac_y * fac_z < atoms_per_unit_cell) {
ADD_ATOM(0.0, 0.0, 0.0, vx, vy, vz); if(fmod == 0) { fac_x *= 2; }
ADD_ATOM(1.0, 0.0, 0.0, vx, vy, vz); if(fmod == 1) { fac_y *= 2; }
ADD_ATOM(0.0, 1.0, 0.0, vx, vy, vz); if(fmod == 2) { fac_z *= 2; }
ADD_ATOM(0.0, 0.0, 1.0, vx, vy, vz); fmod = (fmod + 1) % 3;
} else if(atoms_per_unit_cell == 8) { }
ADD_ATOM(0.0, 0.0, 0.0, vx, vy, vz);
ADD_ATOM(1.0, 0.0, 0.0, vx, vy, vz); MD_FLOAT offset_x = (fac_x > 0) ? 1.0 / (fac_x - 1) : 0.0;
ADD_ATOM(0.0, 1.0, 0.0, vx, vy, vz); MD_FLOAT offset_y = (fac_y > 0) ? 1.0 / (fac_y - 1) : 0.0;
ADD_ATOM(0.0, 0.0, 1.0, vx, vy, vz); MD_FLOAT offset_z = (fac_z > 0) ? 1.0 / (fac_z - 1) : 0.0;
ADD_ATOM(1.0, 1.0, 0.0, vx, vy, vz); for(int ii = 0; ii < fac_x; ++ii) {
ADD_ATOM(1.0, 0.0, 1.0, vx, vy, vz); for(int jj = 0; jj < fac_y; ++jj) {
ADD_ATOM(0.0, 1.0, 1.0, vx, vy, vz); for(int kk = 0; kk < fac_z; ++kk) {
ADD_ATOM(1.0, 1.0, 1.0, vx, vy, vz); if(added_atoms < atoms_per_unit_cell) {
} else if(atoms_per_unit_cell == 16) { ADD_ATOM(ii * offset_x, jj * offset_y, kk * offset_z, vx, vy, vz);
ADD_ATOM(0.0, 0.0, 0.0, vx, vy, vz); added_atoms++;
ADD_ATOM(1.0, 0.0, 0.0, vx, vy, vz); }
ADD_ATOM(0.0, 1.0, 0.0, vx, vy, vz); }
ADD_ATOM(0.0, 0.0, 1.0, vx, vy, vz); }
ADD_ATOM(1.0, 1.0, 0.0, vx, vy, vz);
ADD_ATOM(1.0, 0.0, 1.0, vx, vy, vz);
ADD_ATOM(0.0, 1.0, 1.0, vx, vy, vz);
ADD_ATOM(1.0, 1.0, 1.0, vx, vy, vz);
ADD_ATOM(0.5, 0.5, 0.5, vx, vy, vz);
ADD_ATOM(1.5, 0.5, 0.5, vx, vy, vz);
ADD_ATOM(0.5, 1.5, 0.5, vx, vy, vz);
ADD_ATOM(0.5, 0.5, 1.5, vx, vy, vz);
ADD_ATOM(1.5, 1.5, 0.5, vx, vy, vz);
ADD_ATOM(1.5, 0.5, 1.5, vx, vy, vz);
ADD_ATOM(0.5, 1.5, 1.5, vx, vy, vz);
ADD_ATOM(1.5, 1.5, 1.5, vx, vy, vz);
} else {
printf("Invalid number of atoms per unit cell, must be: 4, 8 or 16\n");
return EXIT_FAILURE;
} }
} }
} }

6
src/main.c
View File

@ -47,7 +47,7 @@ typedef enum {
NUMTIMER NUMTIMER
} timertype; } timertype;
extern double computeForce( Parameter*, Atom*, Neighbor*, int, int); extern double computeForce( Parameter*, Atom*, Neighbor*, int);
void init(Parameter *param) void init(Parameter *param)
{ {
@ -205,7 +205,7 @@ int main (int argc, char** argv)
setup(&param, &atom, &neighbor); setup(&param, &atom, &neighbor);
computeThermo(0, &param, &atom); computeThermo(0, &param, &atom);
computeForce(&param, &atom, &neighbor, 1, 1); computeForce(&param, &atom, &neighbor, 1);
timer[FORCE] = 0.0; timer[FORCE] = 0.0;
timer[NEIGH] = 0.0; timer[NEIGH] = 0.0;
@ -221,7 +221,7 @@ int main (int argc, char** argv)
timer[NEIGH] += reneighbour(&param, &atom, &neighbor); timer[NEIGH] += reneighbour(&param, &atom, &neighbor);
} }
timer[FORCE] += computeForce(&param, &atom, &neighbor, 1, 1); timer[FORCE] += computeForce(&param, &atom, &neighbor, 1);
finalIntegrate(&param, &atom); finalIntegrate(&param, &atom);
if(!((n + 1) % param.nstat) && (n+1) < param.ntimes) { if(!((n + 1) % param.nstat) && (n+1) < param.ntimes) {