Changeset 14910


Ignore:
Timestamp:
05/05/13 12:58:46 (12 years ago)
Author:
Eric.Larour
Message:

CHG: ne io/Print/Print.h header file for all things related to printing output. took this out from the macros.h include file

Location:
issm/trunk-jpl/src/c
Files:
3 added
1 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Makefile.am

    r14907 r14910  
    236236                                        ./io/Disk/pfclose.cpp\
    237237                                        ./io/Disk/WriteLockFile.cpp\
    238                                         ./io/PrintfFunction.cpp\
     238                                        ./io/Print/PrintfFunction.cpp\
     239                                        ./io/Print/Print.h\
    239240                                        ./io/Comm/Comm.h\
    240241                                        ./io/Comm/CommDef.h\

  • issm/trunk-jpl/src/c/classes/DofIndexing.cpp

    r14908 r14910  
    1414#include "../include/types.h"
    1515#include "../include/typedefs.h"
     16#include "../io/Print/Print.h"
    1617#include "../include/macros.h"
    1718#include "../shared/Exceptions/exceptions.h"

  • issm/trunk-jpl/src/c/classes/bamg/Edge.cpp

    r13036 r14910  
    77#include "Mesh.h"
    88#include "Geometry.h"
     9#include "../../io/Print/Print.h"
    910
    1011namespace bamg {

  • issm/trunk-jpl/src/c/classes/bamg/EigenMetric.cpp

    r13622 r14910  
    55
    66#include "Metric.h"
     7#include "../../io/Print/Print.h"
    78
    89namespace bamg {

  • issm/trunk-jpl/src/c/classes/bamg/Metric.cpp

    r13622 r14910  
    66#include "../../include/include.h"
    77#include "../../shared/Exceptions/exceptions.h"
     8#include "../../io/Print/Print.h"
    89
    910using namespace std;

  • issm/trunk-jpl/src/c/classes/gauss/GaussPenta.cpp

    r14909 r14910  
    66#include "./GaussTria.h"
    77#include "../../include/macros.h"
     8#include "../../io/Print/Print.h"
    89#include "../../shared/Exceptions/exceptions.h"
    910#include "../../shared/MemOps/MemOps.h"

  • issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp

    r14909 r14910  
    55#include "./GaussTria.h"
    66#include "../../include/macros.h"
     7#include "../../io/Print/Print.h"
    78#include "../../shared/Exceptions/exceptions.h"
    89#include "../../shared/MemOps/MemOps.h"
    910#include "../../shared/Numerics/GaussPoints.h"
     11#include "../../include/typedefs.h"
    1012
    1113/*GaussTria constructors and destructors:*/

  • issm/trunk-jpl/src/c/include/macros.h

    r13816 r14910  
    1919/*}}}*/
    2020
    21 /* _printf_ {{{*/
    22 /*Printing macro: only cpu number 0 */
    23 #define _printf_(flag,...) do{if(flag) PrintfFunction(__VA_ARGS__);}while(0)
     21
     22/*Exceptions: */
     23/* _assert_ {{{*/
     24/*Assertion macro: do nothing if macro _ISSM_DEBUG_ undefined*/
     25#ifdef _ISSM_DEBUG_
     26#define _assert_(statement)\
     27  if (!(statement)) _error_("Assertion \""<<#statement<<"\" failed, please report bug to "<<PACKAGE_BUGREPORT)
     28#else
     29#define _assert_(ignore)\
     30  ((void) 0)
     31#endif
    2432/*}}}*/
    2533/* _error_ {{{*/
    … …  
    3543   aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
    3644   throw ErrorException(__FILE__,__func__,__LINE__,aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
    37 #endif
    38 /*}}}*/
    39 /* _printLine_ {{{*/
    40 /* macro to print a line, adds std::endl */
    41 #define _printLine_(StreamArgs)\
    42    do{std::cout << StreamArgs << std::endl;}while(0)
    43 /*}}}*/
    44 /* _printString_ {{{*/
    45 /* macro to print some string */
    46 #define _printString_(StreamArgs)\
    47    do{std::cout << StreamArgs;}while(0)
    48 /*}}}*/
    49 /* _pprintLine_ {{{*/
    50 /* macro to print a line, adds std::endl, only on cpu 0 */
    51 #define _pprintLine_(StreamArgs)\
    52   do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
    53           aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
    54           PrintfFunction(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
    55 /*}}}*/
    56 /* _pprintString_ {{{*/
    57 /* macro to print some string. Only on cpu0 */
    58 #define _pprintString_(StreamArgs)\
    59   do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
    60           aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
    61           PrintfFunction2(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
    62 /*}}}*/
    63 /* _assert_ {{{*/
    64 /*Assertion macro: do nothing if macro _ISSM_DEBUG_ undefined*/
    65 #ifdef _ISSM_DEBUG_
    66 #define _assert_(statement)\
    67   if (!(statement)) _error_("Assertion \""<<#statement<<"\" failed, please report bug to "<<PACKAGE_BUGREPORT)
    68 #else
    69 #define _assert_(ignore)\
    70   ((void) 0)
    7145#endif
    7246/*}}}*/

  • issm/trunk-jpl/src/c/io/io.h

    r12513 r14910  
    1111#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    1212#endif
     13
    1314#include "./Disk/diskio.h"
    14 
    15 /*printf: */
    16 int PrintfFunction(const char* format,...);
    17 int PrintfFunction(const string & message);
    18 int PrintfFunction2(const string & message);
     15#include "./Print/Print.h"
     16#include "./Comm/Comm.h"
    1917
    2018#endif  /* _IO_H_ */

  • issm/trunk-jpl/src/c/toolkits/issm/IssmDenseMat.h

    r14904 r14910  
    2020#include "../../shared/Exceptions/exceptions.h"
    2121#include "../../shared/MemOps/MemOps.h"
     22#include "../../io/Print/Print.h"
    2223#include "../../include/macros.h"
    2324#include "../../toolkits/gsl/gslincludes.h"

  • issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h

    r14904 r14910  
    1818
    1919#include "../../shared/Exceptions/exceptions.h"
     20#include "../../io/Print/Print.h"
    2021#include "../../shared/MemOps/MemOps.h"
    2122#include "../../include/macros.h"
Note: See TracChangeset for help on using the changeset viewer.