From adabfc38a6b816c9876953930c9f23021ece4adf Mon Sep 17 00:00:00 2001 From: sjplimp Date: Tue, 18 Aug 2015 21:50:30 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13890 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/fix_ave_histo_weight.cpp | 4 ++-- src/pair_hybrid.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/fix_ave_histo_weight.cpp b/src/fix_ave_histo_weight.cpp index 9bbfebd238..432ce3c2f3 100644 --- a/src/fix_ave_histo_weight.cpp +++ b/src/fix_ave_histo_weight.cpp @@ -259,7 +259,7 @@ void FixAveHistoWeight::end_of_step() if (atom->nlocal > maxatom) { memory->destroy(vector); maxatom = atom->nmax; - memory->create(vector,maxatom,"ave/histo/weights:vector"); + memory->create(vector,maxatom,"ave/histo/weight:vector"); } input->variable->compute_atom(m,igroup,vector,1,0); weights = vector; @@ -388,7 +388,7 @@ void FixAveHistoWeight::end_of_step() if (atom->nlocal > maxatom) { memory->destroy(vector); maxatom = atom->nmax; - memory->create(vector,maxatom,"ave/histo/weights:vector"); + memory->create(vector,maxatom,"ave/histo/weight:vector"); } input->variable->compute_atom(m,igroup,vector,1,0); bin_atoms_weights(vector,1,weights,stride); diff --git a/src/pair_hybrid.cpp b/src/pair_hybrid.cpp index 4d0bbdad2f..81760bb4f7 100644 --- a/src/pair_hybrid.cpp +++ b/src/pair_hybrid.cpp @@ -565,6 +565,8 @@ double PairHybrid::init_one(int i, int j) // perform mixing only if I,I sub-style = J,J sub-style // also require I,I and J,J are both assigned to single sub-style + printf("IJ %d %d\n",i,j); + if (setflag[i][j] == 0) { if (nmap[i][i] != 1 || nmap[j][j] != 1 || map[i][i][0] != map[j][j][0]) error->one(FLERR,"All pair coeffs are not set");