Diff of /trunk/gadget/maininfo.h

Parent Directory | Revision Log | Patch

	revision 11, Thu Jul 23 19:00:38 2015 UTC	revision 20, Fri Apr 7 09:20:55 2017 UTC
#	Line 50	Line 50
50	* \param filename is the name of the file	* \param filename is the name of the file
51	*/	*/
52	void setPrintFinalFile(char* filename);	void setPrintFinalFile(char* filename);
53		#ifdef _OPENMP
54		/**
55		* \brief This function will store parallel options
56		*/
57		void setParallel(char* filename);
58		#endif
59	/**	/**
60	* \brief This function will store the filename that the initial values for the model parameters will be read from	* \brief This function will store the filename that the initial values for the model parameters will be read from
61	* \param filename is the name of the file	* \param filename is the name of the file
#	Line 70	Line 76
76	* \return flag	* \return flag
77	*/	*/
78	int runOptimise() const { return runoptimise; };	int runOptimise() const { return runoptimise; };
	//FIXME doc
	int runOmp() const { return runomp; };
79	/**	/**
80	* \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
81	* \return flag	* \return flag
#	Line 87	Line 91
91	* \return flag	* \return flag
92	*/	*/
93	int runPrint() const { return runprint; };	int runPrint() const { return runprint; };
94		#ifdef _OPENMP
95		/**
96		* \brief This function will return the flag used to determine whether the current simulation should print the model output
97		* \return flag
98		*/
99		int runParallel() const { return runparallel; };
100		#endif
101	/**	/**
102	* \brief This function will return the flag used to determine whether the optimisation parameters have been given	* \brief This function will return the flag used to determine whether the optimisation parameters have been given
103	* \return flag	* \return flag
#	Line 149	Line 160
160	double getMaxRatio() const {	double getMaxRatio() const {
161	return maxratio;	return maxratio;
162	}	}
163	unsigned* getSeed() const {return seed;}	/**
164	//      unsigned getSeedM() const {return seedM;}	* \brief This function will return seeds used in SA
165	//      unsigned getSeedP() const {return seedP;}	* \return seed array of unsigned int with the seeds used in SA
166		*/
167	;	unsigned* getSeed() const {return seed;};
168
169
170	private:	private:
#	Line 206	Line 217
217	* \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
218	*/	*/
219	int runnetwork;	int runnetwork;
	//FIXME doc
	int runomp;
220	/**	/**
221	* \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
222	*/	*/
#	Line 232	Line 241
241	* \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
242	*/	*/
243	double maxratio;	double maxratio;
244		/**
245	//FIXME doc	* \brief vector with the seeds used in SA
246	//see[0] = seed; see[1] = seedM; see[2] = seedP;	* \note see[0] = seed | see[1] = seedM | see[2] = seedP
247		*/
248	unsigned* seed;	unsigned* seed;
249	//  unsigned seed = 0;	#ifdef _OPENMP
250	//  unsigned seedM = 0;	/**
251	//  unsigned seedP = 0;	* \brief This is the flag used to denote whether the likelihood score should be optimised in pararrel   */
252		int runparallel;
253		#endif
254	};	};
255
256	#endif	#endif

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

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

---

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