Commit a103bd4d authored by Richard Berger's avatar Richard Berger
Browse files

Correct compilation error introduced by #1077

parent aac23850
......@@ -39,8 +39,8 @@
important: we cannot know the exact number of atoms that will fall into a
process's box throughout the whole simulation. therefore
we need to make upper bound estimates for various data structures */
int PreAllocate_Space( reax_system *system, control_params */*control*/,
storage */*workspace*/, MPI_Comm comm )
int PreAllocate_Space( reax_system *system, control_params * /*control*/,
storage * workspace, MPI_Comm comm )
{
int mincap = system->mincap;
double safezone = system->safezone;
......@@ -60,6 +60,8 @@ int PreAllocate_Space( reax_system *system, control_params */*control*/,
workspace->forceReduction = NULL;
workspace->valence_angle_atom_myoffset = NULL;
workspace->my_ext_pressReduction = NULL;
#else
LMP_UNUSED_PARAM(workspace);
#endif
return SUCCESS;
......@@ -69,7 +71,7 @@ int PreAllocate_Space( reax_system *system, control_params */*control*/,
/************* system *************/
int Allocate_System( reax_system *system, int /*local_cap*/, int total_cap,
char */*msg*/ )
char * /*msg*/ )
{
system->my_atoms = (reax_atom*)
realloc( system->my_atoms, total_cap*sizeof(reax_atom) );
......@@ -116,7 +118,7 @@ void DeAllocate_System( reax_system *system )
/************* workspace *************/
void DeAllocate_Workspace( control_params */*control*/, storage *workspace )
void DeAllocate_Workspace( control_params * /*control*/, storage *workspace )
{
int i;
......@@ -204,9 +206,9 @@ void DeAllocate_Workspace( control_params */*control*/, storage *workspace )
}
int Allocate_Workspace( reax_system */*system*/, control_params */*control*/,
int Allocate_Workspace( reax_system * /*system*/, control_params * control,
storage *workspace, int local_cap, int total_cap,
MPI_Comm comm, char */*msg*/ )
MPI_Comm comm, char * /*msg*/ )
{
int i, total_real, total_rvec, local_rvec;
......@@ -307,6 +309,8 @@ int Allocate_Workspace( reax_system */*system*/, control_params */*control*/,
workspace->valence_angle_atom_myoffset = (int *) scalloc(sizeof(int), total_cap, "valence_angle_atom_myoffset", comm);
workspace->my_ext_pressReduction = (rvec *) calloc(sizeof(rvec), control->nthreads);
#else
LMP_UNUSED_PARAM(control);
#endif
return SUCCESS;
......
......@@ -213,4 +213,6 @@ typedef int bigint;
#include "lmpwindows.h"
#endif
#define LMP_UNUSED_PARAM(x) (void)x
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment