Commit 55f6a3d0 authored by Fathom's avatar Fathom
Browse files

Fix some compiler warnings

parent 62f2d720
#undef DEBUG
#undef TIME_DEBUG
#include <stdio.h>
#include <stdarg.h>
#include <stdio.h>
#include <time.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <vector>
#include <set>
......@@ -16,6 +12,7 @@
#include <utility>
#include <iostream>
#include <sstream>
#include <string>
#include "moab/Interface.hpp"
#include "Internals.hpp"
......@@ -153,24 +150,6 @@ void VALGRIND_MAKE_VEC_UNDEFINED(std::vector<T>& v) {
#define END_SERIAL
#endif
#ifdef NDEBUG
#undef assert
#define assert
#else
#undef assert
#define assert(A) \
if (!(A)) \
do_assert(__FILE__, __LINE__, #A)
static void do_assert(const char* file, int line, const char* condstr)
{
int rank;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
fprintf(stderr, "[%d] Assert(%s) failed at %s:%d\n", rank, condstr, file, line);
fflush(stderr);
abort();
}
#endif
static int my_Gatherv(void* sendbuf,
int sendcount,
MPI_Datatype sendtype,
......
......@@ -21,7 +21,7 @@
character*150 readopts
integer ngv, nge, ndim, nparts
integer nghlay
integer nverts(3), nelem(3), nblocks(3), nsbc(3), ndbc(3);
integer nverts(3), nelem(3), nblocks(3), nsbc(3), ndbc(3)
C large enough work arrays
integer iwork(100000)
real*8 dwork(100000)
......@@ -85,7 +85,7 @@ c find out MY process ID, and how many processes were started.
call errorout(ierr, 'fail to register application')
C
tmpfile = MESHDIR2
filename = trim(tmpfile) // '/io/p8ex1.h5m' // CHAR(0)
filename = trim(tmpfile)//'/io/p8ex1.h5m'//char(0)
ierr = iMOAB_ReadHeaderInfo ( filename, ngv, nge, ndim, nparts)
call errorout(ierr, 'fail to read header info')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment