[ViewVC] Diff of: group/trunk/OOPSE/libBASS/Globals.cpp

Comparing trunk/OOPSE/libBASS/Globals.cpp (file contents):
Revision 481 by gezelter, Tue Apr 8 21:35:49 2003 UTC vs.
Revision 655 by mmeineke, Tue Jul 29 16:32:06 2003 UTC

#	Line 44 \| Line 44
44		#define G_EST 23
45		#define G_USERF 24
46		#define G_TARGETPRESSURE 25
47	<	#define G_QMASS 26
48	<	#define G_TAUTHERMOSTAT 27
49	<	#define G_TAUBAROSTAT 28
47	>	#define G_TAUTHERMOSTAT 26
48	>	#define G_TAUBAROSTAT 27
49
50
51		Globals::Globals(){
#	Line 85 \| Line 84 \| Globals::Globals(){
84		addHash( "electrostaticSkinThickness", G_EST );
85		addHash( "useReactionField", G_USERF );
86		addHash( "targetPressure", G_TARGETPRESSURE);
88	–	addHash( "qMass", G_QMASS);
87		addHash( "tauThermostat", G_TAUTHERMOSTAT);
88		addHash( "tauBarostat", G_TAUBAROSTAT);
89
#	Line 822 \| Line 820 \| *int Globals::globalAssign( event the_event ){**
820		default:
821		the_event->err_msg =
822		strdup( "Global error. targetPressure unrecognized.\n" );
825	–	return 0;
826	–	break;
827	–	}
828	–	break;
829	–
830	–	case G_QMASS:
831	–	switch( the_type ){
832	–
833	–	case STRING:
834	–	the_event->err_msg =
835	–	strdup( "Global error. qMass is not a double or int.\n" );
836	–	return 0;
837	–	break;
838	–
839	–	case DOUBLE:
840	–	q_mass = the_event->evt.asmt.rhs.dval;
841	–	have_q_mass = 1;
842	–	return 1;
843	–	break;
844	–
845	–	case INT:
846	–	q_mass = (double)the_event->evt.asmt.rhs.ival;
847	–	have_q_mass = 1;
848	–	return 1;
849	–	break;
850	–
851	–	default:
852	–	the_event->err_msg =
853	–	strdup( "Global error. qMass unrecognized.\n" );
823		return 0;
824		break;
825		}
#	Line 914 \| Line 883 \| *int Globals::globalAssign( event the_event ){**
883		}
884		break;
885
886	+
887	+	// add more token cases here.
888	+
889		}
890		}
891

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