Project
People
Skill
Log In
|
Get Help
Home
My Page
Projects
Code Snippets
Project Openings
Mareframe
Summary
Activity
Forums
Tracker
Lists
Tasks
Docs
Surveys
News
SCM
Files
[mareframe] Diff of /trunk/gadget/keeper.cc
[mareframe]
/
trunk
/
gadget
/
keeper.cc
Repository:
Repository Listing
mareframe
Diff of /trunk/gadget/keeper.cc
Parent Directory
|
Revision Log
|
Patch
revision 15, Tue Sep 1 19:14:33 2015 UTC
revision 16, Tue Oct 13 11:29:01 2015 UTC
#
Line 7
Line 7
7
8
extern Ecosystem* EcoSystem;
extern Ecosystem* EcoSystem;
9
10
#ifndef NO_OPENMP
#ifdef _OPENMP
11
extern Ecosystem** EcoSystems;
extern Ecosystem** EcoSystems;
12
#endif
#endif
13
#
Line 290
Line 290
290
291
//JMB - print the number of function evaluations at the start of the line
//JMB - print the number of function evaluations at the start of the line
292
int iters = EcoSystem->getFuncEval();
int iters = EcoSystem->getFuncEval();
293
#ifndef NO_OPENMP
#ifdef _OPENMP
294
int numThr = omp_get_max_threads ( );
int numThr = omp_get_max_threads ( );
295
for (int i = 0; i < numThr; i++)
for (int i = 0; i < numThr; i++)
296
iters += EcoSystems[i]->getFuncEval();
iters += EcoSystems[i]->getFuncEval();
#
Line 423
Line 423
423
424
if (interrupt) {
if (interrupt) {
425
int iters = EcoSystem->getFuncEval();
int iters = EcoSystem->getFuncEval();
426
#ifndef NO_OPENMP
#ifdef _OPENMP
427
int numThr = omp_get_max_threads ( );
int numThr = omp_get_max_threads ( );
428
for (i = 0; i < numThr; i++)
for (i = 0; i < numThr; i++)
429
iters += EcoSystems[i]->getFuncEval();
iters += EcoSystems[i]->getFuncEval();
Colored Diff
Long Colored Diff
Unidiff
Context Diff
Side by Side
Legend:
Removed from v.15
changed lines
Added in v.16
root@forge.cesga.es
ViewVC Help
Powered by
ViewVC 1.0.0