Changeset 23189 for issm/trunk/src/c/classes/Profiler.cpp

Timestamp:

08/28/18 09:45:51 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 23187

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/Profiler.cpp (modified) (3 diffs)

issm/trunk/src/c/classes/Profiler.cpp

@@ -100 +100 @@
         if(this->running[tag]) _error_("Tag "<<tag<<" has not been stopped");
 
-
         #ifdef _HAVE_MPI_
         return this->time[tag];
@@ -143 +142 @@
         _assert_(tag<MAXIMUMSIZE); 
         if(this->running[tag]) _error_("Tag "<<tag<<" is already running");
-
 
         /*If mpisync requested, make sure all the cpus are at the same point in the execution: */
@@ -184 +182 @@
         if(!this->running[tag]) _error_("Tag "<<tag<<" is not running");
 
-
         /*If mpisync requested, make sure all the cpus are at the same point in the execution: */
         if(!dontmpisync){