--- branches/development/src/io/RestReader.cpp 2012/07/07 03:59:27 1768 +++ branches/development/src/io/RestReader.cpp 2012/07/09 14:15:52 1769 @@ -280,9 +280,9 @@ namespace OpenMD { int index = tokenizer.nextTokenAsInt(); - StuntDouble* integrableObject = info_->getIOIndexToIntegrableObject(index); + StuntDouble* sd = info_->getIOIndexToIntegrableObject(index); - if (integrableObject == NULL) { + if (sd == NULL) { return; } @@ -310,7 +310,7 @@ namespace OpenMD { } case 'q' : { - if (integrableObject->isDirectional()) { + if (sd->isDirectional()) { q[0] = tokenizer.nextTokenAsDouble(); q[1] = tokenizer.nextTokenAsDouble(); @@ -332,7 +332,7 @@ namespace OpenMD { } case 'j' : { Vector3d ji; - if (integrableObject->isDirectional()) { + if (sd->isDirectional()) { ji[0] = tokenizer.nextTokenAsDouble(); ji[1] = tokenizer.nextTokenAsDouble(); ji[2] = tokenizer.nextTokenAsDouble(); @@ -366,7 +366,7 @@ namespace OpenMD { all_pos_[index] = pos; // is this io restrained? - GenericData* data = integrableObject->getPropertyByName("Restraint"); + GenericData* data = sd->getPropertyByName("Restraint"); ObjectRestraint* oRest; if (data != NULL) { @@ -377,7 +377,7 @@ namespace OpenMD { // an ObjectRestraint: oRest = dynamic_cast(restData->getData()); if (oRest != NULL) { - if (integrableObject->isDirectional()) { + if (sd->isDirectional()) { oRest->setReferenceStructure(pos, q.toRotationMatrix3()); } else { oRest->setReferenceStructure(pos);