[ViewVC] Diff of: OpenMD/trunk/src/brains/SimCreator.hpp

Comparing trunk/src/brains/SimCreator.hpp (file contents):
Revision 1023 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
Revision 1024 by tim, Wed Aug 30 18:42:29 2006 UTC

#	Line 50 \| Line 50
50		#ifndef BRAINS_SIMCREATOR_HPP
51		#define BRAINS_SIMCREATOR_HPP
52
53	<
53	>	#include <iostream>
54		#include "primitives/Molecule.hpp"
55		#include "brains/SimInfo.hpp"
56		#include "io/Globals.hpp"
#	Line 82 \| Line 82 \| namespace oopse {
82		* @param mdfile
83		* @return simParams
84		*/
85	<	Globals* parseFile(const std::string mdFileName);
85	>	Globals* parseFile(std::istream& rawMetaData, const std::string& mdFileName, int metaDataStartingLine);
86
87
88		/** create the molecules belong to current processor*/
#	Line 105 \| Line 105 \| namespace oopse {
105		void divideMolecules(SimInfo* info);
106
107		/** Load initial coordinates */
108	<	void loadCoordinates(SimInfo* info);
108	>	void loadCoordinates(SimInfo* info, const std::string& mdFileName);
109
110		std::string mdFileName_; //save the meta-data file name which may be used later
111		};

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