--- trunk/OOPSE/libmdtools/SimInfo.cpp 2004/04/19 22:13:01 1125 +++ trunk/OOPSE/libmdtools/SimInfo.cpp 2004/04/28 22:06:29 1139 @@ -63,6 +63,7 @@ SimInfo::SimInfo(){ useReactionField = 0; useGB = 0; useEAM = 0; + useMolecularCutoffs = 0; excludes = Exclude::Instance(); @@ -348,8 +349,6 @@ int SimInfo::getNDF(){ // entire system: ndf = ndf - 3 - nZconstraints; - - std::cerr << "ndf = " << ndf; return ndf; } @@ -438,6 +437,7 @@ void SimInfo::refreshSim(){ //fInfo.SIM_uses_RF = 0; fInfo.SIM_uses_GB = useGB; fInfo.SIM_uses_EAM = useEAM; + fInfo.SIM_uses_molecular_cutoffs = useMolecularCutoffs; n_exclude = excludes->getSize(); excl = excludes->getFortranArray(); @@ -512,11 +512,11 @@ void SimInfo::checkCutOffs( void ){ "\tCurrent Value of LJrcut = %G at time %G\n " "\tThis is larger than half of at least one of the\n" "\tperiodic box vectors. Right now, the Box matrix is:\n" - "\n, %G" + "\n" "\t[ %G %G %G ]\n" "\t[ %G %G %G ]\n" "\t[ %G %G %G ]\n", - rCut, currentTime, maxCutoff, + rCut, currentTime, Hmat[0][0], Hmat[0][1], Hmat[0][2], Hmat[1][0], Hmat[1][1], Hmat[1][2], Hmat[2][0], Hmat[2][1], Hmat[2][2]);