Changeset 12004 for issm/branches/trunk-jpl-damage/src/c/io/PrintfFunction.cpp

Timestamp:

04/16/12 16:06:52 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 11990

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/io/PrintfFunction.cpp (modified) (2 diffs)

issm/branches/trunk-jpl-damage/src/c/io/PrintfFunction.cpp

@@ -9 +9 @@
 #include "../include/include.h"
 
-#ifdef _SERIAL_
+#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
 #include "mex.h"
 #endif
@@ -53 +53 @@
 
         /*Ok, if we are running in parallel, get node 0 to print*/
-#if defined(_PARALLEL_)
+#if defined(_HAVE_MATLAB_) && defined(_SERIAL_)
+        mexPrintf(buffer);
+#else
         if(my_rank==0)printf(buffer);
-#else
-        mexPrintf(buffer);
 #endif