Diff of /trunk/gadget/interruptinterface.cc

Parent Directory | Revision Log | Patch

	revision 14, Thu Jul 30 12:36:46 2015 UTC	revision 17, Mon Nov 9 10:22:57 2015 UTC
#	Line 4	Line 4
4	#include "gadget.h"	#include "gadget.h"
5
6	extern Ecosystem* EcoSystem;	extern Ecosystem* EcoSystem;
7		extern volatile int interrupted;
8	#ifndef NO_OPENMP	#ifdef _OPENMP
9	extern Ecosystem** EcoSystems;	extern Ecosystem** EcoSystems;
10	#endif	#endif
11
#	Line 13	Line 13
13	if (EcoSystem->getFuncEval() != 0)	if (EcoSystem->getFuncEval() != 0)
14	{	{
15	int iters = EcoSystem->getFuncEval();	int iters = EcoSystem->getFuncEval();
16	#ifndef NO_OPENMP	#ifdef _OPENMP
17	int numThr = omp_get_max_threads ( );	int numThr = omp_get_max_threads ( );
18	for (int i = 0; i < numThr; i++)	for (int i = 0; i < numThr; i++)
19	iters += EcoSystems[i]->getFuncEval();	iters += EcoSystems[i]->getFuncEval();
#	Line 31	Line 31
31	}	}
32
33	int InterruptInterface::menu() {	int InterruptInterface::menu() {
34		interrupted = 0;
35	char userinput[MaxStrLength];	char userinput[MaxStrLength];
36	char interruptfile[MaxStrLength];	char interruptfile[MaxStrLength];
37	strncpy(userinput, "", MaxStrLength);	strncpy(userinput, "", MaxStrLength);

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.14   changed lines   Added in v.17

---

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