Diff of /trunk/gadget/interruptinterface.cc

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 5	Line 5
5
6	extern Ecosystem* EcoSystem;	extern Ecosystem* EcoSystem;
7
8		#ifndef NO_OPENMP
9		extern Ecosystem** EcoSystems;
10		//extern StochasticData* data;
11		#endif
12
13	void InterruptInterface::printMenu() {	void InterruptInterface::printMenu() {
14	if (EcoSystem->getFuncEval() != 0)	if (EcoSystem->getFuncEval() != 0)
15	cout << "\nInterrupted after " << EcoSystem->getFuncEval() << " iterations ...";	{
16		int iters = EcoSystem->getFuncEval();
17		#ifndef NO_OPENMP
18		int numThr = omp_get_max_threads ( );
19		for (int i = 0; i < numThr; i++)
20		iters += EcoSystems[i]->getFuncEval();
21		#endif
22		cout << "\nInterrupted after a total of " << iters << " iterations ...";
23		}
24	cout << "\nInterrupted at year " << EcoSystem->getCurrentYear() << ", step "	cout << "\nInterrupted at year " << EcoSystem->getCurrentYear() << ", step "
25	<< EcoSystem->getCurrentStep() << " (" << EcoSystem->getCurrentTime()	<< EcoSystem->getCurrentStep() << " (" << EcoSystem->getCurrentTime()
26	<< " of " << EcoSystem->numTotalSteps() << " timesteps)\n"	<< " of " << EcoSystem->numTotalSteps() << " timesteps)\n"

---

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