[ViewVC] Diff of: group/branches/no-template-branch/OOPSE/libmdtools/SimSetup.cpp

Comparing trunk/OOPSE/libmdtools/SimSetup.cpp (file contents):
Revision 736 by tim, Thu Aug 28 21:09:47 2003 UTC vs.
Revision 746 by mmeineke, Thu Sep 4 21:48:35 2003 UTC

#	Line 686 \| Line 686 \| void SimSetup::gatherInfo(void){
686
687		if (globals->haveThermalTime()){
688		info[i].thermalTime = globals->getThermalTime();
689	+	}
690	+
691	+	info[i].resetIntegrator = 0;
692	+	if( globals->haveResetTime() ){
693	+	info[i].resetTime = globals->getResetTime();
694	+	info[i].resetIntegrator = 1;
695		}
696
697		// check for the temperature set flag
#	Line 1615 \| Line 1621 \| void SimSetup::setupZConstraint(SimInfo& theInfo){
1621		}
1622		theInfo.addProperty(zconsTol);
1623
1624	<	//set Force Substraction Policy
1624	>	//set Force Subtraction Policy
1625		StringData* zconsForcePolicy = new StringData();
1626		zconsForcePolicy->setID(ZCONSFORCEPOLICY_ID);
1627
#	Line 1624 \| Line 1630 \| void SimSetup::setupZConstraint(SimInfo& theInfo){
1630		}
1631		else{
1632		sprintf(painCave.errMsg,
1633	<	"ZConstraint Warning: User does not set force substraction policy, "
1633	>	"ZConstraint Warning: User does not set force Subtraction policy, "
1634		"PolicyByMass is used\n");
1635		painCave.isFatal = 0;
1636		simError();

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines