diff --git a/src/MEAM/pair_meam.cpp b/src/MEAM/pair_meam.cpp index 6a1fb1a877..7c6fd9dbb2 100644 --- a/src/MEAM/pair_meam.cpp +++ b/src/MEAM/pair_meam.cpp @@ -38,11 +38,11 @@ using namespace LAMMPS_NS; #define MAXLINE 1024 enum{FCC,BCC,HCP,DIM,DIAMOND,B1,C11,L12,B2}; -int nkeywords = 19; +int nkeywords = 21; char *keywords[] = {"Ec","alpha","rho0","delta","lattce", "attrac","repuls","nn2","Cmin","Cmax","rc","delr", "augt1","gsmooth_factor","re","ialloy","mixture_ref_t", - "erose_form","zbl"}; + "erose_form","zbl","emb_lin_neg","bkgd_dyn"}; /* ---------------------------------------------------------------------- */ diff --git a/src/memory.cpp b/src/memory.cpp index 3aa5756a60..541a7101df 100644 --- a/src/memory.cpp +++ b/src/memory.cpp @@ -36,7 +36,7 @@ void *Memory::smalloc(bigint nbytes, const char *name) void *ptr = malloc(nbytes); if (ptr == NULL) { char str[128]; - sprintf(str,"Failed to allocate " BIGINT_FORMAT "bytes for array %s", + sprintf(str,"Failed to allocate " BIGINT_FORMAT " bytes for array %s", nbytes,name); error->one(str); } @@ -57,7 +57,7 @@ void *Memory::srealloc(void *ptr, bigint nbytes, const char *name) ptr = realloc(ptr,nbytes); if (ptr == NULL) { char str[128]; - sprintf(str,"Failed to reallocate " BIGINT_FORMAT "bytes for array %s", + sprintf(str,"Failed to reallocate " BIGINT_FORMAT " bytes for array %s", nbytes,name); error->one(str); }