[ViewVC] Diff of: OpenMD/trunk/src/io/Globals.cpp

Comparing trunk/src/io/Globals.cpp (file contents):
Revision 425 by tim, Thu Mar 10 20:28:17 2005 UTC vs.
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC

#	Line 1249 \| Line 1249 \| *int Globals::globalAssign( event the_event ){**
1249		switch( the_type ){
1250
1251		case STRING:
1252	<	strcpy(zconsForcePolicy, the_event->evt.asmt.rhs.sval);
1252	>	strcpy(zconsForcePolicy, the_event->evt.asmt.rhs.sval);
1253
1254	<	for(int i = 0; zconsForcePolicy[i] != '\0'; i++)
1255	<	{
1256	<	zconsForcePolicy[i] = toupper(zconsForcePolicy[i]);
1257	<	}
1254	>	for(int i = 0; zconsForcePolicy[i] != '\0'; i++)
1255	>	{
1256	>	zconsForcePolicy[i] = toupper(zconsForcePolicy[i]);
1257	>	}
1258		have_zcons_force_policy = 1;
1259	<	return 1;
1259	>	return 1;
1260		break;
1261
1262		case DOUBLE:
#	Line 1607 \| Line 1607 \| *int Globals::globalAssign( event the_event ){**
1607		switch( the_type ){
1608
1609		case STRING:
1610	<	the_event->err_msg =
1610	>	the_event->err_msg =
1611		strdup( "Error in parsing meta-data file!\n\tseed is not a string.\n" );
1612		return 0;
1613	<	return 0;
1613	>	return 0;
1614		break;
1615
1616		case DOUBLE:
1617	<	have_seed = 1;
1618	<	seed = (int)the_event->evt.asmt.rhs.dval;
1617	>	have_seed = 1;
1618	>	seed = (int)the_event->evt.asmt.rhs.dval;
1619		return 1;
1620		break;
1621
1622		case INT:
1623	<	have_seed = 1;
1624	<	seed = the_event->evt.asmt.rhs.ival ;
1623	>	have_seed = 1;
1624	>	seed = the_event->evt.asmt.rhs.ival ;
1625		return 1;
1626		break;
1627
#	Line 1810 \| Line 1810 \| *int Globals::globalAssign( event the_event ){**
1810		}
1811		break;
1812
1813	<	case G_THERM_INT_OMEGA_SPRING:
1813	>	case G_THERM_INT_OMEGA_SPRING:
1814		switch( the_type ){
1815
1816		case STRING:

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