Diff of /trunk/gadget/maininfo.h

Parent Directory | Revision Log | Patch

	revision 11, Thu Jul 23 19:00:38 2015 UTC	revision 12, Fri Jul 24 18:36:24 2015 UTC
#	Line 70	Line 70
70	* \return flag	* \return flag
71	*/	*/
72	int runOptimise() const { return runoptimise; };	int runOptimise() const { return runoptimise; };
	//FIXME doc
	int runOmp() const { return runomp; };
73	/**	/**
74	* \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
75	* \return flag	* \return flag
#	Line 149	Line 147
147	double getMaxRatio() const {	double getMaxRatio() const {
148	return maxratio;	return maxratio;
149	}	}
150	unsigned* getSeed() const {return seed;}	/**
151	//      unsigned getSeedM() const {return seedM;}	* \brief This function will return seeds used in SA
152	//      unsigned getSeedP() const {return seedP;}	* \return seed array of unsigned int with the seeds used in SA
153		*/
154	;	unsigned* getSeed() const {return seed;};
155
156
157	private:	private:
#	Line 206	Line 204
204	* \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
205	*/	*/
206	int runnetwork;	int runnetwork;
	//FIXME doc
	int runomp;
207	/**	/**
208	* \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
209	*/	*/
#	Line 232	Line 228
228	* \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
229	*/	*/
230	double maxratio;	double maxratio;
231		/**
232	//FIXME doc	* \brief vector with the seeds used in SA
233	//see[0] = seed; see[1] = seedM; see[2] = seedP;	* \note see[0] = seed | see[1] = seedM | see[2] = seedP
234		*/
235	unsigned* seed;	unsigned* seed;
	//  unsigned seed = 0;
	//  unsigned seedM = 0;
	//  unsigned seedP = 0;
236	};	};
237
238	#endif	#endif

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

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

---

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