Diff of /trunk/gadget/maininfo.h

Parent Directory | Revision Log | Patch

	revision 10, Wed Jun 10 13:01:42 2015 UTC	revision 11, Thu Jul 23 19:00:38 2015 UTC
#	Line 70	Line 70
70	* \return flag	* \return flag
71	*/	*/
72	int runOptimise() const { return runoptimise; };	int runOptimise() const { return runoptimise; };
73		//FIXME doc
74		int runOmp() const { return runomp; };
75	/**	/**
76	* \brief This function will return the flag used to determine whether a simulation run should be performed	* \brief This function will return the flag used to determine whether a simulation run should be performed
77	* \return flag	* \return flag
#	Line 144	Line 146
146	* \brief This function will return the maximum ratio of a stock that can be consumed on any given timestep	* \brief This function will return the maximum ratio of a stock that can be consumed on any given timestep
147	* \return maxratio	* \return maxratio
148	*/	*/
149	double getMaxRatio() const { return maxratio; };	double getMaxRatio() const {
150		return maxratio;
151		}
152		unsigned* getSeed() const {return seed;}
153		//      unsigned getSeedM() const {return seedM;}
154		//      unsigned getSeedP() const {return seedP;}
155
156		;
157
158
159	private:	private:
160	/**	/**
161	* \brief This function will read input from a file instead of the command line	* \brief This function will read input from a file instead of the command line
#	Line 195	Line 206
206	* \brief This is the flag used to denote whether the current simulation has been started using paramin (PVM) or not	* \brief This is the flag used to denote whether the current simulation has been started using paramin (PVM) or not
207	*/	*/
208	int runnetwork;	int runnetwork;
209		//FIXME doc
210		int runomp;
211	/**	/**
212	* \brief This is the flag used to denote whether the current simulation should print model output or not	* \brief This is the flag used to denote whether the current simulation should print model output or not
213	*/	*/
#	Line 219	Line 232
232	* \brief This is the maximum ratio of a stock that can be consumed on any given timestep	* \brief This is the maximum ratio of a stock that can be consumed on any given timestep
233	*/	*/
234	double maxratio;	double maxratio;
235
236		//FIXME doc
237		//see[0] = seed; see[1] = seedM; see[2] = seedP;
238		unsigned* seed;
239		//  unsigned seed = 0;
240		//  unsigned seedM = 0;
241		//  unsigned seedP = 0;
242	};	};
243
244	#endif	#endif
245

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.10   changed lines   Added in v.11

---

root@forge.cesga.es	ViewVC Help
Powered by ViewVC 1.0.0