Correct compilation error introduced by #1077 (a103bd4d) · Commits · 郑智淋 / lammps

src/USER-REAXC/reaxc_allocate.cpp

+10 −6

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@
		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 )
		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;
		@@ -204,7 +206,7 @@ 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/ )
		{
		@@ -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;

+2 −0

Original line number	Diff line number	Diff line
		@@ -213,4 +213,6 @@ typedef int bigint;
		#include "lmpwindows.h"
		#endif

		#define LMP_UNUSED_PARAM(x) (void)x

		#endif