[ViewVC] Diff of: group/trunk/OOPSE-3.0/src/brains/SimSetup.cpp

Comparing trunk/OOPSE-3.0/src/brains/SimSetup.cpp (file contents):
Revision 1650 by gezelter, Tue Oct 26 22:24:52 2004 UTC vs.
Revision 1772 by chrisfen, Tue Nov 23 22:48:31 2004 UTC

#	Line 726 \| Line 726 \| void SimSetup::gatherInfo(void){
726		simError();
727		}
728		if (globals->haveForceFieldVariant()) {
729	<	strcpy(forcefield_variant, globals->getForceFieldVariant());
729	>	forcefield_variant = globals->getForceFieldVariant();
730		has_forcefield_variant = 1;
731		}
732
#	Line 1195 \| Line 1195 \| void SimSetup::makeOutNames(void){
1195		info[k].finalName = prefix + ".eor";
1196		info[k].sampleName = prefix + ".dump";
1197		info[k].statusName = prefix + ".stat";
1198	+
1199	+	if (info[k].useSolidThermInt && !info[k].useLiquidThermInt)
1200	+	info[k].zAngleName = prefix + ".ang";
1201
1202		#ifdef IS_MPI
1203

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